[prev in list] [next in list] [prev in thread] [next in thread]
List: jboss-cvs-commits
Subject: [jboss-cvs] xpetstore-ejb3.0/xpetstore-ejb/web/jsp cart.jsp checkout.jsp myaccount.jsp
From: Gavin King <oneovthafew () users ! sourceforge ! net>
Date: 2004-06-29 4:38:01
Message-ID: E1BfANd-00059A-Kb () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]
User: oneovthafew
Date: 04/06/28 21:38:01
Modified: xpetstore-ejb/web/jsp cart.jsp checkout.jsp myaccount.jsp
Log:
my cleanups
Revision Changes Path
1.2 +4 -4 xpetstore-ejb3.0/xpetstore-ejb/web/jsp/cart.jsp
Index: cart.jsp
===================================================================
RCS file: /cvsroot/jboss/xpetstore-ejb3.0/xpetstore-ejb/web/jsp/cart.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cart.jsp 25 Jun 2004 17:17:49 -0000 1.1
+++ cart.jsp 29 Jun 2004 04:38:00 -0000 1.2
@@ -16,7 +16,7 @@
<tr>
<th class="gridheader"><bean:message key="itemId"/></th>
<th class="gridheader"><bean:message key="description"/></th>
- <th class="gridheader"><bean:message key="unitCost"/></th>
+ <th class="gridheader"><bean:message key="listPrice"/></th>
<th class="gridheader"><bean:message key="quantity"/></th>
<th class="gridheader"><bean:message key="subTotal"/></th>
<th class="gridheader"> </th>
@@ -39,16 +39,16 @@
<html:hidden name="item" property="itemId" />
</td>
<td class="griddata">
- <bean:write name="item" property="description"/>
+ <bean:write name="item" property="item.description"/>
</td>
<td class="griddata" align="right">
- <bean:write name="item" property="unitCost"/>
+ <bean:write name="item" property="listPrice"/>
</td>
<td class="griddata" align="center">
<html:text name="item" property="quantity" size="3" \
maxlength="3"/>
</td>
<td class="griddata"align="right">
- <bean:write name="item" property="totalCost"/>
+ <bean:write name="item" property="subTotal"/>
</td>
<td class="griddata" align="center">
<html:link page="/removeItem.jspa" paramId="itemId" \
paramName="item" paramProperty="itemId">
1.2 +250 -125 xpetstore-ejb3.0/xpetstore-ejb/web/jsp/checkout.jsp
Index: checkout.jsp
===================================================================
RCS file: /cvsroot/jboss/xpetstore-ejb3.0/xpetstore-ejb/web/jsp/checkout.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- checkout.jsp 25 Jun 2004 17:17:49 -0000 1.1
+++ checkout.jsp 29 Jun 2004 04:38:00 -0000 1.2
@@ -1,126 +1,251 @@
-<%@ taglib uri="struts-html" prefix="html" %>
-<%@ taglib uri="struts-bean" prefix="bean" %>
-<%@ taglib uri="struts-logic" prefix="logic" %>
-<html>
-<head>
- <title><bean:message key="order.title"/></title>
- <link href="<%= request.getContextPath() %>/style.css" rel="stylesheet" \
type="text/css">
-</head>
-<body>
-
-<html:form action="/createOrder.jspa" method="post">
-
-<h2><bean:message key="order.subtitle"/></h2>
-
-<!-- Customer informations -->
-<table border="0" cellspacing="4">
- <!-- Address -->
- <tr>
- <td colspan="2" class="sectionheader"><bean:message key="address"/></td>
- </tr>
- <tr>
- <td class="label"><bean:message key="street1"/>:</td>
- <td><bean:write name="cartForm" property="customerValue.street1" /></td>
- </tr>
- <tr>
- <td class="label"><bean:message key="street2"/>:</td>
- <td><bean:write name="cartForm" property="customerValue.street2" /></td>
- </tr>
- <tr>
- <td class="label"><bean:message key="city"/>:</td>
- <td><bean:write name="cartForm" property="customerValue.city" /></td>
- </tr>
- <tr>
- <td class="label"><bean:message key="state"/>:</td>
- <td><bean:write name="cartForm" property="customerValue.state" /></td>
- </tr>
- <tr>
- <td class="label"><bean:message key="zipcode"/>:</td>
- <td><bean:write name="cartForm" property="customerValue.zipcode" /></td>
- </tr>
- <tr>
- <td class="label"><bean:message key="country"/>:</td>
- <td><bean:write name="cartForm" property="customerValue.country" /></td>
- </tr>
-
- <!-- Credit card -->
- <tr><td colspan="2"> </td></tr>
- <tr>
- <td colspan="2" class="sectionheader"><bean:message key="ccInfos"/></td>
- </tr>
- <tr>
- <td class="label"><bean:message key="ccType"/>:</td>
- <td><bean:write name="cartForm" property="customerValue.creditCardType" /></td>
- </tr>
- <tr>
- <td class="label"><bean:message key="ccNumber"/>:</td>
- <td><bean:write name="cartForm" property="customerValue.creditCardNumber" \
/></td>
- </tr>
- <tr>
- <td class="label"><bean:message key="ccExpiryDate"/>:</td>
- <td><bean:write name="cartForm" property="customerValue.creditCardExpiryDate" \
/></td>
- </tr>
-</table>
-
-<!-- Shopping cart -->
-<p>
-<table class="grid">
- <tr>
- <th class="gridheader"><bean:message key="itemId"/></th>
- <th class="gridheader"><bean:message key="description"/></th>
- <th class="gridheader"><bean:message key="unitCost"/></th>
- <th class="gridheader"><bean:message key="quantity"/></th>
- <th class="gridheader"><bean:message key="subTotal"/></th>
- </tr>
- <logic:empty name="cartForm" property="cartItems">
- <tr>
- <td class="griddata" colspan="5"><bean:message key="cart_empty"/></td>
- </tr>
- </logic:empty>
-
- <logic:notEmpty name="cartForm" property="cartItems">
-
- <!-- Items -->
- <logic:iterate id="item" name="cartForm" property="cartItems">
- <tr>
- <td class="griddata">
- <bean:write name="item" property="itemId"/>
- <html:hidden name="item" property="itemId" />
- </td>
- <td class="griddata">
- <bean:write name="item" property="description"/>
- </td>
- <td class="griddata" align="right">
- <bean:write name="item" property="unitCost"/>
- </td>
- <td class="griddata" align="right">
- <bean:write name="item" property="quantity"/>
- <html:hidden name="item" property="quantity"/>
- </td>
- <td class="griddata"align="right">
- <bean:write name="item" property="totalCost"/>
- </td>
- </tr>
- </logic:iterate>
-
- <!-- Total -->
- <tr>
- <td class="griddata" colspan="4" align="right">
- <b><bean:message key="total"/></b>
- </td>
- <td class="griddata" align="right">
- <b><bean:write name="cartForm" property="total"/></b>
- </td>
- </tr>
- </logic:notEmpty>
-</table>
-
-<logic:notEmpty name="cartForm" property="cartItems">
- <p>
- <html:image page="/images/button_submit.gif" border="0" />
-</logic:notEmpty>
-
-</html:form>
-
-</body>
+<%@ taglib uri="struts-html" prefix="html" %>
+
+<%@ taglib uri="struts-bean" prefix="bean" %>
+
+<%@ taglib uri="struts-logic" prefix="logic" %>
+
+<html>
+
+<head>
+
+ <title><bean:message key="order.title"/></title>
+
+ <link href="<%= request.getContextPath() %>/style.css" rel="stylesheet" \
type="text/css">
+
+</head>
+
+<body>
+
+
+
+<html:form action="/createOrder.jspa" method="post">
+
+
+
+<h2><bean:message key="order.subtitle"/></h2>
+
+
+
+<!-- Customer informations -->
+
+<table border="0" cellspacing="4">
+
+ <!-- Address -->
+
+ <tr>
+
+ <td colspan="2" class="sectionheader"><bean:message key="address"/></td>
+
+ </tr>
+
+ <tr>
+
+ <td class="label"><bean:message key="street1"/>:</td>
+
+ <td><bean:write name="cartForm" property="customerValue.street1" /></td>
+
+ </tr>
+
+ <tr>
+
+ <td class="label"><bean:message key="street2"/>:</td>
+
+ <td><bean:write name="cartForm" property="customerValue.street2" /></td>
+
+ </tr>
+
+ <tr>
+
+ <td class="label"><bean:message key="city"/>:</td>
+
+ <td><bean:write name="cartForm" property="customerValue.city" /></td>
+
+ </tr>
+
+ <tr>
+
+ <td class="label"><bean:message key="state"/>:</td>
+
+ <td><bean:write name="cartForm" property="customerValue.state" /></td>
+
+ </tr>
+
+ <tr>
+
+ <td class="label"><bean:message key="zipcode"/>:</td>
+
+ <td><bean:write name="cartForm" property="customerValue.zipcode" /></td>
+
+ </tr>
+
+ <tr>
+
+ <td class="label"><bean:message key="country"/>:</td>
+
+ <td><bean:write name="cartForm" property="customerValue.country" /></td>
+
+ </tr>
+
+
+
+ <!-- Credit card -->
+
+ <tr><td colspan="2"> </td></tr>
+
+ <tr>
+
+ <td colspan="2" class="sectionheader"><bean:message key="ccInfos"/></td>
+
+ </tr>
+
+ <tr>
+
+ <td class="label"><bean:message key="ccType"/>:</td>
+
+ <td><bean:write name="cartForm" property="customerValue.creditCardType" /></td>
+
+ </tr>
+
+ <tr>
+
+ <td class="label"><bean:message key="ccNumber"/>:</td>
+
+ <td><bean:write name="cartForm" property="customerValue.creditCardNumber" \
/></td>
+
+ </tr>
+
+ <tr>
+
+ <td class="label"><bean:message key="ccExpiryDate"/>:</td>
+
+ <td><bean:write name="cartForm" property="customerValue.creditCardExpiryDate" \
/></td>
+
+ </tr>
+
+</table>
+
+
+
+<!-- Shopping cart -->
+
+<p>
+
+<table class="grid">
+
+ <tr>
+
+ <th class="gridheader"><bean:message key="itemId"/></th>
+
+ <th class="gridheader"><bean:message key="description"/></th>
+
+ <th class="gridheader"><bean:message key="listPrice"/></th>
+
+ <th class="gridheader"><bean:message key="quantity"/></th>
+
+ <th class="gridheader"><bean:message key="subTotal"/></th>
+
+ </tr>
+
+ <logic:empty name="cartForm" property="cartItems">
+
+ <tr>
+
+ <td class="griddata" colspan="5"><bean:message key="cart_empty"/></td>
+
+ </tr>
+
+ </logic:empty>
+
+
+
+ <logic:notEmpty name="cartForm" property="cartItems">
+
+
+
+ <!-- Items -->
+
+ <logic:iterate id="item" name="cartForm" property="cartItems">
+
+ <tr>
+
+ <td class="griddata">
+
+ <bean:write name="item" property="itemId"/>
+
+ <html:hidden name="item" property="itemId" />
+
+ </td>
+
+ <td class="griddata">
+
+ <bean:write name="item" property="item.description"/>
+
+ </td>
+
+ <td class="griddata" align="right">
+
+ <bean:write name="item" property="listPrice"/>
+
+ </td>
+
+ <td class="griddata" align="right">
+
+ <bean:write name="item" property="quantity"/>
+
+ <html:hidden name="item" property="quantity"/>
+
+ </td>
+
+ <td class="griddata"align="right">
+
+ <bean:write name="item" property="subTotal"/>
+
+ </td>
+
+ </tr>
+
+ </logic:iterate>
+
+
+
+ <!-- Total -->
+
+ <tr>
+
+ <td class="griddata" colspan="4" align="right">
+
+ <b><bean:message key="total"/></b>
+
+ </td>
+
+ <td class="griddata" align="right">
+
+ <b><bean:write name="cartForm" property="total"/></b>
+
+ </td>
+
+ </tr>
+
+ </logic:notEmpty>
+
+</table>
+
+
+
+<logic:notEmpty name="cartForm" property="cartItems">
+
+ <p>
+
+ <html:image page="/images/button_submit.gif" border="0" />
+
+</logic:notEmpty>
+
+
+
+</html:form>
+
+
+
+</body>
+
</html>
\ No newline at end of file
1.2 +1 -1 xpetstore-ejb3.0/xpetstore-ejb/web/jsp/myaccount.jsp
Index: myaccount.jsp
===================================================================
RCS file: /cvsroot/jboss/xpetstore-ejb3.0/xpetstore-ejb/web/jsp/myaccount.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- myaccount.jsp 25 Jun 2004 17:17:50 -0000 1.1
+++ myaccount.jsp 29 Jun 2004 04:38:01 -0000 1.2
@@ -11,7 +11,7 @@
<h2><bean:message key="myaccount.subtitle"/></h2>
-<html:hidden name="customerForm" property="customerValue.account.userUid" />
+<html:hidden name="customerForm" property="customerValue.account.accountId" />
<html:hidden name="customerForm" property="customerValue.customerId" />
<table border="0" cellspacing="4">
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic