Index: openacs-4/packages/faq/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/faq/www/index.adp	18 Mar 2002 22:42:19 -0000	1.3
+++ openacs-4/packages/faq/www/index.adp	4 Sep 2002 13:28:32 -0000	1.4
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">FAQs</property>
 
 <if @admin_p@ eq 1>
Index: openacs-4/packages/faq/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/faq/www/index.tcl	18 Mar 2002 22:42:19 -0000	1.3
+++ openacs-4/packages/faq/www/index.tcl	4 Sep 2002 13:28:32 -0000	1.4
@@ -10,16 +10,17 @@
    
 } {
 } -properties {
-  context_bar:onevalue
+  context:onevalue
   package_id:onevalue
   user_id:onevalue
   faqs:multirow
 }
 
 set package_id [ad_conn package_id]
 
-set context_bar {All}
+set context {}
 
+
 set user_id [ad_verify_and_get_user_id]
  
 ad_require_permission $package_id faq_view_faq
Index: openacs-4/packages/faq/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/Attic/master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/master.adp	18 Mar 2002 22:42:19 -0000	1.2
+++ openacs-4/packages/faq/www/master.adp	4 Sep 2002 13:28:32 -0000	1.3
@@ -1,9 +1,8 @@
 <master>
 <property name="title">@title@</property>
+<property name="context">@context@</property>
 
 <h2>@title@</h2>
- <if @context_bar@ not nil>
-  <%= [eval ad_context_bar $context_bar] %>
- </if>
+<%= [eval ad_context_bar $context] %>
 <hr>
 <slave>
Index: openacs-4/packages/faq/www/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/faq/www/one-faq.adp	7 May 2002 14:31:09 -0000	1.3
+++ openacs-4/packages/faq/www/one-faq.adp	4 Sep 2002 13:28:32 -0000	1.4
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">@faq_name@</property>
 
 <if @one_question:rowcount@ eq 0>
Index: openacs-4/packages/faq/www/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/one-faq.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/one-faq.tcl	4 Sep 2002 13:28:32 -0000	1.2
@@ -20,7 +20,7 @@
 
 db_1row faq_info "select faq_name, separate_p from faqs where faq_id=:faq_id"
 
-set context_bar [list $faq_name]
+set context [list $faq_name]
 
 db_multirow one_question q_and_a_info "select entry_id, faq_id, question, answer, sort_key 
 from faq_q_and_as 
Index: openacs-4/packages/faq/www/one-question.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-question.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/one-question.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/one-question.adp	4 Sep 2002 13:28:32 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">One Question</property>
 
 <b>Q:</b> @question@
Index: openacs-4/packages/faq/www/one-question.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-question.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/one-question.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/one-question.tcl	4 Sep 2002 13:28:32 -0000	1.2
@@ -23,7 +23,7 @@
                        where entry_id = :entry_id
                          and qa.faq_id = f.faq_id"
 
-set context_bar [list [list "one-faq?faq_id=$faq_id" $faq_name] "One Question"]
+set context [list [list "one-faq?faq_id=$faq_id" $faq_name] "One Question"]
 
 
 ad_return_template
Index: openacs-4/packages/faq/www/admin/faq-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/faq-edit.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/faq-edit.adp	4 Sep 2002 13:28:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">@title@</property>
 
 <form action="@action@">
Index: openacs-4/packages/faq/www/admin/faq-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/faq-edit.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/faq-edit.tcl	4 Sep 2002 13:28:33 -0000	1.2
@@ -9,7 +9,7 @@
 } {
     faq_id:naturalnum
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     faq_id:onevalue
     title:onevalue
     faq_name:onevalue
@@ -19,7 +19,7 @@
 
 ad_require_permission [ad_conn package_id] faq_modify_faq
 
-set context_bar {"Edit an FAQ"}
+set context {"Edit an FAQ"}
 set title "Edit an FAQ"
 set action "faq-edit-2"
 set submit_label "Update FAQ"
Index: openacs-4/packages/faq/www/admin/faq-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/faq-new.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/faq-new.adp	4 Sep 2002 13:28:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master"></master>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">@title@</property>
   
 <form action="@action@">
Index: openacs-4/packages/faq/www/admin/faq-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/faq-new.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/faq-new.tcl	4 Sep 2002 13:28:33 -0000	1.2
@@ -9,7 +9,7 @@
     @creation-date 2000-10-24
 } {
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     faq_id:onevalue
     title:onevalue
     action:onevalue
@@ -20,7 +20,7 @@
 
 ad_require_permission [ad_conn package_id] faq_create_faq
 
-set context_bar {"Create an FAQ"}
+set context {"Create an FAQ"}
 set title "Create an FAQ"
 set action "faq-new-2"
 set submit_label "Create FAQ"
Index: openacs-4/packages/faq/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/index.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/index.adp	4 Sep 2002 13:28:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">FAQ Admin</property>
 
 <if @faqs:rowcount@ eq 0>
Index: openacs-4/packages/faq/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/index.tcl	18 Mar 2002 22:42:19 -0000	1.2
+++ openacs-4/packages/faq/www/admin/index.tcl	4 Sep 2002 13:28:33 -0000	1.3
@@ -10,7 +10,7 @@
    
 } {
 } -properties {
-  context_bar:onevalue
+  context:onevalue
   package_id:onevalue
   user_id:onevalue
 }
@@ -19,9 +19,8 @@
 
 ad_require_permission $package_id faq_admin_faq
 
+set context {}
 
-set context_bar {All}
-
 set user_id [ad_verify_and_get_user_id]
 
 
Index: openacs-4/packages/faq/www/admin/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/master.adp	18 Mar 2002 22:42:19 -0000	1.2
+++ openacs-4/packages/faq/www/admin/master.adp	4 Sep 2002 13:28:33 -0000	1.3
@@ -1,9 +1,8 @@
 <master>
 <property name="title">@title@</property>
+<property name="context">@context@</property>
 
 <h2>@title@</h2>
- <if @context_bar@ not nil>
-  <%= [eval ad_context_bar $context_bar] %>
- </if>
+<%= [eval ad_context_bar $context] %>
 <hr>
 <slave>
Index: openacs-4/packages/faq/www/admin/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/one-faq.adp	18 Mar 2002 22:42:19 -0000	1.2
+++ openacs-4/packages/faq/www/admin/one-faq.adp	4 Sep 2002 13:28:33 -0000	1.3
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">@faq_name@ Admin</property>
 
 <if @faq_q_and_as:rowcount@ eq 0>
Index: openacs-4/packages/faq/www/admin/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-faq.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/one-faq.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/one-faq.tcl	4 Sep 2002 13:28:33 -0000	1.2
@@ -33,6 +33,6 @@
 	    from faq_q_and_as where faq_id=:faq_id"]
 
 db_1row faq_name "select faq_name from faqs where faq_id=:faq_id"
-set context_bar [list $faq_name]
+set context [list $faq_name]
 
 ad_return_template
Index: openacs-4/packages/faq/www/admin/one-question.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-question.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/one-question.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/one-question.adp	4 Sep 2002 13:28:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">One Question</property>
 
 <b>Q:</b> @question@
Index: openacs-4/packages/faq/www/admin/one-question.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/one-question.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/one-question.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/one-question.tcl	4 Sep 2002 13:28:33 -0000	1.2
@@ -26,5 +26,5 @@
       where entry_id = :entry_id
       and a.faq_id = f.faq_id"
 
-set context_bar [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "One Q&A"]
+set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "One Q&A"]
 ad_return_template
Index: openacs-4/packages/faq/www/admin/q_and_a-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/q_and_a-edit.adp	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/q_and_a-edit.adp	4 Sep 2002 13:28:33 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">One Question</property>
 
 <form action="@action@" >
Index: openacs-4/packages/faq/www/admin/q_and_a-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/faq/www/admin/q_and_a-edit.tcl	20 Apr 2001 20:51:10 -0000	1.1
+++ openacs-4/packages/faq/www/admin/q_and_a-edit.tcl	4 Sep 2002 13:28:33 -0000	1.2
@@ -28,7 +28,7 @@
                       where entry_id = :entry_id
                       and f.faq_id = qa.faq_id"
 
-set context_bar [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "One Q&A"]
+set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "One Q&A"]
 
 
 ad_return_template
Index: openacs-4/packages/faq/www/admin/q_and_a-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/faq/www/admin/q_and_a-new.adp	14 Mar 2002 06:01:48 -0000	1.2
+++ openacs-4/packages/faq/www/admin/q_and_a-new.adp	4 Sep 2002 13:28:33 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form action="@target@">
  <input type="hidden" name="insert_p" value="@insert_p@">
Index: openacs-4/packages/faq/www/admin/q_and_a-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/faq/www/admin/q_and_a-new.tcl	14 Mar 2002 06:05:18 -0000	1.3
+++ openacs-4/packages/faq/www/admin/q_and_a-new.tcl	4 Sep 2002 13:28:33 -0000	1.4
@@ -13,7 +13,7 @@
     faq_id:naturalnum,notnull
 
 }  -properties {
-    context_bar:onevalue
+    context:onevalue
     entry_id:onevalue
     title:onevalue
     action:onevalue
@@ -27,7 +27,7 @@
 db_1row get_name "select faq_name from faqs where faq_id=:faq_id"
 
 set page_title "Add Q&A for $faq_name"
-set context_bar [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "Create new Q&A"]
+set context [list [list "one-faq?faq_id=$faq_id" "$faq_name"] "Create new Q&A"]
 set title "Create new Q&A"
 set target "q_and_a-new-2"
 set submit_label "Create Q&A"