[jboss-cvs] jboss-seam/examples/booking/view ...
Gavin King
gavin.king at jboss.com
Sun Mar 18 16:18:41 EDT 2007
User: gavin
Date: 07/03/18 16:18:41
Modified: examples/booking/view book.xhtml confirm.xhtml
hotel.xhtml password.xhtml register.xhtml
Log:
more work on s:decorateAll layout
Revision Changes Path
1.34 +14 -42 jboss-seam/examples/booking/view/book.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: book.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/view/book.xhtml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- book.xhtml 18 Mar 2007 19:21:27 -0000 1.33
+++ book.xhtml 18 Mar 2007 20:18:41 -0000 1.34
@@ -13,43 +13,20 @@
<h1>Book Hotel</h1>
</div>
<div class="section">
- <h:form id="booking">
- <fieldset>
- <div class="entry">
- <div class="label">Name:</div>
- <div class="output">#{hotel.name}</div>
- </div>
- <div class="entry">
- <div class="label">Address:</div>
- <div class="output">#{hotel.address}</div>
- </div>
- <div class="entry">
- <div class="label">City, State:</div>
- <div class="output">#{hotel.city}, #{hotel.state}</div>
- </div>
- <div class="entry">
- <div class="label">Zip:</div>
- <div class="output">#{hotel.zip}</div>
- </div>
- <div class="entry">
- <div class="label">Country:</div>
- <div class="output">#{hotel.country}</div>
- </div>
- <div class="entry">
- <div class="label">Nightly rate:</div>
- <div class="output">
- <h:outputText value="#{hotel.price}">
- <f:convertNumber type="currency"
- currencySymbol="$"/>
- </h:outputText>
- </div>
+ <ui:include src="hotelview.xhtml"/>
+
+ <div class="entry errors">
+ <h:messages globalOnly="true"/>
</div>
+ <h:form id="booking">
+ <fieldset>
<s:validateAll>
<s:decorateAll rowClass="entry"
labelColumnClass="label"
fieldColumnClass="input"
- messageColumnClass="errors">
+ messageColumnClass="errors"
+ id="bookingFields">
<f:facet name="aroundInvalidField">
<s:span styleClass="errors"/>
@@ -132,20 +109,15 @@
</h:selectOneMenu>
</s:decorate>
+ <s:fragment>
+ <h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>
+  
+ <s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/>
+ </s:fragment>
+
</s:decorateAll>
</s:validateAll>
- <div class="entry errors">
- <h:messages globalOnly="true"/>
- </div>
-
- <div class="entry">
- <div class="label"> </div>
- <div class="input">
- <h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/> 
- <s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/>
- </div>
- </div>
</fieldset>
</h:form>
</div>
1.19 +38 -53 jboss-seam/examples/booking/view/confirm.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: confirm.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/view/confirm.xhtml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- confirm.xhtml 17 Dec 2006 01:04:51 -0000 1.18
+++ confirm.xhtml 18 Mar 2007 20:18:41 -0000 1.19
@@ -8,64 +8,49 @@
<!-- content -->
<ui:define name="content">
+
<div class="section">
<h1>Confirm Hotel Booking</h1>
</div>
+
<div class="section">
- <h:form id="confirm">
- <fieldset>
- <div class="entry">
- <div class="label">Name:</div>
- <div class="output">#{hotel.name}</div>
- </div>
- <div class="entry">
- <div class="label">Address:</div>
- <div class="output">#{hotel.address}</div>
- </div>
- <div class="entry">
- <div class="label">City, State:</div>
- <div class="output">#{hotel.city}, #{hotel.state}</div>
- </div>
- <div class="entry">
- <div class="label">Zip:</div>
- <div class="output">#{hotel.zip}</div>
- </div>
- <div class="entry">
- <div class="label">Country:</div>
- <div class="output">#{hotel.country}</div>
- </div>
- <div class="entry">
- <div class="label">Total payment:</div>
- <div class="output">
+
+ <ui:include src="hotelview.xhtml"/>
+
+ <s:decorateAll rowClass="entry"
+ labelColumnClass="label"
+ fieldColumnClass="output"
+ id="booking">
+
<h:outputText value="#{booking.total}">
- <f:convertNumber type="currency"
- currencySymbol="$"/>
+ <f:facet name="label">Total Payment:</f:facet>
+ <f:convertNumber type="currency" currencySymbol="$"/>
+ </h:outputText>
+
+ <h:outputText value="#{booking.checkinDate}">
+ <f:facet name="label">Check In Date:</f:facet>
</h:outputText>
- </div>
- </div>
- <div class="entry">
- <div class="label">Check In Date:</div>
- <div class="output"><h:outputText value="#{booking.checkinDate}"/></div>
- </div>
- <div class="entry">
- <div class="label">Check Out Date:</div>
- <div class="output"><h:outputText value="#{booking.checkoutDate}"/></div>
- </div>
- <div class="entry">
- <div class="label">Credit Card #:</div>
- <div class="output">#{booking.creditCard}</div>
- </div>
- <div class="entry">
- <div class="label"> </div>
- <div class="input">
- <h:commandButton id="confirm" value="Confirm" action="#{hotelBooking.confirm}"/> 
- <s:button id="revise" value="Revise" view="/book.xhtml"/> 
+
+ <h:outputText value="#{booking.checkoutDate}">
+ <f:facet name="label">Check Out Date:</f:facet>
+ </h:outputText>
+
+ <h:outputText value="#{booking.creditCard}">
+ <f:facet name="label">Credit Card #:</f:facet>
+ </h:outputText>
+
+ <h:form id="confirm">
+ <h:commandButton id="confirm" value="Confirm" action="#{hotelBooking.confirm}"/>
+  
+ <s:button id="revise" value="Revise" view="/book.xhtml"/>
+  
<h:commandButton id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/>
- </div>
- </div>
- </fieldset>
</h:form>
+
+ </s:decorateAll>
+
</div>
+
</ui:define>
<!-- sidebar -->
1.15 +12 -40 jboss-seam/examples/booking/view/hotel.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: hotel.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/view/hotel.xhtml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- hotel.xhtml 15 Dec 2006 13:26:33 -0000 1.14
+++ hotel.xhtml 18 Mar 2007 20:18:41 -0000 1.15
@@ -8,52 +8,24 @@
<!-- content -->
<ui:define name="content">
+
<div class="section">
<h1>View Hotel</h1>
</div>
+
<div class="section">
+ <ui:include src="hotelview.xhtml"/>
<div class="entry">
- <div class="label">Name:</div>
- <div class="output">#{hotel.name}</div>
- </div>
- <div class="entry">
- <div class="label">Address:</div>
- <div class="output">#{hotel.address}</div>
- </div>
- <div class="entry">
- <div class="label">City:</div>
- <div class="output">#{hotel.city}</div>
- </div>
- <div class="entry">
- <div class="label">State:</div>
- <div class="output">#{hotel.state}</div>
- </div>
- <div class="entry">
- <div class="label">Zip:</div>
- <div class="output">#{hotel.zip}</div>
- </div>
- <div class="entry">
- <div class="label">Country:</div>
- <div class="output">#{hotel.country}</div>
- </div>
- <div class="entry">
- <div class="label">Nightly rate:</div>
- <div class="output">
- <h:outputText value="#{hotel.price}">
- <f:convertNumber type="currency"
- currencySymbol="$"/>
- </h:outputText>
- </div>
- </div>
-</div>
-<div class="section">
+ <div class="input">
<h:form id="hotel">
- <fieldset class="buttonBox">
- <h:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/> 
+ <h:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>
+  
<h:commandButton id="cancel" action="#{hotelBooking.cancel}" value="Back to Search"/>
- </fieldset>
</h:form>
+ </div>
+ </div>
</div>
+
</ui:define>
<!-- sidebar -->
1.13 +0 -1 jboss-seam/examples/booking/view/password.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: password.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/view/password.xhtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- password.xhtml 27 Feb 2007 01:44:22 -0000 1.12
+++ password.xhtml 18 Mar 2007 20:18:41 -0000 1.13
@@ -50,7 +50,6 @@
</div>
<div class="entry">
- <div class="label"> </div>
<div class="input">
<h:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/> 
<s:button id="cancel" value="Cancel" view="/main.xhtml"/>
1.23 +42 -29 jboss-seam/examples/booking/view/register.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: register.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/view/register.xhtml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- register.xhtml 18 Mar 2007 19:21:27 -0000 1.22
+++ register.xhtml 18 Mar 2007 20:18:41 -0000 1.23
@@ -10,12 +10,17 @@
<title>JBoss Suites: Seam Framework</title>
<link href="css/screen.css" rel="stylesheet" type="text/css" />
</head>
+
<body id="pgHome">
+
<div id="document">
+
<div id="header">
<div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div>
</div>
+
<div id="container">
+
<div id="sidebar">
<h1>Integrated multi-layer validation</h1>
<p>
@@ -33,20 +38,28 @@
</a>
</p>
</div>
+
<div id="content">
+
<div class="section">
<h1>Register</h1>
</div>
+
<div class="section">
- <h:form id="register">
+ <div class="entry errors">
+ <h:messages globalOnly="true"/>
+ </div>
+
+ <h:form id="registration">
<fieldset>
<s:validateAll>
<s:decorateAll rowClass="entry"
labelColumnClass="label"
fieldColumnClass="input"
- messageColumnClass="errors">
+ messageColumnClass="errors"
+ id="registrationFields">
<f:facet name="aroundInvalidField">
<s:span styleClass="errors"/>
@@ -79,28 +92,28 @@
<f:facet name="label">Verify Password:</f:facet>
</h:inputSecret>
+ <s:fragment>
+ <h:commandButton id="register" value="Register" action="#{register.register}"/>
+  
+ <s:button id="cancel" value="Cancel" view="/home.xhtml"/>
+ </s:fragment>
+
</s:decorateAll>
</s:validateAll>
- <div class="entry errors">
- <h:messages globalOnly="true"/>
- </div>
-
- <div class="entry">
- <div class="label"> </div>
- <div class="input">
- <h:commandButton id="register" value="Register" action="#{register.register}"/> 
- <s:button id="cancel" value="Cancel" view="/home.xhtml"/>
- </div>
- </div>
-
</fieldset>
</h:form>
</div>
+
</div>
- </div>
+
+ </div
+ >
<div id="footer">Created with JBoss EJB 3.0, Seam, MyFaces, and Facelets</div>
+
</div>
+
</body>
+
</html>
More information about the jboss-cvs-commits
mailing list