Index: openacs-4/packages/spam/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/index.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/index.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/index.adp	5 Sep 2002 22:14:36 -0000	1.2
@@ -1,11 +1,7 @@
 <master>
+<property name="title">Spam</property>
+<property name="context">@context@</property>
 
-<h2>Spam Admin</h2>
-
-@context_bar@
-
-<hr>
-
 <h3>Spam Queue</h3>
 
 <table cellspacing=3>
Index: openacs-4/packages/spam/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/index.tcl	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/index.tcl	5 Sep 2002 22:14:36 -0000	1.2
@@ -10,7 +10,7 @@
 
 } -properties {
     spam_queue:multirow
-    context_bar:onevalue
+    context:onevalue
 }
 
 set user_id [ad_maybe_redirect_for_registration]
@@ -61,6 +61,4 @@
     order by sm.send_date
 }
 
-set context_bar [ad_context_bar]
-
-ad_return_template
+set context [list]
Index: openacs-4/packages/spam/www/spam-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-add.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-add.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-add.adp	5 Sep 2002 22:14:36 -0000	1.2
@@ -1,12 +1,7 @@
 <master>
 <property name="title">Create a New Spam</property>
+<property name="context">@context@</property>
 
-<h2>Create a New Spam</h2>
-
-@navbar@
-
-<hr>
-
 <p>This message will be sent to @num_recipients@ users. (<a href="spam-show-users">See list of recipients</a>)
 </p>
 
Index: openacs-4/packages/spam/www/spam-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-add.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-add.tcl	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-add.tcl	5 Sep 2002 22:14:36 -0000	1.2
@@ -21,7 +21,7 @@
     export_vars:onevalue
     date_widget:onevalue
     time_widget:onevalue
-    navbar:onevalue
+    context:onevalue
 } 
 
 set sql_query [ad_get_client_property spam "sql_query"]
@@ -49,7 +49,7 @@
 set date_widget [ad_dateentrywidget send_date]
 set time_widget [spam_timeentrywidget send_time]
 
-set navbar [ad_context_bar]
+set context [list "add message"]
 
 ad_return_template
 
Index: openacs-4/packages/spam/www/spam-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-confirm.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-confirm.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-confirm.adp	5 Sep 2002 22:14:36 -0000	1.2
@@ -2,11 +2,8 @@
 
 <master>
 <property name="title">Confirm Spam</property>
+<property name="context">@context@</property>
 
-<h2>Confirm Spam</h2>
-@navbar@
-<hr>
-
 You are about to send the following message to @num_recipients@ users.  
 (<a href="spam-show-users">See list of recipients</a>)
 
Index: openacs-4/packages/spam/www/spam-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-confirm.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-confirm.tcl	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-confirm.tcl	5 Sep 2002 22:14:36 -0000	1.2
@@ -39,7 +39,8 @@
     set escaped_body_plain [ad_convert_to_html $body_plain]
 }
 
-set navbar [ad_context_bar]
+set context [list "confirm"]
+
 set export_vars [export_form_vars send_date_ansi send_time_12hr \
 	subject body_plain body_html spam_id]
 
Index: openacs-4/packages/spam/www/spam-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-edit.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-edit.adp	5 Sep 2002 22:14:36 -0000	1.2
@@ -1,12 +1,7 @@
 <master>
 <property name="title">Edit an outgoing spam</property>
+<property name="context">@context@</property>
 
-<h2>Edit Spam</h2>
-
-@context_bar@
-
-<hr>
-
 <form action="spam-confirm" method="post">
 @export_vars@
  <include src="spam-form-body" 
Index: openacs-4/packages/spam/www/spam-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-edit.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/spam/www/spam-edit.tcl	4 Sep 2001 21:14:59 -0000	1.2
+++ openacs-4/packages/spam/www/spam-edit.tcl	5 Sep 2002 22:14:36 -0000	1.3
@@ -9,7 +9,7 @@
     title:onevalue
     date_widget:onevalue
     time_widget:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 ad_require_permission $spam_id write
@@ -70,7 +70,7 @@
 set time_widget [spam_timeentrywidget send_time $send_time]
 set confirm_target "spam-update"
 set export_vars [export_form_vars spam_id num_recipients confirm_target]
-set context_bar [ad_context_bar "Edit Spam"]
+set context [list "Edit Spam"]
 
 ad_return_template
 
Index: openacs-4/packages/spam/www/spam-send.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-send.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-send.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-send.adp	5 Sep 2002 22:14:36 -0000	1.2
@@ -1,10 +1,7 @@
 <master>
 <property name="title">Spam Queued</property>
+<property name="context">@context@</property>
 
-<h2>Spam Queued for Sending</h2>
-@navbar@
-<hr>
-
 Success!  
 
 <if @approved_p@ eq f> 
Index: openacs-4/packages/spam/www/spam-send.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-send.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-send.tcl	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-send.tcl	5 Sep 2002 22:14:36 -0000	1.2
@@ -65,7 +65,7 @@
 # inserted and in the queue; now display a message to the user 
 # telling them how to link, etc.
 
-set navbar [ad_context_bar]
+set context {queued}
 
 ad_return_template
 
Index: openacs-4/packages/spam/www/spam-show-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-show-users.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-show-users.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-show-users.adp	5 Sep 2002 22:14:36 -0000	1.2
@@ -1,9 +1,7 @@
 <master>
 <property name="title">Show spam recipients</property>
-<h2>Show spam recipients</h2> 
-
-<hr>
-
+<property name="context">@context@</property>
+    
 The following people are about to receive your spam:
 
 <ul>
Index: openacs-4/packages/spam/www/spam-show-users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-show-users.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-show-users.tcl	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-show-users.tcl	5 Sep 2002 22:14:36 -0000	1.2
@@ -2,6 +2,7 @@
     shows the list of users about to receive a spam message
 } -properties {
     spam_list:multirow
+    context:onevalue
 }
 
 set sql_query [ad_get_client_property "spam" "sql_query"]
@@ -22,5 +23,4 @@
       and p2.party_id = parties.party_id
 "
 
-ad_return_template
-
+set context [list "show users"]
Index: openacs-4/packages/spam/www/spam-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-update.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-update.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-update.adp	5 Sep 2002 22:14:36 -0000	1.2
@@ -1,6 +1,5 @@
 <master>
 <property name="title">Spam Updated</property>
-<h2>Spam Updated</h2>
-@context_bar@
-<hr>
-Your spam was updated successfully.
\ No newline at end of file
+<property name="context">@context@</property>
+
+Your spam was successfully updated.
\ No newline at end of file
Index: openacs-4/packages/spam/www/spam-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-update.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-update.tcl	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-update.tcl	5 Sep 2002 22:14:36 -0000	1.2
@@ -24,7 +24,7 @@
 	-plain $body_plain \
 	-html $body_html
 
-set context_bar [ad_context_bar "Spam Updated"]
+set context [list "Spam Updated"]
 
 #ns_return 200 text/html $date
 ad_return_template
Index: openacs-4/packages/spam/www/spam-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-view.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/spam-view.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/spam-view.adp	5 Sep 2002 22:14:36 -0000	1.2
@@ -1,10 +1,7 @@
 <master>
 <property name="title">View Spam</property>
+<property name="context">@context@</property>
 
-<h2>View Spam</h2>
-@context_bar@
-<hr>
-
 <table>
  <tr>
   <th valign="top" align="left">Message Subject</th>
Index: openacs-4/packages/spam/www/spam-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/spam-view.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/spam/www/spam-view.tcl	4 Sep 2001 21:14:59 -0000	1.2
+++ openacs-4/packages/spam/www/spam-view.tcl	5 Sep 2002 22:14:36 -0000	1.3
@@ -50,6 +50,6 @@
     }
 }     
 
-set context_bar [ad_context_bar]
+set context [list]
 
 ad_return_template
Index: openacs-4/packages/spam/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/index.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/admin/index.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/admin/index.adp	5 Sep 2002 22:14:37 -0000	1.2
@@ -1,11 +1,7 @@
 <master>
+<property name="title">Spam Administration</property>
+<property name="context">@context@</property>
 
-<h2>Spam Admin</h2>
-
-@context_bar@
-
-<hr>
-
 <h3>Spam Queue</h3>
 
 <table cellspacing=3>
Index: openacs-4/packages/spam/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/index.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/admin/index.tcl	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/admin/index.tcl	5 Sep 2002 22:14:37 -0000	1.2
@@ -8,7 +8,7 @@
     assume user already verified by request processor
 } -properties {
     spam_queue:multirow
-    context_bar:onevalue
+    context:onevalue
 }
 
 set user_id [ad_maybe_redirect_for_registration]
@@ -58,6 +58,6 @@
     order by sm.send_date
 }
 
-set context_bar [ad_context_bar]
+set context [list]
 
 ad_return_template
Index: openacs-4/packages/spam/www/admin/spam-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/spam-confirm.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/admin/spam-confirm.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/admin/spam-confirm.adp	5 Sep 2002 22:14:37 -0000	1.2
@@ -2,10 +2,8 @@
 
 <master>
 <property name="title">Confirm Spam</property>
+<property name="context">"confirm"</property>
 
-<h2>Confirm Spam</h2>
-<hr>
-
 You are about to send the following message to @num_recipients@ users.  
 (<a href="spam-show-users">See list of recipients</a>)
 
Index: openacs-4/packages/spam/www/admin/spam-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/spam-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/admin/spam-edit.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/admin/spam-edit.adp	5 Sep 2002 22:14:37 -0000	1.2
@@ -1,10 +1,7 @@
 <master>
 <property name="title">Edit an outgoing spam</property>
+<property name="context">@context@</property>
 
-<h2>Edit Spam</h2>
-@context_bar@
-<hr>
-
 <form action="spam-confirm" method="post">
 @export_vars@
  <include src="../spam-form-body" 
Index: openacs-4/packages/spam/www/admin/spam-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/spam-edit.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/spam/www/admin/spam-edit.tcl	28 Mar 2002 22:54:41 -0000	1.3
+++ openacs-4/packages/spam/www/admin/spam-edit.tcl	5 Sep 2002 22:14:37 -0000	1.4
@@ -10,7 +10,7 @@
     title:onevalue
     date_widget:onevalue
     time_widget:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 # grab the spam out of the table: with the most recent content revisions
@@ -76,7 +76,7 @@
 set time_widget [spam_timeentrywidget send_time $send_time]
 set confirm_target "spam-update"
 set export_vars [export_form_vars spam_id num_recipients confirm_target]
-set context_bar [ad_context_bar "Edit Spam"]
+set context [list "Edit Spam"]
 
 ad_return_template
 
Index: openacs-4/packages/spam/www/admin/spam-show-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/spam-show-users.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/admin/spam-show-users.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/admin/spam-show-users.adp	5 Sep 2002 22:14:37 -0000	1.2
@@ -1,18 +1,16 @@
 <master>
 <property name="title">Show spam recipients</property>
-<h2>Show spam recipients</h2> 
+<property name="context">"show recipients"</property>
 
-<hr>
-
 The following people are about to receive your spam:
 
 <ul>
  <multiple name="spam_list">
  <if @spam_list.name@ nil>
-   <li>@spam_list.email@
+   <li>@spam_list.email@</li>
  </if>
  <else>
-  <li>@spam_list.name@ (@spam_list.email@)
+  <li>@spam_list.name@ (@spam_list.email@)</li>
  </else>
  </multiple>
 </ul>
\ No newline at end of file
Index: openacs-4/packages/spam/www/admin/spam-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/spam-update.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/admin/spam-update.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/admin/spam-update.adp	5 Sep 2002 22:14:37 -0000	1.2
@@ -1,7 +1,6 @@
 <master>
-<h2>Spam Updated</h2>
-@context_bar@
-<hr>
+<property name="title">Spam Updated</property>
+<property name="context">@context@</property>
 
 Your spam was updated successfully.  Back to the <a href="index">Admin</a> page.
 
Index: openacs-4/packages/spam/www/admin/spam-update.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/spam-update.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/spam/www/admin/spam-update.tcl	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/spam/www/admin/spam-update.tcl	5 Sep 2002 22:14:37 -0000	1.2
@@ -24,6 +24,6 @@
 
 
 #ns_return 200 text/html $date
-set context_bar [ad_context_bar "Spam Updated"]
+set context [list "Spam Updated"]
 ad_return_template
 
Index: openacs-4/packages/spam/www/admin/spam-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/spam-view.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/spam/www/admin/spam-view.adp	4 Sep 2001 21:14:59 -0000	1.2
+++ openacs-4/packages/spam/www/admin/spam-view.adp	5 Sep 2002 22:14:37 -0000	1.3
@@ -1,10 +1,7 @@
 <master>
 <property name="title">View Spam</property>
+<property name="context">@context@</property>
 
-<h2>View Spam</h2>
-@context_bar@
-<hr>
-
 <table>
  <tr>
   <th valign="top" align="left">Message Subject</th>
Index: openacs-4/packages/spam/www/admin/spam-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/spam/www/admin/spam-view.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/spam/www/admin/spam-view.tcl	4 Sep 2001 21:14:59 -0000	1.2
+++ openacs-4/packages/spam/www/admin/spam-view.tcl	5 Sep 2002 22:14:37 -0000	1.3
@@ -48,6 +48,6 @@
     }
 }     
 
-set context_bar [ad_context_bar]
+set context [list]
 
 ad_return_template