[jboss-cvs] jboss-seam/examples/dvdstore/web ...
Gavin King
gavin.king at jboss.com
Thu Nov 2 13:26:04 EST 2006
User: gavin
Date: 06/11/02 13:26:04
Modified: examples/dvdstore/web browse.xhtml checkout.xhtml
complete.xhtml confirm.xhtml showorders.xhtml
Log:
use seam resource bundle
split out navrules
Revision Changes Path
1.24 +6 -6 jboss-seam/examples/dvdstore/web/browse.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: browse.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/browse.xhtml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- browse.xhtml 16 May 2006 03:26:28 -0000 1.23
+++ browse.xhtml 2 Nov 2006 18:26:04 -0000 1.24
@@ -58,7 +58,7 @@
<c:when test="#{empty searchResults}">
<h2>
- <h:outputText value="#{msgs.noSearchResultsHeader}" />
+ <h:outputText value="#{messages.noSearchResultsHeader}" />
</h2>
</c:when>
@@ -81,7 +81,7 @@
</div>
<div class="message">
- #{msgs.searchResultsHeader}
+ #{messages.searchResultsHeader}
</div>
</div>
@@ -93,13 +93,13 @@
columnClasses="dvdtablecol">
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.searchResultsAdd}" />
+ <h:outputText value="#{messages.searchResultsAdd}" />
</f:facet>
<h:selectBooleanCheckbox value="#{searchSelections[product]}"/>
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.searchResultsTitle}" />
+ <h:outputText value="#{messages.searchResultsTitle}" />
</f:facet>
<s:link view="/dvd.xhtml" value="#{product.title}">
@@ -116,7 +116,7 @@
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.searchResultsPrice}" />
+ <h:outputText value="#{messages.searchResultsPrice}" />
</f:facet>
<h:outputText value="#{product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
@@ -125,7 +125,7 @@
</h:dataTable>
<h:commandButton action="#{search.addAllToCart}"
- value="#{msgs.searchUpdateButton}"/>
+ value="#{messages.searchUpdateButton}"/>
</h:form>
</c:otherwise>
1.17 +10 -10 jboss-seam/examples/dvdstore/web/checkout.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: checkout.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/checkout.xhtml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- checkout.xhtml 29 Jun 2006 19:02:09 -0000 1.16
+++ checkout.xhtml 2 Nov 2006 18:26:04 -0000 1.17
@@ -44,26 +44,26 @@
columnClasses="dvdtablecol">
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartRemoveColumn}" />
+ <h:outputText value="#{messages.cartRemoveColumn}" />
</f:facet>
<h:selectBooleanCheckbox value="#{cart.cartSelection[item]}"/>
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartTitleColumn}" />
+ <h:outputText value="#{messages.cartTitleColumn}" />
</f:facet>
<h:outputText value="#{item.product.title}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartActorColumn}" />
+ <h:outputText value="#{messages.cartActorColumn}" />
</f:facet>
<h:outputText value="#{item.product.actors[0].name}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartPriceColumn}" />
+ <h:outputText value="#{messages.cartPriceColumn}" />
</f:facet>
<h:outputText value="#{item.product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
@@ -71,7 +71,7 @@
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartQuantityColumn}" />
+ <h:outputText value="#{messages.cartQuantityColumn}" />
</f:facet>
<h:inputText value="#{item.quantity}" size="6" />
</h:column>
@@ -83,23 +83,23 @@
value="Empty Cart" />
 
<h:commandButton action="#{cart.updateCart}"
- value="#{msgs.checkoutUpdateButton}" />
+ value="#{messages.checkoutUpdateButton}" />
</h:form>
<div style="width: 100%;">
<div class="cntInfo" style="float:right;">
<h:panelGrid columns="2">
- <h:outputText value="#{msgs.checkoutSubtotal}" />
+ <h:outputText value="#{messages.checkoutSubtotal}" />
<h:outputText value="#{cart.subtotal}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{msgs.checkoutTax}" />
+ <h:outputText value="#{messages.checkoutTax}" />
<h:outputText value="#{cart.tax}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{msgs.checkoutTotal}" />
+ <h:outputText value="#{messages.checkoutTotal}" />
<h:outputText value="#{cart.total}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
@@ -109,7 +109,7 @@
<f:subview rendered="#{login.loggedIn}">
<h:form>
<h:commandButton action="#{checkout.createOrder}"
- value="#{msgs.checkoutPurchaseButton}" />
+ value="#{messages.checkoutPurchaseButton}" />
</h:form>
</f:subview>
</div>
1.13 +9 -9 jboss-seam/examples/dvdstore/web/complete.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: complete.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/complete.xhtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- complete.xhtml 29 Jun 2006 19:02:09 -0000 1.12
+++ complete.xhtml 2 Nov 2006 18:26:04 -0000 1.13
@@ -26,7 +26,7 @@
</f:subview>
<f:subview rendered="#{completedOrder != null}">
- <h2>#{msgs.checkoutCompleteHeader}</h2>
+ <h2>#{messages.checkoutCompleteHeader}</h2>
<h:form>
<h:dataTable value="#{completedOrder.orderLines}"
var="item"
@@ -36,32 +36,32 @@
columnClasses="dvdtablecol">
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartItemColumn}" />
+ <h:outputText value="#{messages.cartItemColumn}" />
</f:facet>
<h:outputText value="#{item.position}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartQuantityColumn}" />
+ <h:outputText value="#{messages.cartQuantityColumn}" />
</f:facet>
<h:outputText value="#{item.quantity}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartTitleColumn}" />
+ <h:outputText value="#{messages.cartTitleColumn}" />
</f:facet>
<h:outputText value="#{item.product.title}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartActorColumn}" />
+ <h:outputText value="#{messages.cartActorColumn}" />
</f:facet>
<h:outputText value="#{item.product.actors[0].name}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartPriceColumn}" />
+ <h:outputText value="#{messages.cartPriceColumn}" />
</f:facet>
<h:outputText value="#{item.product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
@@ -74,17 +74,17 @@
<div style="width: 100%;">
<div class="cntInfo" style="float: right;">
<h:panelGrid columns="2">
- <h:outputText value="#{msgs.checkoutSubtotal}" />
+ <h:outputText value="#{messages.checkoutSubtotal}" />
<h:outputText value="#{completedOrder.netAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{msgs.checkoutTax}" />
+ <h:outputText value="#{messages.checkoutTax}" />
<h:outputText value="#{completedOrder.tax}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{msgs.checkoutTotal}" />
+ <h:outputText value="#{messages.checkoutTotal}" />
<h:outputText value="#{completedOrder.totalAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
1.9 +7 -7 jboss-seam/examples/dvdstore/web/confirm.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: confirm.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/confirm.xhtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- confirm.xhtml 18 Sep 2006 23:04:11 -0000 1.8
+++ confirm.xhtml 2 Nov 2006 18:26:04 -0000 1.9
@@ -33,20 +33,20 @@
columnClasses="dvdtablecol">
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartTitleColumn}" />
+ <h:outputText value="#{messages.cartTitleColumn}" />
</f:facet>
<h:outputText value="#{line.product.title}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartActorColumn}" />
+ <h:outputText value="#{messages.cartActorColumn}" />
</f:facet>
<h:outputText value="#{line.product.actors[0].name}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartPriceColumn}" />
+ <h:outputText value="#{messages.cartPriceColumn}" />
</f:facet>
<h:outputText value="#{line.product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
@@ -54,7 +54,7 @@
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartQuantityColumn}" />
+ <h:outputText value="#{messages.cartQuantityColumn}" />
</f:facet>
<h:outputText value="#{line.quantity}" size="6" />
</h:column>
@@ -64,17 +64,17 @@
<div style="width: 100%;">
<div class="cntInfo" style="float:right;">
<h:panelGrid columns="2">
- <h:outputText value="#{msgs.checkoutSubtotal}" />
+ <h:outputText value="#{messages.checkoutSubtotal}" />
<h:outputText value="#{currentOrder.netAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{msgs.checkoutTax}" />
+ <h:outputText value="#{messages.checkoutTax}" />
<h:outputText value="#{currentOrder.tax}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{msgs.checkoutTotal}" />
+ <h:outputText value="#{messages.checkoutTotal}" />
<h:outputText value="#{currentOrder.totalAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
1.17 +4 -4 jboss-seam/examples/dvdstore/web/showorders.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: showorders.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/dvdstore/web/showorders.xhtml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- showorders.xhtml 22 May 2006 03:57:53 -0000 1.16
+++ showorders.xhtml 2 Nov 2006 18:26:04 -0000 1.17
@@ -101,25 +101,25 @@
columnClasses="dvdtablecol">
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartTitleColumn}" />
+ <h:outputText value="#{messages.cartTitleColumn}" />
</f:facet>
<h:outputText value="#{item.product.title}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartActorColumn}" />
+ <h:outputText value="#{messages.cartActorColumn}" />
</f:facet>
<h:outputText value="#{item.product.actors[0].name}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartQuantityColumn}" />
+ <h:outputText value="#{messages.cartQuantityColumn}" />
</f:facet>
<h:outputText value="#{item.quantity}" />
</h:column>
<h:column>
<f:facet name="header">
- <h:outputText value="#{msgs.cartPriceColumn}" />
+ <h:outputText value="#{messages.cartPriceColumn}" />
</f:facet>
<h:outputText value="#{item.product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
More information about the jboss-cvs-commits
mailing list