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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/index.adp 6 Sep 2002 15:33:37 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/index.adp 12 Sep 2002 19:44:59 -0000 1.3
@@ -1,17 +1,10 @@
<master>
<property name="title">@title@</property>
- <property name="context">@context@</property>
-
<if @admin_p@ eq 1>
- <table width="100%">
- <tbody>
- <tr>
- <td align="right">
- [ <a href="admin/">Administer</a> ]
- </td>
- </tr>
- </tbody>
- </table>
- </if>
+ <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar@</td><td align="right">[ <a href="admin/">Administer</a> ]</td></tr></tbody></table></property>
+ </if>
+ <else>
+ <property name="context_bar">@context_bar@</property>
+ </else>
<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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/index.tcl 6 Sep 2002 15:33:37 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/index.tcl 12 Sep 2002 19:44:59 -0000 1.3
@@ -37,4 +37,4 @@
# Set the context bar.
-set context [list]
+set context_bar [ad_context_bar]
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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/index.adp 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/index.adp 12 Sep 2002 19:45:01 -0000 1.3
@@ -1,17 +1,6 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
<master>
<property name="title">@title@</property>
- <property name="context">@context@</property>
-
- <h2>@title@</h2>
- <table width="100%">
- <tbody>
- <tr>
- <td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
- </tr>
- </tbody>
- </table>
+ <property name="context_bar"><table width="100%"><tbody><tr><td>@context_bar@</td><td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td></tr></tbody></table></property>
<ul>
<li><a href="levels">Administer Service Levels</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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/index.tcl 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/index.tcl 12 Sep 2002 19:45:01 -0000 1.3
@@ -35,4 +35,4 @@
# Set the context bar.
-set context [list]
+set context_bar [ad_context_bar]
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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/level-delete.adp 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/level-delete.adp 12 Sep 2002 19:45:01 -0000 1.3
@@ -1,17 +1,7 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
<master>
<property name="title">@title@</property>
- <property name="context">@context@</property>
+ <property name="context_bar"><table width="100%"><tbody><tr><td>@context_bar@</td><td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td></tr></tbody></table></property>
- <table width="100%">
- <tbody>
- <tr>
- <td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
- </tr>
- </tbody>
- </table>
-
<h3>Do you really want to delete this service level?</h3>
<blockquote>
<formtemplate id="level_delete">
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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/level-delete.tcl 12 Sep 2002 19:45:01 -0000 1.3
@@ -32,7 +32,7 @@
# Set the context bar.
-set context [list]
+set context_bar [ad_context_bar [list levels "Service Levels"] Delete]
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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/level-edit.adp 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/level-edit.adp 12 Sep 2002 19:45:01 -0000 1.3
@@ -1,17 +1,6 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
<master>
<property name="title">@title@</property>
- <property name="context">@context@</property>
-
- <h2>@title@</h2>
- <table width="100%">
- <tbody>
- <tr>
- <td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
- </tr>
- </tbody>
- </table>
+ <property name="context_bar"><table width="100%"><tbody><tr><td>@context_bar@</td><td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td></tr></tbody></table></property>
<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.3 -r1.4
--- openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl 6 Sep 2002 15:33:38 -0000 1.3
+++ openacs-4/packages/value-based-shipping/www/admin/level-edit.tcl 12 Sep 2002 19:45:01 -0000 1.4
@@ -32,7 +32,7 @@
# Set the context bar.
-set context [list "Service Levels"]
+set context_bar [ad_context_bar [list levels "Service Levels"] Edit]
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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/levels.adp 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/levels.adp 12 Sep 2002 19:45:01 -0000 1.3
@@ -1,17 +1,7 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
<master>
<property name="title">@title@</property>
- <property name="context">@context@</property>
+ <property name="context_bar"><table width="100%"><tbody><tr><td>@context_bar@</td><td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td></tr></tbody></table></property>
- <table width="100%">
- <tbody>
- <tr>
- <td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
- </tr>
- </tbody>
- </table>
-
<h3>Defined service levels</h3>
<blockquote>
<table>
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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/levels.tcl 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/levels.tcl 12 Sep 2002 19:45:01 -0000 1.3
@@ -38,7 +38,7 @@
# Set the context bar.
-set context [list "Service Levels"]
+set context_bar [ad_context_bar "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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/rate-delete.adp 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/rate-delete.adp 12 Sep 2002 19:45:01 -0000 1.3
@@ -1,17 +1,7 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
<master>
<property name="title">@title@</property>
- <property name="context">@context@</property>
+ <property name="context_bar"><table width="100%"><tbody><tr><td>@context_bar@</td><td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td></tr></tbody></table></property>
- <table width="100%">
- <tbody>
- <tr>
- <td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
- </tr>
- </tbody>
- </table>
-
<h3>Do you really want to delete this shipping rate?</h3>
<blockquote>
<formtemplate id="rate_delete">
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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/rate-delete.tcl 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/rate-delete.tcl 12 Sep 2002 19:45:01 -0000 1.3
@@ -32,7 +32,7 @@
# Set the context bar.
-set context [list "Shipping Rates"]
+set context_bar [ad_context_bar [list rates "Shipping Rates"] Delete]
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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/rate-edit.adp 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/rate-edit.adp 12 Sep 2002 19:45:01 -0000 1.3
@@ -1,17 +1,6 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
<master>
<property name="title">@title@</property>
- <property name="context">@context@</property>
-
-
- <table width="100%">
- <tbody>
- <tr>
- <td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
- </tr>
- </tbody>
- </table>
+ <property name="context_bar"><table width="100%"><tbody><tr><td>@context_bar@</td><td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td></tr></tbody></table></property>
<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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl 6 Sep 2002 15:33:38 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/admin/rate-edit.tcl 12 Sep 2002 19:45:01 -0000 1.3
@@ -32,7 +32,7 @@
# Set the context bar.
-set context [list "Shipping Rates"]
+set context_bar [ad_context_bar [list rates "Shipping Rates"] Edit]
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.3 -r1.4
--- openacs-4/packages/value-based-shipping/www/admin/rates.adp 6 Sep 2002 15:33:38 -0000 1.3
+++ openacs-4/packages/value-based-shipping/www/admin/rates.adp 12 Sep 2002 19:45:01 -0000 1.4
@@ -1,17 +1,7 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
<master>
<property name="title">@title@</property>
- <property name="context">@context@</property>
+ <property name="context_bar"><table width="100%"><tbody><tr><td>@context_bar@</td><td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td></tr></tbody></table></property>
- <table width="100%">
- <tbody>
- <tr>
- <td align="right">[ <a href="/doc/value-based-shipping">help</a> ]</td>
- </tr>
- </tbody>
- </table>
-
<h3>Defined shipping rates</h3>
<blockquote>
<table>
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.3 -r1.4
--- openacs-4/packages/value-based-shipping/www/admin/rates.tcl 6 Sep 2002 15:33:38 -0000 1.3
+++ openacs-4/packages/value-based-shipping/www/admin/rates.tcl 12 Sep 2002 19:45:01 -0000 1.4
@@ -44,7 +44,7 @@
# Set the context bar.
-set context [list "Shipping Rates"]
+set context_bar [ad_context_bar "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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/doc/index.adp 6 Sep 2002 15:33:39 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/doc/index.adp 12 Sep 2002 19:45:02 -0000 1.3
@@ -1,22 +1,14 @@
-<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "bla"> -->
-
<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>
-
<if @admin_p@ and @value_based_shipping_mounted@>
- <table width="100%">
- <tbody>
- <tr>
- <td align="right">
- [ <a href="@package_url@admin/">Administer</a> ]
- </td>
- </tr>
- </tbody>
- </table>
+ <property name="context_bar"><table width="100%"><tbody><tr><td align="left">@context_bar@</td><td align="right">[ <a href="@package_url@admin/">Administer</a> ]</td></tr> </tbody></table></property>
</if>
+ <else>
+ <property name="context_bar">@context_bar@</property>
+ </else>
+
<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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/doc/index.tcl 6 Sep 2002 15:33:39 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/doc/index.tcl 12 Sep 2002 19:45:02 -0000 1.3
@@ -37,7 +37,7 @@
# Set the context bar.
-set context [list $package_name]
+set context_bar [ad_context_bar $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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/doc/license.adp 6 Sep 2002 15:33:39 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/doc/license.adp 12 Sep 2002 19:45:02 -0000 1.3
@@ -1,9 +1,7 @@
-<!-- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -->
-
<master>
<property name="title">@title@</property>
<property name="signatory">@signatory@</property>
- <property name="context">@context@</property>
+ <property name="context_bar">@context_bar@</property>
<property name="header_stuff"><link href="index.css" type="text/css" rel="stylesheet"></property>
<h2>GNU General Public License</h2>
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.2 -r1.3
--- openacs-4/packages/value-based-shipping/www/doc/license.tcl 6 Sep 2002 15:33:39 -0000 1.2
+++ openacs-4/packages/value-based-shipping/www/doc/license.tcl 12 Sep 2002 19:45:02 -0000 1.3
@@ -21,7 +21,7 @@
# Set the context bar.
-set context [list [list . $package_name] License]
+set context_bar [ad_context_bar [list . $package_name] License]
# Set signatory for at the bottom of the page