Merge branch 'master' of github.com:stephanrauh/BootsFaces-Examples

ModalDialogs/README.md

@@ -1,5 +1,5 @@
 # BootsFaces-Examples: Modal Dialogs and DatePickers
-This demo shows how to use a BootsFaces DatePicker within a modal dialog.
+This demo shows how to use a BootsFaces DatePicker within a modal dialog and/or with a NavBar.
 
 Run this as a Tomcat application. The URL to start typically is http://localhost:8080/ModalDialog/index.jsf
 
@@ -8,4 +8,6 @@ Tested on:
 <li>Tomcat 8.0 / Oracle Mojarra 2.2.10</li>
 <li>Tomcat 8.0 / Apache MyFaces 2.2.7</li>
 <li>WildFly 8.2</li>
+<li>BootsFaces 0.6.7</li>
 </ul>
+

ModalDialogs/pom.xml

@@ -24,12 +24,12 @@
 		<dependency>
 			<groupId>net.bootsfaces</groupId>
 			<artifactId>bootsfaces</artifactId>
-			<version>0.6.5</version>
+			<version>0.6.7-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.primefaces</groupId>
 			<artifactId>primefaces</artifactId>
-			<version>5.1</version>
+			<version>5.2</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>

ModalDialogs/src/main/webapp/index.xhtml

@@ -21,20 +21,41 @@
 			<b:modal id="aboutModal" title="About"
 				styleClass="aboutModalPseudoClass">
 				<b:panel>
+					<p>This is a modal dialog.</p>
+					<p>It even contains a date picker.</p>
 					<p>
-       			     This is a modal dialog.</p>
-       			     <p>
-       			     <b:datepicker></b:datepicker></p>
-   			     </b:panel>
+						<b:datepicker></b:datepicker>
+					</p>
+					<p>Far far away, behind the word mountains, far from the
+						countries Vokalia and Consonantia, there live the blind texts.
+						Separated they live in Bookmarksgrove right at the coast of the
+						Semantics, a large language ocean. A small river named Duden flows
+						by their place and supplies it with the necessary regelialia. It
+						is a paradisematic country, in which roasted parts of sentences
+						fly into your mouth. Even the all-powerful Pointing has no control
+						about the blind texts it is an almost unorthographic life One day
+						however a small line of blind text by the name of Lorem Ipsum
+						decided to leave for the far World of Grammar. The Big Oxmox
+						advised her not to do so, because there were thousands of bad
+						Commas, wild Question Marks and devious Semikoli, but the Little
+						Blind Text didn’t listen. She packed her seven versalia, put her
+						initial into the belt and made herself on the way. When she
+						reached the first hills of the Italic Mountains, she had a last
+						view back on the skyline of her hometown Bookmarksgrove, the
+						headline of Alphabet Village and the subline of her own road, the
+						Line Lane. Pityful a rethoric question ran over her cheek</p>
+				</b:panel>
 			</b:modal>
 
 			<b:navBar brand="Test" brandHref="/index.jsf" inverse="true"
 				fixed="true">
-				<b:navLink value="About"
-					pt:onclick="$('.aboutModalPseudoClass').modal('show');return false;"></b:navLink>
+				<b:navbarLinks>
+					<b:navLink value="About" 
+						onclick="$('.aboutModalPseudoClass').modal('show');return false;"></b:navLink>
+				</b:navbarLinks>
 			</b:navBar>
 
-			<b:button value="sdjhfk"
+			<b:button value="Click me to show the modal dialog."
 				onclick="$('.aboutModalPseudoClass').modal('show');return false;"></b:button>
 		</h:form>
 	</b:container>