[jboss-cvs] jboss-seam/examples/booking/view ...
Gavin King
gavin.king at jboss.com
Tue Mar 20 20:45:31 EDT 2007
User: gavin
Date: 07/03/20 20:45:31
Modified: examples/booking/view book.xhtml confirm.xhtml
display.xhtml edit.xhtml hotelview.xhtml
password.xhtml register.xhtml
Log:
nicer
Revision Changes Path
1.36 +0 -14 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.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- book.xhtml 20 Mar 2007 21:34:25 -0000 1.35
+++ book.xhtml 21 Mar 2007 00:45:31 -0000 1.36
@@ -26,7 +26,6 @@
<s:decorate id="checkinDateDecorate" template="edit.xhtml">
<ui:define name="label">Check In Date:</ui:define>
- <ui:define name="input">
<h:inputText id="checkinDate" value="#{booking.checkinDate}" required="true">
<s:convertDateTime pattern="MM/dd/yyyy"/>
<a:support event="onblur" reRender="checkinDateDecorate"/>
@@ -34,12 +33,10 @@
<s:selectDate for="checkinDate">
<h:graphicImage url="img/dtpick.gif" style="margin-left:5px;cursor:pointer"/>
</s:selectDate>
- </ui:define>
</s:decorate>
<s:decorate id="checkoutDateDecorate" template="edit.xhtml">
<ui:define name="label">Check Out Date:</ui:define>
- <ui:define name="input">
<h:inputText id="checkoutDate" value="#{booking.checkoutDate}" required="true">
<s:convertDateTime pattern="MM/dd/yyyy"/>
<a:support event="onblur" reRender="checkoutDateDecorate"/>
@@ -47,51 +44,41 @@
<s:selectDate for="checkoutDate">
<h:graphicImage url="img/dtpick.gif" style="margin-left:5px;cursor:pointer"/>
</s:selectDate>
- </ui:define>
</s:decorate>
<s:decorate id="bedsDecorate" template="edit.xhtml">
<ui:define name="label">Room Preference:</ui:define>
- <ui:define name="input">
<h:selectOneMenu id="beds" value="#{booking.beds}">
<f:selectItem itemLabel="One king-size bed" itemValue="1"/>
<f:selectItem itemLabel="Two double beds" itemValue="2"/>
<f:selectItem itemLabel="Three beds" itemValue="3"/>
</h:selectOneMenu>
- </ui:define>
</s:decorate>
<s:decorate id="smokingDecorate" template="edit.xhtml">
<ui:define name="label">Smoking Preference:</ui:define>
- <ui:define name="input">
<h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection" styleClass="radio">
<f:selectItem itemLabel="Smoking" itemValue="true"/>
<f:selectItem itemLabel="Non Smoking" itemValue="false"/>
</h:selectOneRadio>
- </ui:define>
</s:decorate>
<s:decorate id="creditCardDecorate" template="edit.xhtml">
<ui:define name="label">Credit Card #:</ui:define>
- <ui:define name="input">
<h:inputText id="creditCard" value="#{booking.creditCard}" required="true">
<a:support event="onblur" reRender="creditCardDecorate"/>
</h:inputText>
- </ui:define>
</s:decorate>
<s:decorate id="creditCardNameDecorate" template="edit.xhtml">
<ui:define name="label">Credit Card Name:</ui:define>
- <ui:define name="input">
<h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true">
<a:support event="onblur" reRender="creditCardNameDecorate"/>
</h:inputText>
- </ui:define>
</s:decorate>
<s:decorate id="creditCardExpiryDecorate" template="edit.xhtml">
<ui:define name="label">Credit Card Expiry:</ui:define>
- <ui:define name="input">
<h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}">
<f:selectItem itemLabel="Jan" itemValue="1"/>
<f:selectItem itemLabel="Feb" itemValue="2"/>
@@ -113,7 +100,6 @@
<f:selectItem itemLabel="2008" itemValue="2008"/>
<f:selectItem itemLabel="2009" itemValue="2009"/>
</h:selectOneMenu>
- </ui:define>
</s:decorate>
<div class="buttonBox">
1.21 +6 -12 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.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- confirm.xhtml 20 Mar 2007 21:34:25 -0000 1.20
+++ confirm.xhtml 21 Mar 2007 00:45:31 -0000 1.21
@@ -19,30 +19,24 @@
<s:decorate template="display.xhtml">
<ui:define name="label">Total Payment:</ui:define>
- <ui:define name="value">
<h:outputText value="#{booking.total}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
- </ui:define>
</s:decorate>
<s:decorate template="display.xhtml">
<ui:define name="label">Check In Date:</ui:define>
- <ui:define name="value">
<h:outputText value="#{booking.checkinDate}"/>
- </ui:define>
</s:decorate>
<s:decorate template="display.xhtml">
<ui:define name="label">Check Out Date:</ui:define>
- <ui:define name="value">
<h:outputText value="#{booking.checkoutDate}"/>
- </ui:define>
</s:decorate>
<s:decorate template="display.xhtml">
<ui:define name="label">Credit Card #:</ui:define>
- <ui:define name="value">#{booking.creditCard}</ui:define>
+ #{booking.creditCard}
</s:decorate>
<div class="buttonBox">
1.2 +1 -1 jboss-seam/examples/booking/view/display.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: display.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/view/display.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- display.xhtml 20 Mar 2007 21:34:25 -0000 1.1
+++ display.xhtml 21 Mar 2007 00:45:31 -0000 1.2
@@ -9,7 +9,7 @@
<ui:insert name="label"/>
</span>
<span class="input">
- <ui:insert name="value"/>
+ <ui:insert/>
</span>
</div>
1.2 +1 -1 jboss-seam/examples/booking/view/edit.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: edit.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/view/edit.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- edit.xhtml 20 Mar 2007 21:34:25 -0000 1.1
+++ edit.xhtml 21 Mar 2007 00:45:31 -0000 1.2
@@ -11,7 +11,7 @@
</s:label>
<span class="input #{invalid?'errors':''}">
<s:validateAll>
- <ui:insert name="input"/>
+ <ui:insert/>
</s:validateAll>
</span>
<s:message styleClass="error errors"/>
1.2 +10 -16 jboss-seam/examples/booking/view/hotelview.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: hotelview.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/booking/view/hotelview.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hotelview.xhtml 20 Mar 2007 21:34:25 -0000 1.1
+++ hotelview.xhtml 21 Mar 2007 00:45:31 -0000 1.2
@@ -2,49 +2,43 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
- xmlns:s="http://jboss.com/products/seam/taglib"
- rowClass="entry"
- labelColumnClass="label"
- fieldColumnClass="output"
- id="hotels">
+ xmlns:s="http://jboss.com/products/seam/taglib">
<s:decorate template="display.xhtml">
<ui:define name="label">Name:</ui:define>
- <ui:define name="value">#{hotel.name}</ui:define>
+ #{hotel.name}
</s:decorate>
<s:decorate template="display.xhtml">
<ui:define name="label">Address:</ui:define>
- <ui:define name="value">#{hotel.address}</ui:define>
+ #{hotel.address}
</s:decorate>
<s:decorate template="display.xhtml">
<ui:define name="label">City:</ui:define>
- <ui:define name="value">#{hotel.city}</ui:define>
+ #{hotel.city}
</s:decorate>
<s:decorate template="display.xhtml">
<ui:define name="label">State:</ui:define>
- <ui:define name="value">#{hotel.state}</ui:define>
+ #{hotel.state}
</s:decorate>
<s:decorate template="display.xhtml">
<ui:define name="label">Zip:</ui:define>
- <ui:define name="value">#{hotel.zip}</ui:define>
+ #{hotel.zip}
</s:decorate>
<s:decorate template="display.xhtml">
<ui:define name="label">Country:</ui:define>
- <ui:define name="value">#{hotel.country}</ui:define>
+ #{hotel.country}
</s:decorate>
<s:decorate template="display.xhtml">
<ui:define name="label">Nightly rate:</ui:define>
- <ui:define name="value">
<h:outputText value="#{hotel.name}">
<f:convertNumber type="currency" currencySymbol="$"/>
</h:outputText>
- </ui:define>
</s:decorate>
</ui:composition>
1.15 +2 -6 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.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- password.xhtml 20 Mar 2007 21:44:32 -0000 1.14
+++ password.xhtml 21 Mar 2007 00:45:31 -0000 1.15
@@ -25,16 +25,12 @@
<s:decorate template="edit.xhtml">
<ui:define name="label">Password:</ui:define>
- <ui:define name="input">
<h:inputSecret id="password" value="#{user.password}" required="true"/>
- </ui:define>
</s:decorate>
<s:decorate template="edit.xhtml">
<ui:define name="label">Verify:</ui:define>
- <ui:define name="input">
<h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/>
- </ui:define>
</s:decorate>
<div class="buttonBox">
1.26 +0 -8 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.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- register.xhtml 20 Mar 2007 21:34:25 -0000 1.25
+++ register.xhtml 21 Mar 2007 00:45:31 -0000 1.26
@@ -56,34 +56,26 @@
<s:decorate id="usernameDecorate" template="edit.xhtml">
<ui:define name="label">Username:</ui:define>
- <ui:define name="input">
<h:inputText id="username" value="#{user.username}" required="true">
<a:support event="onblur" reRender="usernameDecorate"/>
</h:inputText>
- </ui:define>
</s:decorate>
<s:decorate id="nameDecorate" template="edit.xhtml">
<ui:define name="label">Real Name:</ui:define>
- <ui:define name="input">
<h:inputText id="name" value="#{user.name}" required="true">
<a:support event="onblur" reRender="nameDecorate"/>
</h:inputText>
- </ui:define>
</s:decorate>
<s:decorate id="passwordDecorate" template="edit.xhtml">
<ui:define name="label">Password:</ui:define>
- <ui:define name="input">
<h:inputSecret id="password" value="#{user.password}" required="true"/>
- </ui:define>
</s:decorate>
<s:decorate id="verifyDecorate" template="edit.xhtml">
<ui:define name="label">Verify Password:</ui:define>
- <ui:define name="input">
<h:inputSecret id="verify" value="#{register.verify}" required="true"/>
- </ui:define>
</s:decorate>
<div class="buttonBox">
More information about the jboss-cvs-commits
mailing list