Index: openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl	10 Sep 2002 22:22:36 -0000	1.13
+++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl	17 Sep 2002 03:36:38 -0000	1.14
@@ -208,40 +208,40 @@
 
 # current_location can be "Shopping Cart", "Your Account", "Home", or
 # any category_id
-ad_proc ec_footer { {current_location ""} {category_id ""} {subcategory_id ""} {search_text ""} } { returns the ecommerce footer } {
-    set to_return "
-        <hr>
-        <center>
-        [ec_search_widget "$category_id|$subcategory_id"  $search_text]"
-    if { [string compare $current_location "Shopping Cart"] == 0 } {
-	append to_return "<b>Shopping Cart</b>"
-    } else {
-	append to_return "<a href=\"[ec_insecurelink shopping-cart]\">Shopping Cart</a>"
-    }
-    append to_return " | "
-    if { [string compare $current_location "Your Account"] == 0 } {
-	append to_return "<b>Your Account</b>"
-    } else {
-	append to_return "<a href=\"[ec_insecurelink [ad_parameter -package_id [ec_id] EcommercePath]account]\">Your Account</a>"
-    }
-    append to_return " | "
-    if { [string compare $current_location Home] == 0 } {
-	append to_return "<b>[ec_system_name] Home</b>"
-    } else {
-	append to_return "<a href=\"[ec_insecurelink index]\">[ec_system_name] Home</a>"
-    }
-    if { [llength [info procs ds_link]] == 1 } {
-	set ds_link [ds_link]
-    } else {
-	set ds_link ""
-    }
-    append to_return "<br>
-        <a href='[ad_url]'>[ad_system_name]</a>
-        </center>
-        <hr>
-        $ds_link"
-    return $to_return
-}
+# ad_proc ec_footer { {current_location ""} {category_id ""} {subcategory_id ""} {search_text ""} } { returns the ecommerce footer } {
+#     set to_return "
+#         <hr>
+#         <center>
+#         [ec_search_widget "$category_id|$subcategory_id"  $search_text]"
+#     if { [string compare $current_location "Shopping Cart"] == 0 } {
+# 	append to_return "<b>Shopping Cart</b>"
+#     } else {
+# 	append to_return "<a href=\"[ec_insecurelink shopping-cart]\">Shopping Cart</a>"
+#     }
+#     append to_return " | "
+#     if { [string compare $current_location "Your Account"] == 0 } {
+# 	append to_return "<b>Your Account</b>"
+#     } else {
+# 	append to_return "<a href=\"[ec_insecurelink [ad_parameter -package_id [ec_id] EcommercePath]account]\">Your Account</a>"
+#     }
+#     append to_return " | "
+#     if { [string compare $current_location Home] == 0 } {
+# 	append to_return "<b>[ec_system_name] Home</b>"
+#     } else {
+# 	append to_return "<a href=\"[ec_insecurelink index]\">[ec_system_name] Home</a>"
+#     }
+#     if { [llength [info procs ds_link]] == 1 } {
+# 	set ds_link [ds_link]
+#     } else {
+# 	set ds_link ""
+#     }
+#     append to_return "<br>
+#         <a href='[ad_url]'>[ad_system_name]</a>
+#         </center>
+#         <hr>
+#         $ds_link"
+#     return $to_return
+# }
 
 # For administrators
 ad_proc ec_shipping_cost_summary { base_shipping_cost default_shipping_per_item weight_shipping_cost add_exp_base_shipping_cost add_exp_amount_per_item add_exp_amount_by_weight } { returns cost summary } {
Index: openacs-4/packages/ecommerce/www/account.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/account.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/account.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/account.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,10 @@
-<master src="default-ec-master">
-<property name="title">Your account</property>
-<property name="navbar">Your Account</property>
+<master>
+  <property name="title">Your account</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="toolbar" current_location="your-account">
+
 <blockquote>
   <ul>
     <li><a href="/pvt/home">Your workspace at <%= [ad_system_name] %></a></li>
Index: openacs-4/packages/ecommerce/www/account.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/account.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/account.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/account.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -107,4 +107,7 @@
       $mailing_lists
     </ul>"
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Account"]]]
+set ec_system_owner [ec_system_owner]
+
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/address-international.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address-international.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/address-international.adp	15 Sep 2002 01:50:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/address-international.adp	17 Sep 2002 03:36:34 -0000	1.4
@@ -1,13 +1,15 @@
-<master src="default-ec-master">
-<property name="title">Enter Your Address</property>
+<master>
+  <property name="title">Enter Your Address</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
 <if @address_type@ eq "shipping">
-  <property name="navbar">checkout {Select Shipping Address}</property>
+  <include src="checkout-progress" step="1">
   <h2>Enter Your Shipping Address</h2>
 </if>
 <else>
   <if @referer@ ne "gift-certificate-billing">
-    <property name="navbar">checkout {Select Billing Address}</property>
+    <include src="checkout-progress" step="4">
   </if>
   <h2>Enter Your Billing Address</h2>
 </else>
Index: openacs-4/packages/ecommerce/www/address-international.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address-international.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/address-international.tcl	15 Sep 2002 01:50:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/address-international.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -58,4 +58,6 @@
     append hidden_form_vars "[export_form_vars [ns_set key $form_set $i]]"
 }
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/address.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/address.adp	15 Sep 2002 01:50:50 -0000	1.4
+++ openacs-4/packages/ecommerce/www/address.adp	17 Sep 2002 03:36:34 -0000	1.5
@@ -1,14 +1,18 @@
-<master src="default-ec-master">
+<master>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
 <if @address_type@ eq "shipping">
   <property name="title">Enter Your Shipping Address</property>
-  <property name="navbar">checkout {Select Shipping Address}</property>
+
+  <include src="checkout-progress" step="1">
+
   <h2>Enter Your Shipping Address</h2>
 </if>
 <else>
   <property name="title">Enter Your Billing Address</property>
   <if @referer@ ne "gift-certificate-billing">
-    <property name="navbar">checkout {Select Billing Address}</property>
+    <include src="checkout-progress" step="4">
   </if>
   <h2>Enter Your Billing Address</h2>
 </else>
Index: openacs-4/packages/ecommerce/www/address.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/address.tcl	15 Sep 2002 01:50:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/address.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -40,7 +40,7 @@
     # outside the United States.
 
     if { ![string equal $country_code "US"] } {
-	ad_returnredirect "address-international?[export_url_vars address_id address_type]"
+	ad_returnredirect "address-international?[export_url_vars address_id address_type referer]"
     }
 
     if { [info exists usps_abbrev] } {
@@ -84,4 +84,6 @@
 }
 
 set user_name_with_quotes_escaped [ad_quotehtml $attn]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/billing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/billing.adp	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/billing.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,10 @@
-<master src="default-ec-master"></master>
-<property name="title">Completing Your Order</property>
-<property name="navbar">checkout {Select Billing Address}</property>
+<master>
+  <property name="title">Completing Your Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="checkout-progress" step="4">
+
 <h2>Select Your Billing Address</h2>
 
 <blockquote>
Index: openacs-4/packages/ecommerce/www/billing.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/billing.tcl	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/billing.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -138,4 +138,6 @@
 }
 set hidden_form_vars [export_form_vars address_type referer]
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/browse-categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/browse-categories.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/browse-categories.adp	17 Sep 2002 03:36:34 -0000	1.1
@@ -0,0 +1,29 @@
+<h4>Browse</h4>
+
+<table>
+  <tbody>
+    <grid name="categories" cols="3">
+
+      <if @categories.col@ eq 1>
+	<tr>
+      </if>
+
+      <td>
+	<if @categories.rownum@ le @categories:rowcount@>
+	  <ul>
+	    <li><a href="@categories.url@" title="Browse @categories.name@">@categories.name@</a></li>
+	  </ul>
+	</if>
+	<else>
+	  <!-- Placeholder to retain cell formatting -->
+	  &nbsp;
+	</else>
+      </td>
+
+      <if @categories.col@ eq "3">
+      </tr>
+      </if>
+
+    </grid>
+  </tbody>
+</table>
Index: openacs-4/packages/ecommerce/www/browse-categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/browse-categories.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/browse-categories.tcl	17 Sep 2002 03:36:34 -0000	1.1
@@ -0,0 +1,14 @@
+ad_page_contract {
+
+    Present a list of top level product categories to browse.
+
+    @author Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+    @creation-date September 2002
+    @cvs_id
+
+} {
+}
+
+template::query get_categories categories multirow "select category_id as id, category_name as name from ec_categories order by sort_key" -eval {
+    set row(url) "category-browse?category_id=$row(id)"
+}
Index: openacs-4/packages/ecommerce/www/category-browse-subcategory.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subcategory.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/category-browse-subcategory.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/category-browse-subcategory.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,9 +1,11 @@
-<master src="default-ec-master">
-<property name="title">@the_category_name@</property>
-<property name="navbar">@the_category_id@</property>
+<master>
+  <property name="title">@subcategory_name@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="toolbar">
+
 <blockquote>
-  <p align="center"><b>@the_category_name@</b></p>
   <table width="90%">
     <tr valign="top">
       <if @subcategories@ >
Index: openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -213,12 +213,14 @@
  ORDER BY sort_key, sub${sub}category_name
 " {
 
-  
+    ns_log notice "loop"
       append subcategories "<li><a href=category-browse-sub${sub}category?[export_url_vars category_id subcategory_id subsubcategory_id]>[eval "ident \$sub${sub}category_name"]</a>"
   }
 }
 
 set the_category_id   $category_id
 set the_category_name [eval "ident \$${sub}category_name"]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list [list "category-browse?category_id=$the_category_id" $category_name] $subcategory_name]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,9 +1,11 @@
-<master src="default-ec-master">
-<property name="title">@the_category_name@</property>
-<property name="navbar">@the_category_id@</property>
+<master>
+  <property name="title">@subsubcategory_name@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="toolbar">
+
 <blockquote>
-  <p align="center"><b>@the_category_name@</b></p>
   <table width="90%">
     <tr valign="top">
       <if @recommendations@ >
Index: openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -217,5 +217,7 @@
 
 set the_category_id $category_id
 set the_category_name [eval "ident \$${sub}category_name"]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list [list "category-browse?category_id=$the_category_id" $category_name] [list "category-browse-subcategory?category_id=$the_category_id&amp;subcategory_id=$subcategory_id" $subcategory_name] $the_category_name]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/category-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/category-browse.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/category-browse.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,9 +1,11 @@
-<master src="default-ec-master">
-<property name="title">@the_category_name@</property>
-<property name="navbar">@the_category_id@</property>
+<master>
+  <property name="title">@the_category_name@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="toolbar">
+
 <blockquote>
-  <p align="center"><b>@the_category_name@</b></p>
   <table width="90%">
     <tr valign="top">
       <if @subcategories@ >
Index: openacs-4/packages/ecommerce/www/category-browse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/category-browse.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/category-browse.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/category-browse.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -256,5 +256,7 @@
 
 set the_category_id   [eval "ident \$${sub}category_id"]
 set the_category_name [eval "ident \$${sub}category_name"]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list $the_category_name]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/checkout-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/checkout-2.adp	27 May 2002 03:15:12 -0000	1.2
+++ openacs-4/packages/ecommerce/www/checkout-2.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,10 @@
-<master src="default-ec-master">
-<property name="title">Completing Your Order</property>
-<property name="navbar">checkout {Verify Order}</property>
+<master>
+  <property name="title">Completing Your Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="checkout-progress" step="2">
+
 <h2>Check Your Order</h2>
 
 <blockquote>
Index: openacs-4/packages/ecommerce/www/checkout-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/checkout-2.tcl	27 May 2002 03:15:12 -0000	1.7
+++ openacs-4/packages/ecommerce/www/checkout-2.tcl	17 Sep 2002 03:36:34 -0000	1.8
@@ -186,5 +186,7 @@
 	<input type=radio name=tax_exempt_p value=\"f\" checked>No"
 }
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/checkout-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-3.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/checkout-3.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/checkout-3.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,10 @@
-<master src="default-ec-master">
-<property name="title">Please Confirm Your Order</property>
-<property name="navbar">checkout {Confirm Order}</property>
+<master>
+  <property name="title">Completing Your Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="checkout-progress" step="6">
+
 <h2>Please Confirm Your Order</h2>
 
 <blockquote>
Index: openacs-4/packages/ecommerce/www/checkout-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-3.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/checkout-3.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/checkout-3.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -146,4 +146,6 @@
 # them a summary before they submit their order
 
 set order_summary [ec_order_summary_for_customer $order_id $user_id]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/checkout-progress.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/checkout-progress.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/checkout-progress.adp	17 Sep 2002 03:37:50 -0000	1.1
@@ -0,0 +1,19 @@
+<table width="100%" bgcolor="lightgray">
+  <tbody>
+    <tr>
+      <td align="center"><if @step@ ge 1><b></if>Select Shipping Address<if @step@ ge 1></b></if></td>
+      <td align="center"><code>---></code></td>
+      <td align="center"><if @step@ ge 2><b></if>Verify Order<if @step@ ge 2><b></if></td>
+      <td align="center"><code>---></code></td>
+      <if @express_shipping_avail_p@>
+	<td align="center"><if @step@ ge 3><b></if>Select Shipping Method<if @step@ ge 3><b></if></td>
+      <td align="center"><code>---></code></td>
+      </if>
+      <td align="center"><if @step@ ge 4><b></if>Select Billing Address<if @step@ ge 4><b></if></td>
+      <td align="center"><code>---></code></td>
+      <td align="center"><if @step@ ge 5><b></if>Enter Payment Info<if @step@ ge 5><b></if></td>
+      <td align="center"><code>---></code></td>
+      <td align="center"><if @step@ ge 6><b></if>Confirm Order<if @step@ ge 6><b></if></td>
+    </tr>
+  </tbody>
+</table>
Index: openacs-4/packages/ecommerce/www/checkout-progress.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/checkout-progress.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/checkout-progress.tcl	17 Sep 2002 03:37:50 -0000	1.1
@@ -0,0 +1 @@
+set express_shipping_avail_p [ad_parameter -package_id [ec_id] ExpressShippingP ecommerce]
Index: openacs-4/packages/ecommerce/www/checkout.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/checkout.adp	5 Aug 2002 15:29:18 -0000	1.2
+++ openacs-4/packages/ecommerce/www/checkout.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,10 @@
-<master src="default-ec-master"></master>
-<property name="title">Completing Your Order</property>
-<property name="navbar">checkout {Select Shipping Address}</property>
+<master>
+  <property name="title">Completing Your Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="checkout-progress" step="1">
+
 <h2>Select Your Shipping Address</h2>
 
 <blockquote>
Index: openacs-4/packages/ecommerce/www/checkout.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/checkout.tcl	15 Sep 2002 01:50:50 -0000	1.7
+++ openacs-4/packages/ecommerce/www/checkout.tcl	17 Sep 2002 03:36:34 -0000	1.8
@@ -88,4 +88,6 @@
     ad_returnredirect "checkout-2?[export_url_vars address_id address_type]"
 }
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/contextbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/contextbar.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/contextbar.adp	17 Sep 2002 03:36:34 -0000	1.1
@@ -0,0 +1 @@
+<table width ="100%"> <tbody> <tr> <td>@context_bar@</td> <if @ec_admin_p@><td align="right">[&nbsp;<a href="@ec_admin_link@" title="Administer @ec_system_name@">Administer</a>&nbsp;]</td></if> </tr> </tbody> </table>
Index: openacs-4/packages/ecommerce/www/contextbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/contextbar.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/contextbar.tcl	17 Sep 2002 03:36:34 -0000	1.1
@@ -0,0 +1,34 @@
+#     Display the ecommerce toolbar containing a product search widget, 
+#     a link to order gift certificates (if they are allowed) and links
+#     to the shopping cart and store account.
+
+#     @param context_addition
+
+#     @author Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+#     @cvs-id $Id: contextbar.tcl,v 1.1 2002/09/17 03:36:34 bartt Exp $
+#     @creation-date September 2002
+
+# Create an empty context_addition list if no addition has been passed
+# in.
+
+if {![info exists context_addition]} {
+    set context_addition {}
+}
+
+# Create a context bar with the passed in addition(s) if any.
+
+if {[empty_string_p $context_addition]} {
+    set context_bar [ad_context_bar]
+} else {
+    set context_bar [eval ad_context_bar $context_addition]
+}
+
+# Check for admin rights to this (the ecommerce) package.
+
+set ec_admin_p [ad_permission_p [ad_conn package_id] admin]
+set ec_admin_link [ec_insecurelink [ad_parameter -package_id [ec_id] EcommercePath]admin/]
+
+# Get the name of the ecommerce package
+
+set ec_system_name [ec_system_name]
+
Index: openacs-4/packages/ecommerce/www/credit-card-correction.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/credit-card-correction.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/credit-card-correction.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/credit-card-correction.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,6 +1,10 @@
-<master src="default-ec-master"></master>
-<property name="title">Sorry, We Were Unable to Authorize Your Credit Card</property>
+<master>
+  <property name="title">Completing Your Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="checkout-progress" step="6">
+
 <h2>Sorry, We Were Unable to Authorize Your Credit Card</h2>
 
   <blockquote>
Index: openacs-4/packages/ecommerce/www/credit-card-correction.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/credit-card-correction.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/credit-card-correction.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/credit-card-correction.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -103,4 +103,6 @@
 set ec_expires_widget "[ec_creditcard_expire_1_widget [string range $creditcard_expire 0 1]] [ec_creditcard_expire_2_widget [string range $creditcard_expire 3 4]]"
 set formatted_address [ec_display_as_html [ec_pretty_mailing_address_from_args $line1 $line2 $city $usps_abbrev $zip_code $country_code $full_state_name $attn $phone $phone_time]]
 set international_address [string equal $country_code 'US']
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/gift-certificate-billing.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-billing.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate-billing.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate-billing.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,9 @@
-<master src="default-ec-master"></master>
-<property name="title">Completing Your Order</property>
+<master>
+  <property name="title">Completing Your Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Select Your Billing Address</h2>
+  <include src="toolbar" current_location="gift-certificate">
 
 <blockquote>
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -108,3 +108,6 @@
 }
 
 set hidden_form_vars [export_form_vars address_type certificate_to certificate_from certificate_message amount recipient_email referer]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
+
Index: openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp	17 Sep 2002 03:37:50 -0000	1.1
@@ -0,0 +1,22 @@
+<master>
+  <property name="title">@title@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
+
+  <include src="checkout-progress" step="5">
+
+    <blockquote>
+      <if @certificate_added_p@>
+	<p><%= [ec_pretty_price @amount@] %> has been added to your gift
+	  certificate account!</p>
+      </if>
+      <else>
+	<p>Your gift certificate has already been claimed.  Either you
+	  hit submit twice on the form, or it was claimed previously.
+	  Once you claim it, it goes into your gift certificate balance
+	  and you don't have to claim it again.</p>
+      </else>
+      <p><a href="payment?address_id=@address_id@">Continue with your
+	order</a></p>
+    </blockquote>
+    
Index: openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -67,6 +67,9 @@
 # now check whether it's already been claimed
 # and, if so, whether it was claimed by this user
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
+
 db_1row get_gc_user_id "
     select user_id as gift_certificate_user_id, amount 
     from ec_gift_certificates 
@@ -80,15 +83,8 @@
 	update ec_gift_certificates 
 	set user_id=:user_id, claimed_date = sysdate 
 	where gift_certificate_id = :gift_certificate_id"
-    doc_return 200 text/html "
-	[ad_header "Gift Certificate Claimed"]
-    	[ec_header_image]<br clear=all>
-    	<blockquote>
-    	  <p>[ec_pretty_price $amount] has been added to your gift certificate account!</p>
-    	  <p><a href=\"payment?address_id=$address_id\">Continue with your order</a></p>
-    	</blockquote>
-    	[ec_footer]"
-
+    set title "Gift Certificate Claimed"
+    set certificate_added_p "true"
 } else {
 
     # It's already been claimed. See if it was claimed by a different
@@ -106,15 +102,7 @@
 	    (ec_problem_id_sequence.nextval, sysdate, :gift_certificate_id, :prob_details)"
     }
 
+    set title "Gift Certificate Already Claimed"
+    set certificate_added_p "false"
     db_release_unused_handles
-    doc_return 200 text/html "
-	[ad_header "Gift Certificate Already Claimed"]
-    	[ec_header_image]<br clear=all>
-    	<blockquote>
-    	  <p>Your gift certificate has already been claimed.  Either you hit submit twice on the form, or it
-    	   was claimed previously.  Once you claim it, it goes into your gift certificate balance and you don't have to claim it again.</p>
-    	  <p><a href=\"payment?address_id=$address_id\">Continue with your order</a></p>
-    	</blockquote>
-    	[ec_footer]"
-
 }
Index: openacs-4/packages/ecommerce/www/gift-certificate-claim.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate-claim.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Claim a Gift Certificate</property>
+<master>
+  <property name="title">Claim a Gift Certificate</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Claim a Gift Certificate</h2>
+  <include src="checkout-progress" step="5">
 
 <form method="post" action="gift-certificate-claim-2">
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -37,3 +37,6 @@
     ad_returnredirect "index"
     return
 }
+
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Claim a Gift Certificate"]]]
+set ec_system_owner [ec_system_owner]
Index: openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">@title@</property>
+<master>
+  <property name="title">@title@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>@title@</h2>
+  <include src="toolbar" current_location="gift-certificate">
 
 @page@
 
Index: openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl	26 May 2002 04:36:50 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl	17 Sep 2002 03:36:34 -0000	1.5
@@ -184,7 +184,7 @@
 		  credit card. Please check the number and the expiration date and
 		  try again or use a different credit card.</p>
 		  <form method=post action=gift-certificate-finalize-order>
-		    [export_form_vars gift_certificate_id certificate_to certificate_from certificate_message amount recipient_email]
+		    [export_form_vars gift_certificate_id certificate_to certificate_from certificate_message amount recipient_email address_id]
 		    <table>
 		      <tr>
 		       <td>Credit card number:</td>
@@ -420,7 +420,7 @@
     			  credit card. Please check the number and the expiration date and
     			  try again or use a different credit card.</p>
     			  <form method=post action=gift-certificate-finalize-order>
-    			    [export_form_vars gift_certificate_id certificate_to certificate_from certificate_message amount recipient_email]
+    			    [export_form_vars gift_certificate_id certificate_to certificate_from certificate_message amount recipient_email address_id]
     			    <table>
         		      <tr>
         		       <td>Credit card number:</td>
@@ -521,3 +521,5 @@
 	}
     }
 }
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition $title]]
+set ec_system_owner [ec_system_owner]
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate-order-2.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-2.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Your Gift Certificate Order</property>
+<master>
+  <property name="title">Your Gift Certificate Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Your Gift Certificate Order</h2>
+  <include src="toolbar" current_location="gift-certificate">
 
 <form method="post" action="gift-certificate-billing">
   <ol>
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -34,5 +34,7 @@
 set currency [ad_parameter -package_id [ec_id] Currency ecommerce]
 set minimum_amount [ec_pretty_price [ad_parameter -package_id [ec_id] MinGiftCertificateAmount ecommerce]]
 set maximum_amount [ec_pretty_price [ad_parameter -package_id [ec_id] MaxGiftCertificateAmount ecommerce]]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Gift Certificate Order"]]]
+set ec_system_owner [ec_system_owner]
 
 ad_return_template
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Payment Info</property>
+<master>
+  <property name="title">Payment Info</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Payment Info</h2>
+  <include src="toolbar" current_location="gift-certificate">
 
 <form method=post action="gift-certificate-order-4">
   @hidden_form_variables@
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -38,5 +38,7 @@
 set ec_creditcard_widget [ec_creditcard_widget]
 set ec_expires_widget "[ec_creditcard_expire_1_widget] [ec_creditcard_expire_2_widget]"
 set hidden_form_variables [export_form_vars address_id certificate_to certificate_from certificate_message amount recipient_email]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Payment Info"]]]
+set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Please Confirm Your Gift Certificate Order</property>
+<master>
+  <property name="title">Please Confirm Your Gift Certificate Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Please Confirm Your Gift Certificate Order</h2>
+  <include src="toolbar" current_location="gift-certificate">
 
 <blockquote>
   <form method="post" action="gift-certificate-finalize-order">
@@ -77,4 +79,4 @@
       </blockquote>
       <b>Push Submit to send us your order!</b> <input type="submit" value="Submit">
   </form>
-</blockquote>
\ No newline at end of file
+</blockquote>
Index: openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl	26 May 2002 04:36:50 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl	17 Sep 2002 03:36:34 -0000	1.5
@@ -148,4 +148,6 @@
 
 set formatted_amount [ec_pretty_price $amount]
 set zero_in_the_correct_currency [ec_pretty_price 0]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Please Confirm Your Gift Certificate Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/gift-certificate-order.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate-order.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate-order.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Gift Certificates</property>
+<master>
+  <property name="title">Gift Certificates</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Gift Certificates</h2>
+  <include src="toolbar" current_location="gift-certificate">
 
 <blockquote>
   <p>The perfect gift for anyone, gift certificates can be used to to
@@ -26,4 +28,4 @@
       @minimum_amount@ and @maximum_amount@.
     </li>
   </ul>
-</blockquote>
\ No newline at end of file
+</blockquote>
Index: openacs-4/packages/ecommerce/www/gift-certificate-order.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-order.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-order.tcl	10 Sep 2002 22:22:37 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-order.tcl	17 Sep 2002 03:36:34 -0000	1.5
@@ -19,5 +19,7 @@
 # ec_redirect_to_https_if_possible_and_necessary handles secure connections
 # from linked to pages
 set order_url "gift-certificate-order-2"
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Gift Certificates"]]]
+set ec_system_owner [ec_system_owner]
 
 ad_return_template
Index: openacs-4/packages/ecommerce/www/gift-certificate-thank-you.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-thank-you.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate-thank-you.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate-thank-you.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Thank You For Your Gift Certificate Order</property>
+<master>
+  <property name="title">Thank You For Your Gift Certificate Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Thank You For Your Gift Certificate Order</h2>
+  <include src="toolbar" current_location="gift-certificate">
 
 <blockquote>
   <p>The lucky recipient will be notified by email shortly!</p>
Index: openacs-4/packages/ecommerce/www/gift-certificate-thank-you.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate-thank-you.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-thank-you.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-thank-you.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -13,4 +13,7 @@
 }
 
 set home_page "[ec_insecure_location][ec_url]index"
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Thank You For Your Gift Certificate Order"]]]
+set ec_system_owner [ec_system_owner]
+
 ad_return_template
Index: openacs-4/packages/ecommerce/www/gift-certificate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/gift-certificate.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/gift-certificate.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,8 +1,10 @@
-<master src="default-ec-master">
-<property name="title">Your Gift Certificate</property>
+<master>
+  <property name="title">Your Gift Certificate</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Your Gift Certificate</h2>
+  <include src="toolbar" current_location="gift-certificate">
 
 <blockquote>
   @gift_certificate_summary@
-</blockquote>
\ No newline at end of file
+</blockquote>
Index: openacs-4/packages/ecommerce/www/gift-certificate.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/gift-certificate.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -72,6 +72,9 @@
 	"
     }
 }
+
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Gift Certificate"]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 ad_return_template
 
Index: openacs-4/packages/ecommerce/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/index.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/index.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,32 +1,28 @@
-<master src="default-ec-master">
-<property name="title">Welcome</property>
-<property name="navbar">Home</property>
+<master>
+  <property name="title">Welcome</property>
+  <property name="context_bar">@context_bar@</property>
 
-<blockquote>
-  <if @user_is_logged_on@ true>
-    Welcome back @user_name@!&nbsp;&nbsp;&nbsp;If you're not @user_name@, click <a href="@register_url@">here</a>
-  </if>
-  <else>
-    Welcome!
-  </else>
+  <include src="toolbar">
 
-  @search_widget@
+    <blockquote>
+      <if @user_is_logged_on@ true>
+	Welcome back @user_name@!&nbsp;&nbsp;&nbsp;If you're not @user_name@, click <a href="@register_url@">here</a>
+      </if>
+      <else>
+	Welcome!
+      </else>
 
-  <if @recommendations_if_there_are_any@>
-    <h4>We recommend:</h4>
-    @recommendations_if_there_are_any@
-  </if>
+      <include src="browse-categories">
 
-  <if @products@>
-    <h4>Products:</h4>
-    @products@
-  </if>
+      <if @recommendations_if_there_are_any@>
+	<h4>We recommend:</h4>
+	@recommendations_if_there_are_any@
+      </if>
 
-  @prev_link@ @separator@ @next_link@
+      <if @products@>
+	<h4>Products:</h4>
+	@products@
+      </if>
 
-  <if @gift_certificates_are_allowed@ true>
-    <p align=right>
-      <a href="gift-certificate-order">Order a Gift Certificate!</a>
-    </p>
-  </if>
-</blockquote>
+      @prev_link@ @separator@ @next_link@
+    </blockquote>
Index: openacs-4/packages/ecommerce/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/index.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/index.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -92,11 +92,6 @@
     append recommendations_if_there_are_any "</table>"
 }
 
-if { [ad_parameter -package_id [ec_id] SellGiftCertificatesP ecommerce] == 1 } {
-    set gift_certificates_are_allowed 1
-} else {
-    set gift_certificates_are_allowed 0
-}
 set products "<table width=100%>"
 
 set have_how_many_more_p f
@@ -162,5 +157,6 @@
     set separator "|"
 }
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar ""]
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/mailing-list-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/mailing-list-add-2.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/mailing-list-add-2.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,9 +1,10 @@
-<master src="default-ec-master">
-<property name="title">You've been added to the @mailing_list_name@ mailing list!</property>
+<master>
+  <property name="title">@title@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>You've been added to the @mailing_list_name@ mailing list!</h2>
+  <include src="toolbar">
 
 <blockquote>
   To remove yourself anytime, go to @remove_link@
-  @continue_shopping_options@
 </blockquote>
Index: openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -58,7 +58,9 @@
 
 set remove_link "<a href=\"mailing-list-remove?[export_url_vars category_id subcategory_id subsubcategory_id]\">[ec_insecure_location][ec_url]mailing-list-remove?[export_url_vars category_id subcategory_id subsubcategory_id]</a>"
 
-set continue_shopping_options [ec_continue_shopping_options]
+set title "You subscribed to the $mailing_list_name mailing list"
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list $title]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 
 ad_return_template
Index: openacs-4/packages/ecommerce/www/mailing-list-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/mailing-list-add.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/mailing-list-add.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,8 +1,8 @@
-<master src="default-ec-master">
-<property name="title">Add yourself to the @mailing_list_name@ mailing list!</property>
+<master>
+  <property name="title">@title@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Add yourself to the @mailing_list_name@ mailing list!</h2>
-
 <blockquote>
   We think that you are @user_name@.  If not, please <a href="@register_link@">log in</a>.  Otherwise,
   <form method="post" action="mailing-list-add-2">
Index: openacs-4/packages/ecommerce/www/mailing-list-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/mailing-list-add.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/mailing-list-add.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -68,5 +68,8 @@
 
 set register_link "/register?[export_url_vars return_url]"
 set hidden_form_variables [export_form_vars category_id subcategory_id subsubcategory_id]
+set title "Subscribe to the $mailing_list_name mailing list"
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list $title]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/mailing-list-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-remove.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/mailing-list-remove.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/mailing-list-remove.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,12 +1,13 @@
-<master src="default-ec-master">
-<property name="title">You've been removed from the @mailing_list_name@ mailing list</property>
+<master>
+  <property name="title">$title</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>You've been removed from the @mailing_list_name@ mailing list</h2>
+  <include src="toolbar">
 
 <blockquote>
   <p>To re-add yourself anytime, go to @re_add_link@</p>
   <p>To see your other subscriptions (if any), return to @back_to_account_link@.</p>
-  @continue_shopping_options@
 </blockquote>
 
 
Index: openacs-4/packages/ecommerce/www/mailing-list-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/mailing-list-remove.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/mailing-list-remove.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/mailing-list-remove.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -82,7 +82,9 @@
 set re_add_link "<a href=\"mailing-list-add?[export_url_vars category_id subcategory_id subsubcategory_id]\">
    [ec_insecure_location][ec_url]mailing-list-add?[export_url_vars category_id subcategory_id subsubcategory_id]</a>"
 set back_to_account_link "<a href=\"[ec_insecure_location][ec_url]account\">Your Account</a>"
-set continue_shopping_options [ec_continue_shopping_options]
+set title "You unsubscribed from the $mailing_list_name mailing list"
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list $title]]]
+set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/order.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/order.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/order.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/order.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,8 +1,10 @@
-<master src="default-ec-master">
-<property name="title">Your Order</property>
+<master>
+  <property name="title">Your Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Your Order</h2>
+  <include src="toolbar">
 
-<blockquote>
-  @order_summary@
-</blockquote>
\ No newline at end of file
+    <blockquote>
+      @order_summary@
+    </blockquote>
Index: openacs-4/packages/ecommerce/www/order.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/order.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/order.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/order.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -30,6 +30,8 @@
 set user_session_id [ec_get_user_session_id]
 ec_create_new_session_if_necessary [export_url_vars order_id]
 ec_log_user_as_user_id_for_this_session
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Order"]]]
+set ec_system_owner [ec_system_owner]
 
 set order_summary "
 <pre>
Index: openacs-4/packages/ecommerce/www/payment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/payment.adp	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/payment.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,10 @@
-<master src="default-ec-master"></master>
-<property name="title">Payment Info</property>
-<property name="navbar">checkout {Enter Payment Info}</property>
+<master>
+  <property name="title">Completing Your Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="checkout-progress" step="5">
+
 <h2>Payment Info</h2>
 
 <blockquote>
Index: openacs-4/packages/ecommerce/www/payment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/payment.tcl	26 May 2002 04:36:50 -0000	1.4
+++ openacs-4/packages/ecommerce/www/payment.tcl	17 Sep 2002 03:36:34 -0000	1.5
@@ -51,7 +51,7 @@
     # No rows came back, so they probably got here by pushing "Back",
     # so just redirect them to index.tcl
 
-    ad_returnredirect index.tcl
+    ad_returnredirect index
     return
 } 
 
@@ -70,7 +70,7 @@
     # otherwise they've probably gotten here via url surgery, so
     # redirect them to checkout.tcl
     
-    ad_returnredirect checkout.tcl
+    ad_returnredirect checkout
     return
 }
 
@@ -99,7 +99,7 @@
     select count(*) 
     from ec_items 
     where order_id=:order_id"] == 0 } {
-    ad_returnredirect shopping-cart.tcl
+    ad_returnredirect shopping-cart
     return
 }
 
@@ -131,7 +131,7 @@
 
 # Now get the other necessary information
 
-set form_action [ec_securelink [ec_url]process-payment.tcl]
+set form_action [ec_securelink [ec_url]process-payment
 
 # ec_order_cost returns price + shipping + tax - gift_certificate BUT
 # no gift certificates have been applied to in_basket orders, so this
@@ -227,5 +227,7 @@
     append old_cards_to_choose_from "</table>"
 }
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/product-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product-search.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/product-search.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/product-search.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,11 +1,13 @@
-<master src="default-ec-master">
-<property name="title">@category_name@</property>
+<master>
+  <property name="title">@category_name@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<p><b>@category_name@:</b></p>
+  <include src="toolbar">
 
-<blockquote>
-  @search_results@
-</blockquote>
+  <blockquote>
+    @search_results@
+  </blockquote>
 
 
 
Index: openacs-4/packages/ecommerce/www/product-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product-search.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/product-search.tcl	26 May 2002 04:36:50 -0000	1.4
+++ openacs-4/packages/ecommerce/www/product-search.tcl	17 Sep 2002 03:36:34 -0000	1.5
@@ -109,5 +109,8 @@
 } else {
     set search_results " $search_count item[ec_decode $search_count "1" "" "s"] found.<p>$search_string"
 }
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "$category_name"]]]
+set ec_system_owner [ec_system_owner]
+
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/product.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/product.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/product.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,5 +1,8 @@
-<master src="default-ec-master">
-<property name="title">@product_name@</property>
-<property name="navbar">@category_id@</property>
+<master>
+  <property name="title">@product_name@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-@formatted_product@
+  <include src="toolbar">
+
+  @formatted_product@
Index: openacs-4/packages/ecommerce/www/product.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/product.tcl	13 Sep 2002 00:13:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/product.tcl	17 Sep 2002 03:36:34 -0000	1.5
@@ -184,4 +184,7 @@
 }
 
 db_release_unused_handles
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition $product_name]]
+set ec_system_owner [ec_system_owner]
+
 set formatted_product [ns_adp_parse -string $template]
Index: openacs-4/packages/ecommerce/www/review-submit-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/review-submit-2.adp	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/review-submit-2.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Check Your Review</property>
+<master>
+  <property name="title">Check Your Review of @product_name@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Check your review of @product_name@</h2>
+  <include src="toolbar">
 
 <blockquote>
   <form method="post" action="review-submit-3">
Index: openacs-4/packages/ecommerce/www/review-submit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/review-submit-2.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/review-submit-2.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -66,5 +66,8 @@
 [ec_display_as_html $user_comment]"
 
 set system_name [ad_system_name]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Check Your Review"]]]
+set ec_system_owner [ec_system_owner]
+
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/review-submit-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-3.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/review-submit-3.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/review-submit-3.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,15 +1,17 @@
-<master src="default-ec-master">
-<property name="title">Thank you for your review of @product_name@</property>
+<master>
+  <property name="title">Thank You For Your Review of @product_name@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Thank you for your review of @product_name@</h2>
+  <include src="toolbar">
 
 <blockquote>
   <if @comments_need_approval@ true>
     <p>Your review has been received.  Thanks for sharing your
       thoughts with us! It can take a few days for your review to
       appear on our web site.  If your review has not appeared on our
       site and you would like to know why, please send an email to <a
-      href="@system_owner_email@">@system_owner_email@</a>.</p>
+      href="@ec_system_owner@">@ec_system_owner@</a>.</p>
   </if>
   <else>
     <p>Your review has been received. Thanks for sharing your
Index: openacs-4/packages/ecommerce/www/review-submit-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit-3.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/review-submit-3.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/review-submit-3.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -61,8 +61,9 @@
 }
 
 set comments_need_approval [ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP]
-set system_owner_email [ec_system_owner]
 set product_link "product?[export_url_vars product_id]"
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Thank You For Your Review"]]]
+set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/review-submit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/review-submit.adp	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/review-submit.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Write your own review of $product_name</property>
+<master>
+  <property name="title">Write Your Own Review of @product_name@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Write your own review of @product_name@</h2>
+  <include src="toolbar">
 
 <form method="post" action="review-submit-2">
   <input type="hidden" name="product_id" value="@product_id@">
Index: openacs-4/packages/ecommerce/www/review-submit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/review-submit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/review-submit.tcl	10 Sep 2002 22:22:37 -0000	1.3
+++ openacs-4/packages/ecommerce/www/review-submit.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -39,6 +39,8 @@
 
 lappend altered_prev_args_list $product_name
 set rating_widget [ec_rating_widget]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Write Your Own Review"]]]
+set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/select-shipping.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/select-shipping.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/select-shipping.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/select-shipping.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,11 @@
-<master src="default-ec-master">
-<property name="title">Completing Your Order</property>
-<property name="navbar">checkout {Select Shipping Method}</property>
+<master>
+  <property name="title">Completing Your Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="checkout-progress" step="3">
+
+
 <h2>Select Your Shipping Method</h2>
 
 <form method="post" action="@form_action@">
@@ -12,4 +16,4 @@
   <center>
     <input type="submit" value="Continue">
   </center>
-</form>
\ No newline at end of file
+</form>
Index: openacs-4/packages/ecommerce/www/select-shipping.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/select-shipping.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/select-shipping.tcl	15 Sep 2002 01:50:50 -0000	1.5
+++ openacs-4/packages/ecommerce/www/select-shipping.tcl	17 Sep 2002 03:36:34 -0000	1.6
@@ -272,4 +272,6 @@
     append shipping_options "[export_form_vars tax_exempt_p]"
 }
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,9 +1,11 @@
-<master src="default-ec-master">
-<property name="title">Select Shopping Cart</property>
+<master>
+  <property name="title">Select Shopping Cart</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Select Shopping Cart</h2>
+  <include src="toolbar" current_location="shopping-cart">
 
 <blockquote>
   <p>Your saved shopping cart(s):</p>
   @saved_carts@
-</blockquote>
\ No newline at end of file
+</blockquote>
Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl	10 Sep 2002 22:22:37 -0000	1.3
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -58,5 +58,8 @@
     append saved_carts "No shopping carts were found.\n"
 }
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Select Shopping Cart"]]]
+set ec_system_owner [ec_system_owner]
+
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">@page_title@</property>
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2><@page_title@</h2>
+  <include src="toolbar" current_location="shopping-cart">
 
 <blockquote>
   <if @page_function@ eq "view">
Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -134,6 +134,8 @@
 	incr product_counter
     }
 
+    set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list $page_title]]]
+    set ec_system_owner [ec_system_owner]
     db_release_unused_handles
     ad_return_template
     return
@@ -217,6 +219,8 @@
 	set page_title "Merge or Replace Your Current Shopping Cart?"
 	set page_function "retrieve"
 	set hidden_form_variables [export_form_vars order_id]
+	set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list $page_title]]]
+	set ec_system_owner [ec_system_owner]
 
 	ad_return_template
 	return
@@ -378,6 +382,8 @@
     set page_function "discard"
     set hidden_form_variables "[export_form_vars order_id]
     [ec_hidden_input discard_confirmed_p "t"]"
+    set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list $page_title]]]
+    set ec_system_owner [ec_system_owner]
 
     ad_return_template
     return
Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve.adp	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,9 @@
-<master src="default-ec-master"></master>
-<property name="title">Retrieve Shopping Cart</property>
+<master>
+  <property name="title">Retrieve Shopping Cart</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Retrieve Your Shopping Cart</h2>
+  <include src="toolbar" current_location="shopping-cart">
 
 <blockquote>
   <p>We think that you are @user_name@.  If not, please <a
Index: openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -32,6 +32,8 @@
     where user_id=:user_id"]
 
 set register_link "/register?[export_url_vars return_url]"
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Retrieve Shopping Cart"]]]
+set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/shopping-cart-save-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shopping-cart-save-2.adp	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shopping-cart-save-2.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Your Shopping Cart Has Been Saved</property>
+<master>
+  <property name="title">Your Shopping Cart Has Been Saved</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Your Shopping Cart Has Been Saved</h2> 
+  <include src="toolbar" current_location="shopping-cart">
 
 <blockquote>
   <p>When you're ready to return to it, just click on "Retrieve Saved
Index: openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -49,6 +49,8 @@
 # fine
 
 set cart_duration [ad_parameter CartDuration default [ad_parameter -package_id [ec_id] CartDuration]]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Shopping Cart Has Been Saved"]]]
+set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/shopping-cart-save.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shopping-cart-save.adp	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shopping-cart-save.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Save Shopping Cart</property>
+<master>
+  <property name="title">Save Shopping Cart</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Save Your Shopping Cart</h2>
+  <include src="toolbar" current_location="your-account">
 
 <blockquote>
   <p>We think that you are @user_name@.  If not, please <a
Index: openacs-4/packages/ecommerce/www/shopping-cart-save.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart-save.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/shopping-cart-save.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/shopping-cart-save.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -24,6 +24,8 @@
     from cc_users 
     where user_id=:user_id"]
 set register_link "/register?[export_url_vars return_url]"
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Save Shopping Cart"]]]
+set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/shopping-cart.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/shopping-cart.adp	5 Aug 2002 15:13:00 -0000	1.3
+++ openacs-4/packages/ecommerce/www/shopping-cart.adp	17 Sep 2002 03:36:34 -0000	1.4
@@ -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@, 
@@ -87,7 +90,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>
Index: openacs-4/packages/ecommerce/www/shopping-cart.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/shopping-cart.tcl	5 Aug 2002 22:56:27 -0000	1.6
+++ openacs-4/packages/ecommerce/www/shopping-cart.tcl	17 Sep 2002 03:36:34 -0000	1.7
@@ -126,5 +126,7 @@
 	    and saved_p='t')" -default ""]
 }
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Shopping Cart"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/thank-you.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/thank-you.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/thank-you.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/thank-you.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,9 +1,11 @@
-<master src="default-ec-master">
-<property name="title">Thank You For Your Order</property>
+<master>
+  <property name="title">Thank You For Your Order</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Thank You For Your Order</h2>
+  <include src="checkout-progress" step="6">
 
 <blockquote>
   <p><b>Please print this page for your records</b></p>
   @order_summary@
-</blockquote>
\ No newline at end of file
+</blockquote>
Index: openacs-4/packages/ecommerce/www/thank-you.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/thank-you.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/thank-you.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/thank-you.tcl	17 Sep 2002 03:36:34 -0000	1.3
@@ -52,6 +52,8 @@
 }
 
 set order_summary [ec_order_summary_for_customer $order_id $user_id]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Thank You For Your Order"]]]
+set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/toolbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/toolbar.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/toolbar.adp	17 Sep 2002 03:36:34 -0000	1.1
@@ -0,0 +1,20 @@
+<table width="100%">
+  <tbody>
+    <tr>
+      <td>@ec_search_widget@</td>
+      <td align="right">
+	<if @gift_certificates_are_allowed@ true and @current_location@ ne "gift-certificate">
+	  [&nbsp;<a href="gift-certificate-order">Order a Gift Certificate</a>&nbsp;]
+	</if>
+	<if @current_location@ ne "shopping-cart">
+	  [&nbsp;<a href="@ec_cart_link@" title="View the contents of your shopping cart">Shopping Cart</a>&nbsp;]
+	</if>
+	<if @current_location@ ne "your-account">
+	  [&nbsp;<a href="@ec_account_link@" title="View your @ec_system_name@ account">Your Account</a>&nbsp;]
+	</if>
+      </td>
+    </tr>
+  </tbody>
+</table>
+<p>
+	
Index: openacs-4/packages/ecommerce/www/toolbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/toolbar.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/toolbar.tcl	17 Sep 2002 03:36:34 -0000	1.1
@@ -0,0 +1,38 @@
+#     Display the ecommerce toolbar containing a product search widget, 
+#     a link to order gift certificates (if they are allowed) and links
+#     to the shopping cart and store account.
+
+#     @param category_id
+#     @param subcategory_id
+#     @param search_text
+#     @current_location
+
+#     @author Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+#     @cvs-id $Id: toolbar.tcl,v 1.1 2002/09/17 03:36:34 bartt Exp $
+#     @creation-date September 2002
+
+# Create empty lists for each optional parameter that has not been
+# passed in.
+
+foreach parameter {category_id subcategory_id search_text current_location} {
+    if {![info exists $parameter]} {
+	set $parameter {}
+    }
+}
+
+# Create a context aware search widget to search for products.
+
+set ec_search_widget [ec_search_widget "$category_id|$subcategory_id"  $search_text]
+
+# Determine the URLs to the Shopping Cart and store Account.
+
+set ec_cart_link [ec_insecurelink [ad_parameter -package_id [ec_id] EcommercePath]shopping-cart]
+set ec_account_link [ec_insecurelink [ad_parameter -package_id [ec_id] EcommercePath]account]
+
+# Get the name of the ecommerce package
+
+set ec_system_name [ec_system_name]
+
+# Check if gift certificates can be bought.
+
+set gift_certificates_are_allowed [ad_parameter -package_id [ec_id] SellGiftCertificatesP ecommerce]
Index: openacs-4/packages/ecommerce/www/track.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/track.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/track.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/track.adp	17 Sep 2002 03:36:34 -0000	1.2
@@ -1,7 +1,9 @@
-<master src="default-ec-master">
-<property name="title">Your Shipment</property>
+<master>
+  <property name="title">Your Shipment</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2>Your Shipment</h2>
+  <include src="toolbar" current_location="shopping-cart">
 
 <ul>
   <li>Shipping Date: @pretty_ship_date@</li>
@@ -13,4 +15,4 @@
 
 <blockquote>
   @carrier_info@
-</blockquote>
\ No newline at end of file
+</blockquote>
Index: openacs-4/packages/ecommerce/www/track.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/track.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/track.tcl	26 May 2002 04:36:50 -0000	1.5
+++ openacs-4/packages/ecommerce/www/track.tcl	17 Sep 2002 03:36:34 -0000	1.6
@@ -73,5 +73,7 @@
     } 
 }
 
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Shipment"]]]
+set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 ad_return_template
Index: openacs-4/packages/ecommerce/www/update-user-classes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/update-user-classes.adp	15 Sep 2002 01:50:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/update-user-classes.adp	17 Sep 2002 03:36:34 -0000	1.3
@@ -1,7 +1,11 @@
-<master src="default-ec-master">
-<property name="title">Your Account</property>
-<property name="navbar">Your Account</property>
+<master>
+  <property name="title">Your Account</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
+  <include src="toolbar" current_location="your-account">
+
+
 <blockquote>
   <form method="post" action="update-user-classes-2">
     <if @user_classes_need_approval@ true>
Index: openacs-4/packages/ecommerce/www/update-user-classes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/update-user-classes.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/update-user-classes.tcl	26 May 2002 04:36:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/update-user-classes.tcl	17 Sep 2002 03:36:34 -0000	1.4
@@ -29,6 +29,9 @@
     select user_class_id 
     from ec_user_class_user_map 
     where user_id = :user_id"]]
+set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Account"]]]
+set ec_system_owner [ec_system_owner]
+
 db_release_unused_handles
 
 ad_return_template