[jboss-cvs] jboss-seam/examples/jpa/view ...
Michael Yuan
michael.yuan at jboss.com
Tue Jan 9 15:53:45 EST 2007
User: myuan
Date: 07/01/09 15:53:45
Modified: examples/jpa/view book.xhtml confirm.xhtml
home.xhtml hotel.xhtml main.xhtml password.xhtml
register.xhtml template.xhtml
Log:
Update the app to the new booking example
Revision Changes Path
1.7 +10 -1 jboss-seam/examples/jpa/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/jpa/view/book.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- book.xhtml 7 Dec 2006 21:35:18 -0000 1.6
+++ book.xhtml 9 Jan 2007 20:53:45 -0000 1.7
@@ -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.4 +16 -2 jboss-seam/examples/jpa/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/jpa/view/confirm.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- confirm.xhtml 14 Nov 2006 05:51:00 -0000 1.3
+++ confirm.xhtml 9 Jan 2007 20:53:45 -0000 1.4
@@ -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>
@@ -70,6 +79,11 @@
applications that behave elegantly in response to the back, forward and refresh
buttons.
</p>
+<p>
+ <a href="#" onclick="window.open('exp/confirmExp.html','exp','width=752,height=500,scrollbars=yes');">
+ What happens when the conversation ends?
+ </a>
+</p>
</ui:define>
</ui:composition>
1.4 +16 -3 jboss-seam/examples/jpa/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/jpa/view/home.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- home.xhtml 14 Nov 2006 05:51:00 -0000 1.3
+++ home.xhtml 9 Jan 2007 20:53:45 -0000 1.4
@@ -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>
@@ -51,10 +52,22 @@
this sample application.
</p>
+ <p>
+ <a href="#" onclick="window.open('exp/introExp.html','exp','width=752,height=500,scrollbars=yes');">
+ What is JBoss Seam?
+ </a>
+ </p>
+
+ <p>
+ <a href="#" onclick="window.open('exp/loginExp.html','exp','width=752,height=500,scrollbars=yes');">
+ What happens when I login?
+ </a>
+ </p>
+
</div>
</div>
</div>
- <div id="footer">Created with JBoss Seam, Hibernate, MyFaces, Facelets, and Ajax4jsf</div>
+ <div id="footer">Created with JBoss EJB 3.0, Seam, MyFaces, and Facelets</div>
</div>
</f:view>
</body>
1.4 +14 -0 jboss-seam/examples/jpa/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/jpa/view/hotel.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- hotel.xhtml 14 Nov 2006 05:51:00 -0000 1.3
+++ hotel.xhtml 9 Jan 2007 20:53:45 -0000 1.4
@@ -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">
@@ -63,6 +72,11 @@
a clever combination of second-level caching and conversational data
caching to achieve the best performance for your application.
</p>
+<p>
+ <a href="#" onclick="window.open('exp/bookingExp.html','exp','width=752,height=500,scrollbars=yes');">
+ How does the hotel booking wizard work?
+ </a>
+</p>
</ui:define>
1.3 +6 -0 jboss-seam/examples/jpa/view/main.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: main.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/jpa/view/main.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- main.xhtml 14 Nov 2006 05:51:00 -0000 1.2
+++ main.xhtml 9 Jan 2007 20:53:45 -0000 1.3
@@ -127,6 +127,12 @@
conversations do not interfere with each other.
</p>
+<p>
+ <a href="#" onclick="window.open('exp/mainExp.html','exp','width=752,height=500,scrollbars=yes');">
+ How does the search page work?
+ </a>
+</p>
+
</ui:define>
</ui:composition>
1.5 +1 -1 jboss-seam/examples/jpa/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/jpa/view/password.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- password.xhtml 14 Nov 2006 05:51:00 -0000 1.4
+++ password.xhtml 9 Jan 2007 20:53:45 -0000 1.5
@@ -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.5 +6 -1 jboss-seam/examples/jpa/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/jpa/view/register.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- register.xhtml 14 Nov 2006 05:51:00 -0000 1.4
+++ register.xhtml 9 Jan 2007 20:53:45 -0000 1.5
@@ -27,6 +27,11 @@
your application and protects your data. Even better, it's self-documenting, and easy to change when
your business rules change.
</p>
+ <p>
+ <a href="#" onclick="window.open('exp/registerExp.html','exp','width=752,height=500,scrollbars=yes');">
+ What happens when I register?
+ </a>
+ </p>
</div>
<div id="content">
<div class="section">
@@ -101,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.5 +8 -9 jboss-seam/examples/jpa/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/jpa/view/template.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- template.xhtml 13 Dec 2006 06:10:54 -0000 1.4
+++ template.xhtml 9 Jan 2007 20:53:45 -0000 1.5
@@ -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="#{login.logout}" value="Logout"/>
</div>
</div>
<div id="container">
@@ -31,7 +30,7 @@
<ui:include src="conversations.xhtml" />
</div>
</div>
- <div id="footer">Created with JBoss Seam, Hibernate, MyFaces, Facelets, and Ajax4jsf</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