Index: openacs-4/packages/rss-support/www/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/rss-support/www/delete.adp	12 Dec 2001 02:58:23 -0000	1.2
+++ openacs-4/packages/rss-support/www/delete.adp	5 Sep 2002 13:23:33 -0000	1.3
@@ -1,11 +1,7 @@
 <master>
-<property name="title">Delete a Subcription</property>
+<property name="title">Delete Subcription</property>
+<property name="context">@context@</property>
 
-<h2>Delete Subscription</h2>
-@context_bar@
-<hr>
-
-<blockquote>
 Channel: <if @channel_link@ eq "">@channel_title@</if><else>
 <a href="@channel_link@">@channel_title@</a></else>
 <form action=delete-2>
@@ -18,4 +14,4 @@
 <input type=submit value="Really delete?">
 <input type=button onclick="history.back()" value="No, I want to go back">
 </form>
-</blockquote>
+
Index: openacs-4/packages/rss-support/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/delete.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/rss-support/www/delete.tcl	12 Dec 2001 02:58:23 -0000	1.2
+++ openacs-4/packages/rss-support/www/delete.tcl	5 Sep 2002 13:23:33 -0000	1.3
@@ -18,7 +18,7 @@
     set channel_title "Summary Context $summary_context_id"
 }
 
-set context_bar [ad_context_bar Delete]
+set context [list Delete]
 
 if [file exists [rss_gen_report_file -subscr_id $subscr_id]] {
     set offer_file 1
Index: openacs-4/packages/rss-support/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/index.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/rss-support/www/index.adp	19 Nov 2001 04:02:28 -0000	1.1
+++ openacs-4/packages/rss-support/www/index.adp	5 Sep 2002 13:23:33 -0000	1.2
@@ -1,15 +1,12 @@
 <master>
 <property name="title">Rss Support Home</property>
+<property name="context"></property>
 
-<h2>Rss Support Home</h2>
-<%= [ad_context_bar] %>
-<hr>
-
 <ul>
-<li><a href="doc/">Documentation</a>
-<li><a href="my-subscrs">Your Report Generation Subscriptions</a>
+<li><a href="doc/">Documentation</a></li>
+<li><a href="my-subscrs">Your Report Generation Subscriptions</a></li>
 
 <p>
 
-<li><a href="admin">Administration Homepage (requires permission)</a>
+<li><a href="admin">Administration Homepage (requires permission)</a></li>
 </ul>
\ No newline at end of file
Index: openacs-4/packages/rss-support/www/my-subscrs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/my-subscrs.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/rss-support/www/my-subscrs.adp	12 Dec 2001 03:09:04 -0000	1.2
+++ openacs-4/packages/rss-support/www/my-subscrs.adp	5 Sep 2002 13:23:33 -0000	1.3
@@ -1,10 +1,7 @@
 <master>
 <property name="title">Your Report Generation Subscriptions</property>
+<property name="context">@context@</property>
 
-<h2>Report Generation Subscriptions</h2>
-@context_bar@
-<hr>
-
 <small><em>Subscriptions created by you.</em></small>
 
 <include src="subscrs-include" enc_url="@enc_url@" user_id="@user_id@" rel_path=".">
\ No newline at end of file
Index: openacs-4/packages/rss-support/www/my-subscrs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/my-subscrs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/rss-support/www/my-subscrs.tcl	12 Dec 2001 02:58:23 -0000	1.1
+++ openacs-4/packages/rss-support/www/my-subscrs.tcl	5 Sep 2002 13:23:33 -0000	1.2
@@ -1,4 +1,4 @@
-set context_bar [ad_context_bar Subscriptions]
+set context [list Subscriptions]
 
 set enc_url [ad_urlencode [ad_conn url]?[ad_conn query]]
 
Index: openacs-4/packages/rss-support/www/subscr-ae-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae-2.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/rss-support/www/subscr-ae-2.adp	13 Nov 2001 05:35:59 -0000	1.1
+++ openacs-4/packages/rss-support/www/subscr-ae-2.adp	5 Sep 2002 13:23:33 -0000	1.2
@@ -1,14 +1,11 @@
 <master>
 <property name="title">Subscription Change Complete</property>
+<property name="context">@context@</property>
 
-<h2>Subscription change complete</h2>
-@context_bar@
-<hr>
-
 You may now
 <ul>
-<li><a href="@review_url@">Review your subscription</a>.
+<li><a href="@review_url@">Review your subscription</a>.</li>
 <if @return_url@ not nil>
-<li><a href="@return_url@">Return to where you were</a>.
+<li><a href="@return_url@">Return to where you were</a>.</li>
 </if>
 </ul>
Index: openacs-4/packages/rss-support/www/subscr-ae-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae-2.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/rss-support/www/subscr-ae-2.tcl	19 Nov 2001 04:02:28 -0000	1.2
+++ openacs-4/packages/rss-support/www/subscr-ae-2.tcl	5 Sep 2002 13:23:33 -0000	1.3
@@ -51,6 +51,6 @@
 }
 
 
-set context_bar [ad_context_bar]
+set context [list]
 
 set review_url subscr-ae?[export_url_vars impl_id summary_context_id return_url meta]
\ No newline at end of file
Index: openacs-4/packages/rss-support/www/subscr-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/rss-support/www/subscr-ae.adp	12 Dec 2001 02:58:23 -0000	1.3
+++ openacs-4/packages/rss-support/www/subscr-ae.adp	5 Sep 2002 13:23:33 -0000	1.4
@@ -1,10 +1,7 @@
 <master>
-<property name="title">Add or Edit a Subcription</property>
+<property name="title">@pretty_action@ a Subcription</property>
+<property name="context">@context@</property>
 
-<h2>@pretty_action@ a Subscription</h2>
-@context_bar@
-<hr>
-
 <form action=subscr-ae-2>
 <table cellpadding=2 cellspacing=2 border=0 bgcolor=e0e0e0>
 <tr bgcolor=efefef align=left valign=top><th>Channel:</th>
Index: openacs-4/packages/rss-support/www/subscr-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/subscr-ae.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/rss-support/www/subscr-ae.tcl	12 Dec 2001 02:58:23 -0000	1.5
+++ openacs-4/packages/rss-support/www/subscr-ae.tcl	5 Sep 2002 13:23:33 -0000	1.6
@@ -96,5 +96,5 @@
 			       return_url          \
 			       meta]
 
-set context_bar [ad_context_bar Add/Edit]
+set context [list Add/Edit]
 
Index: openacs-4/packages/rss-support/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/admin/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/rss-support/www/admin/index.adp	12 Dec 2001 02:58:23 -0000	1.2
+++ openacs-4/packages/rss-support/www/admin/index.adp	5 Sep 2002 13:23:34 -0000	1.3
@@ -1,12 +1,7 @@
 <master>
 <property name="title">Rss Support Admin Home</property>
+<property name="context"></property>
 
-<h2>Rss Support Admin Home</h2>
-<%= [ad_context_bar] %>
-<hr>
-
 <ul>
-<li><a href="subscrs">All Report Generation Subscriptions</a>
+<li><a href="subscrs">All Report Generation Subscriptions</a></li>
 </ul>
-
-<br><br><br><br><br><br><br>
\ No newline at end of file
Index: openacs-4/packages/rss-support/www/admin/subscrs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/admin/subscrs.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/rss-support/www/admin/subscrs.adp	12 Dec 2001 03:09:04 -0000	1.5
+++ openacs-4/packages/rss-support/www/admin/subscrs.adp	5 Sep 2002 13:23:34 -0000	1.6
@@ -1,8 +1,5 @@
 <master>
 <property name="title">Report Generation Subscriptions</property>
+<property name="context">@context@</property>
 
-<h2>Report Generation Subscriptions</h2>
-@context_bar@
-<hr>
-
 <include src="../subscrs-include" enc_url="@enc_url@" rel_path="..">
\ No newline at end of file
Index: openacs-4/packages/rss-support/www/admin/subscrs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/rss-support/www/admin/subscrs.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/rss-support/www/admin/subscrs.tcl	12 Dec 2001 02:58:23 -0000	1.4
+++ openacs-4/packages/rss-support/www/admin/subscrs.tcl	5 Sep 2002 13:23:34 -0000	1.5
@@ -1,3 +1,3 @@
-set context_bar [ad_context_bar Subscriptions]
+set context [list Subscriptions]
 
 set enc_url [ad_urlencode [ad_conn url]?[ad_conn query]]
\ No newline at end of file