Index: openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-create-extlink.tcl	4 Sep 2002 13:01:46 -0000	1.2
@@ -11,7 +11,7 @@
     { confirmed "f" }
 } -properties {
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     form_vars:onevalue
 }
 
@@ -39,4 +39,4 @@
 }
 
 set page_title "Create a new subtopic"
-set context_bar [ad_context_bar [list "etp" "Edit"] "New subtopic"]
+set context [list [list "etp" "Edit"] "New subtopic"]
Index: openacs-4/packages/edit-this-page/www/etp-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-create.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-create.adp	4 Sep 2002 13:01:46 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="etp-master">
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form method="post" action="etp-create-2">
 <table width="100%" cellspacing="0" cellpadding="6">
Index: openacs-4/packages/edit-this-page/www/etp-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-create.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-create.tcl	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-create.tcl	4 Sep 2002 13:01:46 -0000	1.2
@@ -8,7 +8,7 @@
 } -properties {
     new_page_name
     page_title
-    context_bar
+    context
 }
 
 etp::check_write_access
@@ -26,4 +26,4 @@
 }
 
 set page_title "Create a new content page"
-set context_bar [ad_context_bar [list "etp" "Edit"] "New page"]
+set context [list [list "etp" "Edit"] "New page"]
Index: openacs-4/packages/edit-this-page/www/etp-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-edit.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-edit.adp	4 Sep 2002 13:01:46 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="etp-master">
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form method="post" action="etp-edit-2">
 @form_vars@
Index: openacs-4/packages/edit-this-page/www/etp-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-edit.tcl	18 Dec 2001 19:28:00 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-edit.tcl	4 Sep 2002 13:01:46 -0000	1.3
@@ -9,7 +9,7 @@
     attribute
 } -properties {
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     attribute_title:onevalue
     widget:onevalue
     form_vars:onevalue
@@ -80,9 +80,9 @@
 set page_title "$attribute_title for page \"$page_title\""
 
 if {$name == "index"} {
-    set context_bar [ad_context_bar [list "etp?[export_url_vars name]" Edit] $attribute_title]
+    set context [list [list "etp?[export_url_vars name]" Edit] $attribute_title]
 } else {
-    set context_bar [ad_context_bar [list $name $name] [list "etp?[export_url_vars name]" Edit] $attribute_title]
+    set context [list [list $name $name] [list "etp?[export_url_vars name]" Edit] $attribute_title]
 }
 
 
Index: openacs-4/packages/edit-this-page/www/etp-extlink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-extlink.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-extlink.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-extlink.adp	4 Sep 2002 13:01:46 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="etp-master">
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form method="post" action="etp-extlink">
 @form_vars@
Index: openacs-4/packages/edit-this-page/www/etp-extlink.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-extlink.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-extlink.tcl	31 Oct 2001 05:09:30 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-extlink.tcl	4 Sep 2002 13:01:46 -0000	1.3
@@ -12,7 +12,7 @@
     { confirmed "f" }
 } -properties {
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     form_vars:onevalue
 }
 
@@ -50,10 +50,10 @@
 	    where extlink_id = :item_id
 	}
 	set page_title "Edit an external link"
-	set context_bar [ad_context_bar [list "etp" "Edit"] "Edit external link"]
+	set context [list [list "etp" "Edit"] "Edit external link"]
     } else {
 	set page_title "Create a new external link"
-	set context_bar [ad_context_bar [list "etp" "Edit"] "New external link"]
+	set context [list [list "etp" "Edit"] "New external link"]
     }
 }
 
Index: openacs-4/packages/edit-this-page/www/etp-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-history.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-history.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-history.adp	4 Sep 2002 13:01:46 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="etp-master">
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <table width="100%">
 
Index: openacs-4/packages/edit-this-page/www/etp-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-history.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-history.tcl	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-history.tcl	4 Sep 2002 13:01:46 -0000	1.2
@@ -11,7 +11,7 @@
     name
 } -properties {
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     name:onevalue
     live_revision_id:onevalue
     revisions:multirow
@@ -26,9 +26,9 @@
 set page_title "Revision history for $name"
 
 if {$name == "index"} {
-    set context_bar [ad_context_bar [list "etp?[export_url_vars name]" Edit] "History"]
+    set context [list [list "etp?[export_url_vars name]" Edit] "History"]
 } else {
-    set context_bar [ad_context_bar [list $name $name] [list "etp?[export_url_vars name]" Edit] "History"]
+    set context [list [list $name $name] [list "etp?[export_url_vars name]" Edit] "History"]
 }
 
 
Index: openacs-4/packages/edit-this-page/www/etp-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-master.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-master.adp	4 Sep 2002 13:01:46 -0000	1.2
@@ -1,24 +1,14 @@
-<html>
-<head>
-<title>@title@</title>
-</head>
-<body bgcolor="white">
-
+<master>
+<property name="title">@title@</property>
+<property name="context">@context@</property>
 <h2>@title@</h2>
-@context_bar@
+<%= [eval ad_context_bar $context ] %>
+
 <hr>
 
 <slave>
-
-<hr>
-<table width="100%">
-<tr>
-<td><address><a href="mailto:@signatory@">@signatory@</a></address></td>
 <if @etp_link@ not nil>
-<td align="right">@etp_link@</td>
-</if>
-</tr>
+<table width="100%">
+<tr><td align="right">@etp_link@</td></tr>
 </table>
-
-</body>
-</html>
\ No newline at end of file
+</if>
Index: openacs-4/packages/edit-this-page/www/etp-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-master.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-master.tcl	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-master.tcl	4 Sep 2002 13:01:46 -0000	1.2
@@ -5,8 +5,8 @@
 if { ![info exists title] } {
     set title [ad_system_name]
 }	
-if { ![info exists context_bar] } {
-    set context_bar ""
+if { ![info exists context] } {
+    set context ""
 }	
 if { ![info exists signatory] } {
     set signatory [ad_system_owner]
Index: openacs-4/packages/edit-this-page/www/etp-setup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-setup.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-setup.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-setup.adp	4 Sep 2002 13:01:46 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="etp-master">
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 The ETP application in use for a content section determines the
 appearance and content of its pages.  You may also specify the
Index: openacs-4/packages/edit-this-page/www/etp-setup.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-setup.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-setup.tcl	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-setup.tcl	4 Sep 2002 13:01:46 -0000	1.2
@@ -15,7 +15,7 @@
 } -properties {
     app_options:onevalue
     subtopic_app_options:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 etp::check_write_access
@@ -46,7 +46,7 @@
 	}
     }
     set page_title "Change ETP application in use for content section \"$page_title\""
-    set context_bar [ad_context_bar {"etp" "Edit"} "Setup"]
+    set context [list {"etp" "Edit"} "Setup"]
     
     ad_return_template
 
Index: openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-subtopic-create.adp	4 Sep 2002 13:01:46 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="etp-master">
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form method="post" action="etp-subtopic-create">
 @form_vars@
Index: openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-subtopic-create.tcl	4 Sep 2002 13:01:46 -0000	1.2
@@ -11,7 +11,7 @@
     { confirmed f }
 } -properties {
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     form_vars:onevalue
 }
 
@@ -49,4 +49,4 @@
 }
 
 set page_title "Create a new subtopic"
-set context_bar [ad_context_bar [list "etp" "Edit"] "New subtopic"]
+set context [list [list "etp" "Edit"] "New subtopic"]
Index: openacs-4/packages/edit-this-page/www/etp-symlink.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-symlink.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp-symlink.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp-symlink.adp	4 Sep 2002 13:01:46 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="etp-master">
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <multiple name="all_pages">
 @all_pages.indent@
Index: openacs-4/packages/edit-this-page/www/etp-symlink.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp-symlink.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-symlink.tcl	31 Oct 2001 04:57:40 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-symlink.tcl	4 Sep 2002 13:01:46 -0000	1.3
@@ -10,7 +10,7 @@
     { item_id "" }
 } -properties {
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     item_id:onevalue
     all_pages:multirow
 }
@@ -53,10 +53,10 @@
 	    where symlink_id = :item_id
 	}
 	set page_title "Edit a link to local content"
-	set context_bar [ad_context_bar [list "etp" "Edit"] "Edit internal link"]
+	set context [list [list "etp" "Edit"] "Edit internal link"]
     } else {
 	set page_title "Create a link to local content"
-	set context_bar [ad_context_bar [list "etp" "Edit"] "New internal link"]
+	set context [list [list "etp" "Edit"] "New internal link"]
     }
 
     db_multirow all_pages all_pages {
Index: openacs-4/packages/edit-this-page/www/etp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp.adp	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp.adp	4 Sep 2002 13:01:46 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="etp-master">
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <table width="100%"><tr>
 <td valign="top">
Index: openacs-4/packages/edit-this-page/www/etp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page/www/etp.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/edit-this-page/www/etp.tcl	24 Sep 2001 17:24:13 -0000	1.1
+++ openacs-4/packages/edit-this-page/www/etp.tcl	4 Sep 2002 13:01:46 -0000	1.2
@@ -14,7 +14,7 @@
     page_url:onevalue
     content_pages:multirow
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     subtopics:multirow
 }
 
@@ -57,9 +57,9 @@
 
 set page_title "Attributes for page \"$pa(title)\""
 if { $name == "index" } {
-    set context_bar [ad_context_bar "Edit"]
+    set context [list "Edit"]
 } else {
-    set context_bar [ad_context_bar [list $name $name] "Edit"]
+    set context [list [list $name $name] "Edit"]
 }
 
 set url_dir "[file dirname [ad_conn url]]"