Index: openacs.org-dev/packages/ecommerce/www/shopping-cart.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/shopping-cart.adp,v
diff -u -r1.1.1.2 -r1.1.1.3
--- openacs.org-dev/packages/ecommerce/www/shopping-cart.adp	5 Aug 2002 21:38:46 -0000	1.1.1.2
+++ openacs.org-dev/packages/ecommerce/www/shopping-cart.adp	8 Oct 2002 15:47:06 -0000	1.1.1.3
@@ -1,7 +1,10 @@
-<master src="default-ec-master">
-<property name="title">Your Shopping Cart</property>
-<property name="navbar">Your Shopping Cart</property>
+<master>
+  <property name="title">Your Shopping Cart</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="toolbar" current_location="shopping-cart">
+
 <h3>Shopping Cart</h3> 
 <if @user_id@ ne 0>
   for @first_names@ @last_name@ (if you're not @first_names@ @last_name@, 
@@ -42,10 +45,8 @@
 	       name="quantity.@in_cart.product_id@ {@in_cart.color_choice@} {@in_cart.size_choice@} {@in_cart.style_choice@}" 
 	       value="@in_cart.quantity@" size=4 maxlength=4>
       </td>
+      <td>@in_cart.price@</td>
       <td>
-        @price_line@
-      </td>
-      <td>
         <a href="shopping-cart-delete-from?@delete_export_vars@">delete</a>
       </td>
     </tr>
@@ -87,7 +88,7 @@
       <li> <a href="index">Continue Shopping</a> </li>
     </else>
     <if @user_id@ eq 0>
-      <li> <a href="/register/index?return_url=@return_url@>Log In</a> </li>
+      <li> <a href="/register/index?return_url=@return_url@">Log In</a> </li>
     </if>
     <else>
       <if @saved_carts_p@ not nil>