[jboss-cvs] jboss-seam/examples/booking/view ...
Gavin King
gavin.king at jboss.com
Sat Dec 16 20:04:51 EST 2006
User: gavin
Date: 06/12/16 20:04:51
Modified: examples/booking/view confirm.xhtml home.xhtml
password.xhtml template.xhtml
Log:
reworked the booking example to take advantage of ochestration from pages.xml
Revision Changes Path
1.18 +1 -1 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.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- confirm.xhtml 15 Dec 2006 13:26:33 -0000 1.17
+++ confirm.xhtml 17 Dec 2006 01:04:51 -0000 1.18
@@ -59,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.12 +3 -2 jboss-seam/examples/booking/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/booking/view/home.xhtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- home.xhtml 14 Nov 2006 05:50:59 -0000 1.11
+++ home.xhtml 17 Dec 2006 01:04:51 -0000 1.12
@@ -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.11 +1 -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.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- password.xhtml 14 Nov 2006 05:50:59 -0000 1.10
+++ password.xhtml 17 Dec 2006 01:04:51 -0000 1.11
@@ -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.10 +6 -7 jboss-seam/examples/booking/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/booking/view/template.xhtml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- template.xhtml 8 Dec 2006 00:38:15 -0000 1.9
+++ template.xhtml 17 Dec 2006 01:04:51 -0000 1.10
@@ -1,7 +1,8 @@
<!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=UTF-8" />
<title>JBoss Suites: Seam Framework</title>
@@ -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="#{logout.logout}" value="Logout"/>
</div>
</div>
<div id="container">
More information about the jboss-cvs-commits
mailing list