[seam-commits] Seam SVN: r14702 - branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp.

[seam-commits at lists.jboss.org]

Author: manaRH
Date: 2012-05-18 15:55:29 -0400 (Fri, 18 May 2012)
New Revision: 14702

Modified:
   branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/book.xhtml
   branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/conversations.xhtml
   branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/edit.xhtml
   branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/template.xhtml
Log:
JBSEAM-4875 fixing booking example

Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/book.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/book.xhtml	2012-05-18 19:55:17 UTC (rev 14701)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/book.xhtml	2012-05-18 19:55:29 UTC (rev 14702)
@@ -15,7 +15,7 @@
 </div>
 <div class="section">
 	<div class="entry errors">
-		<h:messages id="messages" globalOnly="true"/>
+		<s:message id="messages" globalOnly="true"/>
 	</div>
 
 	<ui:include src="hotelview.xhtml"/>
@@ -27,12 +27,12 @@
 			
 		<s:decorate id="checkinDateDecorate" template="edit.xhtml">
 			<ui:define name="label">Check In Date:</ui:define>
-			<rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkinDateDecorate" style="width: auto;" />
+			<rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" render="checkinDateDecorate" style="width: auto;" />
 		</s:decorate>
 		
 		<s:decorate id="checkoutDateDecorate" template="edit.xhtml">
 			<ui:define name="label">Check Out Date:</ui:define>
-			<rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkoutDateDecorate"  style="width: auto;"/>
+			<rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" render="checkoutDateDecorate"  style="width: auto;"/>
 		</s:decorate>
 		
 		<s:decorate id="bedsDecorate" template="edit.xhtml">
@@ -55,14 +55,14 @@
 		<s:decorate id="creditCardDecorate" template="edit.xhtml">
 			<ui:define name="label">Credit Card #:</ui:define>
 			<h:inputText id="creditCard" value="#{booking.creditCard}" required="true">
-				<a:ajax id="onblur" event="blur" render="creditCardDecorate"/>
+				<a:ajax event="blur" render="creditCardDecorate"/>
 			</h:inputText>
 		</s:decorate>
 
 		<s:decorate id="creditCardNameDecorate" template="edit.xhtml">
 			<ui:define name="label">Credit Card Name:</ui:define>
 			<h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true">
-				<a:ajax id="onblur" event="blur" render="creditCardNameDecorate"/>
+				<a:ajax event="blur" render="creditCardNameDecorate"/>
 			</h:inputText>
 		</s:decorate>
 

Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/conversations.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/conversations.xhtml	2012-05-18 19:55:17 UTC (rev 14701)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/conversations.xhtml	2012-05-18 19:55:29 UTC (rev 14702)
@@ -21,11 +21,13 @@
 	            </h:column>
 	            <h:column id="column2">
 	                <h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}">
-	                    <s:convertDateTime type="time" pattern="hh:mm"/>
+	                   <!--<s:convertDateTime type="time" pattern="kk:mm:ss"/>-->
+                       <f:convertDateTime type="time" pattern="kk:mm:ss"/>
 	                </h:outputText>
 	                -
 	                <h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}">
-	                    <s:convertDateTime type="time" pattern="hh:mm"/>
+	                   <!--<s:convertDateTime type="time" pattern="hh:mm"/>-->
+                       <f:convertDateTime type="time" pattern="kk:mm:ss"/>
 	                </h:outputText>
 	            </h:column>
 	        </h:dataTable>
@@ -33,4 +35,4 @@
 	</div>
 	
 	</div>
-</ui:composition>
\ No newline at end of file
+</ui:composition>

Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/edit.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/edit.xhtml	2012-05-18 19:55:17 UTC (rev 14701)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/edit.xhtml	2012-05-18 19:55:29 UTC (rev 14702)
@@ -15,7 +15,7 @@
                 <ui:insert/>
             </s:validateAll>
         </span>
-        <s:message id="message" styleClass="error errors"/>
+        <s:message id="message" styleClass="error errors" globalOnly="true"/>
     </div>
     
 </ui:composition>
\ No newline at end of file

Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/template.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/template.xhtml	2012-05-18 19:55:17 UTC (rev 14701)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-web/src/main/webapp/template.xhtml	2012-05-18 19:55:29 UTC (rev 14702)
@@ -11,6 +11,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<title>JBoss Suites: Seam Framework</title>
 	<link href="css/screen.css" rel="stylesheet" type="text/css" />
+	<ui:insert name="head"/>
 </h:head>
 <body>