Index: openacs-4/packages/ecommerce/www/account.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/account.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/account.adp	13 Jan 2005 13:57:57 -0000	1.6
+++ openacs-4/packages/ecommerce/www/account.adp	11 Aug 2008 13:01:09 -0000	1.7
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Your account</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">your-account</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <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.8 -r1.9
--- openacs-4/packages/ecommerce/www/account.tcl	1 Mar 2005 00:01:30 -0000	1.8
+++ openacs-4/packages/ecommerce/www/account.tcl	11 Aug 2008 13:01:09 -0000	1.9
@@ -109,7 +109,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]
-
+set title "Your Account"
+set context [list $title]
 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.8 -r1.9
--- openacs-4/packages/ecommerce/www/address-international.adp	13 Jan 2005 13:57:57 -0000	1.8
+++ openacs-4/packages/ecommerce/www/address-international.adp	11 Aug 2008 13:01:09 -0000	1.9
@@ -1,15 +1,14 @@
 <master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
 
-  <property name="context_bar">@context_bar;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
 <if @address_type@ eq "shipping">
-  <property name="title">Completing Your Order: Shipping Address</property>
   <include src="checkout-progress" step="1">
   <h2>Your shipping address</h2>
 </if>
 <else>
-  <property name="title">Completing Your Order: Billing Address</property>
   <if @referer@ ne "gift-certificate-billing">
     <include src="checkout-progress" step="4">
   </if>
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/address-international.tcl	13 Jan 2005 13:57:57 -0000	1.7
+++ openacs-4/packages/ecommerce/www/address-international.tcl	11 Aug 2008 13:01:09 -0000	1.8
@@ -86,6 +86,12 @@
     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 title "Completing Your Order"
+if { $address_type eq "shipping" } {
+    append title ": your shipping address"
+} else {
+    append title ": your billing address"
+}
+set context [list $title]
 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.8 -r1.9
--- openacs-4/packages/ecommerce/www/address.adp	13 Jan 2005 13:57:57 -0000	1.8
+++ openacs-4/packages/ecommerce/www/address.adp	11 Aug 2008 13:01:09 -0000	1.9
@@ -1,16 +1,17 @@
 <master>
-  <property name="context_bar">@context_bar;noquote@</property>
+
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
 <if @address_type@ eq "shipping">
-  <property name="title">Completing Your Order: Shipping Address</property>
+  <property name="doc(title)">Completing Your Order: Shipping Address</property>
 
   <include src="checkout-progress" step="1">
 
   <h2>Your shipping address</h2>
 </if>
 <else>
-  <property name="title">Completing Your Order: Billing Address</property>
+  <property name="doc(title)">Completing Your Order: Billing Address</property>
   <if @referer@ ne "gift-certificate-billing">
     <include src="checkout-progress" step="4">
   </if>
Index: openacs-4/packages/ecommerce/www/address.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/ecommerce/www/address.tcl	13 Jan 2005 13:57:57 -0000	1.9
+++ openacs-4/packages/ecommerce/www/address.tcl	11 Aug 2008 13:01:09 -0000	1.10
@@ -118,6 +118,7 @@
 set user_first_names_with_quotes_escaped [ad_quotehtml $first_names]
 
 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 title "Completing Your Order"
+set context [list $title]
 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.6 -r1.7
--- openacs-4/packages/ecommerce/www/billing.adp	13 Jan 2005 13:57:57 -0000	1.6
+++ openacs-4/packages/ecommerce/www/billing.adp	11 Aug 2008 13:01:09 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">Completing Your Order: Billing address</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="4">
Index: openacs-4/packages/ecommerce/www/billing.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/billing.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/billing.tcl	1 Mar 2005 00:01:30 -0000	1.7
+++ openacs-4/packages/ecommerce/www/billing.tcl	11 Aug 2008 13:01:09 -0000	1.8
@@ -138,6 +138,7 @@
 }
 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 title "Completing Your Order: billing address"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 db_release_unused_handles
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.10 -r1.11
--- openacs-4/packages/ecommerce/www/category-browse-subcategory.adp	28 Apr 2008 14:46:26 -0000	1.10
+++ openacs-4/packages/ecommerce/www/category-browse-subcategory.adp	11 Aug 2008 13:01:09 -0000	1.11
@@ -1,9 +1,10 @@
 <master>
-  <property name="title">@subcategory_name;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
 <blockquote>
 <if @subcategories:rowcount@ or @recommendations:rowcount@>
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.13 -r1.14
--- openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl	9 Aug 2008 11:57:43 -0000	1.13
+++ openacs-4/packages/ecommerce/www/category-browse-subcategory.tcl	11 Aug 2008 13:01:09 -0000	1.14
@@ -195,7 +195,8 @@
 set the_category_id   $category_id
 set the_category_name [eval "ident \$${sub}category_name"]
 set category_url "category-browse?category_id=${the_category_id}"
-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 title "$category_name &gt; $subcategory_name"
+set context [list $title]
 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.7 -r1.8
--- openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp	28 Apr 2008 12:28:04 -0000	1.7
+++ openacs-4/packages/ecommerce/www/category-browse-subsubcategory.adp	11 Aug 2008 13:01:09 -0000	1.8
@@ -1,10 +1,12 @@
 <master>
-  <property name="title">@subsubcategory_name;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
+
 <blockquote>
   <table width="90%">
     <tr valign="top">
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.10 -r1.11
--- openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl	9 Aug 2008 11:57:43 -0000	1.10
+++ openacs-4/packages/ecommerce/www/category-browse-subsubcategory.tcl	11 Aug 2008 13:01:09 -0000	1.11
@@ -200,7 +200,8 @@
 
 set the_category_id $category_id
 set the_category_name [eval "ec_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 title "$category_name &gt; $subcategory_name &gt; $the_category_name"
+set context [list $title]
 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.11 -r1.12
--- openacs-4/packages/ecommerce/www/category-browse.adp	28 Apr 2008 14:46:26 -0000	1.11
+++ openacs-4/packages/ecommerce/www/category-browse.adp	11 Aug 2008 13:01:09 -0000	1.12
@@ -1,10 +1,12 @@
 <master>
-  <property name="title">@the_category_name;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
+
 <if @subcategories:rowcount@ true or @recommendations:rowcount@>
   <table width="90%">
     <tr valign="top">
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.16 -r1.17
--- openacs-4/packages/ecommerce/www/category-browse.tcl	11 Aug 2008 10:58:23 -0000	1.16
+++ openacs-4/packages/ecommerce/www/category-browse.tcl	11 Aug 2008 13:01:09 -0000	1.17
@@ -209,7 +209,8 @@
 
 set the_category_id   [eval "ec_ident \$${sub}category_id"]
 set the_category_name [eval "ec_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 title $the_category_name
+set context [list $title]
 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.6 -r1.7
--- openacs-4/packages/ecommerce/www/checkout-2.adp	13 Jan 2005 13:57:58 -0000	1.6
+++ openacs-4/packages/ecommerce/www/checkout-2.adp	11 Aug 2008 13:01:09 -0000	1.7
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">Completing Your Order: Verify shopping cart contents</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="2">
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.13 -r1.14
--- openacs-4/packages/ecommerce/www/checkout-2.tcl	11 Aug 2008 06:38:47 -0000	1.13
+++ openacs-4/packages/ecommerce/www/checkout-2.tcl	11 Aug 2008 13:01:09 -0000	1.14
@@ -188,7 +188,8 @@
 	<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 title "Completing Your Order : verify shopping cart contents"
+set context [list $title]
 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.4 -r1.5
--- openacs-4/packages/ecommerce/www/checkout-3.adp	13 Jan 2005 13:57:58 -0000	1.4
+++ openacs-4/packages/ecommerce/www/checkout-3.adp	11 Aug 2008 13:01:09 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">Completing Your Order: Verify and submit order</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
 <if @display_progress@ true>
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.9 -r1.10
--- openacs-4/packages/ecommerce/www/checkout-3.tcl	1 Mar 2005 00:01:30 -0000	1.9
+++ openacs-4/packages/ecommerce/www/checkout-3.tcl	11 Aug 2008 13:01:09 -0000	1.10
@@ -157,6 +157,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 "Completing Your Order"]]]
+set title "Completing Your Order : verify and complete your order"
+set context [list $title]
+
 set ec_system_owner [ec_system_owner]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/checkout-one-form-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/checkout-one-form-2.tcl	11 Aug 2008 06:48:44 -0000	1.4
+++ openacs-4/packages/ecommerce/www/checkout-one-form-2.tcl	11 Aug 2008 13:01:09 -0000	1.5
@@ -788,7 +788,7 @@
         where order_id=:order_id"
     }
 }
-
+set context [list $title]
 db_release_unused_handles
 rp_form_put referer checkout-one-form-2
 rp_internal_redirect checkout-3.tcl
Index: openacs-4/packages/ecommerce/www/checkout-one-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/checkout-one-form.adp	13 Jan 2005 13:57:58 -0000	1.2
+++ openacs-4/packages/ecommerce/www/checkout-one-form.adp	11 Aug 2008 13:01:09 -0000	1.3
@@ -1,9 +1,9 @@
 <master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
 
 <!-- following from billing.adp -->
 
-  <property name="title">Completing Your Order</property>
-
   <p>To complete your order, submit this form, and confirm the information
     on the following page.</p>
 
Index: openacs-4/packages/ecommerce/www/checkout-one-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout-one-form.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/checkout-one-form.tcl	9 Aug 2008 10:31:04 -0000	1.3
+++ openacs-4/packages/ecommerce/www/checkout-one-form.tcl	11 Aug 2008 13:01:09 -0000	1.4
@@ -654,4 +654,6 @@
 #    cannot quote ship_to_state_widget [ad_quotehtml $ship_to_state_widget]
 }
     append hidden_vars [export_form_vars billing_address_id shipping_address_id]
+set title "Completing Your Order"
+set context [list $title]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/checkout.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/checkout.adp	13 Jan 2005 13:57:58 -0000	1.7
+++ openacs-4/packages/ecommerce/www/checkout.adp	11 Aug 2008 13:01:09 -0000	1.8
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">Completing Your Order: Shipping Address</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="1">
Index: openacs-4/packages/ecommerce/www/checkout.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/checkout.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/ecommerce/www/checkout.tcl	13 Jan 2005 13:57:59 -0000	1.14
+++ openacs-4/packages/ecommerce/www/checkout.tcl	11 Aug 2008 13:01:09 -0000	1.15
@@ -98,6 +98,7 @@
     ad_script_abort
 }
 
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set title "Completing Your Order: shipping address"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 db_release_unused_handles
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.5 -r1.6
--- openacs-4/packages/ecommerce/www/credit-card-correction.adp	11 Aug 2008 06:59:21 -0000	1.5
+++ openacs-4/packages/ecommerce/www/credit-card-correction.adp	11 Aug 2008 13:01:09 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">Completing Your Order: Verifying credit card</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="6">
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.8 -r1.9
--- openacs-4/packages/ecommerce/www/credit-card-correction.tcl	1 Mar 2005 00:01:30 -0000	1.8
+++ openacs-4/packages/ecommerce/www/credit-card-correction.tcl	11 Aug 2008 13:01:09 -0000	1.9
@@ -110,6 +110,7 @@
 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 title "Completing Your Order: verifying your credit card"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/default-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/Attic/default-master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/default-master.adp	24 Feb 2005 13:33:14 -0000	1.2
+++ openacs-4/packages/ecommerce/www/default-master.adp	11 Aug 2008 13:01:09 -0000	1.3
@@ -7,13 +7,10 @@
   <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
 
 <if @is_not_in_ecommerce_p@ true>
-   <include src="/packages/ecommerce/www/toolbar" />
+   <include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 </if>
-<else>
-   <if @show_toolbar_p@ not nil>
-   <include src="/packages/ecommerce/www/toolbar" combocategory_id=@combocategory_id@ category_id=@category_id@ subcategory_id=@subcategory_id@ search_text=@search_text@ />
-    </if>
-</else>
     
 <div id="page-body">
   <if @title@ not nil>
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.5 -r1.6
--- openacs-4/packages/ecommerce/www/gift-certificate-billing.adp	11 Aug 2008 07:18:06 -0000	1.5
+++ openacs-4/packages/ecommerce/www/gift-certificate-billing.adp	11 Aug 2008 13:01:09 -0000	1.6
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Completing Your Order</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">gift-certificate</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <blockquote>
 
   <p><b>Please enter your billing address.</b></p>
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.6 -r1.7
--- openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl	1 Mar 2005 00:01:30 -0000	1.6
+++ openacs-4/packages/ecommerce/www/gift-certificate-billing.tcl	11 Aug 2008 13:01:09 -0000	1.7
@@ -108,6 +108,7 @@
 }
 
 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 title "Completing Your Order"
+set context [list $title]
 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 -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp	22 May 2003 14:48:11 -0000	1.2
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim-2.adp	11 Aug 2008 13:01:09 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">@title;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="5">
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl	1 Mar 2005 00:01:30 -0000	1.7
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim-2.tcl	11 Aug 2008 13:01:09 -0000	1.8
@@ -67,7 +67,7 @@
 # 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"]]]
+se title "Completing Your Order"
 set ec_system_owner [ec_system_owner]
 
 db_1row get_gc_user_id "
@@ -106,3 +106,4 @@
     set certificate_added_p "false"
     db_release_unused_handles
 }
+set context [list $title]
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.3 -r1.4
--- openacs-4/packages/ecommerce/www/gift-certificate-claim.adp	22 May 2003 14:48:11 -0000	1.3
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim.adp	11 Aug 2008 13:01:09 -0000	1.4
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">Claim a Gift Certificate</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="5">
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl	1 Mar 2005 00:01:30 -0000	1.7
+++ openacs-4/packages/ecommerce/www/gift-certificate-claim.tcl	11 Aug 2008 13:01:09 -0000	1.8
@@ -38,5 +38,6 @@
     ad_script_abort
 }
 
-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 title "Claim a Gift Certificate"
+set context [list $title]
 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.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.adp	8 Mar 2004 19:46:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.adp	11 Aug 2008 13:01:09 -0000	1.5
@@ -1,10 +1,13 @@
 <master>
-  <property name="title">@title;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
-
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">gift-certificate</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
+
+
 @page;noquote@
 
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.9 -r1.10
--- openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl	1 Mar 2005 00:01:30 -0000	1.9
+++ openacs-4/packages/ecommerce/www/gift-certificate-finalize-order.tcl	11 Aug 2008 13:01:09 -0000	1.10
@@ -521,5 +521,5 @@
 	}
     }
 }
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition $title]]
+set context [list $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.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-order-2.adp	8 Mar 2004 19:46:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-2.adp	11 Aug 2008 13:01:09 -0000	1.5
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Your Gift Certificate Order</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">gift-certificate</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <form method="post" action="gift-certificate-billing">
   <ol>
     <li>
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.6 -r1.7
--- openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl	1 Mar 2005 00:01:30 -0000	1.6
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-2.tcl	11 Aug 2008 13:01:09 -0000	1.7
@@ -34,7 +34,8 @@
 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 title "Your Gift Certificate Order"
+set context [list $title]
 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.5 -r1.6
--- openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp	11 Aug 2008 07:20:15 -0000	1.5
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-3.adp	11 Aug 2008 13:01:09 -0000	1.6
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">Payment Info</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <property name="show_toolbar_t">t</property>
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl	1 Mar 2005 00:01:30 -0000	1.7
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-3.tcl	11 Aug 2008 13:01:09 -0000	1.8
@@ -38,7 +38,8 @@
 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 title "Payment Info"
+set context [list $title]
 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.5 -r1.6
--- openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp	11 Aug 2008 07:21:17 -0000	1.5
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-4.adp	11 Aug 2008 13:01:09 -0000	1.6
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Please Confirm Your Gift Certificate Order</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">gift-certificate</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <blockquote>
   <form method="post" action="gift-certificate-finalize-order">
     @hidden_form_variables;noquote@
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl	1 Mar 2005 00:01:30 -0000	1.7
+++ openacs-4/packages/ecommerce/www/gift-certificate-order-4.tcl	11 Aug 2008 13:01:09 -0000	1.8
@@ -148,6 +148,7 @@
 
 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 title "Please Confirm Your Gift Certificate Order"
+set context [list $title]
 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.5 -r1.6
--- openacs-4/packages/ecommerce/www/gift-certificate-order.adp	8 Mar 2004 19:46:11 -0000	1.5
+++ openacs-4/packages/ecommerce/www/gift-certificate-order.adp	11 Aug 2008 13:01:09 -0000	1.6
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Gift Certificates</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">gift-certificate</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <blockquote>
   <p>The perfect gift for anyone, gift certificates can be used to buy
     anything at @system_name@!</p>
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.5 -r1.6
--- openacs-4/packages/ecommerce/www/gift-certificate-order.tcl	17 Sep 2002 03:36:34 -0000	1.5
+++ openacs-4/packages/ecommerce/www/gift-certificate-order.tcl	11 Aug 2008 13:01:09 -0000	1.6
@@ -19,7 +19,8 @@
 # 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 title "Gift Certificates"
+set context [list $title]
 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.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-thank-you.adp	8 Mar 2004 19:46:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-thank-you.adp	11 Aug 2008 13:01:09 -0000	1.5
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Thank You For Your Gift Certificate Order</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">gift-certificate</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <blockquote>
   <p>The lucky recipient will be notified by email shortly!</p>
   <ul>
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.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate-thank-you.tcl	10 Dec 2002 20:06:18 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate-thank-you.tcl	11 Aug 2008 13:01:09 -0000	1.5
@@ -13,7 +13,8 @@
 }
 
 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 title "Thank You For Your Gift Certificate Order"
+set context [list $title]
 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.4 -r1.5
--- openacs-4/packages/ecommerce/www/gift-certificate.adp	8 Mar 2004 19:46:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/gift-certificate.adp	11 Aug 2008 13:01:09 -0000	1.5
@@ -1,11 +1,14 @@
 <master>
-  <property name="title">Your Gift Certificate</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">gift-certificate</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <blockquote>
   @gift_certificate_summary@
 </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.7 -r1.8
--- openacs-4/packages/ecommerce/www/gift-certificate.tcl	1 Mar 2005 00:01:30 -0000	1.7
+++ openacs-4/packages/ecommerce/www/gift-certificate.tcl	11 Aug 2008 13:01:09 -0000	1.8
@@ -73,7 +73,8 @@
     }
 }
 
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Gift Certificate"]]]
+set title "Your Gift Certificate"
+set context [list $title]
 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.12 -r1.13
--- openacs-4/packages/ecommerce/www/index.adp	11 Aug 2008 10:49:38 -0000	1.12
+++ openacs-4/packages/ecommerce/www/index.adp	11 Aug 2008 13:01:10 -0000	1.13
@@ -1,4 +1,6 @@
 <master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@title;noquote@</property>
 <property name="head">
   <meta name="description" content="Example OpenACS ecommerce catalog">
   <meta name="keywords" content="">
Index: openacs-4/packages/ecommerce/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/index.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/ecommerce/www/index.tcl	11 Aug 2008 10:47:40 -0000	1.12
+++ openacs-4/packages/ecommerce/www/index.tcl	11 Aug 2008 13:01:10 -0000	1.13
@@ -143,7 +143,7 @@
 }
 
 set start_row_current $start_row
-ns_log Notice $start_row $how_many
+
 if { $start_row_current >= $how_many } {
     set start_row [expr { $start_row_current - $how_many } ]
     set prev_link "<a href=\"[export_vars -base index -url {category_id subcategory_id subsubcategory_id how_many start_row} ]\">Previous $how_many</a>"
@@ -169,6 +169,7 @@
 } else {
     set separator "|"
 }
-
+set title "Store"
+set context [list $title]
 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.6 -r1.7
--- openacs-4/packages/ecommerce/www/mailing-list-add-2.adp	13 Jan 2005 13:57:59 -0000	1.6
+++ openacs-4/packages/ecommerce/www/mailing-list-add-2.adp	11 Aug 2008 13:01:10 -0000	1.7
@@ -1,9 +1,10 @@
 <master>
-  <property name="title">@title;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
 <blockquote>
   To remove yourself anytime, go to @remove_link;noquote@ mailing list.
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl	1 Mar 2005 00:01:31 -0000	1.7
+++ openacs-4/packages/ecommerce/www/mailing-list-add-2.tcl	11 Aug 2008 13:01:10 -0000	1.8
@@ -59,7 +59,7 @@
 set remove_link "<a href=\"mailing-list-remove?[export_url_vars category_id subcategory_id subsubcategory_id]\">unsubscribe from $mailing_list_name</a>"
 
 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 context [list $title]
 set ec_system_owner [ec_system_owner]
 db_release_unused_handles
 
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.4 -r1.5
--- openacs-4/packages/ecommerce/www/mailing-list-add.adp	26 Jan 2004 15:39:46 -0000	1.4
+++ openacs-4/packages/ecommerce/www/mailing-list-add.adp	11 Aug 2008 13:01:10 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">@title;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
 <blockquote>
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.6 -r1.7
--- openacs-4/packages/ecommerce/www/mailing-list-add.tcl	1 Mar 2005 00:01:31 -0000	1.6
+++ openacs-4/packages/ecommerce/www/mailing-list-add.tcl	11 Aug 2008 13:01:10 -0000	1.7
@@ -69,7 +69,7 @@
 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 context [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.5 -r1.6
--- openacs-4/packages/ecommerce/www/mailing-list-remove.adp	13 Jan 2005 13:57:59 -0000	1.5
+++ openacs-4/packages/ecommerce/www/mailing-list-remove.adp	11 Aug 2008 13:01:10 -0000	1.6
@@ -1,10 +1,12 @@
 <master>
-  <property name="title">@title@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
+
 <blockquote>
   <p>To re-add yourself anytime, go to @re_add_link;noquote@ mailing list.</p>
   <p>To see your other subscriptions (if any), return to @back_to_account_link;noquote@.</p>
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/mailing-list-remove.tcl	1 Mar 2005 00:01:31 -0000	1.7
+++ openacs-4/packages/ecommerce/www/mailing-list-remove.tcl	11 Aug 2008 13:01:10 -0000	1.8
@@ -83,7 +83,7 @@
    subscribe to $mailing_list_name</a>"
 set back_to_account_link "<a href=\"[ec_insecure_location][ec_url]account\">Your Account</a>"
 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 context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/order.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/order.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/order.adp	13 Jan 2005 13:57:59 -0000	1.5
+++ openacs-4/packages/ecommerce/www/order.adp	11 Aug 2008 13:01:10 -0000	1.6
@@ -1,10 +1,12 @@
 <master>
-  <property name="title">Your Order</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
+
     <blockquote>
       @order_summary;noquote@
     </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.6 -r1.7
--- openacs-4/packages/ecommerce/www/order.tcl	1 Mar 2005 00:01:31 -0000	1.6
+++ openacs-4/packages/ecommerce/www/order.tcl	11 Aug 2008 13:01:10 -0000	1.7
@@ -30,7 +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 title "Your Order"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 set order_summary "
Index: openacs-4/packages/ecommerce/www/payment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/payment.adp	13 Jan 2005 13:58:00 -0000	1.6
+++ openacs-4/packages/ecommerce/www/payment.adp	11 Aug 2008 13:01:10 -0000	1.7
@@ -1,6 +1,7 @@
 <master>
-  <property name="title">Completing Your Order: Payment information</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="5">
Index: openacs-4/packages/ecommerce/www/payment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/payment.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/ecommerce/www/payment.tcl	1 Mar 2005 00:01:31 -0000	1.12
+++ openacs-4/packages/ecommerce/www/payment.tcl	11 Aug 2008 13:01:10 -0000	1.13
@@ -229,7 +229,8 @@
 
 set gift_certificate_p [ad_parameter -package_id [ec_id] SellGiftCertificatesP ecommerce]
 
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Completing Your Order"]]]
+set title "Completing Your Order: Payment information"
+set context [list $title]
 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.7 -r1.8
--- openacs-4/packages/ecommerce/www/product-search.adp	10 Aug 2008 12:47:31 -0000	1.7
+++ openacs-4/packages/ecommerce/www/product-search.adp	11 Aug 2008 13:01:10 -0000	1.8
@@ -1,5 +1,7 @@
 <master>
-  <property name="title">Product search @category_name@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
   <property name="current_location">Product Search</property>
   <property name="search_text">@search_text@</property>
   <property name="category_id">@category_id@</property>
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.10 -r1.11
--- openacs-4/packages/ecommerce/www/product-search.tcl	10 Aug 2008 12:47:31 -0000	1.10
+++ openacs-4/packages/ecommerce/www/product-search.tcl	11 Aug 2008 13:01:10 -0000	1.11
@@ -173,7 +173,8 @@
     }
     append search_results "${search_string}${prev_link}${separator}${next_link}"
 }
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "[ec_system_name] search results"]]]
+set title "${category_name}"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
@@ -185,7 +186,7 @@
 } else {
     set search_results "<p> $search_count [ec_decode $search_count "1" "item found." "items found, most relevant first."]</p>$search_string"
 }
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "[ec_system_name] search results"]]]
+
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/product.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/product.adp	27 Apr 2008 01:38:23 -0000	1.6
+++ openacs-4/packages/ecommerce/www/product.adp	11 Aug 2008 13:01:10 -0000	1.7
@@ -1,13 +1,14 @@
 <master>
-  <property name="title">@product_name;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@product_name;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <property name="combocategory_id">@combocategory_id@</property>
   <property name="search_text">@search_text@</property>
   <property name="category_id">@category_id@</property>
   <property name="subcategory_id">@subcategory_id@</property>  
 
-  <property name="show_toolbar_p">t</property>
+<include src="/packages/ecommerce/lib/toolbar"/>
+<include src="/packages/ecommerce/lib/searchbar"/>
 
   <% eval $product_code %>
Index: openacs-4/packages/ecommerce/www/product.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/product.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/ecommerce/www/product.tcl	10 Aug 2008 11:57:28 -0000	1.12
+++ openacs-4/packages/ecommerce/www/product.tcl	11 Aug 2008 13:01:10 -0000	1.13
@@ -194,7 +194,8 @@
 }
 
 db_release_unused_handles
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list $product_name]]]
+set title $product_name
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 # TODO should memoize this
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/review-submit-2.adp	13 Jan 2005 13:58:00 -0000	1.7
+++ openacs-4/packages/ecommerce/www/review-submit-2.adp	11 Aug 2008 13:01:10 -0000	1.8
@@ -1,10 +1,12 @@
 <master>
-  <property name="title">Check Your Review of @product_name;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
+
 <blockquote>
   <form method="post" action="review-submit-3">
     @hidden_form_variables;noquote@
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/review-submit-2.tcl	1 Mar 2005 00:01:31 -0000	1.7
+++ openacs-4/packages/ecommerce/www/review-submit-2.tcl	11 Aug 2008 13:01:10 -0000	1.8
@@ -65,7 +65,8 @@
 [ec_display_rating $rating] on <i>$current_date</i> and wrote:<br>"
 
 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 title "Check Your Review"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
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.4 -r1.5
--- openacs-4/packages/ecommerce/www/review-submit-3.adp	8 Mar 2004 19:46:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/review-submit-3.adp	11 Aug 2008 13:01:10 -0000	1.5
@@ -1,9 +1,10 @@
 <master>
-  <property name="title">Thank You For Your Review of @product_name;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
 <blockquote>
   <if @comments_need_approval@ true>
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.8 -r1.9
--- openacs-4/packages/ecommerce/www/review-submit-3.tcl	1 Mar 2005 00:01:31 -0000	1.8
+++ openacs-4/packages/ecommerce/www/review-submit-3.tcl	11 Aug 2008 13:01:10 -0000	1.9
@@ -62,7 +62,8 @@
 
 set comments_need_approval [ad_parameter -package_id [ec_id] ProductCommentsNeedApprovalP]
 set product_link "[ec_insecurelink 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 title "Thank You For Your Review of ${product_name}"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
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.8 -r1.9
--- openacs-4/packages/ecommerce/www/review-submit.adp	13 Jan 2005 13:58:00 -0000	1.8
+++ openacs-4/packages/ecommerce/www/review-submit.adp	11 Aug 2008 13:01:10 -0000	1.9
@@ -1,10 +1,13 @@
 <master>
-  <property name="title">Write Your Own Review of @product_name;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
+
 <form method="post" action="review-submit-2">
   <input type="hidden" name="product_id" value="@product_id@">
   <ol>
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.8 -r1.9
--- openacs-4/packages/ecommerce/www/review-submit.tcl	1 Mar 2005 00:01:31 -0000	1.8
+++ openacs-4/packages/ecommerce/www/review-submit.tcl	11 Aug 2008 13:01:10 -0000	1.9
@@ -39,7 +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 title "Write Your Own Review"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
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.4 -r1.5
--- openacs-4/packages/ecommerce/www/select-shipping.adp	13 Jan 2005 13:58:00 -0000	1.4
+++ openacs-4/packages/ecommerce/www/select-shipping.adp	11 Aug 2008 13:01:10 -0000	1.5
@@ -1,6 +1,7 @@
 <master>
-  <property name="title">Completing Your Order: Shipping Method</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="3">
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.11 -r1.12
--- openacs-4/packages/ecommerce/www/select-shipping.tcl	1 Mar 2005 00:01:31 -0000	1.11
+++ openacs-4/packages/ecommerce/www/select-shipping.tcl	11 Aug 2008 13:01:10 -0000	1.12
@@ -273,6 +273,7 @@
     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 title "Completing Your Order"
+set context [list $title]
 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.5 -r1.6
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.adp	16 Mar 2004 16:07:51 -0000	1.5
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.adp	11 Aug 2008 13:01:10 -0000	1.6
@@ -1,11 +1,14 @@
 <master>
-  <property name="title">Select Shopping Cart</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">shopping-cart</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <blockquote>
   <p>Your saved shopping cart(s):</p>
   @saved_carts;noquote@
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.8 -r1.9
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl	1 Mar 2005 00:01:31 -0000	1.8
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-2.tcl	11 Aug 2008 13:01:10 -0000	1.9
@@ -58,7 +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 title "Select Shopping Cart"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
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.8 -r1.9
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp	13 Jan 2005 13:58:01 -0000	1.8
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.adp	11 Aug 2008 13:01:10 -0000	1.9
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">@page_title;noquote@</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">shopping-cart</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <blockquote>
   <if @page_function@ eq "view">
     <form method=post action="shopping-cart-retrieve-3">
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.9 -r1.10
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl	1 Mar 2005 00:01:31 -0000	1.9
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve-3.tcl	11 Aug 2008 13:01:10 -0000	1.10
@@ -131,7 +131,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 title $page_title
+set context [list $title]
 
     db_release_unused_handles
     ad_return_template
@@ -216,7 +217,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 title $page_title
+set context [list $title]
 	set ec_system_owner [ec_system_owner]
 
 	ad_return_template
@@ -376,10 +378,11 @@
     # Otherwise I have to give them a confirmation page
 
     set page_title "Discard Your Saved Shopping Cart?"
+    set context [list $title]
     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 title $page_title
     set ec_system_owner [ec_system_owner]
 
     ad_return_template
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.5 -r1.6
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve.adp	8 Mar 2004 19:46:11 -0000	1.5
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve.adp	11 Aug 2008 13:01:10 -0000	1.6
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Retrieve Shopping Cart</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">shopping-cart</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <blockquote>
   <p>We think that you are @user_name@.  If not, please <a
   href="@register_link@">log in</a>.</p>
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.6 -r1.7
--- openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl	1 Mar 2005 00:01:31 -0000	1.6
+++ openacs-4/packages/ecommerce/www/shopping-cart-retrieve.tcl	11 Aug 2008 13:01:10 -0000	1.7
@@ -32,7 +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 title "Retrieve Shopping Cart"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
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.5 -r1.6
--- openacs-4/packages/ecommerce/www/shopping-cart-save-2.adp	8 Mar 2004 19:46:11 -0000	1.5
+++ openacs-4/packages/ecommerce/www/shopping-cart-save-2.adp	11 Aug 2008 13:01:10 -0000	1.6
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Your Shopping Cart Has Been Saved</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">shopping-cart</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <blockquote>
   <p>When you're ready to return to it, just click on "Retrieve Saved
   Cart" from the Shopping Cart page.  We'll save your cart for you for
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.6 -r1.7
--- openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl	1 Mar 2005 00:01:31 -0000	1.6
+++ openacs-4/packages/ecommerce/www/shopping-cart-save-2.tcl	11 Aug 2008 13:01:10 -0000	1.7
@@ -49,7 +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 title "Your Shopping Cart Has Been Saved"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
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.5 -r1.6
--- openacs-4/packages/ecommerce/www/shopping-cart-save.adp	8 Mar 2004 19:46:11 -0000	1.5
+++ openacs-4/packages/ecommerce/www/shopping-cart-save.adp	11 Aug 2008 13:01:10 -0000	1.6
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Save Shopping Cart</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">your-account</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <blockquote>
   <p>We think that you are @user_name@.  If not, please <a
   href="@register_link@">log in</a>. Otherwise,</p>
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.6 -r1.7
--- openacs-4/packages/ecommerce/www/shopping-cart-save.tcl	1 Mar 2005 00:01:31 -0000	1.6
+++ openacs-4/packages/ecommerce/www/shopping-cart-save.tcl	11 Aug 2008 13:01:10 -0000	1.7
@@ -24,7 +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 title "Save Shopping Cart"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
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.12 -r1.13
--- openacs-4/packages/ecommerce/www/shopping-cart.adp	10 Aug 2008 11:34:05 -0000	1.12
+++ openacs-4/packages/ecommerce/www/shopping-cart.adp	11 Aug 2008 13:01:10 -0000	1.13
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Your Shopping Cart</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">shopping-cart</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <if @user_id@ ne 0>
   for @first_names@ @last_name@ (if you're not @first_names@ @last_name@, 
   <a href="/register/">click here</a>).
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.17 -r1.18
--- openacs-4/packages/ecommerce/www/shopping-cart.tcl	10 Aug 2008 11:34:05 -0000	1.17
+++ openacs-4/packages/ecommerce/www/shopping-cart.tcl	11 Aug 2008 13:01:10 -0000	1.18
@@ -331,7 +331,8 @@
 	    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 title "Shopping Cart"
+set context [list $title]
 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.4 -r1.5
--- openacs-4/packages/ecommerce/www/thank-you.adp	13 Jan 2005 13:58:01 -0000	1.4
+++ openacs-4/packages/ecommerce/www/thank-you.adp	11 Aug 2008 13:01:10 -0000	1.5
@@ -1,6 +1,6 @@
 <master>
-  <property name="title">Thank You For Your Order</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
   <include src="checkout-progress" step="6">
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/thank-you.tcl	1 Mar 2005 00:01:31 -0000	1.7
+++ openacs-4/packages/ecommerce/www/thank-you.tcl	11 Aug 2008 13:01:10 -0000	1.8
@@ -53,7 +53,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 title "Thank You For Your Order"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles
Index: openacs-4/packages/ecommerce/www/track.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/track.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/track.adp	8 Mar 2004 19:46:11 -0000	1.4
+++ openacs-4/packages/ecommerce/www/track.adp	11 Aug 2008 13:01:10 -0000	1.5
@@ -1,11 +1,13 @@
 <master>
-  <property name="title">Your Shipment</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">shopping-cart</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
+
 <ul>
   <li>Shipping Date: @pretty_ship_date@</li>
   <li>Carrier: @carrier@</li>
Index: openacs-4/packages/ecommerce/www/track.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/track.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/ecommerce/www/track.tcl	1 Mar 2005 00:01:31 -0000	1.9
+++ openacs-4/packages/ecommerce/www/track.tcl	11 Aug 2008 13:01:10 -0000	1.10
@@ -73,7 +73,8 @@
     } 
 }
 
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition [list "Your Shipment"]]]
+set title "Your Shipment"
+set context [list $title]
 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.6 -r1.7
--- openacs-4/packages/ecommerce/www/update-user-classes.adp	11 Aug 2008 07:25:28 -0000	1.6
+++ openacs-4/packages/ecommerce/www/update-user-classes.adp	11 Aug 2008 13:01:10 -0000	1.7
@@ -1,11 +1,12 @@
 <master>
-  <property name="title">Your Account</property>
-  <property name="context_bar">@context_bar;noquote@</property>
+  <property name="doc(title)">@title@</property>
+  <property name="context">@context;noquote@</property>
   <property name="signatory">@ec_system_owner;noquote@</property>
 
-  <property name="show_toolbar_p">t</property>
   <property name="current_location">your-account</property>
 
+<include src="/packages/ecommerce/lib/toolbar">
+<include src="/packages/ecommerce/lib/searchbar">
 
 <blockquote>
   <form method="post" action="update-user-classes-2">
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.9 -r1.10
--- openacs-4/packages/ecommerce/www/update-user-classes.tcl	1 Mar 2005 00:01:31 -0000	1.9
+++ openacs-4/packages/ecommerce/www/update-user-classes.tcl	11 Aug 2008 13:01:10 -0000	1.10
@@ -29,7 +29,8 @@
     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 title "Your Account"
+set context [list $title]
 set ec_system_owner [ec_system_owner]
 
 db_release_unused_handles