Index: openacs-4/packages/glossary/www/disable.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/disable.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/disable.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/disable.adp	5 Sep 2002 10:20:04 -0000	1.2
@@ -1,12 +1,9 @@
 <master>
 
 <property name=title>Disable @title@?</property>
+<property name="context">@context@</property>
 
-<h1>Disable <i>@title@</i>?</h1>
-@context_bar@
-
-<hr>
-
-Really disable <i>@title@</i>?
+<p>Really disable <em>@title@</em>?</p>
 <p>
-<formtemplate id="disable_item"></formtemplate>
\ No newline at end of file
+<formtemplate id="disable_item"></formtemplate>
+</p>
\ No newline at end of file
Index: openacs-4/packages/glossary/www/disable.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/disable.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/disable.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/disable.tcl	5 Sep 2002 10:20:04 -0000	1.2
@@ -13,7 +13,7 @@
   item_id:integer
 } -properties {  
   title:onevalue
-  context_bar:onevalue
+  context:onevalue
 } 
 
 ad_require_permission $item_id glossary_admin
@@ -24,7 +24,7 @@
     where item_id = :item_id 
     and revision_id = content_item.get_live_revision(:item_id)}]
     
-set context_bar [ad_context_bar "Disable <i>$title</i>?"]
+set context [list "Disable <i>$title</i>?"]
 
 template::form create disable_item
 
Index: openacs-4/packages/glossary/www/glossary-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/glossary-add-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/glossary-add-edit.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/glossary-add-edit.adp	5 Sep 2002 10:20:04 -0000	1.2
@@ -1,19 +1,12 @@
-<!-- glossary/www/glossary-add-edit.adp -->
-
 <master>
-
 <if @new_p@ eq 0>
 <property name=title>@title@</property>
-<h2>@title@</h2>
 </if>
 <else>
 <property name=title>Add a Glossary</property>
-<h2>Add a Glossary</h2>
 </else>
+<property name="context">@context@</property>
 
-@context_bar@
-
-<hr>
 <if @new_p@ eq 0 and @glossary_admin_p@ eq 1> 
 <table align=right>
 <tr>
Index: openacs-4/packages/glossary/www/glossary-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/glossary-add-edit.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/glossary/www/glossary-add-edit.tcl	18 Dec 2001 02:54:09 -0000	1.3
+++ openacs-4/packages/glossary/www/glossary-add-edit.tcl	5 Sep 2002 10:20:04 -0000	1.4
@@ -25,7 +25,7 @@
     description:optional,trim
     owner_id:integer,optional
 } -properties {  
-    context_bar:onevalue
+    context:onevalue
     new_p:onevalue
     permissions_link:onevalue
     live_p:onevalue
@@ -61,7 +61,7 @@
     # this is an existing glossary
     ad_require_permission $item_id glossary_modify
     
-    set context_bar [ad_context_bar "Edit Glossary"]
+    set context [list "Edit Glossary"]
     
     set new_p 0
     
@@ -94,7 +94,7 @@
     # this will be a new glossary
     ad_require_permission $package_id glossary_create
     
-    set context_bar [ad_context_bar "New Glossary"]
+    set context [list "New Glossary"]
 
     set new_p 1
 
Index: openacs-4/packages/glossary/www/glossary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/glossary.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossary/www/glossary.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/glossary/www/glossary.adp	5 Sep 2002 10:20:04 -0000	1.3
@@ -1,12 +1,7 @@
 <master>
 <property name=title>@glossary_title@</property>
-<!-- glossary info -->
-<h3>@glossary_title@</h3>
+<property name="context">@context@</property>
 
-@context_bar@
-
-<hr>
-
 <if @glossary_edit_p@ eq 1>
  <table align=right><tr><td>[<a href=glossary-add-edit?item_id=@glossary_item_id@>Edit Glossary</a>]</td></tr></table>
 </if>
Index: openacs-4/packages/glossary/www/glossary.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/glossary.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/glossary.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/glossary.tcl	5 Sep 2002 10:20:04 -0000	1.2
@@ -17,7 +17,7 @@
   glossary_item_id:onevalue
   glossary_edit_p:onevalue
   glossary_term_item:multirow
-  context_bar:onevalue
+  context:onevalue
   term_create_p:onevalue
 } 
 
@@ -50,7 +50,7 @@
     ad_script_abort
 }
 
-set context_bar [ad_context_bar $glossary_title]
+set context [list $glossary_title]
 
 set term_create_p [ad_permission_p $glossary_item_id glossary_term_create]
 
Index: openacs-4/packages/glossary/www/illustration-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/illustration-add-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/illustration-add-edit.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/illustration-add-edit.adp	5 Sep 2002 10:20:04 -0000	1.2
@@ -1,28 +1,12 @@
-<!-- glossary/www/illustration-add-edit.adp -->
-
 <master>
-
 <if @title@ nil>
 <property name=title>Upload Illustration</property>
 </if>
 <else>
 <property name=title>Edit @title@</property>
 </else>
+<property name="context">@context@</property>
 
-<if @title@ nil>
-<h2>Upload Illustration</h2>
-</if>
-<else>
-<h2>Edit @title@</h2>
-</else>
-
-@context_bar@
-
-<hr>
-
-<p>
-
-<blockquote>
 <form enctype=multipart/form-data method=POST action="illustration-add-edit-2">
 @export_vars@
 <table>
@@ -66,6 +50,5 @@
 <input type=submit value="Edit Illustration">
 </else>
 </center>
-</blockquote>
-</form>
 
+
Index: openacs-4/packages/glossary/www/illustration-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/illustration-add-edit.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/illustration-add-edit.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/illustration-add-edit.tcl	5 Sep 2002 10:20:04 -0000	1.2
@@ -18,7 +18,7 @@
     name:optional,trim
     description:optional,trim
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     title:onevalue
     descritpion:onevalue
     name:onevalue
@@ -33,7 +33,7 @@
 if {[info exists item_id]} {
     ad_require_permission $item_id glossary_term_modify_illustration
 
-    set context_bar [ad_context_bar "Edit Illustration"]
+    set context [list "Edit Illustration"]
     db_1row illustration_select {
 	select title, description, name
 	from imagesx im, cr_items i
@@ -46,7 +46,7 @@
 } else {
     ad_require_permission $term_item_id glossary_term_add_illustration
     
-    set context_bar [ad_context_bar "Upload Illustration"]
+    set context [list "Upload Illustration"]
     
     set title ""
     set description ""
Index: openacs-4/packages/glossary/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/index.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossary/www/index.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/glossary/www/index.adp	5 Sep 2002 10:20:04 -0000	1.3
@@ -1,13 +1,8 @@
 <master>
 
 <property name=title>@package_title@</property>
+<property name="context">@context@</property>
 
-<h2>@package_title@</h2>
-
-@context_bar@
-
-<hr>
-
 <if @admin_p@ eq 1 or @workflow_p@ eq 1> 
 
 <table align=right>
Index: openacs-4/packages/glossary/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/index.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossary/www/index.tcl	25 Oct 2001 01:52:19 -0000	1.2
+++ openacs-4/packages/glossary/www/index.tcl	5 Sep 2002 10:20:04 -0000	1.3
@@ -11,7 +11,7 @@
 } -properties {  
   glossary_item:multirow
   package_title:onevalue
-  context_bar:onevalue
+  context:onevalue
   create_p:onevalue
   admin_p:onevalue
   workflow_p:onevalue
@@ -28,7 +28,7 @@
 
 set user_id [ad_conn user_id]
 
-set context_bar [ad_context_bar]
+set context [list]
 
 ad_require_permission $package_id read
 
Index: openacs-4/packages/glossary/www/package-administer.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/package-administer.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossary/www/package-administer.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/glossary/www/package-administer.adp	5 Sep 2002 10:20:04 -0000	1.3
@@ -1,19 +1,7 @@
 <master>
-
 <property name=title>Need to figure out how to get the package title</property>
+<property name="context">@context@</property>
 
-<h2>Package or Application title</h2>
-
-@context_bar@
-
-<hr>
-
-
-<p>&nbsp;
-<p>
-
-<center>
-
 <table border=0 cellpadding=1 cellspacing=0 width="80%">
 <tr><td bgcolor=#aaaaaa>
 <table border=0 cellpadding=3 cellspacing=0 width="100%">
@@ -69,5 +57,3 @@
 </table>
 </td>
 </table>
-
-</center>
\ No newline at end of file
Index: openacs-4/packages/glossary/www/package-administer.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/package-administer.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/package-administer.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/package-administer.tcl	5 Sep 2002 10:20:04 -0000	1.2
@@ -10,15 +10,15 @@
 } {
 } -properties {  
   glossary_item:multirow
-  context_bar:onevalue
+  context:onevalue
   create_p:onevalue
 } 
 
 set package_id [ad_conn package_id]
 
 set user_id [ad_conn user_id]
 
-set context_bar [ad_context_bar "Administration"]
+set context [list "Administration"]
 
 ad_require_permission $package_id read
 
Index: openacs-4/packages/glossary/www/publish.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/publish.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/publish.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/publish.adp	5 Sep 2002 10:20:04 -0000	1.2
@@ -1,12 +1,7 @@
 <master>
-
 <property name=title>Publish @title@?</property>
+<property name="context">@context@</property>
 
-<h1>Publish <i>@title@</i>?</h1>
-@context_bar@
-
-<hr>
-
 Really publish <i>@title@</i>?
 <p>
 <formtemplate id="publish_item"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/glossary/www/publish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/publish.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/publish.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/publish.tcl	5 Sep 2002 10:20:04 -0000	1.2
@@ -11,7 +11,7 @@
   item_id:integer
 } -properties {  
   title:onevalue
-  context_bar:onevalue
+  context:onevalue
 } 
 
 ad_require_permission $item_id glossary_admin
@@ -24,7 +24,7 @@
 }
     
 
-set context_bar [ad_context_bar "Publish <i>$title</i>?"]
+set context [list "Publish <i>$title</i>?"]
 
 template::form create publish_item
 
Index: openacs-4/packages/glossary/www/term-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/term-add-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/term-add-edit.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/term-add-edit.adp	5 Sep 2002 10:20:04 -0000	1.2
@@ -1,16 +1,12 @@
-<!-- glossary/www/term-add-edit.adp -->
-
 <master>
 <if @new_p@ eq 0>
 <property name=title>@term@</property>
 </if>
 <else>
 <property name=title>Add a New Term</property>
 </else>
-@context_bar@
+<property name="context">@context@</property>
 
-<hr>
-
 <if @new_p@ eq 0>
 <table align=right>
 <tr>
Index: openacs-4/packages/glossary/www/term-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/term-add-edit.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/glossary/www/term-add-edit.tcl	18 Dec 2001 02:54:09 -0000	1.5
+++ openacs-4/packages/glossary/www/term-add-edit.tcl	5 Sep 2002 10:20:04 -0000	1.6
@@ -23,7 +23,7 @@
     mime_type:optional
     publish_status:optional
 } -properties {  
-    context_bar:onevalue
+    context:onevalue
     illustration_exists_p:onevalue
     illustration_link_url:onevalue
     illustration_add_p:onevalue
@@ -55,7 +55,7 @@
 	set illustration_exists_p 0
     }
     
-    set context_bar [ad_context_bar "Edit Term"]
+    set context [list "Edit Term"]
 
 } else {
     ad_require_permission $glossary_item_id glossary_term_create
@@ -64,7 +64,7 @@
 
     set illustration_exists_p 0
 
-    set context_bar [ad_context_bar "New Term"]
+    set context [list "New Term"]
 
     set new_p 1
 }
Index: openacs-4/packages/glossary/www/term.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/term.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossary/www/term.adp	31 Oct 2001 20:42:07 -0000	1.2
+++ openacs-4/packages/glossary/www/term.adp	5 Sep 2002 10:20:04 -0000	1.3
@@ -1,15 +1,8 @@
 <master>
 
 <property name=title>@term@</property>
+<property name="context">@context@</property>
 
-<!-- term info -->
-<h3>@term@</h3>
-
-@context_bar@
-
-<hr>
-
-
 <if @term_modify_p@ eq 1 and @term_create_p@ eq 1> 
 <table align=right>
 <tr>
Index: openacs-4/packages/glossary/www/term.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/term.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/glossary/www/term.tcl	9 Mar 2002 02:00:02 -0000	1.4
+++ openacs-4/packages/glossary/www/term.tcl	5 Sep 2002 10:20:04 -0000	1.5
@@ -12,7 +12,7 @@
 } -properties {  
     term:onevalue
     definition:onevalue
-    context_bar:onevalue
+    context:onevalue
     term_modify_p:onevalue
     term_create_p:onevalue
     illustration_exists_p:onevalue
@@ -91,7 +91,7 @@
 where revision_id = content_item.get_live_revision(:glossary_item_id)
 "]
 
-set context_bar [ad_context_bar [list "glossary?item_id=$glossary_item_id" $glossary_title] $term]
+set context [list [list "glossary?item_id=$glossary_item_id" $glossary_title] $term]
 
 set term_create_p [ad_permission_p $glossary_item_id glossary_term_create]
 
Index: openacs-4/packages/glossary/www/terms-pending.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/terms-pending.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossary/www/terms-pending.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/glossary/www/terms-pending.adp	5 Sep 2002 10:20:04 -0000	1.3
@@ -1,12 +1,7 @@
 <master>
 <property name=title>@glossary_title@</property>
-<!-- glossary info -->
-<h3>@glossary_title@</h3>
+<property name="context">@context@</property>
 
-@context_bar@
-
-<hr>
-
 <if @glossary_edit_p@ eq 1>
  <table align=right><tr><td>[<a href=glossary-add-edit?item_id=@glossary_item_id@>Edit Glossary</a>]</td></tr></table>
 </if>
Index: openacs-4/packages/glossary/www/terms-pending.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/terms-pending.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/terms-pending.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/terms-pending.tcl	5 Sep 2002 10:20:04 -0000	1.2
@@ -17,7 +17,7 @@
   glossary_edit_p:onevalue
   glossary_status:onevalue
   glossary_term_item:multirow
-  context_bar:onevalue
+  context:onevalue
   term_create_p:onevalue
 } 
 
@@ -43,7 +43,7 @@
     and i.live_revision = g.revision_id
 }
 
-set context_bar [ad_context_bar $glossary_title]
+set context [list $glossary_title]
 
 set term_create_p [ad_permission_p $glossary_item_id glossary_term_create]
 
Index: openacs-4/packages/glossary/www/workflow-add-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/workflow-add-edit.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/workflow-add-edit.adp	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/workflow-add-edit.adp	5 Sep 2002 10:20:04 -0000	1.2
@@ -1,16 +1,5 @@
-<!-- glossary/www/workflow-add-edit.adp -->
-
 <master>
+<property name="title">Set Workflow for @glossary_title@</property>
+<property name="context">@context@</property>
 
-<property name=title>Set Workflow for @glossary_title@</property>
-<h2>Set Workflow for @glossary_title@</h2>
-
-
-@context_bar@
-
-<p>
-<center>
-
 <formtemplate id="new_workflow"></formtemplate>
-
-</center>
Index: openacs-4/packages/glossary/www/workflow-add-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossary/www/workflow-add-edit.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossary/www/workflow-add-edit.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/glossary/www/workflow-add-edit.tcl	5 Sep 2002 10:20:04 -0000	1.2
@@ -24,7 +24,7 @@
 
 ad_require_permission $item_id glossary_modify
 
-set context_bar [ad_context_bar "Set Workflow"]
+set context [list "Set Workflow"]
 
 if {[info exists workflow_key]} {
     set new_p 0