Merge pull request #1 from markleusink/master

theme switcher added
markleusink · Mar 24, 2014 · 4e302c5 · 4e302c5
2 parents 9030b74 + 452b5c0
commit 4e302c5
Show file tree

Hide file tree

Showing 16 changed files with 287 additions and 15,770 deletions.
diff --git a/Site/CustomControls/ccAppLayout.xsp b/Site/CustomControls/ccAppLayout.xsp
@@ -2,23 +2,22 @@
 <xp:view xmlns:xp="http://www.ibm.com/xsp/core" xmlns:xe="http://www.ibm.com/xsp/coreex" xmlns:bx="http://www.openntf.org/xsp/bootstrap">
 
 	<xe:applicationLayout id="applicationLayout1">
+
 		<xp:callback
 			facetName="facetMiddle"
 			id="facetMiddle">
 		</xp:callback>
-		
+
 		<!-- analytics -->
-	<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+		<script>
+			(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
+			Date();a=s.createElement(o), m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+			})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-  ga('create', 'UA-31456612-3', 'bootstrap4xpages.com');
-  ga('send', 'pageview');
+			ga('create', 'UA-31456612-3', 'bootstrap4xpages.com'); ga('send', 'pageview');
+
+		</script>
 
-</script>
-
 		<xe:this.configuration>
 			<bx:bootstrapApplication
 				banner="true"
@@ -27,36 +26,48 @@
 				legal="false"
 				placeBar="false"
 				titleBar="false"
-				navbarInverted="true">
+				navbarInverted="true"
+				productLogoAlt="Bootstrap4XPages">
 				<bx:this.bannerApplicationLinks>
+
 					<xe:basicLeafNode label="Demos">
 						<xe:this.href><![CDATA[/.ibmxspres/domino/bs4xp/demos.nsf]]></xe:this.href>
 					</xe:basicLeafNode>
-					<!--<xe:basicContainerNode label="Themes">
+
+					<xe:basicContainerNode label="Themes">
 						<xe:this.children>
-							<xe:basicLeafNode label="Default"></xe:basicLeafNode>
-							<xe:basicLeafNode label="Bootswatch - Yeti"></xe:basicLeafNode>
-							<xe:basicLeafNode label="Bootswatch - Cyborg"></xe:basicLeafNode>
+							<xe:basicLeafNode label="Default" submitValue="default"></xe:basicLeafNode>
+							<xe:basicLeafNode label="Bootswatch - Superhero" submitValue="superhero"></xe:basicLeafNode>
+							<xe:basicLeafNode label="Bootswatch - Journal" submitValue="journal"></xe:basicLeafNode>
+							<xe:basicLeafNode label="Bootswatch - Darkly" submitValue="darkly"></xe:basicLeafNode>
 						</xe:this.children>
 					</xe:basicContainerNode>
 
-					--><xe:basicContainerNode label="Bootstrap sites">
+					<xe:basicContainerNode label="Bootstrap sites">
 						<xe:this.children>
 							<xe:basicLeafNode label="Official Bootstrap site">
 								<xe:this.href><![CDATA[http://getbootstrap.com]]></xe:this.href>
 							</xe:basicLeafNode>
 							<xe:basicLeafNode label="Bootstrap blog">
-							<xe:this.href><![CDATA[http://blog.getbootstrap.com]]></xe:this.href>
+								<xe:this.href><![CDATA[http://blog.getbootstrap.com]]></xe:this.href>
 							</xe:basicLeafNode>
 							<xe:basicLeafNode label="Bootswatch">
-							<xe:this.href><![CDATA[http://bootswatch.com]]></xe:this.href>
+								<xe:this.href><![CDATA[http://bootswatch.com]]></xe:this.href>
 							</xe:basicLeafNode>
 							<xe:basicLeafNode label="Wrapbootstrap">
-							<xe:this.href><![CDATA[http://wrapbootstrap.com]]></xe:this.href>
+								<xe:this.href><![CDATA[http://wrapbootstrap.com]]></xe:this.href>
 							</xe:basicLeafNode>
 						</xe:this.children>
 					</xe:basicContainerNode>
+
 				</bx:this.bannerApplicationLinks>
 			</bx:bootstrapApplication>
 		</xe:this.configuration>
-	</xe:applicationLayout></xp:view>
+
+		 <xp:eventHandler event="onItemClick" submit="true" refreshMode="complete">
+            <xe:this.action><![CDATA[#{javascript:sessionScope.put("theme",context.getSubmittedValue())}]]></xe:this.action>
+        </xp:eventHandler>
+
+	</xe:applicationLayout>
+
+</xp:view>
diff --git a/Site/CustomControls/ccBS_DatePicker.xsp b/Site/CustomControls/ccBS_DatePicker.xsp
@@ -46,7 +46,7 @@ if (itDate != null) {
 				<xp:validateRequired message="Datum is verplicht."></xp:validateRequired>
 			</xp:this.validators></xp:inputText>
 		<span class="add-on">
-			<i class="icon-calendar"></i>
+			<i class="glyphicon glyphicon-calendar"></i>
 		</span>
 	</xp:div>
 

diff --git a/Site/CustomControls/ccBS_TimePicker.xsp b/Site/CustomControls/ccBS_TimePicker.xsp
@@ -35,7 +35,7 @@
 		</xp:inputText>
 
 		<span class="add-on">
-			<i class="icon-time"></i>
+			<i class="glyphicon glyphicon-time"></i>
 		</span>
 	</xp:div>
 

diff --git a/Site/CustomControls/ccDemoMenu.xsp b/Site/CustomControls/ccDemoMenu.xsp
@@ -6,88 +6,95 @@
 		<li>
 			<xp:link escape="true" id="link12" value="/.ibmxspres/domino/bs4xp/demos.nsf/reusableFields.xsp">
 				<xp:this.text><![CDATA[Reusable fields & validation]]></xp:this.text>
-				<i class="icon-chevron-right"></i>
+				<i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 
 		<li>
 			<xp:link escape="true" text="All Bootstrap controls" id="link8"
 				value="/.ibmxspres/domino/bs4xp/demos.nsf/allControls.xsp">
-					<i class="icon-chevron-right"></i>
+					<i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 
 		<li>
 			<xp:link escape="true" text="Buttons" id="link2"
 				value="/.ibmxspres/domino/bs4xp/demos.nsf/demos.xsp#content=buttons">
-					<i class="icon-chevron-right"></i>
+					<i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 
 
 		<li>
 			<xp:link escape="true" text="Do more with buttons" id="link11"
 				value="/.ibmxspres/domino/bs4xp/demos.nsf/doMoreWithButtons.xsp">
-					<i class="icon-chevron-right"></i>
+					<i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 
 		<li>
 			<xp:link escape="true" text="(Modal) Dialog"
 				id="link5" value="/.ibmxspres/domino/bs4xp/demos.nsf/dialog.xsp">
-					<i class="icon-chevron-right"></i>
+					<i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 
 		<li>
 			<xp:link escape="true" text="Alerts"
 				id="link10" value="/.ibmxspres/domino/bs4xp/demos.nsf/alerts.xsp">
-					<i class="icon-chevron-right"></i>
+					<i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 
 
 		<li>
 			<xp:link escape="true" text="Forms"
 				id="link3" value="/.ibmxspres/domino/bs4xp/demos.nsf/form.xsp">
-					<i class="icon-chevron-right"></i>
+					<i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 		<li>
 			<xp:link escape="true" text="Form controls: Date picker"
 				id="link1" value="/.ibmxspres/domino/bs4xp/demos.nsf/datePicker.xsp">
-					<i class="icon-chevron-right"></i>
+					<i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 
-		<li>
+		<!--<li>
 			<xp:link escape="true" text="Form controls: Time picker"
 				id="link4" value="/.ibmxspres/domino/bs4xp/demos.nsf/timePicker.xsp">
-					<i class="icon-chevron-right"></i>
+					<i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 		
-		<li>
+		--><li>
 			<xp:link escape="true" text="Login form" id="link6">
-				<xp:this.value><![CDATA[#{javascript:"/.ibmxspres/domino/bs4xp/demos.nsf?open&login"}]]></xp:this.value><i class="icon-chevron-right"></i>
+				<xp:this.value><![CDATA[#{javascript:"/.ibmxspres/domino/bs4xp/demos.nsf?open&login"}]]></xp:this.value><i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 
 		<li>
 			<xp:link escape="true" text="Want more icons?"
-				id="link7" value="/.ibmxspres/domino/bs4xp/demos.nsf/moreIcons.xsp">
-					<i class="icon-chevron-right"></i>
+				id="link7" value="/.ibmxspres/domino/bs4xp/demos.nsf/fontAwesome.xsp">
+					<i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 
 		<li>
 			<xp:link escape="true" text="Select2"
 				id="link9" value="/.ibmxspres/domino/bs4xp/demos.nsf/select2.xsp">
-					<i class="icon-chevron-right"></i>
+					<i class="glyphicon glyphicon-chevron-right"></i>
+			</xp:link>
+		</li><!--
+		
+			
+		<li>
+			<xp:link escape="true" text="Multi file upload" id="link14">
+				<xp:this.value><![CDATA[#{javascript:"/.ibmxspres/domino/bs4xp/demos.nsf/uploadAdvanced.xsp"}]]></xp:this.value><i class="glyphicon glyphicon-chevron-right"></i>
 			</xp:link>
 		</li>
 		
 	
-	</ul>
+	--></ul>
 
 </xp:view>