Index: openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.adp	28 Apr 2008 12:28:04 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.adp	12 Aug 2008 12:52:10 -0000	1.2
@@ -1,9 +1,7 @@
 <master>
-<property name="title">@page_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="show_toolbar_p">t</property>
-
 <h2>@page_title@</h2>
 
 <blockquote>
Index: openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.tcl	28 Apr 2008 12:28:04 -0000	1.7
+++ openacs-4/packages/ecommerce/www/admin/products/categories-upload-2.tcl	12 Aug 2008 12:52:10 -0000	1.8
@@ -22,8 +22,8 @@
 set user_id [ad_get_user_id]
 set ip [ns_conn peeraddr]
 
-set page_title "Uploading Category Mappings"
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar "Uploading Category Mappings"]
+set title "Uploading Category Mappings"
+set context [list $title]
 
 
 # Get the name of the transfered data file
Index: openacs-4/packages/ecommerce/www/admin/products/categories-upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/categories-upload.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/products/categories-upload.adp	28 Apr 2008 12:28:04 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/products/categories-upload.adp	12 Aug 2008 12:52:10 -0000	1.2
@@ -1,10 +1,10 @@
 <master>
-<property name="title">@page_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="show_toolbar_p">t</property>
 
-<h2>@page_title@</h2>
+<h2>@title@</h2>
 
 <blockquote>
 
Index: openacs-4/packages/ecommerce/www/admin/products/categories-upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/categories-upload.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ecommerce/www/admin/products/categories-upload.tcl	28 Apr 2008 12:28:04 -0000	1.6
+++ openacs-4/packages/ecommerce/www/admin/products/categories-upload.tcl	12 Aug 2008 12:52:10 -0000	1.7
@@ -35,7 +35,8 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-set page_title "Upload Category Mapping Data"
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar "Upload Category Mapping Data"]
+set title "Upload Category Mapping Data"
+set context [list $title]
 
 
+
Index: openacs-4/packages/ecommerce/www/admin/products/import-images.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/import-images.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/products/import-images.adp	27 Apr 2008 01:38:24 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/products/import-images.adp	12 Aug 2008 12:52:10 -0000	1.2
@@ -1,10 +1,10 @@
 <master>
-<property name="title">@page_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="show_toolbar_p">t</property>
 
-<h2>@page_title@</h2>
+<h2>@title@</h2>
 
 <blockquote>
 
Index: openacs-4/packages/ecommerce/www/admin/products/import-images.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/import-images.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/products/import-images.tcl	27 Apr 2008 01:38:24 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/products/import-images.tcl	12 Aug 2008 12:52:10 -0000	1.4
@@ -30,6 +30,6 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-set page_title "Bulk Import Product Images"
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition "Bulk Import Product Images"]]
+set title "Bulk Import Product Images"
+set context [list $title]
 
Index: openacs-4/packages/ecommerce/www/admin/products/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/products/index.adp	28 Apr 2008 14:46:26 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/products/index.adp	12 Aug 2008 12:52:10 -0000	1.2
@@ -1,11 +1,7 @@
 <master>
-<property name="title">@page_title@</property>
-<property name="context_bar">@context_bar;noquote@</property>
-
-<property name="show_toolbar_p">t</property>
-
-<h2>@page_title@</h2>
-
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
 <ul>
 
 <li>@n_products@ products 
Index: openacs-4/packages/ecommerce/www/admin/products/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/index.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/products/index.tcl	28 Apr 2008 12:54:47 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/products/index.tcl	12 Aug 2008 12:52:10 -0000	1.6
@@ -11,8 +11,8 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-set page_title "Product Administration"
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition "Product Administration"]]
+set title "Product Administration"
+set context [list $title]
 
 # For Audit tables
 set table_names_and_id_column [list ec_products ec_products_audit product_id]
Index: openacs-4/packages/ecommerce/www/admin/products/upload-utilities.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/upload-utilities.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/products/upload-utilities.adp	28 Apr 2008 14:46:26 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/products/upload-utilities.adp	12 Aug 2008 12:52:10 -0000	1.2
@@ -1,11 +1,7 @@
 <master>
-<property name="title">@page_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="show_toolbar_p">t</property>
-
-<h2>@page_title@</h2>
-
 These utilities help you load catalog data into the database:
 
 <ul>
Index: openacs-4/packages/ecommerce/www/admin/products/upload-utilities.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/products/upload-utilities.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/admin/products/upload-utilities.tcl	28 Apr 2008 12:54:47 -0000	1.7
+++ openacs-4/packages/ecommerce/www/admin/products/upload-utilities.tcl	12 Aug 2008 12:52:10 -0000	1.8
@@ -11,6 +11,7 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-set page_title "Upload Utilities"
-set context_bar [template::adp_parse [acs_root_dir]/packages/[ad_conn package_key]/www/contextbar [list context_addition "Upload Utilities"]]
+set title "Upload Utilities"
+set context [list $title]
 
+