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.16 -r1.17
--- openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl	18 Sep 2002 21:33:44 -0000	1.16
+++ openacs-4/packages/ecommerce/tcl/ecommerce-procs.tcl	19 Sep 2002 03:02:20 -0000	1.17
@@ -192,43 +192,6 @@
     return [ad_parameter -package_id [ec_id] ProductDataDirectory "" product/]
 }
 
-# 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
-# }
-
 # 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/contextbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/contextbar.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/contextbar.tcl	17 Sep 2002 03:36:34 -0000	1.1
+++ openacs-4/packages/ecommerce/www/contextbar.tcl	19 Sep 2002 03:02:19 -0000	1.2
@@ -1,6 +1,4 @@
-#     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.
+#     Add a [ Administer ] link at the far right to the context bar.
 
 #     @param context_addition
 
@@ -26,7 +24,7 @@
 # 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/]
+set ec_admin_link admin/
 
 # Get the name of the ecommerce package
 
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.3 -r1.4
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp	17 Sep 2002 03:36:34 -0000	1.3
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp	19 Sep 2002 03:02:19 -0000	1.4
@@ -49,4 +49,10 @@
     </form>
   </if>
 
+  <if @page_function@ eq "invalid_order">
+     <p>The order you have selected either does not exist or does not
+       belong to you.  Please contact <a href="mailto@ec_system_owner@">@ec_system_owner@</a> 
+       if this is incorrect.</p>
+  </if>
+
 </blockquote>
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.4 -r1.5
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl	18 Sep 2002 21:33:46 -0000	1.4
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl	19 Sep 2002 03:02:19 -0000	1.5
@@ -43,6 +43,9 @@
     ad_script_abort
 }
 
+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]
+
 # Make sure this order is theirs
 
 set order_theirs_p [db_string get_order_is_theirs "
@@ -52,14 +55,9 @@
     and user_id=:user_id"]
 
 if { !$order_theirs_p } {
-    doc_return  200 text/html "
-	[ad_header "Invalid Order"]
-
-	<h2>Invalid Order</h2>
-
-	<p>The order you have selected either does not exist or does not belong to you. 
-	   Please contact <a href=\"mailto:[ec_system_owner]\">[ec_system_owner]</a> if this is incorrect.</p>
-	[ec_footer]"
+    set page_function "invalid_order"
+    set page_title "Invalid Order"
+    ad_return_template
     ad_script_abort
 }
 
@@ -134,8 +132,6 @@
 	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
     ad_script_abort
Index: openacs-4/packages/ecommerce/www/doc/audit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/audit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/doc/audit.adp	15 Sep 2002 01:50:49 -0000	1.3
+++ openacs-4/packages/ecommerce/www/doc/audit.adp	19 Sep 2002 03:02:18 -0000	1.4
@@ -1,17 +1,8 @@
 <master>
   <property name=title>Audit Trail Package</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <h2>The Big Picture</h2>
 
   <p>When you have more than one person updating information in a
Index: openacs-4/packages/ecommerce/www/doc/contextbar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/contextbar.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/doc/contextbar.adp	19 Sep 2002 03:02:18 -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/doc/contextbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/contextbar.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/doc/contextbar.tcl	19 Sep 2002 03:02:18 -0000	1.1
@@ -0,0 +1,32 @@
+#     Add a [ Administer ] link at the far right to the context bar.
+
+#     @param context_addition
+
+#     @author Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+#     @cvs-id $Id: contextbar.tcl,v 1.1 2002/09/19 03:02:18 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 [apm_package_url_from_id [ec_id]]admin/
+
+# Get the name of the ecommerce package
+
+set ec_system_name [ec_system_name]
+
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.adp	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-customer-service.adp	19 Sep 2002 03:02:18 -0000	1.3
@@ -1,19 +1,8 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name=title>@title@</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <p>The Customer Service Module can be found at <a
    href="@package_url@admin/customer-service/">@package_url@admin/customer-service/</a>
    (it is also linked to from the main Ecommerce Administration
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-features.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-features.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/ecommerce-features.adp	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-features.adp	19 Sep 2002 03:02:18 -0000	1.3
@@ -1,20 +1,8 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name=title>@title@</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-
-  <hr>
-
   <h2>Some of the high-level features of the @package_name@:</h2>
 
   <h3>Products</h3>
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-features.tcl	19 Sep 2002 03:02:18 -0000	1.2
@@ -29,7 +29,7 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar [list "." "$package_name Documentation"] "Feature overview"]
+set context_bar [ad_context_bar [list "." "Ecommerce Documentation"] "Feature overview"]
 
 # Set signatory for at the bottom of the page
 
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-for-mbas.adp	19 Sep 2002 03:02:18 -0000	1.3
@@ -1,19 +1,8 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name=title>@title@</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <p>The big decision:</p>
 
   <ol type="A">
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-operation.adp	19 Sep 2002 03:02:18 -0000	1.3
@@ -1,19 +1,8 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name=title>Operation of the Ecommerce Module</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <p>Before reading this, make sure that you have read about <a
    href="ecommerce-setup">setting up your ecommerce module</a>.  This
    document takes up where that one leaves off and covers all the
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-setup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-setup.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/ecommerce-setup.adp	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-setup.adp	19 Sep 2002 03:02:18 -0000	1.3
@@ -1,19 +1,8 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name=title>Setup of the Ecommerce Module</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <p>This is intended to be a guide for the content administrators of
     @package_name@.  Content administrators are not assumed to have any
     technical expertise (although HTML knowledge is necessary if you
Index: openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp	15 Sep 2002 01:50:49 -0000	1.3
+++ openacs-4/packages/ecommerce/www/doc/ecommerce-technical.adp	19 Sep 2002 03:02:18 -0000	1.4
@@ -1,17 +1,8 @@
 <master>
   <property name=title>@title@</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <h2>Setup</h2>
 
   <ul>
Index: openacs-4/packages/ecommerce/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/index.adp	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/index.adp	19 Sep 2002 03:02:18 -0000	1.3
@@ -1,24 +1,8 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name="title">@title@</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-	<td align="right">
-          <if @admin_p@ eq 1>
-            [ <a href="@package_url@admin/">Administer</a> ]
-          </if>
-        </td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <p>@package_name@ implements all the IT needs for a standard
     business-to-consumer web service.  Most importantly, it is tightly
     integrated with the rest of the Open Architecture Community System
Index: openacs-4/packages/ecommerce/www/doc/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/doc/index.tcl	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/doc/index.tcl	19 Sep 2002 03:02:18 -0000	1.2
@@ -27,7 +27,7 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar $package_name]
+set context_bar [template::adp_parse [acs_root_dir]/packages/ecommerce/www/doc/contextbar [list context_addition [list $title]]]
 
 # Set signatory for at the bottom of the page
 
Index: openacs-4/packages/ecommerce/www/doc/license.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/license.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/doc/license.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/doc/license.adp	19 Sep 2002 03:02:18 -0000	1.2
@@ -1,20 +1,9 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name="title">@title@</property>
   <property name="signatory">@signatory@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
+  <property name="context_bar">@context_bar@</property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <h2>GNU General Public License</h2>
 
   <p>Version 2, June 1991</p>
Index: openacs-4/packages/ecommerce/www/doc/porting-diary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/porting-diary.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/doc/porting-diary.adp	15 Sep 2002 01:50:49 -0000	1.3
+++ openacs-4/packages/ecommerce/www/doc/porting-diary.adp	19 Sep 2002 03:02:18 -0000	1.4
@@ -1,17 +1,8 @@
 <master>
   <property name=title>@title@</property>
   <property name="signatory">@signatory@</property>
+  <property name="context_bar">@context_bar@</property>
 
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
-
   <h2>Diary</h2>
   
   <ul>
Index: openacs-4/packages/ecommerce/www/doc/release.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/doc/release.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/doc/release.adp	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/doc/release.adp	19 Sep 2002 03:02:18 -0000	1.3
@@ -1,18 +1,7 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
 <master>
   <property name=title>@title@</property>
   <property name="signatory">@signatory@</property>
-
-  <h2>@title@</h2>
-  <table width="100%">
-    <tbody>
-      <tr>
-	<td align="left">@context_bar@</td>
-      </tr>
-    </tbody>
-  </table>
-  <hr>
+  <property name="context_bar">@context_bar@</property>
     
   <h2>Features</h2>