[jboss-cvs] jboss-seam/examples/glassfish/view ...
Michael Yuan
michael.yuan at jboss.com
Tue Jan 9 04:12:11 EST 2007
User: myuan
Date: 07/01/09 04:12:11
Modified: examples/glassfish/view book.xhtml confirm.xhtml
home.xhtml hotel.xhtml password.xhtml
register.xhtml template.xhtml
Log:
change to the new booking code w/ room rate and the new pages.xml
Revision Changes Path
1.3 +10 -1 jboss-seam/examples/glassfish/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/glassfish/view/book.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- book.xhtml 7 Dec 2006 21:04:40 -0000 1.2
+++ book.xhtml 9 Jan 2007 09:12:11 -0000 1.3
@@ -35,6 +35,15 @@
<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>
<s:validateAll>
1.2 +10 -1 jboss-seam/examples/glassfish/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/glassfish/view/confirm.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- confirm.xhtml 29 Nov 2006 09:30:42 -0000 1.1
+++ confirm.xhtml 9 Jan 2007 09:12:11 -0000 1.2
@@ -35,6 +35,15 @@
<div class="output">#{hotel.country}</div>
</div>
<div class="entry">
+ <div class="label">Total payment:</div>
+ <div class="output">
+ <h:outputText value="#{booking.total}">
+ <f:convertNumber type="currency"
+ currencySymbol="$"/>
+ </h:outputText>
+ </div>
+ </div>
+ <div class="entry">
<div class="label">Check In Date:</div>
<div class="output"><h:outputText value="#{booking.checkinDate}"/></div>
</div>
@@ -50,7 +59,7 @@
<div class="label"> </div>
<div class="input">
<h:commandButton id="confirm" value="Confirm" action="#{hotelBooking.confirm}"/> 
- <h:commandButton id="revise" value="Revise" action="back"/> 
+ <s:button id="revise" value="Revise" view="/book.xhtml"/> 
<h:commandButton id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/>
</div>
</div>
1.2 +3 -2 jboss-seam/examples/glassfish/view/home.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: home.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/glassfish/view/home.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- home.xhtml 29 Nov 2006 09:30:42 -0000 1.1
+++ home.xhtml 9 Jan 2007 09:12:11 -0000 1.2
@@ -2,7 +2,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
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:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>JBoss Suites: Seam Framework</title>
@@ -29,7 +30,7 @@
</div>
<div class="errors"><h:messages globalOnly="true"/></div>
<div class="buttonBox"><h:commandButton id="login" action="#{login.login}" value="Account Login"/></div>
- <div class="notes"><h:commandLink id="register" action="register">Register New User</h:commandLink></div>
+ <div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div>
</fieldset>
</h:form>
</div>
1.2 +9 -0 jboss-seam/examples/glassfish/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/glassfish/view/hotel.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- hotel.xhtml 29 Nov 2006 09:30:42 -0000 1.1
+++ hotel.xhtml 9 Jan 2007 09:12:11 -0000 1.2
@@ -36,6 +36,15 @@
<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">
<h:form id="hotel">
1.2 +1 -1 jboss-seam/examples/glassfish/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/glassfish/view/password.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- password.xhtml 29 Nov 2006 09:30:42 -0000 1.1
+++ password.xhtml 9 Jan 2007 09:12:11 -0000 1.2
@@ -53,7 +53,7 @@
<div class="label"> </div>
<div class="input">
<h:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/> 
- <s:button id="cancel" value="Cancel" action="#{changePassword.cancel}"/>
+ <s:button id="cancel" value="Cancel" view="/main.xhtml"/>
</div>
</div>
1.2 +1 -1 jboss-seam/examples/glassfish/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/glassfish/view/register.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- register.xhtml 29 Nov 2006 09:30:42 -0000 1.1
+++ register.xhtml 9 Jan 2007 09:12:11 -0000 1.2
@@ -106,7 +106,7 @@
<div class="label"> </div>
<div class="input">
<h:commandButton id="register" value="Register" action="#{register.register}"/> 
- <s:button id="cancel" value="Cancel" action="login"/>
+ <s:button id="cancel" value="Cancel" view="/home.xhtml"/>
</div>
</div>
1.3 +7 -8 jboss-seam/examples/glassfish/view/template.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: template.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/glassfish/view/template.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- template.xhtml 13 Dec 2006 06:33:49 -0000 1.2
+++ template.xhtml 9 Jan 2007 09:12:11 -0000 1.3
@@ -1,9 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:h="http://java.sun.com/jsf/html">
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:s="http://jboss.com/products/seam/taglib">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <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" />
<link href="css/date.css" rel="stylesheet" type="text/css" />
@@ -14,12 +15,10 @@
<div id="header">
<div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div>
<div id="status">
- <h:form id="navigation">
Welcome #{user.name}
- | <h:outputLink id="main" value="main.seam">Search</h:outputLink>
- | <h:outputLink id="password" value="password.seam">Settings</h:outputLink>
- | <h:commandLink id="logout" action="#{logout.logout}">Logout</h:commandLink>
- </h:form>
+ | <s:link id="search" view="/main.xhtml" value="Search" propagation="none"/>
+ | <s:link id="settings" view="/password.xhtml" value="Settings" propagation="none"/>
+ | <s:link id="logout" action="#{login.logout}" value="Logout"/>
</div>
</div>
<div id="container">
More information about the jboss-cvs-commits
mailing list