Index: openacs-4/packages/robot-detection/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/robot-detection/www/admin/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/robot-detection/www/admin/index.adp	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/robot-detection/www/admin/index.adp	6 Sep 2002 15:36:39 -0000	1.2
@@ -1,8 +1,7 @@
 <master>
 <property name="title">Robot Detection Administration</property>
-<h2>Robot Detection Administration</h2>
-@context_bar@
-<hr>
+<property name="context"></property>
+
 Documentation:  <a href="/doc/robot-detection">/doc/robot-detection</a>
 
 <h3>Configuration Settings</h3>
Index: openacs-4/packages/robot-detection/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/robot-detection/www/admin/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/robot-detection/www/admin/index.tcl	20 Apr 2001 20:51:22 -0000	1.1
+++ openacs-4/packages/robot-detection/www/admin/index.tcl	6 Sep 2002 15:36:39 -0000	1.2
@@ -8,13 +8,13 @@
     @creation-date 2000-12-13
     @cvs-id $Id$
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     web_robots_db:onevalue
     filter_patterns:multirow
     redirect_url:onevalue
     robots:multirow
 }
-set context_bar [ad_context_bar]
+set context {}
 set web_robots_db [ad_parameter WebRobotsDB]
 
 set filter_patterns_list [join [ad_parameter FilterPattern] "\n"]
@@ -30,5 +30,3 @@
 
 set redirect_url [ad_parameter RedirectURL]
 db_multirow robots robots_query "select robot_name, robot_details_url from robots order by robot_name"
-
-ad_return_template
Index: openacs-4/packages/value-based-shipping/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/index.adp	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/index.adp	6 Sep 2002 15:33:37 -0000	1.2
@@ -1,18 +1,17 @@
 <master>
   <property name="title">@title@</property>
+  <property name="context">@context@</property>
 
-  <h2>@title@</h2>
+  <if @admin_p@ eq 1>
   <table width="100%">
     <tbody>
       <tr>
-	<td align="left">@context_bar@</td>
 	<td align="right">
-          <if @admin_p@ eq 1>
             [ <a href="admin/">Administer</a> ]
-          </if>
         </td>
       </tr>
     </tbody>
   </table>
-  <hr>
+  </if>
+
   <p>There are no user pages for this package.</p>
Index: openacs-4/packages/value-based-shipping/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/index.tcl	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/index.tcl	6 Sep 2002 15:33:37 -0000	1.2
@@ -10,7 +10,7 @@
 } {
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 # Authenticate the user
@@ -37,4 +37,4 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar]
+set context [list]
Index: openacs-4/packages/value-based-shipping/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/index.adp	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/index.adp	6 Sep 2002 15:33:38 -0000	1.2
@@ -2,17 +2,17 @@
 
 <master>
   <property name="title">@title@</property>
+  <property name="context">@context@</property>
   
   <h2>@title@</h2>
   <table width="100%">
     <tbody>
       <tr>
-	<td align="left">@context_bar@</td>
 	<td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
       </tr>
     </tbody>
   </table>
-  <hr>
+
   <ul>
     <li><a href="levels">Administer Service Levels</a></li>
     <li><a href="rates">Administer Shipping Rates</a></li>
Index: openacs-4/packages/value-based-shipping/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/index.tcl	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/index.tcl	6 Sep 2002 15:33:38 -0000	1.2
@@ -8,7 +8,7 @@
 } {
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 # Authenticate the user
@@ -35,4 +35,4 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar]
+set context [list]
Index: openacs-4/packages/value-based-shipping/www/admin/level-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/level-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/level-delete.adp	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/level-delete.adp	6 Sep 2002 15:33:38 -0000	1.2
@@ -2,17 +2,15 @@
 
 <master>
   <property name="title">@title@</property>
+  <property name="context">@context@</property>
 
-  <h2>@title@</h2>
   <table width="100%">
     <tbody>
       <tr>
-	<td align="left">@context_bar@</td>
 	<td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
       </tr>
     </tbody>
   </table>
-  <hr>
 
   <h3>Do you really want to delete this service level?</h3>
   <blockquote>
Index: openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl	6 Sep 2002 15:33:38 -0000	1.2
@@ -32,7 +32,7 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar]
+set context [list]
 
 template::form create level_delete -elements {
     service_level_id \
Index: openacs-4/packages/value-based-shipping/www/admin/level-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/level-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/level-edit.adp	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/level-edit.adp	6 Sep 2002 15:33:38 -0000	1.2
@@ -2,17 +2,16 @@
 
 <master>
   <property name="title">@title@</property>
+  <property name="context">@context@</property>
 
   <h2>@title@</h2>
   <table width="100%">
     <tbody>
       <tr>
-	<td align="left">@context_bar@</td>
 	<td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
       </tr>
     </tbody>
   </table>
-  <hr>
   
   <h3>Enter the service level description</h3>
   <blockquote>
Index: openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl	23 May 2002 05:13:37 -0000	1.2
+++ openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl	6 Sep 2002 15:33:38 -0000	1.3
@@ -32,7 +32,7 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar "Service Levels"]
+set context [list "Service Levels"]
 
 template::form create level_edit -elements {
     service_level_id \
Index: openacs-4/packages/value-based-shipping/www/admin/levels.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/levels.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/levels.adp	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/levels.adp	6 Sep 2002 15:33:38 -0000	1.2
@@ -2,17 +2,15 @@
 
 <master>
   <property name="title">@title@</property>
+  <property name="context">@context@</property>
 
-  <h2>@title@</h2>
   <table width="100%">
     <tbody>
       <tr>
-	<td align="left">@context_bar@</td>
 	<td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
       </tr>
     </tbody>
   </table>
-  <hr>
 
   <h3>Defined service levels</h3>
   <blockquote>
Index: openacs-4/packages/value-based-shipping/www/admin/levels.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/levels.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/levels.tcl	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/levels.tcl	6 Sep 2002 15:33:38 -0000	1.2
@@ -11,7 +11,7 @@
 } {
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 # Authenticate the user
@@ -38,7 +38,7 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar "Service Levels"]
+set context [list "Service Levels"]
 
 template::query get_service_levels service_levels multirow "
     select *
Index: openacs-4/packages/value-based-shipping/www/admin/rate-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rate-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/rate-delete.adp	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/rate-delete.adp	6 Sep 2002 15:33:38 -0000	1.2
@@ -2,17 +2,15 @@
 
 <master>
   <property name="title">@title@</property>
+  <property name="context">@context@</property>
 
-  <h2>@title@</h2>
   <table width="100%">
     <tbody>
       <tr>
-	<td align="left">@context_bar@</td>
 	<td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
       </tr>
     </tbody>
   </table>
-  <hr>
 
   <h3>Do you really want to delete this shipping rate?</h3>
   <blockquote>
Index: openacs-4/packages/value-based-shipping/www/admin/rate-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rate-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/rate-delete.tcl	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/rate-delete.tcl	6 Sep 2002 15:33:38 -0000	1.2
@@ -32,7 +32,7 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar "Shipping Rates"]
+set context [list "Shipping Rates"]
 
 template::form create rate_delete -elements {
     shipping_rate_id \
Index: openacs-4/packages/value-based-shipping/www/admin/rate-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rate-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/rate-edit.adp	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/rate-edit.adp	6 Sep 2002 15:33:38 -0000	1.2
@@ -2,17 +2,16 @@
 
 <master>
   <property name="title">@title@</property>
+  <property name="context">@context@</property>
 
-  <h2>@title@</h2>
+
   <table width="100%">
     <tbody>
       <tr>
-	<td align="left">@context_bar@</td>
 	<td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
       </tr>
     </tbody>
   </table>
-  <hr>
   
   <h3>Enter the service level description</h3>
   <blockquote>
Index: openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl	6 Sep 2002 15:33:38 -0000	1.2
@@ -32,7 +32,7 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar "Shipping Rates"]
+set context [list "Shipping Rates"]
 
 template::form create rate_edit -elements {
     shipping_rate_id \
Index: openacs-4/packages/value-based-shipping/www/admin/rates.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rates.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/rates.adp	16 Aug 2002 00:06:56 -0000	1.2
+++ openacs-4/packages/value-based-shipping/www/admin/rates.adp	6 Sep 2002 15:33:38 -0000	1.3
@@ -2,17 +2,15 @@
 
 <master>
   <property name="title">@title@</property>
+  <property name="context">@context@</property>
 
-  <h2>@title@</h2>
   <table width="100%">
     <tbody>
       <tr>
-	<td align="left">@context_bar@</td>
 	<td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
       </tr>
     </tbody>
   </table>
-  <hr>
 
   <h3>Defined shipping rates</h3>
   <blockquote>
Index: openacs-4/packages/value-based-shipping/www/admin/rates.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/admin/rates.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/rates.tcl	16 Aug 2002 00:06:56 -0000	1.2
+++ openacs-4/packages/value-based-shipping/www/admin/rates.tcl	6 Sep 2002 15:33:38 -0000	1.3
@@ -11,7 +11,7 @@
 } {
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 # Return error messages for any incorrect parameter values.
@@ -44,7 +44,7 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar "Shipping Rates"]
+set context [list "Shipping Rates"]
 
 template::query get_shipping_rates shipping_rates multirow "
     select r.shipping_rate_id, l.service_level_description, c.default_name as country, round(r.from_value, 2) as from_value, round(r.to_value, 2) as to_value,
Index: openacs-4/packages/value-based-shipping/www/doc/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/doc/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/doc/index.adp	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/doc/index.adp	6 Sep 2002 15:33:39 -0000	1.2
@@ -3,23 +3,20 @@
 <master>
   <property name="title">@title@</property>
   <property name="signatory">@signatory@</property>
+  <property name="context">@context@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
 
-  <h2>@title@</h2>
+  <if @admin_p@ and @value_based_shipping_mounted@>
   <table width="100%">
     <tbody>
       <tr>
-	<td align="left">@context_bar@</td>
 	<td align="right">
-          <if @admin_p@ and @value_based_shipping_mounted@>
             [ <a href="@package_url@admin/">Administer</a> ]
-          </if>
         </td>
       </tr>
     </tbody>
   </table>
-  <hr>
-
+  </if>
   <h2>Why</h2>
 
   <p>@package_name@ provides a simple yet flexible way to maintain a
Index: openacs-4/packages/value-based-shipping/www/doc/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/doc/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/doc/index.tcl	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/doc/index.tcl	6 Sep 2002 15:33:39 -0000	1.2
@@ -9,7 +9,7 @@
 } {
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 # Authenticate the user
@@ -37,7 +37,7 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar $package_name]
+set context [list $package_name]
 
 # Set signatory for at the bottom of the page
 
Index: openacs-4/packages/value-based-shipping/www/doc/license.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/doc/license.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/doc/license.adp	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/doc/license.adp	6 Sep 2002 15:33:39 -0000	1.2
@@ -3,18 +3,9 @@
 <master>
   <property name="title">@title@</property>
   <property name="signatory">@signatory@</property>
+  <property name="context">@context@</property>
   <property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></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/value-based-shipping/www/doc/license.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/value-based-shipping/www/doc/license.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/value-based-shipping/www/doc/license.tcl	21 May 2002 18:35:37 -0000	1.1
+++ openacs-4/packages/value-based-shipping/www/doc/license.tcl	6 Sep 2002 15:33:39 -0000	1.2
@@ -9,7 +9,7 @@
 } {
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 # Authenticate the user
@@ -21,7 +21,7 @@
 
 # Set the context bar.
 
-set context_bar [ad_context_bar [list . $package_name] License]
+set context [list [list . $package_name] License]
 
 # Set signatory for at the bottom of the page