Index: openacs-4/packages/site-wide-search/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/site-wide-search/www/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/site-wide-search/www/index.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/site-wide-search/www/index.adp	5 Sep 2002 21:55:11 -0000	1.2
@@ -1,5 +1,5 @@
 <master src="master">
-<property name="context_bar">@context_bar@</property>
 <property name="title">@title@</property>
+<property name="context">@context@</property>
 
 <include src="search-form">
Index: openacs-4/packages/site-wide-search/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/site-wide-search/www/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/site-wide-search/www/index.tcl	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/site-wide-search/www/index.tcl	5 Sep 2002 21:55:11 -0000	1.2
@@ -9,10 +9,10 @@
     {group_by_p:naturalnum 1}
     {search_methods_p:naturalnum 1}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
 }
 
-set context_bar {}
+set context {}
 
 set title "Search Page"
 
Index: openacs-4/packages/site-wide-search/www/intermedia-categories.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/site-wide-search/www/intermedia-categories.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/site-wide-search/www/intermedia-categories.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/site-wide-search/www/intermedia-categories.adp	5 Sep 2002 21:55:11 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="context_bar">{categories}</property>
 <property name="title">The categories for '@title@'</property>
+<property name="context">categories</property>
 
 <if @intermedia_categories_list:rowcount@ gt 0>
 <ul>    <multiple name=intermedia_categories_list>   
Index: openacs-4/packages/site-wide-search/www/list-all.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/site-wide-search/www/list-all.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/site-wide-search/www/list-all.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/site-wide-search/www/list-all.adp	5 Sep 2002 21:55:11 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="context_bar">{All Content}</property>
 <property name="title">All Content</property>
+<property name="context">"All Content"</property>
 
 <if @content_list:rowcount@ gt 0>
        <multiple name=content_list>
@@ -14,9 +14,8 @@
        </table>
        </multiple>
 </if>
-
-<if @content_list:rowcount@ eq 0>
+<else>
      Empty content
-</if>
+</else>
     
        
\ No newline at end of file
Index: openacs-4/packages/site-wide-search/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/site-wide-search/www/Attic/master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/site-wide-search/www/master.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/site-wide-search/www/master.adp	5 Sep 2002 21:55:11 -0000	1.2
@@ -1,7 +1,8 @@
 <master>
 <property name="title">@title@</property>
+<property name="context">@context@</property>
 
 <h2>@title@</h2>
-<%= [eval ad_context_bar $context_bar] %>
+<%= [eval ad_context_bar $context] %>
 <hr>
 <slave>
Index: openacs-4/packages/site-wide-search/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/site-wide-search/www/search.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/site-wide-search/www/search.adp	20 Apr 2001 20:51:25 -0000	1.1
+++ openacs-4/packages/site-wide-search/www/search.adp	5 Sep 2002 21:55:11 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
-<property name="context_bar">{result}</property>
 <property name="title">Search Results</property>
+<property name="context">result</property>
 
 <if @search_result:rowcount@ gt 0>
     <if @group_by@ eq 1>