cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From coli...@apache.org
Subject cvs commit: cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl Cart.xml ViewOrder.xml
Date Tue, 22 Apr 2003 23:52:49 GMT
coliver     2003/04/22 16:52:49

  Modified:    src/scratchpad/webapp/samples/petstore/view/jexl Cart.xml
                        ViewOrder.xml
  Log:
  fixed Jexl Cart and ViewOrder pages
  
  Revision  Changes    Path
  1.5       +2 -2      cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Cart.xml
  
  Index: Cart.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/Cart.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Cart.xml	22 Apr 2003 20:03:43 -0000	1.4
  +++ Cart.xml	22 Apr 2003 23:52:49 -0000	1.5
  @@ -53,8 +53,8 @@
   </table>
   </form>
   
  -<t:if test="$(cartForm.cart.numberOfItems.intValue() > 0}">
  -<br /><center><a href="checkout.do"><img border="0" src="images/button_checkout.gif"
/></a></center>
  +<t:if test="${cartForm.cart.numberOfItems > 0}">
  +  <br /><center><a href="checkout.do"><img border="0" src="images/button_checkout.gif"
/></a></center>
   </t:if>
   
   </td>
  
  
  
  1.3       +29 -29    cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/ViewOrder.xml
  
  Index: ViewOrder.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/petstore/view/jexl/ViewOrder.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ViewOrder.xml	21 Apr 2003 05:34:46 -0000	1.2
  +++ ViewOrder.xml	22 Apr 2003 23:52:49 -0000	1.3
  @@ -6,30 +6,30 @@
           <message></message>
           <panel header="Order #${order.orderId}" subheader="${order.orderDate}">
               <panel label="Payment Details">
  -                <field label="Card Type"><${order.cardType}</field>
  -                <field label="Card Number"><${order.creditCard}</field>
  -                <field label="Expiry Date (MM/YYYY)"><${order.expiryDate}</field>
  +                <field label="Card Type">${order.cardType}</field>
  +                <field label="Card Number">${order.creditCard}</field>
  +                <field label="Expiry Date (MM/YYYY)">${order.expiryDate}</field>
               </panel>
               <panel label="Billing Address">
  -                <field label="First name"><${order.billToFirstName}</field>
  -                <field label="Last name" ><${order.billToLastName}</field>
  -                <field label="Address 1" ><${order.billAddress1}</field>
  -                <field label="Address 2" ><${order.billAddress2}</field>
  -                <field label="City" ><${order.billCity}</field>
  -                <field label="State" ><${order.billState}</field>
  -                <field label="Zip" ><${order.billZip}</field>
  -                <field label="Country" ><${order.billCountry}</field>
  +                <field label="First name">${order.billToFirstName}</field>
  +                <field label="Last name" >${order.billToLastName}</field>
  +                <field label="Address 1" >${order.billAddress1}</field>
  +                <field label="Address 2" >${order.billAddress2}</field>
  +                <field label="City" >${order.billCity}</field>
  +                <field label="State" >${order.billState}</field>
  +                <field label="Zip" >${order.billZip}</field>
  +                <field label="Country" >${order.billCountry}</field>
               </panel>
               <panel label="Shipping Address">
  -                <field label="First name"><${order.shipToFirstName}</field>
  -                <field label="Last name" ><${order.shipToLastName}</field>
  -                <field label="Address 1" ><${order.shipAddress1}</field>
  -                <field label="Address 2" ><${order.shipAddress2}</field>
  -                <field label="City" ><${order.shipCity}</field>
  -                <field label="State" ><${order.shipState}</field>
  -                <field label="Zip" ><${order.shipZip}</field>
  -                <field label="Country" ><${order.shipCountry}</field>
  -                <field label="Courier" ><${order.courier}</field>
  +                <field label="First name">${order.shipToFirstName}</field>
  +                <field label="Last name" >${order.shipToLastName}</field>
  +                <field label="Address 1" >${order.shipAddress1}</field>
  +                <field label="Address 2" >${order.shipAddress2}</field>
  +                <field label="City" >${order.shipCity}</field>
  +                <field label="State" >${order.shipState}</field>
  +                <field label="Zip" >${order.shipZip}</field>
  +                <field label="Country" >${order.shipCountry}</field>
  +                <field label="Courier" >${order.courier}</field>
               </panel>
               <panel label="Status">
                   <field empty="2">
  @@ -37,18 +37,18 @@
                           <c:forEach var ="cartItem" items="${itemList}" >
                               <item product-id="${cartItem.item.productId}" id="${cartItem.item.itemId}">
                                   <desc>
  -                                    <${cartItem.item.attr1} 
  -                                    <${cartItem.item.attr2} 
  -                                    <${cartItem.item.attr3} 
  -                                    <${cartItem.item.attr4} 
  -                                    <${cartItem.item.attr5} 
  -                                    <${cartItem.item.product.name} 
  +                                    ${cartItem.item.attr1} 
  +                                    ${cartItem.item.attr2} 
  +                                    ${cartItem.item.attr3} 
  +                                    ${cartItem.item.attr4} 
  +                                    ${cartItem.item.attr5} 
  +                                    ${cartItem.item.product.name} 
                                   </desc>
  -                                <price><${cartItem.listPrice}</price>
  -                                <quantity><${cartItem.quantity}</quantity>
  +                                <price>${cartItem.listPrice}</price>
  +                                <quantity>${cartItem.quantity}</quantity>
                               </item>
                           </c:forEach>
  -                        <total><${order.totalPrice}</total>
  +                        <total>${order.totalPrice}</total>
                       </cart>
                   </field>
               </panel>
  
  
  

Mime
View raw message