Index: openacs-4/packages/forums/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/forums/www/forum-view.adp	30 Jul 2002 22:04:59 -0000	1.12
+++ openacs-4/packages/forums/www/forum-view.adp	5 Sep 2002 09:50:45 -0000	1.13
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Forum: @forum.name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <center>
 
Index: openacs-4/packages/forums/www/forum-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/www/forum-view.tcl	30 Jul 2002 22:04:59 -0000	1.5
+++ openacs-4/packages/forums/www/forum-view.tcl	5 Sep 2002 09:50:45 -0000	1.6
@@ -70,6 +70,6 @@
     -url [ad_conn url]?forum_id=$forum_id \
 ]
 
-set context_bar [list $forum(name)]
+set context [list $forum(name)]
 
 ad_return_template
Index: openacs-4/packages/forums/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/forums/www/index.adp	1 Aug 2002 14:37:02 -0000	1.11
+++ openacs-4/packages/forums/www/index.adp	5 Sep 2002 09:50:45 -0000	1.12
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Forums</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <center>
   <table width="95%">
Index: openacs-4/packages/forums/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/index.tcl	30 Jul 2002 22:04:59 -0000	1.4
+++ openacs-4/packages/forums/www/index.tcl	5 Sep 2002 09:50:45 -0000	1.5
@@ -32,6 +32,6 @@
 
 db_multirow forums select_forums {}
 
-set context_bar {}
+set context {}
 
 ad_return_template
Index: openacs-4/packages/forums/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/master.adp	1 Aug 2002 14:53:20 -0000	1.4
+++ openacs-4/packages/forums/www/master.adp	5 Sep 2002 09:50:45 -0000	1.5
@@ -1,6 +1,7 @@
 <master>
 <property name="title">@title@</property>
 <if @focus@ not nil><property name="focus">@focus@</property></if>
+<property name="context">@context@</property>
 
 <h2>@title@</h2>
 
Index: openacs-4/packages/forums/www/master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/master.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/master.tcl	3 Jun 2002 04:39:05 -0000	1.3
+++ openacs-4/packages/forums/www/master.tcl	5 Sep 2002 09:50:45 -0000	1.4
@@ -1 +1 @@
-set context_bar [eval ad_context_bar $context_bar]
+set context_bar [eval ad_context_bar $context]
Index: openacs-4/packages/forums/www/message-email.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/forums/www/message-email.adp	30 Jul 2002 22:04:59 -0000	1.3
+++ openacs-4/packages/forums/www/message-email.adp	5 Sep 2002 09:50:45 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Email Message: @message.forum_name@ - @message.subject@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <p>Email a copy of the following message:</p>
 
Index: openacs-4/packages/forums/www/message-email.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-email.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/message-email.tcl	3 Jun 2002 04:39:05 -0000	1.2
+++ openacs-4/packages/forums/www/message-email.tcl	5 Sep 2002 09:50:45 -0000	1.3
@@ -65,11 +65,11 @@
 element set_properties message subject -value "\[Fwd: $message(subject)\]"
 element set_properties message message_id -value $message_id
 
-set context_bar [list [list "./forum-view?forum_id=$message(forum_id)" "$message(forum_name)"]]
+set context [list [list "./forum-view?forum_id=$message(forum_id)" "$message(forum_name)"]]
 if {![empty_string_p $message(parent_id)]} {
-    lappend context_bar [list "./message-view?message_id=$message(root_message_id)" "Entire Thread"]
+    lappend context [list "./message-view?message_id=$message(root_message_id)" "Entire Thread"]
 }
-lappend context_bar [list "./message-view?message_id=$message(message_id)" "$message(subject)"]
-lappend context_bar {Email to a friend}
+lappend context [list "./message-view?message_id=$message(message_id)" "$message(subject)"]
+lappend context {Email to a friend}
 
 ad_return_template
Index: openacs-4/packages/forums/www/message-post-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post-confirm.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/www/message-post-confirm.adp	30 Jul 2002 22:04:59 -0000	1.5
+++ openacs-4/packages/forums/www/message-post-confirm.adp	5 Sep 2002 09:50:45 -0000	1.6
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Confirm Post to Forum: @forum.name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <p>Please confirm the following post:</p>
 
Index: openacs-4/packages/forums/www/message-post.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/message-post.adp	1 Aug 2002 14:53:20 -0000	1.4
+++ openacs-4/packages/forums/www/message-post.adp	5 Sep 2002 09:50:45 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Post to Forum: @forum.name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">message.subject</property>
 
 <if @parent_id@ ne "">
Index: openacs-4/packages/forums/www/message-post.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/forums/www/message-post.tcl	9 Aug 2002 20:51:49 -0000	1.11
+++ openacs-4/packages/forums/www/message-post.tcl	5 Sep 2002 09:50:45 -0000	1.12
@@ -111,8 +111,8 @@
             }
         }
 
-        set context_bar [list [list "./forum-view?forum_id=$forum_id" "$forum(name)"]]
-        lappend context_bar {Post a Message}
+        set context [list [list "./forum-view?forum_id=$forum_id" "$forum(name)"]]
+        lappend context {Post a Message}
 
         ad_return_template message-post-confirm
         return
@@ -183,12 +183,12 @@
 element set_properties message confirm_p -value 0
 element set_properties message subscribe_p -value 0
 
-set context_bar [list [list "./forum-view?forum_id=$forum_id" "$forum(name)"]]
+set context [list [list "./forum-view?forum_id=$forum_id" "$forum(name)"]]
 if {![empty_string_p $parent_id]} {
-    lappend context_bar [list "./message-view?message_id=$parent_message(message_id)" "$parent_message(subject)"]
-    lappend context_bar {Post a Reply}
+    lappend context [list "./message-view?message_id=$parent_message(message_id)" "$parent_message(subject)"]
+    lappend context {Post a Reply}
 } else {
-    lappend context_bar {Post a Message}
+    lappend context {Post a Message}
 }
 
 ad_return_template
Index: openacs-4/packages/forums/www/message-view-flat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/Attic/message-view-flat.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/message-view-flat.adp	11 Jul 2002 12:49:26 -0000	1.4
+++ openacs-4/packages/forums/www/message-view-flat.adp	5 Sep 2002 09:50:45 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Forum @forum.name@: @message.subject@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <center>
 
Index: openacs-4/packages/forums/www/message-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/forums/www/message-view.adp	30 Jul 2002 22:04:59 -0000	1.8
+++ openacs-4/packages/forums/www/message-view.adp	5 Sep 2002 09:50:45 -0000	1.9
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Forum @forum.name@: @message.subject@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <br>
 
Index: openacs-4/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/forums/www/message-view.tcl	30 Jul 2002 22:04:59 -0000	1.8
+++ openacs-4/packages/forums/www/message-view.tcl	5 Sep 2002 09:50:45 -0000	1.9
@@ -102,11 +102,11 @@
     set notification_chunk ""
 }
 
-set context_bar [list [list "./forum-view?forum_id=$message(forum_id)" "$message(forum_name)"]]
+set context [list [list "./forum-view?forum_id=$message(forum_id)" "$message(forum_name)"]]
 if {![empty_string_p $message(parent_id)]} {
-    lappend context_bar [list "./message-view?message_id=$message(root_message_id)" "Entire Thread"]
+    lappend context [list "./message-view?message_id=$message(root_message_id)" "Entire Thread"]
 }
-lappend context_bar {One Message}
+lappend context {One Message}
 
 if {[string equal $forum(presentation_type) flat]} {
     ad_return_template "message-view-flat"
Index: openacs-4/packages/forums/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/search.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/search.adp	2 Jul 2002 02:00:01 -0000	1.1
+++ openacs-4/packages/forums/www/search.adp	5 Sep 2002 09:50:45 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Search Forums</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <center>
 
Index: openacs-4/packages/forums/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/search.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/search.tcl	2 Jul 2002 20:44:45 -0000	1.4
+++ openacs-4/packages/forums/www/search.tcl	5 Sep 2002 09:50:45 -0000	1.5
@@ -43,6 +43,6 @@
     set messages:rowcount 0
 }
 
-set context_bar {Search}
+set context {Search}
 
 ad_return_template
Index: openacs-4/packages/forums/www/user-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/user-history.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/user-history.adp	5 Jun 2002 14:43:52 -0000	1.4
+++ openacs-4/packages/forums/www/user-history.adp	5 Sep 2002 09:50:45 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Forums: Posting history for @user.full_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <p>
   Posting history for
Index: openacs-4/packages/forums/www/user-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/user-history.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/user-history.tcl	2 Jul 2002 20:00:23 -0000	1.4
+++ openacs-4/packages/forums/www/user-history.tcl	5 Sep 2002 09:50:45 -0000	1.5
@@ -36,6 +36,6 @@
 
 set dimensional_chunk [ad_dimensional $dimensional_list]
 
-set context_bar {{Posting History}}
+set context {{Posting History}}
 
 ad_return_template
Index: openacs-4/packages/forums/www/admin/forum-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-edit.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/forums/www/admin/forum-edit.adp	1 Aug 2002 14:53:20 -0000	1.4
+++ openacs-4/packages/forums/www/admin/forum-edit.adp	5 Sep 2002 09:50:45 -0000	1.5
@@ -1,6 +1,6 @@
 <master src="../master">
 <property name="title">Edit Forum: @forum.name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">forum.name</property>
 
 <if @forum.enabled_p@ eq t>
Index: openacs-4/packages/forums/www/admin/forum-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-edit.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/www/admin/forum-edit.tcl	1 Aug 2002 14:53:20 -0000	1.5
+++ openacs-4/packages/forums/www/admin/forum-edit.tcl	5 Sep 2002 09:50:45 -0000	1.6
@@ -61,7 +61,7 @@
     ad_script_abort
 }
 
-set context_bar [list "Edit forum"]
+set context [list "Edit forum"]
     
 if { [form is_request forum] } {
     element set_properties forum forum_id -value $forum_id
Index: openacs-4/packages/forums/www/admin/forum-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-new.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/admin/forum-new.adp	1 Aug 2002 14:53:20 -0000	1.2
+++ openacs-4/packages/forums/www/admin/forum-new.adp	5 Sep 2002 09:50:45 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="../master">
 <property name="title">Create New Forum</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">forum.name</property>
 
 <formtemplate id="forum"></formtemplate>
Index: openacs-4/packages/forums/www/admin/forum-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/forum-new.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/forums/www/admin/forum-new.tcl	1 Aug 2002 14:53:20 -0000	1.5
+++ openacs-4/packages/forums/www/admin/forum-new.tcl	5 Sep 2002 09:50:45 -0000	1.6
@@ -73,7 +73,7 @@
     ad_script_abort
 }
 
-set context_bar [list "Create New Forum"]
+set context [list "Create New Forum"]
 
 if { [form is_request forum] } {
     # Pre-fetch the forum_id
Index: openacs-4/packages/forums/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/admin/index.adp	29 May 2002 21:40:11 -0000	1.1
+++ openacs-4/packages/forums/www/admin/index.adp	5 Sep 2002 09:50:45 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../master">
 <property name="title">Forums Administration</property>
-<property name="context_bar"></property>
+<property name="context"></property>
 
 <h3>Forums</h3>
 <ul>
Index: openacs-4/packages/forums/www/moderate/forum.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/forum.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/moderate/forum.adp	29 May 2002 21:40:11 -0000	1.1
+++ openacs-4/packages/forums/www/moderate/forum.adp	5 Sep 2002 09:50:46 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="../master">
 <property name="title">Manage Forum: @forum.name@</property>
-<property name="context_bar"></property>
+<property name="context">Manage</property>
 
 <h3>Pending Threads</h3>
 
Index: openacs-4/packages/forums/www/moderate/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/moderate/message-delete.adp	20 Aug 2002 21:39:42 -0000	1.2
+++ openacs-4/packages/forums/www/moderate/message-delete.adp	5 Sep 2002 09:50:46 -0000	1.3
@@ -1,14 +1,14 @@
 <master src="../master">
 <property name="title">Confirm Delete: @message.subject@</property>
-<property name="context_bar"></property>
+<property name="context">delete</property>
 
 <table width="95%">
   
   Are you sure you want to delete this message and <strong>all replies to it</strong>?
   <p>
   
   <table style="color: black; background-color: @table_border_color@;" width="100%">
-    <include src="../message-chunk" &message="message" preview=1>
+    <include src="../message-chunk" &message="message" preview="1">
   </table>
   
   <p>
Index: openacs-4/packages/forums/www/moderate/message-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/forums/www/moderate/message-edit.adp	29 May 2002 21:40:11 -0000	1.1
+++ openacs-4/packages/forums/www/moderate/message-edit.adp	5 Sep 2002 09:50:46 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="../master">
 <property name="title">Edit Message: @message.subject@</property>
-<property name="context_bar"></property>
+<property name="context">Edit</property>
 
 <formtemplate id="message"></formtemplate>