Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.adp	3 Sep 2002 16:39:53 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.adp	6 Sep 2002 21:50:15 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Add Assignee</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">@focus@</property>
 
 <if @party_widget@ nil>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.tcl	19 Nov 2001 18:27:40 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/assignee-add.tcl	6 Sep 2002 21:50:15 -0000	1.3
@@ -4,7 +4,7 @@
     task_id:integer
     return_url:optional
 } -properties {
-    context_bar
+    context
     export_vars
     party_widget
     return_url
@@ -13,7 +13,7 @@
 
 array set task [wf_task_info $task_id]
 
-set context_bar [ad_context_bar [list "case?[export_vars -url {{case_id $task(case_id)}}]" "$task(object_name) case"] [list "task?[export_vars -url {task_id}]" "$task(task_name)"] "Add assignee"]
+set context [list [list "case?[export_vars -url {{case_id $task(case_id)}}]" "$task(object_name) case"] [list "task?[export_vars -url {task_id}]" "$task(task_name)"] "Add assignee"]
 
 set export_vars [export_vars -form {task_id return_url}]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.adp	3 Sep 2002 16:39:53 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.adp	6 Sep 2002 21:50:15 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Assign @role_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form action="case-assignment-set-2" name="assignment">
 @export_vars@
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.tcl	19 Nov 2001 18:27:40 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignment-set.tcl	6 Sep 2002 21:50:15 -0000	1.3
@@ -10,7 +10,7 @@
     role_key
     return_url:optional
 } -properties {
-    context_bar
+    context
     export_vars
     widget
 }
@@ -34,7 +34,7 @@
 where role_key = :role_key
 and workflow_key = :workflow_key" -default ""]
 
-set context_bar [ad_context_bar [list "case?[export_vars -url {{case_id $case(case_id)}}]" "$case(object_name) case"] "Assign $role_name"]
+set context [list [list "case?[export_vars -url {{case_id $case(case_id)}}]" "$case(object_name) case"] "Assign $role_name"]
 
 set export_vars [export_form_vars case_id role_key workflow_key return_url]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.adp	3 Sep 2002 16:39:53 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.adp	6 Sep 2002 21:50:15 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Assignments for @case.object_name@ case</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <blockquote>
   <include src="case-assignments-table" case_id="@case.case_id@" return_url="@return_url@">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.tcl	19 Nov 2001 18:27:40 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-assignments.tcl	6 Sep 2002 21:50:15 -0000	1.3
@@ -9,7 +9,7 @@
     case_id:integer,notnull
 } -properties {
     case:onerow
-    context_bar
+    context
     case_id
     return_url
     done_export_vars
@@ -28,7 +28,7 @@
 
 set return_url "case-assignments?[export_vars -url {{case_id $case(case_id)}}]"
 
-set context_bar [ad_context_bar [list "case?case_id=$case_id" "$case(object_name) case"] "Assignments"]
+set context [list [list "case?case_id=$case_id" "$case(object_name) case"] "Assignments"]
 
 set done_export_vars [export_vars -form {{case_id $case(case_id)}}]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.adp	3 Sep 2002 16:39:53 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.adp	6 Sep 2002 21:50:15 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Set Deadline</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form action="case-deadline-set-2" name="deadline">
 @export_vars@
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.tcl	19 Nov 2001 18:27:40 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadline-set.tcl	6 Sep 2002 21:50:15 -0000	1.3
@@ -10,7 +10,7 @@
     transition_key
     return_url:optional
 } -properties {
-    context_bar
+    context
     export_vars
     date_widget
 }
@@ -34,7 +34,7 @@
 where transition_key = :transition_key
       and workflow_key = :workflow_key" -default ""]
 
-set context_bar [ad_context_bar [list "case?[export_vars -url {{case_id $case(case_id)}}]" "$case(object_name) case"] "Deadline for $transition_name "]
+set context [list [list "case?[export_vars -url {{case_id $case(case_id)}}]" "$case(object_name) case"] "Deadline for $transition_name "]
 
 set export_vars [export_form_vars case_id transition_key workflow_key return_url]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.adp	3 Sep 2002 16:39:53 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.adp	6 Sep 2002 21:50:15 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@case.object_name@ Deadlines</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <blockquote>
   <include src="case-deadlines-table" case_id="@case.case_id@" return_url="@return_url@">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.tcl	19 Nov 2001 18:27:40 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case-deadlines.tcl	6 Sep 2002 21:50:15 -0000	1.3
@@ -8,7 +8,7 @@
     case_id:integer,notnull
 } -properties {
     case:onerow
-    context_bar
+    context
     return_url
     done_export_vars
 }
@@ -26,7 +26,7 @@
 
 set return_url "case-deadlines?[export_vars -url {{case_id $case(case_id)}}]"
 
-set context_bar [ad_context_bar [list "case?case_id=$case_id" "$case(object_name) case"] "Deadlines"]
+set context [list [list "case?case_id=$case_id" "$case(object_name) case"] "Deadlines"]
 
 set done_export_vars [export_vars -form {{case_id $case(case_id)}}]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp	3 Sep 2002 16:39:53 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case.adp	6 Sep 2002 21:50:15 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@case.object_name@ case</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <table width="100%" cellspacing="4" cellpadding="2" border="0">
   <tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/case.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/case.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/case.tcl	19 Nov 2001 18:27:40 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/case.tcl	6 Sep 2002 21:50:15 -0000	1.3
@@ -8,7 +8,7 @@
     case_id:integer,notnull
 } -properties {
     case:onerow
-    context_bar
+    context
     actions:multirow
     return_url
 }
@@ -27,7 +27,7 @@
 
 set workflow_key $case(workflow_key)
 
-set context_bar [ad_context_bar "$case(object_name) case"]
+set context [list "$case(object_name) case"]
 
 template::multirow create actions url title
 switch $case(state) {
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.adp	3 Sep 2002 16:39:53 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.adp	6 Sep 2002 21:50:15 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Comment on case @case.object_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">comment.msg</property>
 
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.tcl	19 Nov 2001 18:27:40 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/comment-add.tcl	6 Sep 2002 21:50:15 -0000	1.3
@@ -6,7 +6,7 @@
     case_id:integer
     return_url:optional
 } -properties {
-    context_bar
+    context
     case:onerow
     export_form_vars
 }
@@ -19,7 +19,7 @@
     where  case_id = :case_id
 } -column_array case
 
-set context_bar [ad_context_bar_ws_or_index [list "" "Work List"] [list "case?[export_url_vars case_id]" "Case $case(object_name)"] "Comment"]
+set context [list [list "./" "Work List"] [list "case?[export_url_vars case_id]" "Case $case(object_name)"] "Comment"]
 
 set export_form_vars [export_form_vars case_id return_url]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/index.adp	3 Sep 2002 16:39:53 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/index.adp	6 Sep 2002 21:50:15 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Work List</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @admin_p@ eq 1>
   (<a href="admin/">Administer</a>)<p>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/index.tcl	19 Nov 2001 18:27:40 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/index.tcl	6 Sep 2002 21:50:15 -0000	1.3
@@ -5,12 +5,12 @@
     @creation-date 13 July 2000
     @cvs-id $Id$
 } -properties {
-    context_bar
+    context
     admin_p
 }
 
 set admin_p [ad_permission_p [ad_conn package_id] "admin"] 
 
-set context_bar [ad_context_bar]
+set context [list]
 
 ad_return_template
\ No newline at end of file
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/acs-workflow/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/acs-workflow/www/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.adp	3 Sep 2002 16:39:53 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.adp	6 Sep 2002 21:50:15 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Reassign Task</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <h3>Current Assignees</h3>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.tcl	12 Feb 2002 01:35:16 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task-assignees.tcl	6 Sep 2002 21:50:15 -0000	1.4
@@ -4,7 +4,7 @@
     task_id:integer
     {return_url ""}
 } -properties {
-    context_bar
+    context
     task:onerow
     assignees:multirow
     effective_assignees:multirow
@@ -20,7 +20,7 @@
 set task(assign_yourself_url) "assignee-add-2?[export_vars -url {task_id party_id {return_url $sub_return_url}}]"
 
 
-set context_bar [ad_context_bar [list "case?[export_vars -url {{case_id $task(case_id)}}]" "$task(object_name) case"] [list "task?[export_vars -url {task_id}]" "$task(task_name)"] "Assignees"]
+set context [list [list "case?[export_vars -url {{case_id $task(case_id)}}]" "$task(object_name) case"] [list "task?[export_vars -url {task_id}]" "$task(task_name)"] "Assignees"]
 
 db_multirow assignees assignees {
     select p.party_id,
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.adp	3 Sep 2002 16:39:53 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.adp	6 Sep 2002 21:50:15 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Set Deadline</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form action="task-deadline-set-2" name="deadline">
 @export_vars@
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.tcl	19 Nov 2001 18:27:40 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task-deadline-set.tcl	6 Sep 2002 21:50:15 -0000	1.3
@@ -9,7 +9,7 @@
     task_id:integer
     return_url:optional
 } -properties {
-    context_bar
+    context
     export_vars
     date_widget
 }
@@ -18,7 +18,7 @@
 
 array set task [wf_task_info $task_id]
 
-set context_bar [ad_context_bar [list "case?case_idf=$task(case_id)" "Case \"$task(object_name)\""] [list "task?[export_url_vars task_id]" "Task \"$task(task_name)\""] "Set deadline"]
+set context [list [list "case?case_idf=$task(case_id)" "Case \"$task(object_name)\""] [list "task?[export_url_vars task_id]" "Task \"$task(task_name)\""] "Set deadline"]
 
 set export_vars [export_form_vars task_id return_url]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp	3 Sep 2002 16:39:53 -0000	1.6
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task.adp	6 Sep 2002 21:50:15 -0000	1.7
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@task.task_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <table width="100%" cellspacing="0" cellpadding="0" border="0">
 <tr><td bgcolor="#cccccc">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/task.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/task.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/task.tcl	19 Nov 2001 18:27:40 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/task.tcl	6 Sep 2002 21:50:15 -0000	1.5
@@ -14,7 +14,7 @@
     {return_url ""}
 } -properties {
     case_id
-    context_bar
+    context
     task:onerow
     task_html
     user_id
@@ -67,7 +67,7 @@
 set task(manage_assignments_url) "task-assignees?[export_vars -url {task_id return_url}]"
 set task(cancel_url) "task?[export_vars -url {task_id return_url {action.cancel Cancel}}]"
 
-set context_bar [ad_context_bar [list "case?case_id=$task(case_id)" "$task(object_name) case"] "$task(task_name)"]
+set context [list [list "case?case_id=$task(case_id)" "$task(object_name) case"] "$task(task_name)"]
 
 set panel_color "#dddddd"
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/workflow.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/workflow.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/workflow.tcl	19 Nov 2001 18:27:40 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/workflow.tcl	6 Sep 2002 21:50:15 -0000	1.3
@@ -16,7 +16,7 @@
 [ad_header $workflow_name]
 <h2>$workflow_name</h2>
 
-[ad_context_bar_ws_or_index [list "" "Work List"] [list admin "Workflow Admin"] $workflow_name]
+[ad_context_bar [list "./" "Work List"] [list admin "Workflow Admin"] $workflow_name]
 
 <hr>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Edit Arc</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">arc.guard_description</property>
 
 <blockquote>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/arc-edit.tcl	6 Sep 2002 21:50:16 -0000	1.2
@@ -7,7 +7,7 @@
     direction
     return_url:optional
 } -properties {
-    context_bar
+    context
     export_vars
     guard_description
     guard_options:multirow
@@ -72,7 +72,7 @@
 }
  
 
-set context_bar [ad_context_bar [list "define?[export_url_vars workflow_key]" "Process Builder"] "Edit arc"]
+set context [list [list "define?[export_url_vars workflow_key]" "Process Builder"] "Edit arc"]
 set export_vars [export_form_vars workflow_key transition_key place_key direction return_url]
 
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Assign Transition to @role.role_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form action="assign-transition-role-2" method="post">
 @export_form_vars@
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.tcl	19 Nov 2001 18:29:28 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/assign-transition-role.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -47,7 +47,7 @@
     and role_key = :role_key
 } -column_array role
 
-set context_bar [ad_context_bar [list "workflow?[export_vars -url {workflow_key}]" "$workflow(pretty_name)"] [list "workflow-roles?[export_vars -url {workflow_key}]" "Workflow Roles"] "Assign transition to $role(role_name)"]
+set context [list [list "workflow?[export_vars -url {workflow_key}]" "$workflow(pretty_name)"] [list "workflow-roles?[export_vars -url {workflow_key}]" "Workflow Roles"] "Assign transition to $role(role_name)"]
 
 db_multirow available_transitions workflow_transitions {
     select transition_name,
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Add attribute</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">attribute.name</property>
 
 <form action="attribute-add-2" name="attribute">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.tcl	19 Nov 2001 18:29:28 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attribute-add.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -8,7 +8,7 @@
     workflow_key
     return_url:optional
 } -properties {
-    context_bar
+    context
     workflow_name
     datatypes:multirow
     export_vars
@@ -20,7 +20,7 @@
     where  ot.object_type = :workflow_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_vars -url {workflow_key}]" "$workflow_name"] [list "attributes?[export_vars -url {workflow_key}]" "Attributes"] "Add attribute"]
+set context [list [list "workflow?[export_vars -url {workflow_key}]" "$workflow_name"] [list "attributes?[export_vars -url {workflow_key}]" "Attributes"] "Add attribute"]
 
 set export_vars [export_vars -form {workflow_key return_url}]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Attributes for @workflow_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <table>
   <tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.tcl	19 Nov 2001 18:29:28 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/attributes.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -16,7 +16,7 @@
     }
 } -properties {
     workflow_key
-    context_bar
+    context
 }
 
 db_1row workflow_name {
@@ -25,7 +25,7 @@
     where  ot.object_type = :workflow_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Attributes"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Attributes"]
 
 ad_return_template
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Case: @case.object_name@ (@case.state@)</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <h3>All Tasks</h3>
 <table border=1>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.tcl	19 Nov 2001 18:29:28 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/case-debug.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -7,7 +7,7 @@
 } {
     case_id:integer,notnull
 } -properties {
-    context_bar
+    context
     case:onerow
     tasks:multirow
     attributes:multirow
@@ -22,7 +22,7 @@
     select case_id, acs_object.name(object_id) as object_name, state as state from wf_cases where case_id = :case_id
 } -column_array case
 
-set context_bar [ad_context_bar "Case $case(object_name)"]
+set context [list "Case $case(object_name)"]
 
 db_multirow tasks tasks {
     select task_id, transition_key, state, case_id
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@workflow_name@ Cases</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 @dimensional_html@
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.tcl	19 Nov 2001 18:29:28 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/cases.tcl	6 Sep 2002 21:50:16 -0000	1.4
@@ -16,7 +16,7 @@
 	}
     }
 } -properties {
-    context_bar
+    context
     workflow_name
     cases:multirow
     dimensional_html
@@ -33,7 +33,7 @@
 
 set workflow_name [ad_quotehtml $workflow_name]
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Cases"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Cases"]
 
 
 #
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Add Context</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">context.context_key</property>
 
 <form method="post" action="context-add-2" name="context">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.tcl	19 Nov 2001 18:29:28 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/context-add.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -8,11 +8,11 @@
     {workflow_key ""}
     {return_url ""}
 } -properties {
-    context_bar
+    context
     export_vars
 }
 
-set context_bar [ad_context_bar "Add Context"]
+set context [list "Add Context"]
 set export_vars [export_form_vars workflow_key return_url]
 
 ad_return_template
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Process Builder for @workflow.pretty_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <table width="100%">
 <tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.tcl	19 Nov 2001 18:29:28 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/define.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -32,7 +32,7 @@
 	}
     }
 } -properties {
-    context_bar
+    context
     mode
     transition_key
     place_key
@@ -107,7 +107,7 @@
 
 set header_stuff {}
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow(pretty_name)"] "Edit process"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow(pretty_name)"] "Edit process"]
 
 set return_url "[ns_conn url]?[export_url_vars workflow_key format transition_key place_key]"
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Export Business Process</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @message@ not nil>
   <blockquote><strong>@message@</strong></blockquote>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.tcl	19 Nov 2001 18:29:28 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export-2.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -9,7 +9,7 @@
     {context_key "default"}
     {format "view"}
 } -properties {
-    context_bar
+    context
     sql_script
     format
     return_url
@@ -22,7 +22,7 @@
     where  ot.object_type = :workflow_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Export process"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Export process"]
 
 set message {}
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Export Business Process</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 This will export the process definition as a SQL script, which you can
 subsequently run on a different system, in order to recreate the process there.
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.tcl	19 Nov 2001 18:29:28 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/export.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -8,7 +8,7 @@
     workflow_key
     {context_key "default"}
 } -properties {
-    context_bar
+    context
     download_url
     view_url
     textarea_url
@@ -21,7 +21,7 @@
     where  ot.object_type = :workflow_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Export process"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Export process"]
 
 set download_url "export-download?[export_vars -url {workflow_key context_key}]"
 set view_url "export-2?[export_vars -url {workflow_key context_key {format "view"}}]"
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Business Process Administration</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <h3>Business Processes on This System</h3>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.tcl	19 Nov 2001 18:29:28 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/index.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -5,12 +5,12 @@
     @creation-date 25 September 2000
     @cvs-id $Id$
 } -properties {
-    context_bar 
+    context 
     workflows
     actions:multirow
 }
 
-set context_bar [ad_context_bar]
+set context [list]
 
 db_multirow workflows all_workflows {
     select w.workflow_key, 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Initialize Case</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <blockquote><em> 
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/init.tcl	6 Sep 2002 21:50:16 -0000	1.2
@@ -4,7 +4,7 @@
 } {
     workflow_key
 } -properties {
-    context_bar
+    context
     export_vars
     contexts:multirow
     objects:multirow
@@ -27,7 +27,7 @@
 
 set workflow_name [db_string workflow_name "select pretty_name from acs_object_types where object_type = :workflow_key"]
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Start case"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Start case"]
 
 set export_vars [export_form_vars workflow_key]
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Edit Process Name</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">workflow.workflow_name</property>
 
 <form action="name-edit-2" name="workflow">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/name-edit.tcl	6 Sep 2002 21:50:16 -0000	1.2
@@ -4,7 +4,7 @@
     workflow_key:notnull
     return_url:optional
 } -properties {
-    context_bar
+    context
     export_vars
     workflow_name
     description
@@ -19,7 +19,7 @@
 
 
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Edit name"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Edit name"]
 
 set export_vars [export_form_vars workflow_key return_url]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Add Place</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">place.place_name</property>
 
 <form action="place-add-2" name="place">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-add.tcl	6 Sep 2002 21:50:16 -0000	1.2
@@ -3,7 +3,7 @@
 } {
     workflow_key:notnull
 } -properties {
-    context_bar
+    context
     export_vars
     special_widget
 }
@@ -14,7 +14,7 @@
     where  ot.object_type = :workflow_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_url_vars workflow_key]" "Edit process"] "Add place"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_url_vars workflow_key]" "Edit process"] "Add place"]
 
 set export_vars [export_form_vars workflow_key]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Place @place_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">place.place_name</property>
 
 <form action="place-edit-2" name="place">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/place-edit.tcl	6 Sep 2002 21:50:16 -0000	1.2
@@ -21,7 +21,7 @@
 
 set place_name [ad_quotehtml $place_name]
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_url_vars workflow_key]" "Edit process"] "Edit place"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_url_vars workflow_key]" "Edit process"] "Edit place"]
 
 set export_vars [export_form_vars workflow_key place_key return_url]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Add Role</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">role.role_name</property>
 
 <form action="role-add-2" name="role" method="post">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-add.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -9,7 +9,7 @@
     workflow_key:notnull
     return_url:optional
 } -properties {
-    context_bar
+    context
     export_vars
 }
 
@@ -19,7 +19,7 @@
     where  ot.object_type = :workflow_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_vars -url {workflow_key {tab roles}}]" "$workflow_name"] "Add role"]
+set context [list [list "workflow?[export_vars -url {workflow_key {tab roles}}]" "$workflow_name"] "Add role"]
 
 set export_vars [export_vars -form {workflow_key return_url}]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Edit @role_name@ role</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">role.role_name</property>
 
 <form action="role-edit-2" name="role" method="post">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-edit.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -10,7 +10,7 @@
     role_key:notnull
     return_url:optional
 } -properties {
-    context_bar
+    context
     export_vars
     role_key
     role_name
@@ -22,7 +22,7 @@
     where  ot.object_type = :workflow_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_vars -url {workflow_key {tab roles}}]" "$workflow_name"] "Edit role"]
+set context [list [list "workflow?[export_vars -url {workflow_key {tab roles}}]" "$workflow_name"] "Edit role"]
 
 set export_vars [export_vars -form {workflow_key role_key return_url}]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Manually Assign @role_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">manual_form.transition_key</property>
 
 <form action="role-manual-2" name="manual_form" method="post">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/role-manual.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -10,7 +10,7 @@
     role_key:notnull
     {return_url "workflow?[export_vars -url {workflow_key {tab roles}}]"}
 } -properties {
-    context_bar
+    context
     export_vars
     transitions
     role_name
@@ -29,7 +29,7 @@
        and role_key = :role_key
 }
 
-set context_bar [ad_context_bar [list "$return_url" "$workflow_name"] "Manually Assign $role_name"]
+set context [list [list "$return_url" "$workflow_name"] "Manually Assign $role_name"]
 
 set export_vars [export_vars -form {workflow_key role_key return_url}]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@workflow_name@ Static Assignments</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <!--
 Context: [ 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/static-assignments.tcl	6 Sep 2002 21:50:16 -0000	1.2
@@ -14,7 +14,7 @@
 } -properties {
     workflow_name
     workflow_key
-    context_bar
+    context
     context_slider:multirow
     context_add_url
     tasks:multirow
@@ -26,7 +26,7 @@
     where  object_type = :workflow_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Static Assignments"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Static Assignments"]
 
 
 db_multirow context_slider context_slider {
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Task Actions</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">actions.enable_callback</property>
 
 <form action="task-actions-2" name="actions">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-actions.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -29,7 +29,7 @@
     and    t.transition_key = :transition_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Actions by $transition_name"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Actions by $transition_name"]
 
 set export_vars [ad_export_vars -form {workflow_key transition_key context_key return_url}]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Add Task</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">task.transition_name</property>
 
 <form action="task-add-2" name="task">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-add.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -4,7 +4,7 @@
     workflow_key:notnull
     return_url:optional
 } -properties {
-    context_bar
+    context
     export_vars
     trigger_types:multirow
 }
@@ -16,7 +16,7 @@
 }
 
 
-set context_bar [ad_context_bar [list "workflow?[export_vars -url {workflow_key}]" "$workflow_name"] [list "define?[export_url_vars workflow_key]" "Edit process"] "Add task"]
+set context [list [list "workflow?[export_vars -url {workflow_key}]" "$workflow_name"] [list "define?[export_url_vars workflow_key]" "Edit process"] "Add task"]
 
 set export_vars [export_vars -form {workflow_key return_url}]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Assignments to be done by @transition_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 The user performing the task <strong>@transition_name@</strong> will be asked to <strong>assign the following roles</strong>:
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-assignment.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -20,7 +20,7 @@
     transition_key
     workflow_key
     transition_name
-    context_bar
+    context
     assigned_by_this:multirow
     to_be_assigned_by_this:multirow
     assign_url
@@ -38,7 +38,7 @@
     and    t.transition_key = :transition_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Assignments by $transition_name"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Assignments by $transition_name"]
 
 db_multirow assigned_by_this assigned_by_this {
     select r.role_name,
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Attributes to be set by @transition_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <table>
   <tr>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-attributes.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -19,7 +19,7 @@
     transition_key
     workflow_key
     transition_name
-    context_bar
+    context
     attributes:multirow
     add_url
     add_export_vars
@@ -35,7 +35,7 @@
     and    t.transition_key = :transition_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Attributes for $transition_name"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Attributes for $transition_name"]
 
 set counter 0
 db_multirow attributes attributes {
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Task @transition_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">@focus@</property>
 
 <form action="task-edit-2" name="task" method="post">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-edit.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -12,7 +12,7 @@
     {new_role_p:boolean 0}
 } -properties {
     transition_name
-    context_bar
+    context
     export_vars
     trigger_types:multirow
     roles:multirow
@@ -28,7 +28,7 @@
      where object_type = :workflow_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_vars -url {workflow_key}]" "$workflow_name"]  "Edit task"]
+set context [list [list "workflow?[export_vars -url {workflow_key}]" "$workflow_name"]  "Edit task"]
 set export_vars [export_vars -form {workflow_key transition_key return_url context_key}]
 
 db_1row transition_info {
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,9 +1,9 @@
-<master src="master">
+<master>
 <property name="title">Add panel</property>
 <property name="focus">panel.header</property>
 
 <h2>Add Panel</h2>
-@context_bar@
+@context@
 <hr>
 
 <form action="task-panel-add-2" name="panel" method="post">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-add.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -10,7 +10,7 @@
     {context_key "default"}
     return_url:optional
 } -properties {
-    context_bar
+    context
     transition_name
     export_vars
 }
@@ -26,7 +26,7 @@
     and    t.transition_key = :transition_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_vars -url {workflow_key}]" "$workflow_name"]  "Add panel"]
+set context [list [list "workflow?[export_vars -url {workflow_key}]" "$workflow_name"]  "Add panel"]
 
 set export_vars [export_vars -form { workflow_key transition_key context_key return_url}]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Edit panel</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">panel.header</property>
 
 <form action="task-panel-edit-2" name="panel" method="post">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panel-edit.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -11,7 +11,7 @@
     sort_order:notnull,integer
     return_url:optional
 } -properties {
-    context_bar
+    context
     transition_name
     panel:onerow
 }
@@ -27,7 +27,7 @@
     and    t.transition_key = :transition_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Edit panel"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Edit panel"]
 
 db_1row panel {
     select p.header,
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.adp	6 Sep 2002 21:50:16 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Panels for @transition_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <!--
 Context: [ 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/task-panels.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -20,7 +20,7 @@
     transition_key
     workflow_key
     transition_name
-    context_bar
+    context
     context_slider:multirow
     context_add_url
     panels:multirow
@@ -37,7 +37,7 @@
     and    t.transition_key = :transition_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Panels for $transition_name"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] [list "define?[export_vars -url {workflow_key transition_key}]" "Edit process"] "Panels for $transition_name"]
 
 db_multirow context_slider context_slider {
     select context_key as context_key_from_db,
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Unassigned Tasks</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 
 <if @tasks:rowcount@ eq 0>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/unassigned-tasks.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -8,7 +8,7 @@
     workflow_key
 } -properties {
     workflow:onerow
-    context_bar
+    context
     tasks:multirow
 }
 
@@ -21,7 +21,7 @@
 
 set workflow(workflow_key) $workflow_key
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow(pretty_name)"] "Unassigned tasks"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow(pretty_name)"] "Unassigned tasks"]
 
 set date_format "Mon fmDDfm, YYYY HH24:MI:SS"
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">New Advanced Process</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">workflow.workflow_name</property>
 
 The first step in defining a new process is to give it a name and an
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.tcl	13 Mar 2001 22:59:27 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-add.tcl	6 Sep 2002 21:50:16 -0000	1.2
@@ -1,9 +1,9 @@
 ad_page_contract {
     Create new process.
 } -properties {
-    context_bar
+    context
 }
 
-set context_bar [ad_context_bar "New Process"]
+set context [list "New Process"]
 
 ad_return_template
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy-2.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy-2.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -61,7 +61,7 @@
 ReturnHeaders
 ns_write "[ad_header "Copying Process..."]
 <h2>Copying Process...</h2>
-[ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Copy process"]
+[list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Copy process"]
 <hr>
 
 <pre>
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Copy Process</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">workflow.new_workflow_pretty_name</property>
 
 You're about to make a copy of the process @pretty_name@.
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.tcl	19 Nov 2001 18:29:29 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-copy.tcl	6 Sep 2002 21:50:16 -0000	1.4
@@ -7,7 +7,7 @@
 } {
     workflow_key
 } -properties {
-    context_bar
+    context
     export_vars
     pretty_name
     new_workflow_key
@@ -22,7 +22,7 @@
     where  ot.object_type = :workflow_key
 }
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Copy process"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Copy process"]
 
 
 db_1row pretty_names {
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@workflow.pretty_name@ Roles</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <include src="roles-table" workflow_key="@workflow_key@" return_url="@return_url@">
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-roles.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -9,7 +9,7 @@
     workflow_key:notnull
 } -properties {
     workflow:onerow
-    context_bar
+    context
     workflow_roles:multirow
 } -validate {
     workflow_exists -requires {workflow_key} {
@@ -32,6 +32,6 @@
     and    w.workflow_key = t.object_type
 } -column_array workflow
 
-set context_bar [ad_context_bar [list "workflow?[export_vars -url {workflow_key}]" "$workflow(pretty_name)"] "Workflow Roles"]
+set context [list [list "workflow?[export_vars -url {workflow_key}]" "$workflow(pretty_name)"] "Workflow Roles"]
 
 ad_return_template
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.adp	6 Sep 2002 21:50:16 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@workflow_name@ Summary</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <h3><a href="@cases_url_for_state.active@">@num_cases_in_state.active@</a> Active Cases</h3>
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow-summary.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -24,7 +24,7 @@
     num_cases_total
     num_cases:onerow
     simple_p
-    context_bar
+    context
     places:multirow
     transitions:multirow
     simple_steps:multirow
@@ -40,7 +40,7 @@
 
 set workflow_name [ad_quotehtml $workflow_name]
 
-set context_bar [ad_context_bar [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Workflow Summary"]
+set context [list [list "workflow?[export_url_vars workflow_key]" "$workflow_name"] "Workflow Summary"]
 
 set workflow_info [wf_get_workflow_net $workflow_key]
 array set workflow $workflow_info
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.adp	3 Sep 2002 16:39:57 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.adp	6 Sep 2002 21:50:16 -0000	1.5
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@workflow.pretty_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <!-- Tab bar -->
 <include src="workflow-tabs" tab="@tab@" workflow_key="@workflow_key@">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.tcl	19 Nov 2001 18:29:29 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/workflow.tcl	6 Sep 2002 21:50:16 -0000	1.3
@@ -9,7 +9,7 @@
     {tab home}
 } -properties {
     workflow:onerow
-    context_bar
+    context
     edit_process_url
     export_process_url
     edit_attributes_url
@@ -68,7 +68,7 @@
     and    c.state = 'active'
 }]
 
-set context_bar [ad_context_bar "$workflow(pretty_name)"]
+set context [list "$workflow(pretty_name)"]
 
 if { $workflow(num_cases) > 0 } { 
     #set edit_process_url ""
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.adp	6 Sep 2002 21:50:18 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Simple Process Wizard Step 4: Assignments for @workflow_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <include src="progress-bar" num_completed="3">
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.tcl	19 Nov 2001 18:30:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/assignments.tcl	6 Sep 2002 21:50:18 -0000	1.3
@@ -8,7 +8,7 @@
     @cvs-id $Id$
 } -properties {
     workflow_name
-    context_bar
+    context
     tasks:multirow
     tasks_with_options:multirow
 }
@@ -17,7 +17,7 @@
 set workflow_name [ad_quotehtml [ad_get_client_property wf workflow_name]]
 wf_wizard_massage_tasks [ad_get_client_property wf tasks] task_list task tasks
 
-set context_bar [ad_context_bar [list "" "Simple Process Wizard"] "Assignments"]
+set context [list [list "" "Simple Process Wizard"] "Assignments"]
 
 
 # We massage the tasks into 'tasks_with_options", which is an outer-join style multirow,
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.adp	3 Sep 2002 16:39:57 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.adp	6 Sep 2002 21:50:18 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Simple Process Wizard Step 5: Create @workflow_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <include src="progress-bar" num_completed="4" no_links="1">
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.tcl	19 Nov 2001 18:30:18 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/create.tcl	6 Sep 2002 21:50:18 -0000	1.4
@@ -13,7 +13,7 @@
 wf_wizard_massage_tasks [ad_get_client_property wf tasks] tasks task
 set num_tasks [llength $tasks]
 
-set context_bar [ad_context_bar [list "" "Simple Process Wizard"] "Create"]
+set context [list [list "" "Simple Process Wizard"] "Create"]
 
 if { [empty_string_p $workflow_name] } {
     ad_returnredirect ""
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.adp	6 Sep 2002 21:50:18 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="focus">workflow.workflow_name</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">Simple Process Wizard</property>
 
 <include src="progress-bar" num_completed="0">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.tcl	19 Nov 2001 18:30:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/index.tcl	6 Sep 2002 21:50:18 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date 29 August 2000
     @cvs-id $Id$
 } -properties {
-    context_bar
+    context
     progress_bar
     workflow_name
     description
@@ -14,7 +14,7 @@
 set workflow_name [ad_quotehtml [ad_get_client_property wf workflow_name]]
 set description [ad_quotehtml [ad_get_client_property wf workflow_description]]
 
-set context_bar [ad_context_bar "Simple Process Wizard"]
+set context [list "Simple Process Wizard"]
 
 set progress_bar [wf_progress_bar -name "Simple Process Wizard" [wf_simple_wizard_process_def] 0]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.adp	6 Sep 2002 21:50:18 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="focus">loop.to_transition_key</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">Add Loop from @task_name@</property>
 
 <form action="loop-add-2" name="loop">
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.tcl	19 Nov 2001 18:30:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loop-add.tcl	6 Sep 2002 21:50:18 -0000	1.3
@@ -14,7 +14,7 @@
     }
 } -properties {
     workflow_name
-    context_bar
+    context
     task_name
     to_transitions
 }
@@ -23,7 +23,7 @@
 
 set task_name [ad_quotehtml $task($from_transition_key,task_name)]
 
-set context_bar [ad_context_bar [list "" "Simple Process Wizard"] [list "loops" "Loops"] "Add loop from $task_name"]
+set context [list [list "" "Simple Process Wizard"] [list "loops" "Loops"] "Add loop from $task_name"]
 
 set export_vars [export_form_vars from_transition_key]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.adp	6 Sep 2002 21:50:18 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Simple Process Wizard Step 3: Loops for @workflow_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <include src="progress-bar" num_completed="2">
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.tcl	19 Nov 2001 18:30:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/loops.tcl	6 Sep 2002 21:50:18 -0000	1.3
@@ -23,7 +23,7 @@
 
 wf_wizard_massage_tasks [ad_get_client_property wf tasks] task_list task tasks
 
-set context_bar [ad_context_bar [list "" "Simple Process Wizard"] "Loops"]
+set context [list [list "" "Simple Process Wizard"] "Loops"]
 
 set loop_from_task_name {}
 set loop_to_task_name {}
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.adp	6 Sep 2002 21:50:18 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="focus">task.task_name</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">Add Task to @workflow_name@</property>
 
 Add a task to the process. The task name should be an imperative, such as "Write", "Review", "Assign", etc.
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.tcl	19 Nov 2001 18:30:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-add.tcl	6 Sep 2002 21:50:18 -0000	1.3
@@ -5,11 +5,11 @@
     @cvs-id $Id$
 } -properties {
     workflow_name
-    context_bar
+    context
 }
 
 set workflow_name [ad_quotehtml [ad_get_client_property wf workflow_name]]
 
-set context_bar [ad_context_bar [list "" "Simple Process Wizard"] [list "tasks" "Tasks"] "Add task"]
+set context [list [list "" "Simple Process Wizard"] [list "tasks" "Tasks"] "Add task"]
 
 ad_return_template
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.adp	6 Sep 2002 21:50:18 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="focus">task.task_name</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="title">Edit Task @task_name@</property>
 
 Edit the task. The task name should be an imperative, such as "Write", "Review", "Assign", etc.
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.tcl	19 Nov 2001 18:30:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/task-edit.tcl	6 Sep 2002 21:50:18 -0000	1.3
@@ -14,7 +14,7 @@
     }
 } -properties {
     workflow_name
-    context_bar
+    context
     task_name
     task_time
 }
@@ -25,7 +25,7 @@
 
 set task_time $task($transition_key,task_time)
 
-set context_bar [ad_context_bar [list "" "Simple Process Wizard"] [list "tasks" "Tasks"] "Edit task $task($transition_key,task_name)"]
+set context [list [list "" "Simple Process Wizard"] [list "tasks" "Tasks"] "Edit task $task($transition_key,task_name)"]
 
 set export_vars [export_form_vars transition_key]
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.adp	3 Sep 2002 16:39:57 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.adp	6 Sep 2002 21:50:18 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Simple Process Wizard Step 2: Tasks for @workflow_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <include src="progress-bar" num_completed="1">
 
Index: openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.tcl	19 Nov 2001 18:30:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/acs-workflow/www/admin/wizard/tasks.tcl	6 Sep 2002 21:50:18 -0000	1.3
@@ -19,6 +19,6 @@
 
 wf_wizard_massage_tasks [ad_get_client_property wf tasks] "" "" tasks
 
-set context_bar [ad_context_bar [list "" "Simple Process Wizard"] "Tasks"]
+set context [list [list "" "Simple Process Wizard"] "Tasks"]
 
 ad_return_template
\ No newline at end of file
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/acs-workflow/www/sample/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/acs-workflow/www/sample/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/obsolete-packages/bboard/www/category-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/category-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/category-delete.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/category-delete.adp	6 Sep 2002 21:50:21 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Delete a Category</property>
 
 You are going to delete the category "@category_name@", causing all
Index: openacs-4/contrib/obsolete-packages/bboard/www/category-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/category-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/category-delete.tcl	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/category-delete.tcl	6 Sep 2002 21:50:21 -0000	1.3
@@ -9,7 +9,7 @@
 } {
     category_id:integer,notnull,bboard_category_id
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     category_id:onevalue
     category_name:onevalue
     message_count:onevalue
@@ -36,5 +36,5 @@
         where category_id = :category_id
 }
 
-set context_bar [ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] \
-                      {"Delete Category"}]
+set context [list [list "forum?[export_url_vars forum_id]" $forum_name] \
+                      "Delete Category"]
Index: openacs-4/contrib/obsolete-packages/bboard/www/category-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/category-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/category-edit.tcl	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/category-edit.tcl	6 Sep 2002 21:50:21 -0000	1.3
@@ -9,7 +9,7 @@
 } {
     category_id:integer,notnull,bboard_category_id
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     forum_name:onevalue
     forum_id:onevalue
     category_id:onevalue
@@ -37,7 +37,7 @@
         and f.forum_id = c.forum_id
 }
 
-set context_bar	[ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] \
+set context	[list [list "forum?[export_url_vars forum_id]" $forum_name] \
 	      "Edit a Category"]
 
 ad_return_template category-entry
Index: openacs-4/contrib/obsolete-packages/bboard/www/category-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/category-entry.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/category-entry.adp	12 May 2002 20:57:02 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/category-entry.adp	6 Sep 2002 21:50:21 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@forum_name@: @title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">category.short_name</property>
 
 <form action="@action@" method="POST" name="category">
Index: openacs-4/contrib/obsolete-packages/bboard/www/category-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/category-new.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/category-new.tcl	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/category-new.tcl	6 Sep 2002 21:50:21 -0000	1.3
@@ -8,7 +8,7 @@
 } {
     forum_id:integer,notnull,bboard_forum_id
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     forum_name:onevalue
     forum_id:onevalue
     short_name:onevalue
@@ -30,7 +30,7 @@
       where forum_id = :forum_id
 }
 
-set context_bar [ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] \
+set context [list [list "forum?[export_url_vars forum_id]" $forum_name] \
              "Create a Category"]
 
 set category_id [db_nextval acs_object_id_seq]
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-by-category.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-by-category.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-by-category.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-by-category.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -11,7 +11,7 @@
 } -properties {
     forum_write_p:onevalue
     forum_create_p:onevalue
-    context_bar:onevalue
+    context:onevalue
     title:onevalue
     forum_name:onevalue
     forum_id:onevalue
@@ -71,7 +71,7 @@
     set subscribed_p 0
 }
 
-set context_bar [ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] \
+set context [list [list "forum?[export_url_vars forum_id]" $forum_name] \
 		      $category_name]
 set title "$forum_name: $category_name"
 
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-delete.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-delete.adp	6 Sep 2002 21:50:21 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@forum_name@</property>
 
 <h3>Delete @forum_name@ forum?</h3>
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-delete.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-delete.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -14,7 +14,7 @@
 
 set package_id [ad_conn package_id]
 
-set context_bar [ad_context_bar "Delete a forum"]
+set context [list "Delete a forum"]
 set user_id [ad_verify_and_get_user_id]
 
 ad_require_permission $forum_id admin
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-edit.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-edit.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-edit.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -9,7 +9,7 @@
 } {
     forum_id:integer,notnull,bboard_forum_id
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     forum_id:onevalue
     title:onevalue
     action:onevalue
@@ -26,7 +26,7 @@
       where forum_id = :forum_id
 }
 
-set context_bar [ad_context_bar "Edit a Forum"]
+set context [list "Edit a Forum"]
 set title "Edit a Forum"
 set action "forum-edit-2"
 set submit_label "Save Changes"
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-entry.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-entry.adp	12 May 2002 20:57:02 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-entry.adp	6 Sep 2002 21:50:21 -0000	1.5
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@title@</property>
 <property name="focus">forum.short_name</property>
 
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-move.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-move.adp	29 Jun 2001 20:37:18 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-move.adp	6 Sep 2002 21:50:21 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Move a forum's messages</property>
-<property name="context_bar">Move</property>
+<property name="context">Move</property>
 
 <form action="forum-move-2" method="POST">
  @form_data@
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-new.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-new.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-new.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -7,7 +7,7 @@
     @cvs-id $Id$
 } {
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     forum_id:onevalue
     title:onevalue
     action:onevalue
@@ -18,7 +18,7 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-set context_bar [ad_context_bar "Create a Forum"]
+set context [list "Create a Forum"]
 set title "Create a Forum"
 set action "forum-new-2"
 set submit_label "Create Forum"
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp	13 Mar 2002 22:50:53 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum-view.adp	6 Sep 2002 21:50:21 -0000	1.4
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@title@</property>
 
 <table width="100%" cellspacing="0" cellpadding="0"><tr><td>
Index: openacs-4/contrib/obsolete-packages/bboard/www/forum.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/forum.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/forum.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/forum.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -11,7 +11,7 @@
 } -properties {
     forum_write_p:onevalue
     forum_create_p:onevalue
-    context_bar:onevalue
+    context:onevalue
     title:onevalue
     forum_name:onevalue
     forum_id:onevalue
@@ -59,7 +59,7 @@
     }
 }
 
-set context_bar [ad_context_bar $forum_name]
+set context [list $forum_name]
 set title $forum_name
 
 set package_id [ad_conn package_id]
Index: openacs-4/contrib/obsolete-packages/bboard/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/bboard/www/index.adp	12 May 2002 20:57:02 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/bboard/www/index.adp	6 Sep 2002 21:50:21 -0000	1.5
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Forums</property>
 
 [<a href="subscriptions">Manage Subscriptions</a>]
Index: openacs-4/contrib/obsolete-packages/bboard/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/index.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/index.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -7,15 +7,15 @@
     @cvs-id $Id$
 } {
 } -properties {
-  context_bar:onevalue
+  context:onevalue
   package_id:onevalue
   user_id:onevalue
   forums:multirow
 }
 
 set package_id [ad_conn package_id]
 
-set context_bar [ad_context_bar]
+set context [list]
 
 set user_id [ad_verify_and_get_user_id]
 
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/bboard/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-attach.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-attach.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/message-attach.adp	12 May 2002 20:57:02 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-attach.adp	6 Sep 2002 21:50:21 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">attach.file_title</property>
 
 <form enctype="multipart/form-data" method=POST action="message-attach-2" name="attach">
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-attach.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/message-attach.tcl	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-attach.tcl	6 Sep 2002 21:50:21 -0000	1.3
@@ -11,7 +11,7 @@
     message_id:integer,notnull
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     file_id:onevalue
     message_id:onevalue
     forum_id:onevalue
@@ -20,7 +20,7 @@
 ad_require_permission $message_id bboard_write_message
 
 set title "Upload message attachment"
-set context_bar [ad_context_bar "Upload an attachment"]
+set context [list "Upload an attachment"]
 
 set file_id [db_nextval acs_object_id_seq]
 
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/message-delete.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-delete.adp	6 Sep 2002 21:50:21 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Delete a Message</property>
 
 <include src="simple-message" title="@message.title@" author="@message.full_name@"
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-delete.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/message-delete.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-delete.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -11,7 +11,7 @@
     forum_id:integer,notnull,bboard_forum_id
     {replies ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     message_id:onevalue
     forum_id:onevalue
     message:onerow
@@ -44,7 +44,6 @@
       where forum_id = :forum_id
 }
 
-set context_bar [ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] \
-		      {"Delete Message"}]
+set context [list [list "forum?[export_url_vars forum_id]" $forum_name] \
+		      "Delete Message"]
 
-ad_return_template
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-edit-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-edit-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/message-edit-2.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-edit-2.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -32,7 +32,7 @@
 } -properties { 
     forum_id:onevalue
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     forum_name:onevalue
     content_for_display:onevalue
     title:onevalue
@@ -61,7 +61,7 @@
 
 set page_title "Confirm Message Changes in $forum_name"
 
-set context_bar [ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] \
+set context [list [list "forum?[export_url_vars forum_id]" $forum_name] \
         "Confirm Message Edit"]
 
 set content_for_display [acs_messaging_format_as_html $mime_type $content]
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/message-edit.tcl	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-edit.tcl	6 Sep 2002 21:50:21 -0000	1.3
@@ -12,7 +12,7 @@
     message_id:integer,notnull,acs_message_id
     forum_id:integer,notnull,bboard_forum_id
 } -properties { 
-    context_bar:onevalue
+    context:onevalue
     forum_id:onevalue
     forum_name:onevalue
     categories:multirow
@@ -57,7 +57,7 @@
 set target "message-edit-2"
 set submit_label "Confirm Changes"
 
-set context_bar	[ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] \
+set context	[list [list "forum?[export_url_vars forum_id]" $forum_name] \
              "Edit a Message"]
 
 set user_id [ad_verify_and_get_user_id]
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-entry.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/message-entry.adp	12 May 2002 20:57:02 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-entry.adp	6 Sep 2002 21:50:21 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">message.title</property>
 
 <form action="@target@" method="POST" name="message">
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-mail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-mail.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/message-mail.adp	12 May 2002 20:57:02 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-mail.adp	6 Sep 2002 21:50:21 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Mail to a friend</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <property name="focus">mail.email</property>
 
 <form action="message-mail-2" method="POST" name="mail">
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-mail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-mail.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/message-mail.tcl	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-mail.tcl	6 Sep 2002 21:50:21 -0000	1.3
@@ -14,7 +14,7 @@
     forum_id:integer,notnull,bboard_forum_id
     message_id:integer,notnull,acs_message_id
 } -properties { 
-    context_bar:onevalue
+    context:onevalue
     forum_id:onevalue
     message:onerow
     message_id:onevalue
@@ -38,7 +38,7 @@
 
 set new_message_id [db_nextval acs_object_id_seq]
 
-set context_bar [ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] "Mail message"]
+set context [list [list "forum?[export_url_vars forum_id]" $forum_name] "Mail message"]
 
 db_0or1row message_info {
     select reply_to, title, sent_date,
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-move.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/message-move.adp	29 Jun 2001 20:37:18 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-move.adp	6 Sep 2002 21:50:21 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Move a message</property>
-<property name="context_bar">Move</property>
+<property name="context">Move</property>
 
 <form action="message-move-2" method="POST">
  @form_data@
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-new-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/message-new-2.tcl	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-new-2.tcl	6 Sep 2002 21:50:21 -0000	1.3
@@ -29,7 +29,7 @@
     }
 } -properties { 
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     forum_name:onevalue
     content_for_display:onevalue
     title:onevalue
@@ -57,7 +57,7 @@
 
 set page_title "Confirm Message for Posting in $forum_name"
 
-set context_bar [ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] \
+set context [list [list "forum?[export_url_vars forum_id]" $forum_name] \
 	"Post"]
 
 set content_for_display [acs_messaging_format_as_html $mime_type $content]
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-new.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/message-new.tcl	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-new.tcl	6 Sep 2002 21:50:21 -0000	1.3
@@ -15,7 +15,7 @@
     {category_id:integer,bboard_category_id ""}
     {reply_to:integer,acs_message_id ""}
 } -properties { 
-    context_bar:onevalue
+    context:onevalue
     forum_id:onevalue
     forum_name:onevalue
     categories:multirow
@@ -46,7 +46,7 @@
 set title ""
 set content ""
 
-set context_bar [ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] \
+set context [list [list "forum?[export_url_vars forum_id]" $forum_name] \
               "Post"]
 
 set user_id [ad_verify_and_get_user_id]
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-preview.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/message-preview.adp	29 Jun 2001 20:37:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-preview.adp	6 Sep 2002 21:50:21 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form action="@target@" method="POST">
  @form_vars@
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.adp	29 Jun 2001 20:37:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.adp	6 Sep 2002 21:50:21 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@forum_name@: @title@</property>
 
 <table width="100%"><tr><td>
Index: openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.tcl	3 Sep 2002 13:40:41 -0000	1.4
+++ openacs-4/contrib/obsolete-packages/bboard/www/message-threaded.tcl	6 Sep 2002 21:50:21 -0000	1.5
@@ -10,7 +10,7 @@
     forum_id:integer,notnull,bboard_forum_id
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     forum_name:onevalue
     forum_id:onevalue
     message:onerow
@@ -43,7 +43,7 @@
       where message_id = :message_id
 }
 
-set context_bar [ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] "One Message"]
+set context [list [list "forum?[export_url_vars forum_id]" $forum_name] "One Message"]
                    
 db_multirow messages messages_and_replies {
   select m.message_id, m.reply_to, m.title, m.sent_date, m.mime_type,
Index: openacs-4/contrib/obsolete-packages/bboard/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/message.adp	29 Jun 2001 20:37:18 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/message.adp	6 Sep 2002 21:50:21 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@forum_name@: @message.title@</property>
 
 <table width="100%"><tr><td>
Index: openacs-4/contrib/obsolete-packages/bboard/www/message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/message.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/message.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/message.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -10,7 +10,7 @@
     forum_id:integer,notnull,bboard_forum_id
 } -properties {
     message_create_p:onevalue
-    context_bar:onevalue
+    context:onevalue
     forum_name:onevalue
     forum_id:onevalue
     message:onerow
@@ -49,7 +49,7 @@
       and person_id = sender
 } -column_array message
 
-set context_bar [ad_context_bar [list "forum?[export_url_vars forum_id]" $forum_name] \
+set context [list [list "forum?[export_url_vars forum_id]" $forum_name] \
 		      "One Message"]
                    
 db_multirow replies message_replies {
Index: openacs-4/contrib/obsolete-packages/bboard/www/messages-by-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/messages-by-user.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/messages-by-user.adp	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/messages-by-user.adp	6 Sep 2002 21:50:21 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @messages:rowcount@ eq 0>
   <i>There are no messages for this user this forum.</i><p>
Index: openacs-4/contrib/obsolete-packages/bboard/www/messages-by-user.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/messages-by-user.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/messages-by-user.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/messages-by-user.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -10,7 +10,7 @@
     user_id:integer,notnull
     forum_id:integer,notnull,bboard_forum_id
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     title:onevalue
     forum_name:onevalue
     forum_id:onevalue
@@ -74,6 +74,6 @@
 
 set title "Posting History for $full_name in $forum_name"
 
-set context_bar [ad_context_bar $forum_name]
+set context [list $forum_name]
  
 ad_return_template
Index: openacs-4/contrib/obsolete-packages/bboard/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/search.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/search.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/search.adp	6 Sep 2002 21:50:21 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@title@</property>
 
 <include src="message-list" &messages="results" forum_id="@forum_id@" 
Index: openacs-4/contrib/obsolete-packages/bboard/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/search.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/bboard/www/search.tcl	3 Sep 2002 13:40:41 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/bboard/www/search.tcl	6 Sep 2002 21:50:21 -0000	1.4
@@ -12,14 +12,14 @@
     query:onevalue
     results:multirow
     forum_id:onevalue
-    context_bar:onevalue
+    context:onevalue
     title:onevalue
 }
 
 set user_id [ad_verify_and_get_user_id]
 
 set title "Search Results for \"$query\""
-set context_bar [ad_context_bar  "Search"]
+set context [list  "Search"]
 
 set package_id [ad_conn package_id] 
 
Index: openacs-4/contrib/obsolete-packages/bboard/www/subscriptions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/subscriptions.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/subscriptions.adp	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/subscriptions.adp	6 Sep 2002 21:50:21 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 You have the follow subscriptions:<br>
 
Index: openacs-4/contrib/obsolete-packages/bboard/www/subscriptions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/subscriptions.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/bboard/www/subscriptions.tcl	3 Sep 2002 13:40:41 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/bboard/www/subscriptions.tcl	6 Sep 2002 21:50:21 -0000	1.3
@@ -7,7 +7,7 @@
 } {
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     forum_subs:multirow
     category_subs:multirow
     thread_subs:multirow
@@ -18,7 +18,7 @@
 set user_id [ad_verify_and_get_user_id]
 
 set title "Manage Subscriptions"
-set context_bar [ad_context_bar $title]
+set context [list $title]
 
 # three sorts of subscriptions:
 #  forums
Index: openacs-4/contrib/obsolete-packages/bboard/www/test.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/bboard/www/test.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/obsolete-packages/bboard/www/test.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/contrib/obsolete-packages/bboard/www/test.adp	6 Sep 2002 21:50:21 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar"></property>
+<master>
+<property name="context"></property>
 <property name="title">test</property>
 
 <pre><%=[ns_quotehtml "{}{}{}<><><><foo>bar</bar>"]%></pre>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/index.adp	5 Sep 2002 10:41:43 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/index.adp	6 Sep 2002 21:50:48 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/mp3-jukebox/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/one-playlist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/one-playlist.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/one-playlist.adp	5 Sep 2002 10:41:43 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/one-playlist.adp	6 Sep 2002 21:50:48 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/vote-thankyou.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/vote-thankyou.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/vote-thankyou.adp	5 Sep 2002 10:41:43 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/vote-thankyou.adp	6 Sep 2002 21:50:48 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
 <property name="page_title">@page_title@</property>
 <property name="context">@context@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/file-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/file-search.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/file-search.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/file-search.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/index.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/index.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-add-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-add-2.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-add-2.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-add.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-add.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-edit.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/mp3-edit.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/one-playlist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/one-playlist.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/one-playlist.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/one-playlist.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/order-choose.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/order-choose.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/order-choose.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/order-choose.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-create.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-create.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-create.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-delete.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-delete.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-edit.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-edit.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-add.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/playlist-item-add.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/scanner.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/scanner.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/scanner.adp	5 Sep 2002 10:41:44 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/mp3-jukebox/www/admin/scanner.adp	6 Sep 2002 21:50:50 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="page_title">@page_title@</property>
 <property name="title">@title@</property>
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/category.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/category.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/category.adp	6 Sep 2002 06:57:03 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/category.adp	6 Sep 2002 21:51:07 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>@page_title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.adp	6 Sep 2002 06:57:03 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/index.adp	6 Sep 2002 21:51:07 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/ticket-tracker/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/summary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/summary.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/summary.adp	6 Sep 2002 06:57:03 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/summary.adp	6 Sep 2002 21:51:07 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-ae.adp	6 Sep 2002 06:57:03 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-ae.adp	6 Sep 2002 21:51:07 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-view.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-view.adp	6 Sep 2002 06:57:03 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/ticket-view.adp	6 Sep 2002 21:51:07 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Ticket #@ticket_id@</property>
 <property name="context">@context@</property>
 [ @option_bar@ ]
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.adp	6 Sep 2002 06:57:03 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/tickets.adp	6 Sep 2002 21:51:07 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>@page_title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-ae.adp	6 Sep 2002 06:57:05 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-ae.adp	6 Sep 2002 21:51:08 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
 <property name="category_name">@category_name@</property>
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-delete.adp	6 Sep 2002 06:57:05 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/category-delete.adp	6 Sep 2002 21:51:08 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
 <property name="category_name">@category_name@</property>
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/description-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/description-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/description-edit.adp	6 Sep 2002 06:57:05 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/description-edit.adp	6 Sep 2002 21:51:08 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Edit description</property>
 <property name="context">@context@</property>
 
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/index.adp	6 Sep 2002 06:57:05 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/index.adp	6 Sep 2002 21:51:08 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Ticket Tracker Administration</property>
 <property name="context">@context@</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/option-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/option-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/option-ae.adp	6 Sep 2002 06:57:05 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/option-ae.adp	6 Sep 2002 21:51:08 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
 @action_bar@
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/sender-designate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/sender-designate.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/sender-designate.adp	6 Sep 2002 06:57:05 -0000	1.2
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/sender-designate.adp	6 Sep 2002 21:51:08 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Designate Notification Sender</property>
 <property name="context">@context@</property>
 
Index: openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp	6 Sep 2002 06:57:05 -0000	1.5
+++ openacs-4/contrib/obsolete-packages/ticket-tracker/www/admin/install/index.adp	6 Sep 2002 21:51:09 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="../master">
+<master>
 <property name="title">Install</property>
 <property name="context">@context@</property>
 
Index: openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/master.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/master.adp	6 Sep 2002 13:28:00 -0000	1.3
+++ openacs-4/contrib/obsolete-packages/ticket-tracker-lite/www/master.adp	6 Sep 2002 21:51:09 -0000	1.4
@@ -3,15 +3,13 @@
 <property name="context">@context@</property> 
 <property name="header_stuff">@header_stuff@</property>
 
-<table class="full" cellspacing=0>
+<table class="full" cellspacing=0 width="100%">
   <tr>
-    <td class="contextbar"><%= [eval ad_context_bar @context@] %></td>
     <td class="contextbar" align=right>
     <if @admin_url@ not nil><a class=tiny href=@admin_url@>Admin view</a></if>
     </td>
   </tr>
   <tr>
-    <td></td>
     <td align=right>
         <if @right_header_html@ not nil>@right_header_html@</if>
     </td>
Index: openacs-4/packages/acs-admin/www/users/complex-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/complex-search.adp	2 Sep 2002 14:44:42 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/complex-search.adp	6 Sep 2002 21:49:53 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Complex User Search</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @criteria:rowcount@ eq 0>
   all matching users
Index: openacs-4/packages/acs-admin/www/users/complex-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/complex-search.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/users/complex-search.tcl	2 Sep 2002 14:44:42 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/complex-search.tcl	6 Sep 2002 21:49:53 -0000	1.6
@@ -54,15 +54,15 @@
     export_authorize:onevalue
     passthrough_parameters:onevalue
     combine_method:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 # Check input.
 set exception_count 0
 set exception_text ""
 
 
-set context_bar [ad_admin_context_bar [list "index" "Users"] "Complex search"]
+set context [list [list "index" "Users"] "Complex search"]
 
 if { ![info exists target] || [empty_string_p $target] } {
     incr exception_count
Index: openacs-4/packages/acs-admin/www/users/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/index.adp	2 Sep 2002 14:44:42 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/index.adp	6 Sep 2002 21:49:53 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>Users</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <ul>
   <li>total users: <a href="complex-search?target=one">@n_users@</a> (@n_deleted_users@ deleted).  Last registration on @last_registration@ (<a href="registration-history">history</a>).</li>
Index: openacs-4/packages/acs-admin/www/users/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/users/index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-admin/www/users/index.tcl	6 Sep 2002 21:49:53 -0000	1.2
@@ -15,14 +15,14 @@
 	@cvs-id $Id$
 	@author Multiple
     } {} -properties {
-	context_bar:onevalue
+	context:onevalue
 	n_users:onevalue
 	n_deleted_users:onevalue
 	last_registration:onevalue
         groups:onevalue
     }
 
-    set context_bar [ad_admin_context_bar "Users"]
+    set context [list "Users"]
 
     # XXX This query should be optimized
     db_1row users_n_users "select 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-admin/www/users/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-admin/www/users/member-state-change.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/member-state-change.adp	2 Sep 2002 14:44:42 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/member-state-change.adp	6 Sep 2002 21:49:53 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@action@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <p>Done.</p>
 <p>You can <a href="/shared/send-email?@export_vars@">send the user email</a> or <a href="@return_url@">go back</a>.</p>
Index: openacs-4/packages/acs-admin/www/users/member-state-change.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/member-state-change.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-admin/www/users/member-state-change.tcl	4 Jul 2002 09:27:10 -0000	1.6
+++ openacs-4/packages/acs-admin/www/users/member-state-change.tcl	6 Sep 2002 21:49:53 -0000	1.7
@@ -11,7 +11,7 @@
     {email_verified_p "no_change"}
     {return_url ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     action:onevalue
     return_url:onevalue
@@ -103,7 +103,7 @@
     ad_script_abort
 }
 
-set context_bar [ad_admin_context_bar [list "index.tcl" "Users"] "$action"]
+set context [list [list "./" "Users"] "$action"]
 set export_vars [export_url_vars email email_from subject message return_url]
 
 ad_return_template
Index: openacs-4/packages/acs-admin/www/users/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/one.adp	2 Sep 2002 14:44:42 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/one.adp	6 Sep 2002 21:49:53 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@first_names@ @last_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <ul>
 <li>Name:  @first_names@ @last_name@ (<a href="/user/basic-info-update?@export_edit_vars@">edit</a>)</li>
Index: openacs-4/packages/acs-admin/www/users/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/one.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/one.tcl	2 Sep 2002 14:44:42 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/one.tcl	6 Sep 2002 21:49:53 -0000	1.4
@@ -8,7 +8,7 @@
 } {
     user_id
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     first_names:onevalue
     last_name:onevalue
     email:onevalue
@@ -32,7 +32,7 @@
 
 set return_url "/acs-admin/users/one?user_id=$user_id"
 
-set context_bar [ad_admin_context_bar [list "index" "Users"] "One User"]
+set context [list [list "./" "Users"] "One User"]
 set export_edit_vars [export_url_vars user_id return_url]
 set registration_date [util_AnsiDatetoPrettyDate $creation_date] 
 
Index: openacs-4/packages/acs-admin/www/users/registration-history.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/registration-history.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/registration-history.adp	2 Sep 2002 14:44:42 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/registration-history.adp	6 Sep 2002 21:49:53 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>Registration History</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 <table>
   <tr><th>Year</th><th align="left">Month</th><th>Registrations</th></tr>
 <multiple name="user_rows">
Index: openacs-4/packages/acs-admin/www/users/registration-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/registration-history.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/users/registration-history.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-admin/www/users/registration-history.tcl	6 Sep 2002 21:49:53 -0000	1.2
@@ -5,11 +5,11 @@
     @creation-date Jan 1999
     @cvs-id $Id$
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     user_rows:multirow
 }
 
-set context_bar [ad_admin_context_bar [list "index.tcl" "Users"] "Registration History"]
+set context [list [list "./" "Users"] "Registration History"]
 
 # we have to query for pretty month and year separately because Oracle pads
 # month with spaces that we need to trim
Index: openacs-4/packages/acs-admin/www/users/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/search.adp	2 Sep 2002 14:44:42 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/search.adp	6 Sep 2002 21:49:53 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @search_type@ eq "keyword">
   for name or email matching "@keyword@"
Index: openacs-4/packages/acs-admin/www/users/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/search.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/search.tcl	2 Sep 2002 14:44:42 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/search.tcl	6 Sep 2002 21:49:53 -0000	1.4
@@ -32,14 +32,14 @@
     only_authorized_p:onevalue
     export_authorize:onevalue
     passthrough_parameters:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 # Check input.
 set exception_count 0
 set exception_text ""
 
-set context_bar [ad_admin_context_bar [list "index" "Users"] "Search"]
+set context [list [list "./" "Users"] "Search"]
 
 if [info exists keyword] {
     # this is an administrator 
Index: openacs-4/packages/acs-admin/www/users/session-history.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/session-history.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/users/session-history.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-admin/www/users/session-history.tcl	6 Sep 2002 21:49:53 -0000	1.2
@@ -4,7 +4,7 @@
 
 <h2>Session History</h2>
 
-[ad_admin_context_bar [list "index.tcl" "Users"] "Session History"]
+[ad_context_bar [list "./" "Users"] "Session History"]
 
 <hr>
 
Index: openacs-4/packages/acs-admin/www/users/sessions-one-month.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/sessions-one-month.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/users/sessions-one-month.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-admin/www/users/sessions-one-month.tcl	6 Sep 2002 21:49:53 -0000	1.2
@@ -7,7 +7,7 @@
 
 <h2>$pretty_month $pretty_year</h2>
 
-[ad_admin_context_bar [list "index.tcl" "Users"] [list "session-history.tcl" "Session History"] "One Month"]
+[ad_context_bar [list "./" "Users"] [list "session-history.tcl" "Session History"] "One Month"]
 
 <hr>
 
Index: openacs-4/packages/acs-admin/www/users/sessions-registered-summary.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/Attic/sessions-registered-summary.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-admin/www/users/sessions-registered-summary.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-admin/www/users/sessions-registered-summary.tcl	6 Sep 2002 21:49:53 -0000	1.2
@@ -15,7 +15,7 @@
 
 <h2>Registered Sessions</h2>
 
-[ad_admin_context_bar [list "index.tcl" "Users"] "Registered Sessions"]
+[ad_context_bar [list "./" "Users"] "Registered Sessions"]
 
 <hr>
 
Index: openacs-4/packages/acs-admin/www/users/user-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/user-add-2.adp	2 Sep 2002 14:44:42 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/user-add-2.adp	6 Sep 2002 21:49:53 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>Add a user</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 
 <p>
Index: openacs-4/packages/acs-admin/www/users/user-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-admin/www/users/user-add-2.tcl	26 Jul 2002 13:57:57 -0000	1.5
+++ openacs-4/packages/acs-admin/www/users/user-add-2.tcl	6 Sep 2002 21:49:53 -0000	1.6
@@ -10,7 +10,7 @@
     password_confirmation
     {referer "/acs-admin/users"}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     system_name:onevalue
     system_url:onevalue
@@ -103,7 +103,7 @@
 set administration_name [db_string admin_name "select
 first_names || ' ' || last_name from persons where person_id = :admin_user_id"]
 
-set context_bar [ad_admin_context_bar [list "index.tcl" "Users"] "Notify added user"]
+set context [list [list "./" "Users"] "Notify added user"]
 set system_name [ad_system_name]
 set export_vars [export_form_vars email first_names last_name user_id]
 set system_url [ad_parameter -package_id [ad_acs_kernel_id] SystemURL ""].
Index: openacs-4/packages/acs-admin/www/users/user-add-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-3.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/user-add-3.adp	2 Sep 2002 14:44:42 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/user-add-3.adp	6 Sep 2002 21:49:53 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>Email sent</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <p>
 @first_names@ @last_name@ has been notified.
Index: openacs-4/packages/acs-admin/www/users/user-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add-3.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-admin/www/users/user-add-3.tcl	4 Jul 2002 09:27:10 -0000	1.3
+++ openacs-4/packages/acs-admin/www/users/user-add-3.tcl	6 Sep 2002 21:49:53 -0000	1.4
@@ -10,15 +10,15 @@
     user_id
     {referer "/acs-admin/users"}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     first_names:onevalue
     last_name:onevalue
     export_vars:onevalue
 }
     
 set admin_user_id [ad_verify_and_get_user_id]
 
-set context_bar [ad_admin_context_bar [list "index.tcl" "Users"] "New user notified"]
+set context [list [list "./" "Users"] "New user notified"]
 set export_vars [export_url_vars user_id]
 
 set admin_email [db_string unused "select email from 
@@ -31,5 +31,3 @@
 </pre></blockquote>"
     return
 }
-
-ad_return_template
Index: openacs-4/packages/acs-admin/www/users/user-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-admin/www/users/user-add.adp	2 Sep 2002 14:44:42 -0000	1.4
+++ openacs-4/packages/acs-admin/www/users/user-add.adp	6 Sep 2002 21:49:53 -0000	1.5
@@ -1,7 +1,7 @@
-<master src="master">
+<master>
 <property name=title>Add a user</property>
 <property name="focus">user.email</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form action="user-add-2" method="post" name="user">
 @export_vars@
Index: openacs-4/packages/acs-admin/www/users/user-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/user-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-admin/www/users/user-add.tcl	12 Jan 2002 10:31:29 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/user-add.tcl	6 Sep 2002 21:49:53 -0000	1.3
@@ -5,11 +5,11 @@
 } -query {
     {referer "/acs-admin/users"}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
 }
 
-set context_bar [ad_admin_context_bar [list "index.tcl" "Users"] "Add user"]
+set context [list [list "./" "Users"] "Add user"]
 
 # generate unique key here so we can handle the "user hit s" case
 set user_id [db_nextval acs_object_id_seq]
Index: openacs-4/packages/acs-api-browser/www/content-page-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/content-page-view.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/content-page-view.adp	2 Sep 2002 15:01:33 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/content-page-view.adp	6 Sep 2002 21:49:54 -0000	1.4
@@ -1,5 +1,5 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 @script_documentation@
\ No newline at end of file
Index: openacs-4/packages/acs-api-browser/www/content-page-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/content-page-view.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-api-browser/www/content-page-view.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-api-browser/www/content-page-view.tcl	6 Sep 2002 21:49:54 -0000	1.2
@@ -14,10 +14,11 @@
     path
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     script_documentation:onevalue
 }
 
+set context [list]
 if { ![info exists version_id] && \
         [regexp {^packages/([^ /]+)/} $path "" package_key] } {
     db_0or1row version_id_from_package_key {
@@ -33,12 +34,11 @@
           from apm_package_version_info
          where version_id = :version_id
     }
-    lappend context_bar_elements [list "package-view?version_id=$version_id&kind=content" "$pretty_name $version_name"]
+    lappend context [list "package-view?version_id=$version_id&kind=content" "$pretty_name $version_name"]
 }
 
-lappend context_bar_elements [file tail $path]
+lappend context [file tail $path]
 
-set context_bar [eval ad_context_bar $context_bar_elements]
 set title [file tail $path]
 set script_documentation [api_script_documentation $path]
 
Index: openacs-4/packages/acs-api-browser/www/deprecated.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/deprecated.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/deprecated.adp	2 Sep 2002 15:01:33 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/deprecated.adp	6 Sep 2002 21:49:54 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 <h3>Deprecated Procedures:</h3>
 <ul>
Index: openacs-4/packages/acs-api-browser/www/deprecated.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/deprecated.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-api-browser/www/deprecated.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-api-browser/www/deprecated.tcl	6 Sep 2002 21:49:54 -0000	1.2
@@ -11,12 +11,12 @@
 } {
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     deprecated:multirow
 }
 
 set title "Deprecated Procedure Search"
-set context_bar [ad_context_bar "Deprecated Procedures"]
+set context [list "Deprecated Procedures"]
 
 multirow create deprecated proc args
 
Index: openacs-4/packages/acs-api-browser/www/display-sql.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/display-sql.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/display-sql.adp	2 Sep 2002 15:01:33 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/display-sql.adp	6 Sep 2002 21:49:54 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 <pre>
 @sql@
Index: openacs-4/packages/acs-api-browser/www/display-sql.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/display-sql.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-api-browser/www/display-sql.tcl	20 Aug 2002 01:31:39 -0000	1.2
+++ openacs-4/packages/acs-api-browser/www/display-sql.tcl	6 Sep 2002 21:49:54 -0000	1.3
@@ -24,23 +24,22 @@
     { package_key ""}
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     sql:onevalue
 }
 
-set context_bar_elements [list]
+set context [list]
 if [exists_and_not_null version_id] {
     db_0or1row package_info_from_package_id {
         select pretty_name, package_key, version_name
           from apm_package_version_info
          where version_id = :version_id
     }
-    lappend context_bar_elements [list "package-view?version_id=$version_id&amp;kind=sql_files" "$pretty_name $version_name"]
+    lappend context [list "package-view?version_id=$version_id&amp;kind=sql_files" "$pretty_name $version_name"]
 }
-lappend context_bar_elements [file tail $url]
+lappend context [file tail $url]
 
 set title "[file tail $url]"
-set context_bar [eval ad_context_bar $context_bar_elements]
 
 # This is normally a password-protected page, but to be safe let's
 # check the incoming URL for ".." to make sure that someone isn't
Index: openacs-4/packages/acs-api-browser/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-api-browser/www/index.adp	2 Sep 2002 15:01:33 -0000	1.6
+++ openacs-4/packages/acs-api-browser/www/index.adp	6 Sep 2002 21:49:54 -0000	1.7
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 <table align="right" border="0" cellspacing="0" cellpadding="0" bgcolor="#DDDDDD"> 
  <tr>
Index: openacs-4/packages/acs-api-browser/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-api-browser/www/index.tcl	12 May 2002 20:57:01 -0000	1.2
+++ openacs-4/packages/acs-api-browser/www/index.tcl	6 Sep 2002 21:49:54 -0000	1.3
@@ -8,14 +8,14 @@
 } {
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     installed_packages:multirow
     disabled_packages:multirow
     uninstalled_packages:multirow
 }
 
 set title "API Browser"
-set context_bar [ad_context_bar]
+set context [list]
 
 set aolserver_tcl_api_root "http://www.aolserver.com/docs/devel/tcl/api/"
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-api-browser/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-api-browser/www/package-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/package-view.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/package-view.adp	2 Sep 2002 15:01:33 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/package-view.adp	6 Sep 2002 21:49:54 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 @dimensional_slider@
 
Index: openacs-4/packages/acs-api-browser/www/package-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/package-view.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-api-browser/www/package-view.tcl	19 Apr 2001 14:52:47 -0000	1.2
+++ openacs-4/packages/acs-api-browser/www/package-view.tcl	6 Sep 2002 21:49:54 -0000	1.3
@@ -14,7 +14,7 @@
     { kind "procs_files" }
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     dimensional_slider:onevalue
     kind:onevalue
     version_id:onevalue
@@ -51,7 +51,7 @@
 }
 
 set title "$pretty_name $version_name"
-set context_bar [ad_context_bar $title]
+set context [list $title]
 set dimensional_slider "[ad_dimensional \
         $dimensional_list \
         "" \
Index: openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.adp	2 Sep 2002 15:01:33 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.adp	6 Sep 2002 21:49:54 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @package_slider_list@ ne "">
 <table align=right><tr><td>
Index: openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl	2 Sep 2002 12:43:12 -0000	1.2
+++ openacs-4/packages/acs-api-browser/www/plsql-subprogram-one.tcl	6 Sep 2002 21:49:54 -0000	1.3
@@ -14,11 +14,11 @@
     type
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
 }
 
 set title $name
-set context_bar [ad_context_bar {"plsql-subprograms-all" "All PL/SQL Subprograms"} "One PL/SQL Subprogram"]
+set context [list {"plsql-subprograms-all" "All PL/SQL Subprograms"} "One PL/SQL Subprogram"]
 
 set source_text ""
 
Index: openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.adp	2 Sep 2002 15:01:33 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.adp	6 Sep 2002 21:49:54 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>All PL/SQL Subprograms</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 <multiple name="all_subprograms">
 <h2>@all_subprograms.type@</h2>
Index: openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.tcl	2 Sep 2002 12:43:12 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/plsql-subprograms-all.tcl	6 Sep 2002 21:49:54 -0000	1.4
@@ -8,11 +8,11 @@
     @cvs-id $Id$
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     all_subprograms:multirow
 }
 
-set context_bar [ad_context_bar "All PL/SQL Subprograms"]
+set context [list "All PL/SQL Subprograms"]
 
 # Organize the subprograms under three headings: FUNCTION, PROCEDURE,
 # and PACKAGE.
Index: openacs-4/packages/acs-api-browser/www/proc-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-browse.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-api-browser/www/proc-browse.adp	2 Sep 2002 15:01:33 -0000	1.4
+++ openacs-4/packages/acs-api-browser/www/proc-browse.adp	6 Sep 2002 21:49:54 -0000	1.5
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 @dimensional_slider@
 
Index: openacs-4/packages/acs-api-browser/www/proc-browse.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-browse.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-api-browser/www/proc-browse.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-api-browser/www/proc-browse.tcl	6 Sep 2002 21:49:54 -0000	1.2
@@ -12,7 +12,7 @@
     { sort_by "file"} 
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     dimensional_slider:onevalue
     proc_list:multirow
 }
@@ -31,7 +31,7 @@
 }
 
 set title "$type Procedures"
-set context_bar [ad_context_bar "Browse Procedures"]
+set context [list "Browse Procedures"]
 set dimensional_slider [ad_dimensional $dimensional]
 
 set matches [list]
Index: openacs-4/packages/acs-api-browser/www/proc-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-search.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/proc-search.adp	2 Sep 2002 15:01:33 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/proc-search.adp	6 Sep 2002 21:49:54 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 <h3>Procedure Matches:</h3>
 <ul>
Index: openacs-4/packages/acs-api-browser/www/proc-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-search.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-api-browser/www/proc-search.tcl	6 Jul 2002 13:21:13 -0000	1.2
+++ openacs-4/packages/acs-api-browser/www/proc-search.tcl	6 Sep 2002 21:49:54 -0000	1.3
@@ -21,7 +21,7 @@
     query_string
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     name_weight:onevalue
     doc_weight:onevalue
     param_weight:onevalue
@@ -118,7 +118,7 @@
 }
 
 set title "Procedure Search for: \"$query_string\""
-set context_bar [ad_context_bar "Search: $query_string"]
+set context [list "Search: $query_string"]
 
 multirow create results score proc args url
 
Index: openacs-4/packages/acs-api-browser/www/proc-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-view.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-api-browser/www/proc-view.adp	2 Sep 2002 15:01:33 -0000	1.4
+++ openacs-4/packages/acs-api-browser/www/proc-view.adp	6 Sep 2002 21:49:54 -0000	1.5
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @error_msg@ ne "">
 @error_msg@
Index: openacs-4/packages/acs-api-browser/www/proc-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/proc-view.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-api-browser/www/proc-view.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-api-browser/www/proc-view.tcl	6 Sep 2002 21:49:54 -0000	1.2
@@ -7,7 +7,7 @@
     source_p:optional,integer,trim
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     source_p:onevalue
     default_source_p:onevalue
     return_url:onevalue
@@ -16,7 +16,7 @@
 }
 
 set title $proc
-set context_bar [ad_context_bar $proc]
+set context [list $proc]
 
 set default_source_p [ad_get_client_property -default 0 acs-api-browser api_doc_source_p]
 set return_url [ns_urlencode [ad_conn url]?[export_url_vars proc]]
Index: openacs-4/packages/acs-api-browser/www/procs-file-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/procs-file-view.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/acs-api-browser/www/procs-file-view.adp	2 Sep 2002 15:01:33 -0000	1.6
+++ openacs-4/packages/acs-api-browser/www/procs-file-view.adp	6 Sep 2002 21:49:54 -0000	1.7
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 @dimensional_slider@
 @library_documentation@
Index: openacs-4/packages/acs-api-browser/www/procs-file-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/procs-file-view.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-api-browser/www/procs-file-view.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-api-browser/www/procs-file-view.tcl	6 Sep 2002 21:49:54 -0000	1.2
@@ -8,7 +8,7 @@
     path
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     dimensional_slider:onevalue
     library_documentation:onevalue
     proc_list:multirow
@@ -39,20 +39,20 @@
     }
 }
 
-set context_bar_elements [list]
+set context [list]
 if { [info exists version_id] } {
     db_1row package_info_from_package_id {
         select pretty_name, package_key, version_name
           from apm_package_version_info
          where version_id = :version_id
     }
-    lappend context_bar_elements [list "package-view?version_id=$version_id" "$pretty_name $version_name"]
+    lappend context [list "package-view?version_id=$version_id" "$pretty_name $version_name"]
 }
 
-lappend context_bar_elements [file tail $path]
+lappend context [file tail $path]
 
 set title [file tail $path]
-set context_bar [eval ad_context_bar $context_bar_elements]
+
 set dimensional_slider [ad_dimensional $dimensional_list]
 set library_documentation [api_library_documentation $path]
 
Index: openacs-4/packages/acs-api-browser/www/tcl-doc-search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-doc-search.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-api-browser/www/tcl-doc-search.adp	2 Sep 2002 15:01:33 -0000	1.4
+++ openacs-4/packages/acs-api-browser/www/tcl-doc-search.adp	6 Sep 2002 21:49:54 -0000	1.5
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 Sorry, no Tcl procedures were found with that name.
 
Index: openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl	12 May 2002 20:57:01 -0000	1.2
+++ openacs-4/packages/acs-api-browser/www/tcl-doc-search.tcl	6 Sep 2002 21:49:54 -0000	1.3
@@ -5,7 +5,7 @@
     tcl_proc
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     tcl_proc:onevalue
 }
 
@@ -28,6 +28,6 @@
 }
 
 set title "Tcl API Procedure Search for: \"$tcl_proc\""
-set context_bar [ad_context_bar "TCL API Search: $tcl_proc"]
+set context [list "TCL API Search: $tcl_proc"]
 
 ad_return_template
Index: openacs-4/packages/acs-api-browser/www/tcl-proc-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-proc-view.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-api-browser/www/tcl-proc-view.adp	2 Sep 2002 15:01:33 -0000	1.4
+++ openacs-4/packages/acs-api-browser/www/tcl-proc-view.adp	6 Sep 2002 21:49:54 -0000	1.5
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 Sorry, no Tcl API procedures were found with that name.
 
Index: openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl	12 May 2002 20:57:01 -0000	1.2
+++ openacs-4/packages/acs-api-browser/www/tcl-proc-view.tcl	6 Sep 2002 21:49:54 -0000	1.3
@@ -5,7 +5,7 @@
     tcl_proc
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     tcl_proc:onevalue
 }
 
@@ -26,7 +26,7 @@
 }
 
 set title "Tcl API Procedure Search for: \"$tcl_proc\""
-set context_bar [ad_context_bar "TCL API Search: $tcl_proc"]
+set context [list "TCL API Search: $tcl_proc"]
 
 ad_return_template
 
Index: openacs-4/packages/acs-api-browser/www/type-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/type-view.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-api-browser/www/type-view.adp	2 Sep 2002 15:01:33 -0000	1.3
+++ openacs-4/packages/acs-api-browser/www/type-view.adp	6 Sep 2002 21:49:54 -0000	1.4
@@ -1,5 +1,5 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name=context_bar>@context_bar@</property>
+<property name="context">@context@</property>
 
 @documentation@
\ No newline at end of file
Index: openacs-4/packages/acs-api-browser/www/type-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-api-browser/www/Attic/type-view.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-api-browser/www/type-view.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-api-browser/www/type-view.tcl	6 Sep 2002 21:49:54 -0000	1.2
@@ -9,7 +9,7 @@
     type
 } -properties {
     title:onevalue
-    contextbar:onevalue
+    context:onevalue
     documentation:onevalue
 }
 
@@ -28,19 +28,18 @@
     set public_p [api_set_public]
 }
 
-set context_bar_elements [list]
+set context [list]
 
 if { [info exists version_id] } {
     db_1row package_info_from_version_id {
         select package_name, package_key, version_name
           from apm_package_version_info
          where version_id = :version_id
     }
-    lappend context_bar_elements [list "package-view?version_id=$version_id&kind=types" "$package_name $version_name"]
+    lappend context [list "package-view?version_id=$version_id&kind=types" "$package_name $version_name"]
 }
 
-lappend context_bar_elements $type
+lappend context $type
 
 set title $type
-set context_bar [eval ad_context_bar $context_bar_elements]
 set documentation [api_type_documentation $type]
\ No newline at end of file
Index: openacs-4/packages/acs-service-contract/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-service-contract/www/index.adp	3 Sep 2002 07:40:20 -0000	1.2
+++ openacs-4/packages/acs-service-contract/www/index.adp	6 Sep 2002 21:49:55 -0000	1.3
@@ -1,6 +1,6 @@
 <master>
 <property name="title">ACS Service Contract</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <h2>Installed Bindings</h2>
 <ul>
Index: openacs-4/packages/acs-service-contract/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-service-contract/www/index.tcl	8 Mar 2002 20:23:12 -0000	1.3
+++ openacs-4/packages/acs-service-contract/www/index.tcl	6 Sep 2002 21:49:55 -0000	1.4
@@ -1,5 +1,5 @@
 
-set context_bar [ad_context_bar]
+set context [list]
 
 db_multirow valid_installed_binding valid_installed_binding ""
 
Index: openacs-4/packages/acs-subsite/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/index.adp	3 Sep 2002 16:29:09 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/index.adp	6 Sep 2002 21:49:56 -0000	1.3
@@ -1,9 +1,8 @@
-<master src="master">
+<master>
 <property name="title">@subsite_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <ul>
-
  <if @nodes:rowcount@ eq 0> 
   <li>(no packages)</li>
  </if>
@@ -16,5 +15,4 @@
  <if @admin_p@ eq 1> 
   <li> <a href="admin/">Administration</a></li>
  </if>
-
 </ul>
Index: openacs-4/packages/acs-subsite/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/index.tcl	3 Sep 2002 16:29:09 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/index.tcl	6 Sep 2002 21:49:56 -0000	1.4
@@ -9,13 +9,13 @@
   @cvs-id $Id$
 } {
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     subsite_name:onevalue
     nodes:multirow
     admin_p:onevalue
 }
 
-set context_bar [ad_context_bar]
+set context [list]
 set package_id [ad_conn package_id]
 set admin_p [ad_permission_p $package_id admin]
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/index.adp	9 Jul 2002 21:19:58 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/index.adp	6 Sep 2002 21:49:56 -0000	1.5
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@subsite_name@ Administration</property>
 
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/index.tcl	29 Aug 2001 21:22:49 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/index.tcl	6 Sep 2002 21:49:56 -0000	1.3
@@ -8,7 +8,7 @@
     @cvs-id $Id$
 } {
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     subsite_name:onevalue
     acs_admin_available_p:onevalue
     acs_admin_url:onevalue
@@ -35,6 +35,6 @@
     set acs_admin_available_p "f"
 }
 
-set context_bar {}
+set context {}
 
 ad_return_template
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/admin/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/add-2.tcl	6 Sep 2002 21:49:57 -0000	1.2
@@ -17,7 +17,7 @@
     required_p:notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     pretty_name:onevalue
     datatypes:multirow
Index: openacs-4/packages/acs-subsite/www/admin/attributes/add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/add.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/add.adp	6 Sep 2002 21:49:57 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add attribute to @object_pretty_name@</property>
 <property name="focus">main_form.pretty_name</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/add.tcl	6 Sep 2002 21:49:57 -0000	1.2
@@ -12,7 +12,7 @@
     object_type:notnull,trim
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     object_pretty_name:onevalue
     datatypes:multirow
@@ -24,7 +24,7 @@
     }
 }
 
-set context_bar [list "Add attribute"]
+set context [list "Add attribute"]
 set export_vars [ad_export_vars -form {object_type return_url}]
 
 set object_pretty_name [db_string object_pretty_name {
Index: openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/delete.adp	6 Sep 2002 21:49:57 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Delete @attribute_pretty_name@</property>
 
 Are you sure you want to permanently remove this attribute? Doing so will also remove any values previously specified for this attribute for any object of type "@object_type@."
Index: openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/delete.tcl	6 Sep 2002 21:49:57 -0000	1.2
@@ -12,14 +12,14 @@
     attribute_id:notnull,naturalnum,attribute_dynamic_p
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     attribute_id:onevalue
     object_type:onevalue
     attribute_pretty_name:onevalue
     export_form_vars:onevalue
 }
 
-set context_bar [list [list one?[ad_export_vars attribute_id] "One attribute"] "Delete attribute"]
+set context [list [list one?[ad_export_vars attribute_id] "One attribute"] "Delete attribute"]
 
 db_1row select_object_type {
     select a.object_type, a.pretty_name as attribute_pretty_name
Index: openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.adp	6 Sep 2002 21:49:57 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Edit @attribute_pretty_name@</property>
 <property name="focus">@focus@</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/edit-one.tcl	6 Sep 2002 21:49:57 -0000	1.2
@@ -14,14 +14,14 @@
     { attribute_value "" }
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     focus:onevalue
     attribute_pretty_name:onevalue    
 }
 
 ad_require_permission $id_column "write"
 
-set context_bar [list "Edit attribute"]
+set context [list "Edit attribute"]
 
 db_1row attribute_properties {
     select a.pretty_name as attribute_pretty_name, a.datatype, a.attribute_id,
Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.adp	6 Sep 2002 21:49:57 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Specify values for @attribute_pretty_name@</property>
 
 Note: Every value must have a unique name. Duplicate names will be ignored.
Index: openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/enum-add.tcl	6 Sep 2002 21:49:57 -0000	1.2
@@ -12,7 +12,7 @@
     attribute_id:integer,notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     attribute_pretty_name:onevalue
     attribute_src:multirow
@@ -49,7 +49,7 @@
      where a.attribute_id = :attribute_id
 }
 
-set context_bar [list [list one?[export_url_vars attribute_id] "One attribute"] "Add values"]
+set context [list [list one?[export_url_vars attribute_id] "One attribute"] "Add values"]
 
 set export_vars [ad_export_vars -form {attribute_id return_url}]
 
Index: openacs-4/packages/acs-subsite/www/admin/attributes/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/one.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/one.adp	6 Sep 2002 21:49:57 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@attribute.pretty_name@</property>
 	
 <b>Properties:</b>			   
Index: openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/one.tcl	6 Sep 2002 21:49:57 -0000	1.2
@@ -12,13 +12,13 @@
     attribute_id:naturalnum,notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     attribute:onerow
     url_vars:onevalue
     dynamic_p:onevalue
     enum_values:multirow
 }
-set context_bar [list "One attribute"]
+set context [list "One attribute"]
 
 set url_vars [ad_export_vars {attribute_id return_url}]
 
Index: openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.adp	6 Sep 2002 21:49:57 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Delete value @pretty_name@</property>
 
 Are you sure you want to permanently remove this attribute value?
Index: openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/attributes/value-delete.tcl	6 Sep 2002 21:49:57 -0000	1.2
@@ -13,7 +13,7 @@
     enum_value:trim,notnull
     { return_url "one?[ad_export_vars attribute_id]" }    
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     pretty_name:onevalue
 }
@@ -29,7 +29,7 @@
     return
 }
 
-set context_bar [list [list one?[ad_export_vars attribute_id] "One attribute"] "Delete value"]
+set context [list [list one?[ad_export_vars attribute_id] "One attribute"] "Delete value"]
 set export_vars [ad_export_vars -form {attribute_id enum_value return_url}]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.adp	6 Sep 2002 21:49:58 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@group_type_pretty_name@</property>
 
 <blockquote>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/change-join-policy.tcl	6 Sep 2002 21:49:58 -0000	1.3
@@ -11,7 +11,7 @@
     group_type:notnull
     {return_url ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     group_type:onevalue
     QQgroup_type:onevalue
     group_type_pretty_name:onevalue
@@ -21,7 +21,7 @@
     possible_join_policies:onevalue
 }
 
-set context_bar [list \
+set context [list \
         [list "[ad_conn package_url]admin/group-types/" "Group types"] \
 	[list "one?[ad_export_vars group_type]" "One type"] \
 	"Edit default join policy"]
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl	20 Aug 2001 21:52:31 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-2.tcl	6 Sep 2002 21:49:58 -0000	1.4
@@ -13,7 +13,7 @@
     { return_url "" }
     { operation "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
 } -validate {
     user_can_delete_group -requires {group_type:notnull} {
 	if { ![group_type::drop_all_groups_p $group_type] } {
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-rel-types-exist.adp	6 Sep 2002 21:49:58 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Relationship types exist that depend on this group type</property>
 
 You must remove all of the following relationship types before you can
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete-subtypes-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete-subtypes-exist.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete-subtypes-exist.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete-subtypes-exist.adp	6 Sep 2002 21:49:58 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Subtypes exist!</property>
 
 You must remove all subtypes of the group type
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.adp	6 Sep 2002 21:49:58 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Delete @group_type_pretty_name@</property>
 
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/delete.tcl	6 Sep 2002 21:49:58 -0000	1.3
@@ -13,7 +13,7 @@
     { return_url "" }
 } -properties {
     subtypes:multirow
-    context_bar:onevalue
+    context:onevalue
     export_url_vars:onevalue
     export_form_vars:onevalue
     group_type:onevalue
@@ -28,7 +28,7 @@
     }
 }
 
-set context_bar [list \
+set context [list \
          [list "[ad_conn package_url]admin/group-types/" "Group types"] \
          [list one?[export_url_vars group_type] "One group type"] \
          "Delete group type"]
Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.adp	6 Sep 2002 21:49:58 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">All groups of type @group_type_pretty_name@</property>
 
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/groups-display.tcl	6 Sep 2002 21:49:58 -0000	1.3
@@ -11,14 +11,14 @@
 } {
     group_type:notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     group_type_pretty_name:onevalue
     group_type:onevalue
     group_type_enc:onevalue
 }
 
 set user_id [ad_conn user_id]
-set context_bar [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars group_type] "One type"] "Groups"]
+set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars group_type] "One type"] "Groups"]
 set group_type_enc [ad_urlencode $group_type]
 
 if { ![db_0or1row select_type_info {
Index: openacs-4/packages/acs-subsite/www/admin/group-types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/index.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/index.adp	6 Sep 2002 21:49:58 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Group type administration</property>
 
 Currently, the system is able to handle the following types of groups: 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/index.tcl	6 Sep 2002 21:49:58 -0000	1.2
@@ -9,13 +9,13 @@
     @cvs-id $Id$
 } {
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     group_types:multirow
 }
 
 subsite::configure_if_necessary
 
-set context_bar [list "Group types"]
+set context [list "Group types"]
 
 # we may want to move the inner count to get the number of groups of
 # each type to its own pl/sql function. That way, we execute the
Index: openacs-4/packages/acs-subsite/www/admin/group-types/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/new.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/new.adp	6 Sep 2002 21:49:58 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add group type</property>
 <property name="focus">group_type.object_type</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/new.tcl	6 Sep 2002 21:49:58 -0000	1.3
@@ -13,10 +13,10 @@
     { supertype:trim "" }
     { approval_policy:trim "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
 }
 
-set context_bar [list [list "[ad_conn package_url]admin/group-types/" "Group types"] "Add type"]
+set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] "Add type"]
 
 template::form create group_type
 
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/group-types/one.adp	13 Mar 2002 22:50:53 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one.adp	6 Sep 2002 21:49:58 -0000	1.4
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Group Type "@group_type_pretty_name@"</property>
 				   
 <h4>Groups of this type</h4>
Index: openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/one.tcl	6 Sep 2002 21:49:58 -0000	1.3
@@ -11,7 +11,7 @@
 } {
     group_type:notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     group_type:onevalue
     group_type_enc:onevalue
     group_type_pretty_name:onevalue
@@ -31,7 +31,7 @@
 
 set package_id [ad_conn package_id]
 
-set context_bar [list [list "[ad_conn package_url]admin/group-types/" "Group types"] "One type"]
+set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] "One type"]
 
 if { ![db_0or1row select_pretty_name {
     select t.pretty_name as group_type_pretty_name, t.dynamic_p,
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp	11 Aug 2001 21:31:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.adp	6 Sep 2002 21:49:58 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add permissible relationship type</property>
 				   
 <if @primary_rels:rowcount@ eq "0">
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-add.tcl	6 Sep 2002 21:49:58 -0000	1.3
@@ -12,14 +12,14 @@
     group_type:trim,notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     return_url_enc:onevalue
     export_vars:onevalue
     primary_rels:multirow
 }
 
 set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"]
-set context_bar [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Add relation type"]
+set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Add relation type"]
 
 
 # Select out all the relationship types that are not currently
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.adp	6 Sep 2002 21:49:58 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Remove @rel_pretty_name@</property>
 
 Are you sure you want to remove @rel_pretty_name@ from the list of allowable relations for groups of type @group_type_pretty_name@?
Index: openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/group-types/rel-type-remove.tcl	6 Sep 2002 21:49:58 -0000	1.3
@@ -12,7 +12,7 @@
     group_rel_type_id:naturalnum,notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     rel_pretty_name:onevalue
     group_type_pretty_name:onevalue
     export_vars:onevalue
@@ -31,6 +31,6 @@
 }
 
 set export_vars [ad_export_vars -form {group_rel_type_id return_url}]
-set context_bar [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Remove relation type"]
+set context [list [list "[ad_conn package_url]admin/group-types/" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Remove relation type"]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.adp	6 Sep 2002 21:49:59 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@group_name@</property>
 
 <blockquote>
Index: openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/change-join-policy.tcl	6 Sep 2002 21:49:59 -0000	1.3
@@ -11,7 +11,7 @@
     group_id:integer,notnull
     {return_url ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     group_id:onevalue
     group_name:onevalue
     admin_p:onevalue
@@ -32,7 +32,7 @@
 }
 
 
-set context_bar [list \
+set context [list \
         [list "[ad_conn package_url]admin/groups/" "Groups"] \
 	[list "one?group_id=$group_id" "One Group" ] \
         "Edit Join Policy"]
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.adp	6 Sep 2002 21:49:59 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Constraints on relationship type</property>
 
 Relational segments allows you to treat all parties that have a
Index: openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/constraints-create.tcl	6 Sep 2002 21:49:59 -0000	1.3
@@ -14,13 +14,13 @@
     rel_type:notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     rel_type_pretty_name:onevalue
     group_name:onevalue
 }
 
-set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "Add constraint"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "Add constraint"]
 set export_vars [ad_export_vars -form {group_id rel_type return_url}]
 
 db_1row select_props {
Index: openacs-4/packages/acs-subsite/www/admin/groups/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/delete.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete.adp	6 Sep 2002 21:49:59 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Delete @group_name@</property>
 
 Are you sure you want to permanently, and irreversibly, remove this
Index: openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/delete.tcl	6 Sep 2002 21:49:59 -0000	1.2
@@ -11,7 +11,7 @@
 } {
     group_id:integer,notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     group_name:onevalue
     number:onerow
     group_id:onevalue
@@ -23,7 +23,7 @@
     }
 }
 
-set context_bar [list [list "" "Groups"] [list one?[ad_export_vars {group_id}] "One Group"] "Nuke group"]
+set context [list [list "" "Groups"] [list one?[ad_export_vars {group_id}] "One Group"] "Nuke group"]
 set group_name [db_string object_name {select acs_object.name(:group_id) from dual}]
 set export_form_vars [ad_export_vars -form {group_id}]
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.adp	6 Sep 2002 21:49:59 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@role_pretty_plural@ of @group_name@</property>
 
 <include src="elements-display-list" group_id="@group_id@" rel_type="@rel_type@" member_state="@member_state@">
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl	6 Sep 2002 21:49:59 -0000	1.3
@@ -13,7 +13,7 @@
     rel_type:notnull
     {member_state ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     create_p:onevalue
     group_id:onevalue
     group_name:onevalue
@@ -49,6 +49,6 @@
      where rel_types.rel_type = :rel_type
 }
 
-set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "All $role_pretty_plural"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars group_id] "One Group"] "All $role_pretty_plural"]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/groups/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/index.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/index.adp	6 Sep 2002 21:49:59 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Group administration</property>
 
 Currently, the @instance_name@ has the following groups:
Index: openacs-4/packages/acs-subsite/www/admin/groups/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/index.tcl	6 Sep 2002 21:49:59 -0000	1.2
@@ -18,15 +18,15 @@
 	}
     }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     groups:multirow
     subsite_group_id:onevalue
     view_by:onevalue
 }
 
 subsite::configure_if_necessary
 
-set context_bar [list "Groups"]
+set context [list "Groups"]
 
 set this_url [ad_conn url]
 
Index: openacs-4/packages/acs-subsite/www/admin/groups/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/new.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/new.adp	6 Sep 2002 21:49:59 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add a group of type @group_type_pretty_name@</property>
 
 <formtemplate id="add_group"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/admin/groups/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/new.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/new.tcl	6 Sep 2002 21:49:59 -0000	1.3
@@ -18,7 +18,7 @@
     { return_url "" }
     {group_rel_type_list ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     group_type_pretty_name:onevalue
     attributes:multirow
 } -validate {
@@ -31,7 +31,7 @@
     }
 }
 
-set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] "Add a group"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] "Add a group"]
 
 if {[empty_string_p $add_to_group_id]} {
     set add_to_group_id [application_group::group_id_from_package_id]
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/groups/one.adp	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.adp	6 Sep 2002 21:49:59 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@group_name@</property>
 
 <h3>Attributes</h3>
Index: openacs-4/packages/acs-subsite/www/admin/groups/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/one.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/groups/one.tcl	13 Mar 2002 22:50:53 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/groups/one.tcl	6 Sep 2002 21:49:59 -0000	1.4
@@ -10,7 +10,7 @@
 } {
     group_id:integer,notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     group_id:onevalue
     group_name:onevalue
     write_p:onevalue
@@ -51,7 +51,7 @@
        and g.group_id = :group_id
 }
 
-set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] "One Group"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] "One Group"]
 
 attribute::multirow \
 	-start_with group \
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.adp	6 Sep 2002 21:49:59 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add relation type</property>
 				   
 <if @primary_rels:rowcount@ eq "0">
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-add.tcl	6 Sep 2002 21:49:59 -0000	1.3
@@ -12,13 +12,13 @@
     group_id:integer,notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     return_url_enc:onevalue
     primary_rels:multirow
 }
 
-set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list "one?[ad_export_vars group_id]" "One Group"] "Add relation type"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list "one?[ad_export_vars group_id]" "One Group"] "Add relation type"]
 set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"]
 
 # Select out all the relationship types that are not currently
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.adp	6 Sep 2002 21:49:59 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Remove @rel_pretty_name@</property>
 
 Are you sure you want to remove @rel_pretty_name@ from the list of
Index: openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/groups/rel-type-remove.tcl	6 Sep 2002 21:49:59 -0000	1.3
@@ -13,7 +13,7 @@
     group_rel_id:integer,notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     rel_pretty_name:onevalue
     group_name:onevalue
     export_vars:onevalue
@@ -33,6 +33,6 @@
 ad_require_permission $group_id admin
 
 set export_vars [ad_export_vars -form {group_rel_id return_url}]
-set context_bar [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars {group_id}] "One group"] "Remove relation type"]
+set context [list [list "[ad_conn package_url]admin/groups/" "Groups"] [list one?[ad_export_vars {group_id}] "One group"] "Remove relation type"]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/object-types/alphabetical-index.tcl	6 Sep 2002 21:49:59 -0000	1.2
@@ -13,7 +13,7 @@
 set page "
 [ad_admin_header $title]
 <h2>$title</h2>
-[ad_admin_context_bar [list "./index" "Object Type Administration"] $title]
+[list [list "./index" "Object Type Administration"] $title]
 <hr>
 <ul>"
 
Index: openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl	29 Aug 2001 21:22:49 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/object-types/index.tcl	6 Sep 2002 21:49:59 -0000	1.3
@@ -13,7 +13,7 @@
 set page "
 [ad_admin_header $title]
 <h2>$title</h2>
-[ad_admin_context_bar $title]
+[list $title]
 <hr>
 <ul>"
 
Index: openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl	1 Sep 2001 16:41:44 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/object-types/one.tcl	6 Sep 2002 21:49:59 -0000	1.4
@@ -38,7 +38,7 @@
 set page "
 [ad_admin_header $title]
 <h2>$title</h2>
-[ad_admin_context_bar [list "./index" "Object Type Administration"] $title]
+[list [list "./index" "Object Type Administration"] $title]
 <hr>
 <ul>"
 
Index: openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp	9 Sep 2001 15:57:54 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/parties/add-select-type.adp	6 Sep 2002 21:50:00 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Select specific @object_type_pretty_name@ type</property>
 
 <blockquote>
Index: openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/parties/new-list-required-segments.adp	6 Sep 2002 21:50:00 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Create a new user</property>
 
 <blockquote>
Index: openacs-4/packages/acs-subsite/www/admin/parties/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/parties/new.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/parties/new.adp	6 Sep 2002 21:50:00 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add a party of type @party_type_pretty_name@</property>
 
 <formtemplate id="add_party"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/admin/parties/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/parties/new.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/parties/new.tcl	6 Sep 2002 21:50:00 -0000	1.2
@@ -17,12 +17,12 @@
     {add_with_rel_type "membership_rel"}
     {group_rel_type_list ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     party_type_pretty_name:onevalue
     attributes:multirow
 }
 
-set context_bar [list [list "" "Parties"] "Add a party"]
+set context [list [list "" "Parties"] "Add a party"]
 
 if {[empty_string_p $add_to_group_id]} {
     set add_to_group_id [application_group::group_id_from_package_id]
Index: openacs-4/packages/acs-subsite/www/admin/parties/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/parties/one.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/parties/one.adp	6 Sep 2002 21:50:00 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@party_name@</property>
 
 <h3>Attributes</h3>
Index: openacs-4/packages/acs-subsite/www/admin/parties/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/parties/one.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/parties/one.tcl	6 Sep 2002 21:50:00 -0000	1.2
@@ -11,7 +11,7 @@
 } {
     party_id:integer,notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     party_id:onevalue
     party_name:onevalue
     admin_p:onevalue
@@ -62,7 +62,7 @@
 set write_p [ad_permission_p $party_id "write"]
 set admin_p [ad_permission_p $party_id "admin"]
 
-set context_bar [list [list "" "Parties"] "One Party"]
+set context [list [list "" "Parties"] "One Party"]
 
 attribute::multirow \
 	-start_with party \
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.adp	6 Sep 2002 21:50:01 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Remove segment</property>
 
 Are you sure you want to remove the relational segment @segment_name@?
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete.tcl	6 Sep 2002 21:50:01 -0000	1.3
@@ -29,7 +29,7 @@
 }
 
 set export_vars [export_form_vars segment_id]
-set context_bar [list \
+set context [list \
      [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] \
      [list one?[ad_export_vars segment_id] "One segment"] \
      "Remove segment"]
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.adp	6 Sep 2002 21:50:01 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@segment_name@</property>
 
 <include src="elements-display" segment_id="@segment_id@" segment_name="@segment_name@" group_id=@group_id@ role="@role_pretty_plural@">
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl	13 Mar 2002 22:50:53 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/elements.tcl	6 Sep 2002 21:50:01 -0000	1.4
@@ -11,7 +11,7 @@
 } {
     segment_id:integer,notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     segment_id:onevalue
     segment_name:onevalue
     role_pretty_plural:onevalue
@@ -32,7 +32,7 @@
        and s.rel_type = r.rel_type
 }
 
-set context_bar [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[ad_export_vars {segment_id}] "One segment"] "Elements"]
+set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[ad_export_vars {segment_id}] "One segment"] "Elements"]
 
 # Expects segment_id, segment_name, group_id, role to be passed in 
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/index.adp	6 Sep 2002 21:50:01 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Relational Segment administration</property>
 
 Currently, the system is able to handle the following relational segments:
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/index.tcl	6 Sep 2002 21:50:01 -0000	1.2
@@ -10,11 +10,11 @@
 
 } {
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     seg:multirow
 }
 
-set context_bar [list "Relational segments"]
+set context [list "Relational segments"]
 
 set user_id [ad_conn user_id]
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.adp	6 Sep 2002 21:50:01 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Create relational segment</property>
 <property name="focus">segment_new.segment_name</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-2.tcl	6 Sep 2002 21:50:01 -0000	1.3
@@ -14,7 +14,7 @@
     rel_type:notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     group_id:onevalue
     role_pretty_plural:onevalue
@@ -37,7 +37,7 @@
 
 ad_require_permission $group_id "read"
 
-set context_bar [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] "Add segment"]
+set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] "Add segment"]
 
 set export_vars [ad_export_vars -form {group_id rel_type return_url}]
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.adp	6 Sep 2002 21:50:01 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add Constraint on @segment_name@</property>
 
 Now that you have created a relational segment, you can create
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new-3.tcl	6 Sep 2002 21:50:01 -0000	1.3
@@ -15,7 +15,7 @@
     rel_type:notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     segment_name:onevalue
 } -validate {
@@ -66,7 +66,7 @@
 }
 
 
-set context_bar [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[ad_export_vars segment_id] "One segment"] "Create constraints"]
+set context [list [list "[ad_conn package_url]admin/rel-segments/" "Relational segments"] [list one?[ad_export_vars segment_id] "One segment"] "Create constraints"]
 set export_vars [ad_export_vars -form {segment_id return_url}]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new.adp	6 Sep 2002 21:50:01 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Create relational segment</property>
 <property name="focus">segment_new.segment_name</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/new.tcl	6 Sep 2002 21:50:01 -0000	1.2
@@ -13,7 +13,7 @@
     { rel_type:trim "" }
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     group_id:onevalue
     primary_rels:multirow
@@ -37,7 +37,7 @@
 
 ad_require_permission $group_id "read"
 
-set context_bar [list [list "" "Relational segments"] "Add segment"]
+set context [list [list "" "Relational segments"] "Add segment"]
 
 set export_vars [ad_export_vars -form {group_id return_url}]
 # Select out all relationship types
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one.adp	6 Sep 2002 21:50:01 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Segment "@props.segment_name@"</property>
 				   
 <h4>Properties of this segment</h4>
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl	11 Aug 2001 21:31:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/one.tcl	6 Sep 2002 21:50:01 -0000	1.3
@@ -11,7 +11,7 @@
 } {
     segment_id:naturalnum,notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     props:onerow
     number_elements:onevalue
     admin_p:onevalue
@@ -28,7 +28,7 @@
     }
 }
 
-set context_bar [list [list "./" "Relational segments"] "One segment"]
+set context [list [list "./" "Relational segments"] "One segment"]
 
 if { ![db_0or1row select_segment_properties {
     select s.segment_id, s.segment_name, s.group_id, acs_object.name(s.group_id) as group_name,
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.adp	6 Sep 2002 21:50:02 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Delete @constraint_name@</property>
 
 Are you sure you want to delete the constraint @constraint_name@ on segment @segment_name@?
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/delete.tcl	6 Sep 2002 21:50:02 -0000	1.2
@@ -12,13 +12,13 @@
     constraint_id:naturalnum,notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     constraint_name:onevalue
     segment_name:onevalue
     export_vars:onevalue
 }
 
-set context_bar [list [list one?[ad_export_vars constraint_id] "One constraint"] "Delete constraint"]
+set context [list [list one?[ad_export_vars constraint_id] "One constraint"] "Delete constraint"]
 
 set package_id [ad_conn package_id]
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.adp	6 Sep 2002 21:50:02 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Relational Constraint Administration</property>
 
 Currently, the system is able to handle the following relational constraints:
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl	6 Sep 2002 21:50:02 -0000	1.2
@@ -10,7 +10,7 @@
 
 }
 
-set context_bar [list [list ../ "Relational segments"] "Constraints"]
+set context [list [list ../ "Relational segments"] "Constraints"]
 
 set user_id [ad_conn user_id]
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.adp	6 Sep 2002 21:50:02 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add constraint to @segment_name@</property>
 <property name="focus">constraint_new.constraint_name</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/new.tcl	6 Sep 2002 21:50:02 -0000	1.2
@@ -15,7 +15,7 @@
     required_rel_segment:optional
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     segment_name:onevalue
     return_url_enc:onevalue
     violations:onerow
@@ -35,7 +35,7 @@
 
 set return_url_enc [ad_urlencode "[ad_conn url]?[ad_export_vars {rel_segment constraint_name rel_side required_rel_segment return_url}]"]
 
-set context_bar [list [list "../" "Relational segments"] [list "../one?segment_id=$rel_segment" "One Segment"] "Add constraint"]
+set context [list [list "../" "Relational segments"] [list "../one?segment_id=$rel_segment" "One Segment"] "Add constraint"]
 
 set package_id [ad_conn package_id]
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.adp	6 Sep 2002 21:50:02 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@props.constraint_name@</property>
 
 All elements in side @props.rel_side@ of the segment 
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/one.tcl	6 Sep 2002 21:50:02 -0000	1.2
@@ -11,7 +11,7 @@
 } {
     constraint_id:naturalnum,notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     admin_p:onevalue
     props:onerow
     rel:onerow
@@ -58,7 +58,7 @@
 
 set segment_id $props(segment_id)
 
-set context_bar [list [list "../" "Relational segments"] [list "../one?segment_id=$props(segment_id)" "One Segment"] "One constraint"]
+set context [list [list "../" "Relational segments"] [list "../one?segment_id=$props(segment_id)" "One Segment"] "One constraint"]
 
 # Now we pull out information about the relationship types for each
 # segment. The outer join is there in case the role in acs_rel_types
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/violations.adp	6 Sep 2002 21:50:02 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Violations exists</property>
 
 The following relations are in violation of the constraint you are
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/add.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/add.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add group type</property>
 				   
 <if primary_rels:rowcount eq 0> 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl	11 Aug 2001 21:31:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/add.tcl	6 Sep 2002 21:50:03 -0000	1.3
@@ -12,13 +12,13 @@
     object_type:notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_form_vars:onevalue
     export_url_vars:onevalue
     primary_rels:multirow
 }
 
-set context_bar [list "Add relation type"]
+set context [list "Add relation type"]
 set constraint_id [db_nextval "acs_object_id_seq"]
 set export_form_vars [export_form_vars constraint_id object_type return_url]
 set export_url_vars [export_url_vars constraint_id object_type return_url]
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete-subtypes-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete-subtypes-exist.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete-subtypes-exist.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete-subtypes-exist.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Subtypes exist!</property>
 
 You must remove all subtypes of the relationship type
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Delete @rel_type_pretty_name@</property>
 
 Are you sure you want to delete this relationship type? Doing so will:
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/delete.tcl	6 Sep 2002 21:50:03 -0000	1.2
@@ -12,13 +12,13 @@
     rel_type:notnull,rel_type_dynamic_p
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     rel_type_pretty_name:onevalue
     rel_type:onevalue
     counts:onerow
 }
 
-set context_bar [list [list "" "Relationship types"] [list one?[ad_export_vars rel_type] "One type"] "Delete type"]
+set context [list [list "" "Relationship types"] [list one?[ad_export_vars rel_type] "One type"] "Delete type"]
 
 set rel_type_pretty_name [db_string select_pretty_name {
     select t.pretty_name
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/index.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Relationship administration</property>
 
 Currently, the system is able to handle the following types of relationships: 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/index.tcl	6 Sep 2002 21:50:03 -0000	1.2
@@ -11,11 +11,11 @@
 
 } {
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     rel_types:multirow
 }
 
-set context_bar [list "Relationship types"]
+set context [list "Relationship types"]
 
 set package_id [ad_conn package_id]
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl	11 Aug 2001 21:31:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove-2.tcl	6 Sep 2002 21:50:03 -0000	1.3
@@ -14,7 +14,7 @@
     { group_type_rel_id "" }
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
 }
 
 if { [empty_string_p $group_rel_id] || [empty_string_p $group_type_rel_id] } {
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/mapping-remove.tcl	6 Sep 2002 21:50:03 -0000	1.2
@@ -13,7 +13,7 @@
     { group_rel_id:naturalnum "" }
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     rel_pretty_name:onevalue
     group_pretty_name:onevalue
     export_vars:onevalue
@@ -32,6 +32,6 @@
 }
 
 set export_vars [ad_export_vars -form {group_rel_type_id return_url}]
-set context_bar [list [list "" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Remove relation type"]
+set context [list [list "" "Group types"] [list one?[ad_export_vars {group_type}] "One type"] "Remove relation type"]
 
 ad_return_template
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Create relation type (child of @supertype_pretty_name@)</property>
 <property name="focus">rel_type.rel_type</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl	13 Mar 2002 22:50:53 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new-2.tcl	6 Sep 2002 21:50:03 -0000	1.5
@@ -23,11 +23,11 @@
     max_n_rels_two:optional
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     supertype_pretty_name:onevalue
 }
 
-set context_bar [list [list "[ad_conn package_url]admin/rel-types/" "Relationship types"] "Add relation type"]
+set context [list [list "[ad_conn package_url]admin/rel-types/" "Relationship types"] "Add relation type"]
 
 template::form create rel_type
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Create relation type</property>
 
 First, select the supertype for the new relationship type:
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/new.tcl	6 Sep 2002 21:50:03 -0000	1.3
@@ -11,7 +11,7 @@
 } {
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
 }
 
 
@@ -23,7 +23,7 @@
      start with t.object_type in ('membership_rel','composition_rel')
 }
 
-set context_bar [list [list "[ad_conn package_url]admin/rel-types/" "Relationship types"] "Add relationship type"]
+set context [list [list "[ad_conn package_url]admin/rel-types/" "Relationship types"] "Add relationship type"]
 
 set export_vars [ad_export_vars -form {return_url}]
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/one.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Relationship Type "@rel_type_pretty_name@"</property>
 				   
 <h4>Relations of this type</h4>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/one.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-types/one.tcl	11 Aug 2001 21:31:03 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/one.tcl	6 Sep 2002 21:50:03 -0000	1.3
@@ -11,7 +11,7 @@
 } {
     rel_type:notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     rel_type:onevalue
     rel_type_enc:onevalue
     rel_type_pretty_name:onevalue
@@ -28,7 +28,7 @@
 
 set package_id [ad_conn package_id]
 
-set context_bar [list [list "./" "Relationship types"] "One type"]
+set context [list [list "./" "Relationship types"] "One type"]
 
 if { ![db_0or1row select_pretty_name {
     select t.pretty_name as rel_type_pretty_name, t.table_name, t.id_column, t.dynamic_p
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">All relations of type "@rel_type_pretty_name@"</property>
 				   
 <if @rels:rowcount@ eq 0>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/rels-list.tcl	6 Sep 2002 21:50:03 -0000	1.2
@@ -11,15 +11,15 @@
 } {
     rel_type:notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     rel_type_pretty_name:onevalue
     rels:multirow
 }
 
 set user_id [ad_conn user_id]
 set package_id [ad_conn package_id]
 
-set context_bar [list [list "" "Relationship types"] [list one?[ad_export_vars rel_type] "One type"] "Relations"]
+set context [list [list "" "Relationship types"] [list one?[ad_export_vars rel_type] "One type"] "Relations"]
 
 if { ![db_0or1row select_pretty_name {
     select t.pretty_name as rel_type_pretty_name
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Delete @pretty_name@</property>
 
 Are you sure you want to delete this role? 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/delete.tcl	6 Sep 2002 21:50:03 -0000	1.2
@@ -12,12 +12,12 @@
     role:notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     pretty_name:onevalue
     export_vars:onevalue
 }
 
-set context_bar [list [list "../" "Relationship types"] [list "" "Roles"] [list one?[ad_export_vars role] "One role"] "Delete role"]
+set context [list [list "../" "Relationship types"] [list "" "Roles"] [list one?[ad_export_vars role] "One role"] "Delete role"]
 
 set export_vars [ad_export_vars -form {role return_url}]
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Edit @role@</property>
 <property name="focus">role_form.role</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/edit.tcl	6 Sep 2002 21:50:03 -0000	1.2
@@ -12,7 +12,7 @@
     role:notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     
 }
 
@@ -22,7 +22,7 @@
      where r.role = :role
 }
 
-set context_bar [list [list "../" "Relationship types"] [list "one?[ad_export_vars role]" "One role"] "Edit"]
+set context [list [list "../" "Relationship types"] [list "one?[ad_export_vars role]" "One role"] "Edit"]
 
 template::form create role_form
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Roles</property>
 
 <ul>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/index.tcl	6 Sep 2002 21:50:03 -0000	1.2
@@ -10,11 +10,11 @@
 
 } {
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     
 }
 
-set context_bar [list [list "../" "Relationship types"] "Roles"]
+set context [list [list "../" "Relationship types"] "Roles"]
 
 db_multirow roles select_roles {
     select r.role, r.pretty_name, nvl(num1.number_rels,0) + nvl(num2.number_rels,0) as number_rel_types
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Create role</property>
 <property name="focus">role_form.role</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/new.tcl	6 Sep 2002 21:50:03 -0000	1.3
@@ -14,11 +14,11 @@
     { pretty_plural "" }
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     
 }
 
-set context_bar [list [list "../" "Relationship types"] [list "[ad_conn package_url]admin/rel-types/roles/" "Roles"] "Create role"]
+set context [list [list "../" "Relationship types"] [list "[ad_conn package_url]admin/rel-types/roles/" "Roles"] "Create role"]
 
 template::form create role_form
 
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.adp	6 Sep 2002 21:50:03 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">@role_props.pretty_name@</property>
 
 <p><b>Properties:</b>
Index: openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/rel-types/roles/one.tcl	6 Sep 2002 21:50:03 -0000	1.3
@@ -11,7 +11,7 @@
 } {
     role:notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     role:onevalue
     role_enc:onevalue
     role_props:onerow
@@ -20,7 +20,7 @@
 }
 
 set role_enc [ad_urlencode $role]
-set context_bar [list [list "../" "Relationship types"] [list "[ad_conn package_url]admin/rel-types/roles/" "Roles"] "One role"]
+set context [list [list "../" "Relationship types"] [list "[ad_conn package_url]admin/rel-types/roles/" "Roles"] "One role"]
 
 if { ![db_0or1row select_role_props {
     select r.pretty_name, r.pretty_plural
Index: openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/relations/add-no-valid-parties.adp	6 Sep 2002 21:50:04 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add @role_pretty_name@ to @group_name@</property>
 
 <blockquote>
Index: openacs-4/packages/acs-subsite/www/admin/relations/add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/relations/add.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.adp	6 Sep 2002 21:50:04 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add @role_pretty_name@ to @group_name@</property>
 
 <blockquote>
Index: openacs-4/packages/acs-subsite/www/admin/relations/add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/add.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	4 Dec 2001 00:20:47 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/relations/add.tcl	6 Sep 2002 21:50:04 -0000	1.4
@@ -16,7 +16,7 @@
     { return_url "" }
     { allow_out_of_scope_p "f" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     role_pretty_name:onevalue
     group_name:onevalue
     export_form_vars:onevalue
@@ -42,7 +42,7 @@
 # double-click protection (which we're not doing yet).  We also need
 # to check permissions on the party.
 
-set context_bar [list "Add relation"]
+set context [list "Add relation"]
 
 set export_var_list [list group_id rel_type exact_p return_url allow_out_of_scope_p]
 
Index: openacs-4/packages/acs-subsite/www/admin/relations/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/relations/one.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/relations/one.adp	6 Sep 2002 21:50:04 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">One relation</property>
 				   
 <h3>Attributes</h3>
Index: openacs-4/packages/acs-subsite/www/admin/relations/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/relations/one.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/relations/one.tcl	6 Sep 2002 21:50:04 -0000	1.2
@@ -11,7 +11,7 @@
 } {
     rel_id:integer,notnull
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     rel_id:onevalue
     rel:onerow
     delete_p:onevalue
@@ -41,7 +41,7 @@
 set delete_p [ad_permission_p $rel_id "delete"]
 set write_p [ad_permission_p $rel_id "write"]
 
-set context_bar [list "One relation"]
+set context [list "One relation"]
 
 set subsite_group_id [application_group::group_id_from_package_id]
 
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove-dependants-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove-dependants-exist.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/relations/remove-dependants-exist.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove-dependants-exist.adp	6 Sep 2002 21:50:04 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Dependant relations exist</property>
 
 You must remove the following dependant relations before you can
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.adp	6 Sep 2002 21:50:04 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Remove relation</property>
 
 Are you sure you want to remove the @rel.rel_type_pretty_name@
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl	6 Sep 2002 21:50:04 -0000	1.2
@@ -10,7 +10,7 @@
     rel_id:integer,notnull
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     rel:onerow
     dependants:multirow
@@ -27,7 +27,7 @@
     }
 }
 
-set context_bar [list "Remove relation"]
+set context [list "Remove relation"]
 
 if { ![db_0or1row select_rel_info {
     select acs_object_type.pretty_name(r.rel_type) as rel_type_pretty_name,
Index: openacs-4/packages/acs-subsite/www/admin/users/new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/users/new.adp	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/users/new.adp	6 Sep 2002 21:50:05 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="../master">
-<property name="context_bar">@context_bar@</property>
+<master>
+<property name="context">@context@</property>
 <property name="title">Add a user</property>
 
 <formtemplate id="add_user"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/admin/users/new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/users/new.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/admin/users/new.tcl	2 Sep 2001 17:35:57 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/admin/users/new.tcl	6 Sep 2002 21:50:05 -0000	1.3
@@ -17,12 +17,12 @@
     {add_with_rel_type "user_profile"}
     {group_rel_type_list ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     user_type_pretty_name:onevalue
     attributes:multirow
 }
 
-set context_bar [list [list "" "Parties"] "Add a user"]
+set context [list [list "" "Parties"] "Add a user"]
 
 set export_var_list [list \
 	user_id user_type add_to_group_id add_with_rel_type \
Index: openacs-4/packages/acs-subsite/www/permissions/grant.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/grant.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/permissions/grant.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/permissions/grant.tcl	6 Sep 2002 21:50:06 -0000	1.2
@@ -17,8 +17,7 @@
 
 <h2>Grant Permission on $name</h2>
 
-[ad_context_bar [list .?[export_url_vars object_id] Permissions for $name] \
-    "Grant Permission on $name"]
+[ad_context_bar [list ./?[export_url_vars object_id] "Permissions for $name"] "Grant"]
 <hr>
 
 <form method=get action=grant-2>
Index: openacs-4/packages/acs-subsite/www/permissions/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/permissions/one.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/permissions/one.tcl	6 Sep 2002 21:50:06 -0000	1.2
@@ -20,7 +20,7 @@
 
 <h2>Permissions for $name</h2>
 
-[ad_context_bar {. "Permissions"} "Permissions for $name"]
+[ad_context_bar [list "./" "Permissions"] "Permissions for $name"]
 <hr>
 
 <h3>Inherited Permissions</h3>
Index: openacs-4/packages/acs-subsite/www/pvt/alerts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/alerts.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/pvt/alerts.adp	3 Sep 2002 16:29:12 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/pvt/alerts.adp	6 Sep 2002 21:50:08 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @discussion_forum_alert_p@ eq 1>
 
Index: openacs-4/packages/acs-subsite/www/pvt/alerts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/alerts.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/pvt/alerts.tcl	3 Sep 2002 16:29:12 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/pvt/alerts.tcl	6 Sep 2002 21:50:08 -0000	1.3
@@ -3,7 +3,7 @@
 } {
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     discussion_forum_alert_p:onevalue
     bboard_keyword_p:onevalue
     bboard_rows:multirow
@@ -24,7 +24,7 @@
 
 set title "$full_name's alerts in [ad_system_name]"
 
-set context_bar [ad_context_bar "Alerts"]
+set context [list "Alerts"]
 
 
 set discussion_forum_alert_p 0
Index: openacs-4/packages/acs-subsite/www/pvt/home.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/pvt/home.adp	3 Sep 2002 16:29:12 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/pvt/home.adp	6 Sep 2002 21:50:08 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@full_name@'s workspace at @system_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <ul>
 
Index: openacs-4/packages/acs-subsite/www/pvt/home.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/home.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-subsite/www/pvt/home.tcl	3 Sep 2002 16:29:12 -0000	1.4
+++ openacs-4/packages/acs-subsite/www/pvt/home.tcl	6 Sep 2002 21:50:08 -0000	1.5
@@ -5,7 +5,7 @@
     @cvs-id $Id$
 } -properties {
     system_name:onevalue
-    context_bar:onevalue
+    context:onevalue
     full_name:onevalue
     email:onevalue
     url:onevalue
@@ -108,9 +108,9 @@
 set header [ad_header "$full_name's workspace at $system_name"]
 
 if {[ad_conn package_url] == "/"} {
-  set context_bar [ad_context_bar "[ad_pvt_home_name]"]
+  set context [list "[ad_pvt_home_name]"]
 } else {
-  set context_bar [ad_context_bar "Home"]
+  set context [list "Home"]
 }
 
 #  set site_map [ad_parameter SiteMap content]
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/pvt/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/pvt/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/set-on-vacation-to-null.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp	3 Sep 2002 16:29:12 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-to-null.adp	6 Sep 2002 21:50:08 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Vacation Information Updated</property>
 
 <p>You're marked as back from vacation at @site_link@.</p>
Index: openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/Attic/set-on-vacation-until.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp	3 Sep 2002 16:29:12 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/pvt/set-on-vacation-until.adp	6 Sep 2002 21:50:08 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Vacation Information Updated</property>
 
 <p>Your vacation information at @site_link@ has been updated.</p>
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp	3 Sep 2002 16:29:12 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe-2.adp	6 Sep 2002 21:50:08 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Account Deleted</property>
 
 Your account at @system_name@ has been marked as "deleted".
Index: openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp	3 Sep 2002 16:29:12 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/pvt/unsubscribe.adp	6 Sep 2002 21:50:08 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Confirm Unsubscribe</property>
 
 
Index: openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-approval.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/awaiting-approval.adp	6 Sep 2002 21:50:09 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Awaiting Approval</property>
 
 <p>Your registration request has been submitted 
Index: openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/awaiting-email-verification.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/awaiting-email-verification.adp	6 Sep 2002 21:50:09 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Awaiting email verification</property>
 
 <p>Registration information for this service has just been
Index: openacs-4/packages/acs-subsite/www/register/bad-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/bad-password.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/bad-password.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/bad-password.adp	6 Sep 2002 21:50:09 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Bad Password</property>
 <property name="context_bar">in <a href="/index">@system_name@</a></property>
 
Index: openacs-4/packages/acs-subsite/www/register/banned-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/banned-user.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/banned-user.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/banned-user.adp	6 Sep 2002 21:50:09 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Sorry</property>
 
 Sorry but it seems that you've been banned from @system_name@.
Index: openacs-4/packages/acs-subsite/www/register/deleted-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/deleted-user.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/deleted-user.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/deleted-user.adp	6 Sep 2002 21:50:09 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Welcome Back</property>
 <property name="context_bar">to @site_link@</property>
 
Index: openacs-4/packages/acs-subsite/www/register/email-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/email-confirm.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/email-confirm.adp	3 Sep 2002 16:29:13 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/email-confirm.adp	6 Sep 2002 21:50:09 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Email Confirmation</property>
 
 <if @email_verified_p@ eq "f">
Index: openacs-4/packages/acs-subsite/www/register/email-for-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-for-password.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/email-for-password.adp	3 Sep 2002 16:29:13 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/email-for-password.adp	6 Sep 2002 21:50:09 -0000	1.4
@@ -1,7 +1,7 @@
-<master src="master">
+<master>
 <property name="title">Forgotten Password / Enter Your Email</property>
+<property name="context">"email password"</property>
 
-
 <form method="get" action="email-for-password-2">
   Your email: <input type="text" name="email" /> <input type="submit" value="send" />
 </form>
Index: openacs-4/packages/acs-subsite/www/register/email-password-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/email-password-2.adp	3 Sep 2002 16:29:13 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/email-password-2.adp	6 Sep 2002 21:50:09 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Check Your Inbox</property>
 
 Please check your inbox. Within the next few minutes, you should find
Index: openacs-4/packages/acs-subsite/www/register/email-password-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password-3.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/email-password-3.adp	3 Sep 2002 16:29:13 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/email-password-3.adp	6 Sep 2002 21:50:09 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Customized Question/Answer Entered</property>
 
 <p>Please Wait for our Email</p>
Index: openacs-4/packages/acs-subsite/www/register/email-password.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/email-password.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/email-password.adp	3 Sep 2002 16:29:13 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/email-password.adp	6 Sep 2002 21:50:09 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Email Password</property>
 
 
Index: openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/explain-persistent-cookies.adp	6 Sep 2002 21:50:09 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Saving email address and password</property>
 <property name="context_bar">at @home_link@</property>
 
Index: openacs-4/packages/acs-subsite/www/register/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/register/index.adp	3 Sep 2002 16:29:13 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/register/index.adp	6 Sep 2002 21:50:09 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Log In</property>
 <property name=focus>login.email</property>
 <property name="context_bar">to <a href="/">@system_name@</a></property>
Index: openacs-4/packages/acs-subsite/www/register/login-expired.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/login-expired.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/login-expired.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/login-expired.adp	6 Sep 2002 21:50:09 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Login Expired</property>
 
 <p>The login page has expired. Please <a href="./index">login</a> again.</p>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/register/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/register/restore-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/restore-user.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/restore-user.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/restore-user.adp	6 Sep 2002 21:50:09 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Your Account is Restored</property>
 
 
Index: openacs-4/packages/acs-subsite/www/register/user-join.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-join.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/user-join.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/user-join.adp	6 Sep 2002 21:50:09 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master">
+<master>
 <property name="title">Join @group_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <formtemplate id="join"></formtemplate>
Index: openacs-4/packages/acs-subsite/www/register/user-join.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-join.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/register/user-join.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/register/user-join.tcl	6 Sep 2002 21:50:09 -0000	1.2
@@ -11,7 +11,7 @@
     {rel_type:notnull "membership_rel"}
     { return_url "" }
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     role_pretty_name:onevalue
     group_name:onevalue
     export_form_vars:onevalue
@@ -38,7 +38,7 @@
 
 set party_id [ad_conn user_id]
 
-set context_bar [list "Join $group_name"]
+set context [list "Join $group_name"]
 
 template::form create join
 
Index: openacs-4/packages/acs-subsite/www/register/user-new-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/Attic/user-new-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/register/user-new-2.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/register/user-new-2.adp	6 Sep 2002 21:50:09 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 
 <if @email_verified_p@ eq f>
Index: openacs-4/packages/acs-subsite/www/register/user-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/register/user-new.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/register/user-new.adp	3 Sep 2002 16:29:13 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/register/user-new.adp	6 Sep 2002 21:50:09 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Register</property>
 
 
Index: openacs-4/packages/acs-subsite/www/shared/community-member.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/shared/community-member.adp	3 Sep 2002 16:29:13 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/shared/community-member.adp	6 Sep 2002 21:50:11 -0000	1.4
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@first_names@ @last_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @inline_portrait_state@ eq "inline">
   <a href="portrait?@portrait_export_vars@"><img src="portrait-bits?@portrait_export_vars@" align="right" width="@width@" height="@height@"></a><br />
Index: openacs-4/packages/acs-subsite/www/shared/community-member.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/community-member.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/community-member.tcl	22 Jan 2002 20:08:00 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/community-member.tcl	6 Sep 2002 21:50:11 -0000	1.3
@@ -6,7 +6,7 @@
 } {
     user_id:integer
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     member_state:onevalue
     first_names:onevalue
     last_name:onevalue
@@ -126,7 +126,7 @@
 and a.creation_user = :user_id
 order by object_name, creation_date"
 
-set context_bar [ad_context_bar_ws_or_index "Community member"]
+set context [list "Community member"]
 set system_name [ad_system_name]
 set pretty_creation_date [util_AnsiDatetoPrettyDate $creation_date]
 set login_export_vars "return_url=[ns_urlencode [acs_community_member_url -user_id $user_id]]"
Index: openacs-4/packages/acs-subsite/www/shared/confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/confirm.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/confirm.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/confirm.adp	6 Sep 2002 21:50:11 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 
 @message@
Index: openacs-4/packages/acs-subsite/www/shared/db-error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/db-error.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/db-error.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/db-error.adp	6 Sep 2002 21:50:11 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Database error</property>
 
 <p><if @custom_message@ nil>
Index: openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/iso-codes-no-exist.adp	6 Sep 2002 21:50:11 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">ISO Codes not loaded</property>
  
 <p>The iso codes were not loaded on this server.</p>
Index: openacs-4/packages/acs-subsite/www/shared/iso-codes.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/iso-codes.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/iso-codes.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/iso-codes.adp	6 Sep 2002 21:50:11 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Complete List of ISO Codes</property>
 
 Please locate your country's code among those listed below then use
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/shared/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/shared/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/shared/portrait.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/portrait.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/portrait.adp	6 Sep 2002 21:50:11 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Portrait of @first_names@ @last_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <p><center>
 <img @widthheight_param@ src="/shared/portrait-bits.tcl?@export_vars@">
Index: openacs-4/packages/acs-subsite/www/shared/portrait.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/portrait.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/portrait.tcl	22 Jan 2002 20:08:00 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/portrait.tcl	6 Sep 2002 21:50:11 -0000	1.3
@@ -6,7 +6,7 @@
 } {
     user_id:integer
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     first_names:onevalue
     last_name:onevalue
     description:onevalue
@@ -41,7 +41,7 @@
     set widthheight_param ""
 }
 
-set context_bar [ad_context_bar_ws_or_index [list [acs_community_member_url -user_id $user_id] "One Member"] "Portrait"]
+set context [list [list [acs_community_member_url -user_id $user_id] "One Member"] "Portrait"]
 set export_vars [export_url_vars user_id]
 set publish_date [util_AnsiDatetoPrettyDate $publish_date]
 
Index: openacs-4/packages/acs-subsite/www/shared/report-error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/report-error.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/report-error.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/report-error.adp	6 Sep 2002 21:50:11 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Application error</property>
 
 <if @custom_message@ nil>
Index: openacs-4/packages/acs-subsite/www/shared/send-email.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/send-email.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/send-email.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/send-email.adp	6 Sep 2002 21:50:11 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Sent: @sent_subject@</property>
 
 @sent_message@
Index: openacs-4/packages/acs-subsite/www/shared/whos-online.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/whos-online.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/shared/whos-online.adp	3 Sep 2002 16:29:13 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/shared/whos-online.adp	6 Sep 2002 21:50:11 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @chat_system_name@ not nil>
   This page is mostly useful in conjuction with 
Index: openacs-4/packages/acs-subsite/www/shared/whos-online.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/shared/whos-online.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-subsite/www/shared/whos-online.tcl	3 Sep 2002 16:29:13 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/shared/whos-online.tcl	6 Sep 2002 21:50:11 -0000	1.4
@@ -4,7 +4,7 @@
     @cvs-id $Id$
 } -properties {
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
     last_visit_interval:onevalue
     chat_system_name:onevalue
     connected_user_id:onevalue
@@ -21,7 +21,7 @@
 db_release_unused_handles
 
 set title "Who's Online?"
-set context_bar [ad_context_bar_ws_or_index "Who's Online"]
+set context [list "Who's Online"]
 
 set last_visit_interval [ad_parameter LastVisitUpdateInterval ""]
 
Index: openacs-4/packages/acs-subsite/www/user/basic-info-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/basic-info-update.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	3 Sep 2002 16:29:14 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/basic-info-update.adp	6 Sep 2002 21:50:12 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Update Basic Information</property>
 <property name="context_bar">in @site_link@</property>
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/user/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/user/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/user/password-update.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/password-update.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-subsite/www/user/password-update.adp	3 Sep 2002 16:29:14 -0000	1.7
+++ openacs-4/packages/acs-subsite/www/user/password-update.adp	6 Sep 2002 21:50:12 -0000	1.8
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Update Password</property>
 <property name="context_bar">for @first_names@ @last_name@ in @site_link@</property>
 
Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp	3 Sep 2002 16:29:15 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.adp	6 Sep 2002 21:50:14 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Edit comment for the portrait of @first_names@ @last_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form method="post" action="comment-edit-2.tcl">
 @export_vars@
Index: openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/comment-edit.tcl	6 Sep 2002 21:50:14 -0000	1.2
@@ -8,7 +8,7 @@
     {return_url "" }
     {user_id ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     description:onevalue
     first_names:onevalue
@@ -49,7 +49,5 @@
 
 db_release_unused_handles
 
-set context_bar [ad_context_bar_ws [list index "Your Portrait"] "Edit comment"]
+set context [list [list "./" "Your Portrait"] "Edit comment"]
 set export_vars [export_form_vars user_id return_url]
-
-ad_return_template
Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/user/portrait/erase.adp	3 Sep 2002 16:29:15 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/portrait/erase.adp	6 Sep 2002 21:50:14 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Erase Portrait</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <if @admin_p@ eq 0>
   <p>Are you sure that you want to erase your portrait?</p>
Index: openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/erase.tcl	6 Sep 2002 21:50:14 -0000	1.2
@@ -6,7 +6,7 @@
     {return_url "" }
     {user_id ""}
 } -properties {
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     admin_p:onevalue
 }
@@ -23,12 +23,10 @@
 ad_require_permission $user_id "write"
 
 if {$admin_p} {
-    set context_bar [ad_context_bar_ws [list "index?user_id=$user_id" "User's Portrait"] "Erase"]
+    set context [list [list "./?user_id=$user_id" "User's Portrait"] "Erase"]
 } else {
-    set context_bar [ad_context_bar_ws [list "index" "Your Portrait"] "Erase"]
+    set context [list_ws [list "./" "Your Portrait"] "Erase"]
 }
 
 set export_vars [export_form_vars user_id return_url]
 
-
-ad_return_template
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/user/portrait/index.adp	3 Sep 2002 16:29:15 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.adp	6 Sep 2002 21:50:14 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">Portrait of @first_names@ @last_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <p>This is the image that we show to other users at @system_name@:</p>
 
Index: openacs-4/packages/acs-subsite/www/user/portrait/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/index.tcl	6 Sep 2002 21:50:14 -0000	1.2
@@ -85,9 +85,9 @@
 db_release_unused_handles
 
 if {$admin_p} {
-    set context_bar [ad_context_bar_ws "User's Portrait"]
+    set context [list "User's Portrait"]
 } else {
-    set context_bar [ad_context_bar_ws "Your Portrait"]
+    set context [list "Your Portrait"]
 }
 
 set system_name [ad_system_name]
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/user/portrait/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/acs-subsite/www/user/portrait/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.adp	3 Sep 2002 16:29:15 -0000	1.2
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.adp	6 Sep 2002 21:50:14 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>Upload Portrait</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 How would you like the world to see @first_names@ @last_name@?
 
Index: openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	13 Mar 2001 22:59:26 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/user/portrait/upload.tcl	6 Sep 2002 21:50:14 -0000	1.2
@@ -8,7 +8,7 @@
 } -properties {
     first_names:onevalue
     last_name:onevalue
-    context_bar:onevalue
+    context:onevalue
     export_vars:onevalue
     
 }
@@ -33,9 +33,9 @@
 }
 
 if {$admin_p} {
-    set context_bar [ad_context_bar_ws [list "index.tcl?user_id=$user_id" "User's Portrait"] "Upload Portrait"]
+    set context [list [list "./?user_id=$user_id" "User's Portrait"] "Upload Portrait"]
 } else {
-    set context_bar [ad_context_bar_ws [list "index.tcl" "Your Portrait"] "Upload Portrait"]
+    set context [list [list "./" "Your Portrait"] "Upload Portrait"]
 }
 
 set export_vars [export_form_vars user_id return_url]
Index: openacs-4/packages/address-book/www/address-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/address-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/address-book/www/address-ae.adp	3 Sep 2002 12:47:17 -0000	1.2
+++ openacs-4/packages/address-book/www/address-ae.adp	6 Sep 2002 21:50:19 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=title>@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form action=address-ae-2>
 @address_widget@
Index: openacs-4/packages/address-book/www/address-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/address-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/address-ae.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/address-ae.tcl	6 Sep 2002 21:50:19 -0000	1.2
@@ -10,7 +10,7 @@
     address_id:integer,optional
 } -properties {
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     address_widget:onevalue
     activity:onevalue
 }
@@ -35,7 +35,7 @@
     append address_widget [place::address::entrywidget -address_id $address_id]
 }
 
-set context_bar [ad_context_bar [list contact-view?contact_id=$contact_id "View a Contact"] Address]
+set context [list [list contact-view?contact_id=$contact_id "View a Contact"] Address]
 
 
 
Index: openacs-4/packages/address-book/www/attr-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/attr-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/address-book/www/attr-ae.adp	3 Sep 2002 12:47:17 -0000	1.2
+++ openacs-4/packages/address-book/www/attr-ae.adp	6 Sep 2002 21:50:19 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form action=attr-ae-2>
 @attr_widget@
Index: openacs-4/packages/address-book/www/attr-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/attr-ae.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/attr-ae.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/attr-ae.tcl	6 Sep 2002 21:50:19 -0000	1.2
@@ -10,7 +10,7 @@
     attr_id:integer,optional
 } -properties {
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     attr_widget:onerow
     activity:onevalue
 }
@@ -62,7 +62,7 @@
 [ab::contact_attr_type::select -default $type_key]
 <input type=text size=30 maxlength=200 name=attr_value value=\"[ad_quotehtml $value]\">
 "
-set context_bar [ad_context_bar [list contact-view?contact_id=$contact_id "View a Contact"] Attribute]
+set context [list [list contact-view?contact_id=$contact_id "View a Contact"] Attribute]
 
 
 ad_return_template
\ No newline at end of file
Index: openacs-4/packages/address-book/www/contact-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/address-book/www/contact-add.adp	3 Sep 2002 12:47:17 -0000	1.2
+++ openacs-4/packages/address-book/www/contact-add.adp	6 Sep 2002 21:50:19 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name=>@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form method=post action=contact-add-2>
 @hidden_vars@
Index: openacs-4/packages/address-book/www/contact-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/contact-add.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/contact-add.tcl	6 Sep 2002 21:50:19 -0000	1.2
@@ -9,7 +9,7 @@
 } {
 } -properties {
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     hidden_vars:onevalue
     escaped_first_names:onevalue
     escaped_last_name:onevalue
@@ -29,7 +29,7 @@
 set page_title "Add a Contact"
 set activity "Add"
 set contact_id [db_nextval acs_object_id_seq]
-set context_bar [ad_context_bar $page_title]
+set context [list $page_title]
 
 set hidden_vars "<input type=hidden name=contact_id value=$contact_id>"
 
Index: openacs-4/packages/address-book/www/contact-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/address-book/www/contact-edit.adp	3 Sep 2002 12:47:17 -0000	1.2
+++ openacs-4/packages/address-book/www/contact-edit.adp	6 Sep 2002 21:50:19 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form method=post action=contact-edit-2>
 @hidden_vars@
Index: openacs-4/packages/address-book/www/contact-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-edit.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/contact-edit.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/contact-edit.tcl	6 Sep 2002 21:50:19 -0000	1.2
@@ -11,7 +11,7 @@
 } -properties {
     hidden_vars:onevalue
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     escaped_first_names:onevalue
     escaped_last_name:onevalue
     escaped_title:onevalue
@@ -27,7 +27,7 @@
 ad_require_permission $contact_id write
 set activity "Update"
 set page_title "Edit a Contact"
-set context_bar [ad_context_bar [list contact-view?contact_id=$contact_id "View a Contact"] $activity]
+set context [list [list contact-view?contact_id=$contact_id "View a Contact"] $activity]
 
 set hidden_vars "<input type=hidden name=contact_id value=$contact_id>"
 
Index: openacs-4/packages/address-book/www/contact-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-view.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/address-book/www/contact-view.adp	3 Sep 2002 12:47:17 -0000	1.2
+++ openacs-4/packages/address-book/www/contact-view.adp	6 Sep 2002 21:50:19 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <table>
 <tr>
Index: openacs-4/packages/address-book/www/contact-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/contact-view.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/address-book/www/contact-view.tcl	20 Apr 2001 20:51:12 -0000	1.1
+++ openacs-4/packages/address-book/www/contact-view.tcl	6 Sep 2002 21:50:19 -0000	1.2
@@ -10,7 +10,7 @@
     contact_id:integer,notnull
 } -properties {
     page_title:onevalue
-    context_bar:onevalue
+    context:onevalue
     contact_widget:onevalue
     write_p:onevalue
     create_p:onevalue
@@ -28,7 +28,7 @@
 
 set page_title "View a Contact"
 
-set context_bar [ad_context_bar "View a Contact"]
+set context [list "View a Contact"]
 
 ab::contact::1row $contact_id contact
 
Index: openacs-4/packages/address-book/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/address-book/www/index.adp	3 Sep 2002 12:47:17 -0000	1.2
+++ openacs-4/packages/address-book/www/index.adp	6 Sep 2002 21:50:19 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="master">
+<master>
 <property name="title">@instance_name@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <form action="./">
 <input type=text name=substr size=20 maxlength=40 value=@escaped_substr@>
Index: openacs-4/packages/address-book/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/address-book/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/address-book/www/index.tcl	1 Sep 2001 20:34:19 -0000	1.2
+++ openacs-4/packages/address-book/www/index.tcl	6 Sep 2002 21:50:19 -0000	1.3
@@ -11,7 +11,7 @@
     {substr:trim,optional ""}
 } -properties {
     instance_name:onevalue
-    context_bar:onevalue
+    context:onevalue
     user_id:onevalue
     create_p:onevalue
     admin_p:onevalue
@@ -27,7 +27,7 @@
 
 set instance_name [db_exec_plsql package_name {begin :1 := acs_object.name(:instance_id); end;}]
 
-set context_bar [ad_context_bar]
+set context [list]
 
 set create_p [ad_permission_p $instance_id create]
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/address-book/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/address-book/www/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/adserver/www/default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/default.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/adserver/www/default.adp	3 Sep 2002 12:44:10 -0000	1.2
+++ openacs-4/packages/adserver/www/default.adp	6 Sep 2002 21:50:20 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
 <property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 @page_content@
Index: openacs-4/packages/adserver/www/default.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/default.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/adserver/www/default.tcl	3 Sep 2002 12:44:11 -0000	1.1
+++ openacs-4/packages/adserver/www/default.tcl	6 Sep 2002 21:50:20 -0000	1.2
@@ -1,8 +1,8 @@
 if { ![info exists title] } {
     set title ""
 }
-if { ![info exists context_bar] } {
-    set context_bar [ad_context_bar [list $title]]
+if { ![info exists context] } {
+    set context [list $title]
 }
 if { [info exists admin_p] && $admin_p } { 
     set page_content "$admin_link $page_content"
Index: openacs-4/packages/adserver/www/admin/default.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/admin/default.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/adserver/www/admin/default.adp	3 Sep 2002 12:44:12 -0000	1.2
+++ openacs-4/packages/adserver/www/admin/default.adp	6 Sep 2002 21:50:21 -0000	1.3
@@ -1,5 +1,5 @@
 <master>
 <property name="title">@title@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 @page_content@
Index: openacs-4/packages/adserver/www/admin/default.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/adserver/www/admin/default.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/adserver/www/admin/default.tcl	3 Sep 2002 12:44:12 -0000	1.1
+++ openacs-4/packages/adserver/www/admin/default.tcl	6 Sep 2002 21:50:21 -0000	1.2
@@ -1,8 +1,8 @@
 if { ![info exists title] } {
     set title ""
 }
-if { ![info exists context_bar] } {
-    set context_bar [ad_context_bar [list $title]]
+if { ![info exists context] } {
+    set context [list [list $title]]
 }
 if { [info exists admin_p] && $admin_p } { 
     set page_content "$admin_link $page_content"
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/bookmarks/www/bm-master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/bookmarks/www/bm-master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/bookmarks/www/bookmark-add-import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmark-add-import.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmark-add-import.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 <% set hidden_form_vars "<input type=hidden name=return_url value=@return_url@>
 <input type=hidden name=viewed_user_id value=@viewed_user_id@>
Index: openacs-4/packages/bookmarks/www/bookmark-add-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-import.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	17 Jul 2001 01:52:44 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-add-import.tcl	6 Sep 2002 21:50:22 -0000	1.3
@@ -30,7 +30,7 @@
 } -properties {
 
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
     return_url:onevalue
     viewed_user_id:onevalue
     bookmark_id:onevalue
@@ -49,7 +49,7 @@
 
 set page_title "Add/Import Bookmarks"
 
-set context_bar_args [bm_context_bar_args "\"$page_title\"" $viewed_user_id]
+set context [bm_context_bar_args "\"$page_title\"" $viewed_user_id]
 
 # get the next bookmark_id (used as primary key in bm_bookmarks)
 set bookmark_id [db_nextval acs_object_id_seq]
Index: openacs-4/packages/bookmarks/www/bookmark-add-one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmark-add-one.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 <if @url_unreachable_p@ eq "t">
 <strong>Warning: We are not able to reach the url (@complete_url@) that you specified. Please make sure that you did not misspell the url.</strong>
Index: openacs-4/packages/bookmarks/www/bookmark-add-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-add-one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmark-add-one.tcl	6 Sep 2002 21:50:22 -0000	1.2
@@ -72,7 +72,7 @@
 
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
     errmsg:onevalue
     local_title:onevalue
     complete_url:onevalue
@@ -117,7 +117,7 @@
 
 set page_title "Inserting \"[string trim $local_title]\""
 
-set context_bar_args [bm_context_bar_args "\[list bookmark-add-import?[export_url_vars return_url viewed_user_id] \"Add/Import Bookmarks\"\] \"[ad_quotehtml $page_title]\"" $viewed_user_id]
+set context [bm_context_bar_args "\[list bookmark-add-import?[export_url_vars return_url viewed_user_id] \"Add/Import Bookmarks\"\] \"[ad_quotehtml $page_title]\"" $viewed_user_id]
 
 set meta_description [bm_get_html_description $url_content]
 set meta_keywords [bm_get_html_keywords $url_content]
Index: openacs-4/packages/bookmarks/www/bookmark-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmark-delete.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmark-delete.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 
 
Index: openacs-4/packages/bookmarks/www/bookmark-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmark-delete.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmark-delete.tcl	6 Sep 2002 21:50:22 -0000	1.2
@@ -20,7 +20,7 @@
 
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
     bookmark_title:onevalue
     contained_bookmarks:multirow
     return_url
@@ -32,7 +32,7 @@
 
 set page_title "Confirm Deletion"
 
-set context_bar_args "\[list bookmark-edit?bookmark_id=$bookmark_id&viewed_user_id=$viewed_user_id \"Edit Bookmark\"\] \"$page_title\""
+set context [list [list bookmark-edit?bookmark_id=$bookmark_id&viewed_user_id=$viewed_user_id "Edit Bookmark"] $page_title]
 
 set bookmark_title [db_string bookmark_title "select local_title from bm_bookmarks
                                               where bookmark_id = :bookmark_id"]
Index: openacs-4/packages/bookmarks/www/bookmark-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmark-edit.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmark-edit.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 
 <form method=post action=bookmark-edit-2>
Index: openacs-4/packages/bookmarks/www/bookmark-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-edit.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-edit.tcl	19 Jul 2001 15:15:26 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-edit.tcl	6 Sep 2002 21:50:22 -0000	1.3
@@ -34,7 +34,7 @@
 
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
     bookmark:onerow
     viewed_user_id:onevalue
     folder_p:onevalue
@@ -61,7 +61,7 @@
 
 set page_title "Edit [ad_decode $folder_p "t" "Folder" "Bookmark"]"
 
-set context_bar_args [bm_context_bar_args "\"$page_title\"" $viewed_user_id]
+set context [bm_context_bar_args "\"$page_title\"" $viewed_user_id]
 
 set delete_p [bm_delete_permission_p $bookmark_id]
 
Index: openacs-4/packages/bookmarks/www/bookmark-permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmark-permissions.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmark-permissions.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 <property name="viewed_user_id">@viewed_user_id@</property>
 
 <form method=post action=bookmark-permissions-2>
Index: openacs-4/packages/bookmarks/www/bookmark-permissions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-permissions.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmark-permissions.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmark-permissions.tcl	6 Sep 2002 21:50:22 -0000	1.2
@@ -17,7 +17,7 @@
 
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
     old_public_p:onevalue
     viewed_user_id:onevalue
 }
@@ -30,7 +30,7 @@
 
 set page_title "Manage Permisssions on all Bookmarks"
 
-set context_bar_args [bm_context_bar_args "\"[ad_quotehtml $page_title]\"" $viewed_user_id]
+set context [bm_context_bar_args "\"[ad_quotehtml $page_title]\"" $viewed_user_id]
 
 
 ad_return_template
Index: openacs-4/packages/bookmarks/www/bookmark-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-view.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-view.adp	3 Sep 2002 14:20:38 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-view.adp	6 Sep 2002 21:50:22 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 <ul>
 <li> Bookmark Title: @bookmark.local_title@</li>
Index: openacs-4/packages/bookmarks/www/bookmark-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-view.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmark-view.tcl	19 Jul 2001 15:15:26 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmark-view.tcl	6 Sep 2002 21:50:22 -0000	1.3
@@ -16,13 +16,13 @@
 
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
 
 }
 
 set page_title "View Bookmark"
 
-set context_bar_args "\"$page_title\""
+set context [list $page_title]
 
 ad_require_permission $bookmark_id read
 
Index: openacs-4/packages/bookmarks/www/bookmarks-check.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-check.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/bookmarks-check.tcl	23 Jul 2001 03:01:40 -0000	1.2
+++ openacs-4/packages/bookmarks/www/bookmarks-check.tcl	6 Sep 2002 21:50:22 -0000	1.3
@@ -25,7 +25,7 @@
 
 set page_title "Checking Bookmarks"
 
-set context_bar_args [bm_context_bar_args "\"$page_title\"" $viewed_user_id]
+set context [bm_context_bar_args "\"$page_title\"" $viewed_user_id]
 
 set package_id [ad_conn package_id]
 
Index: openacs-4/packages/bookmarks/www/bookmarks-export.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-export.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmarks-export.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmarks-export.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 Clicking on the link below (alternatively you can right click on the link 
 and choose "Save Target As..." or "Save Link As...") will deliver your bookmarks file in a
Index: openacs-4/packages/bookmarks/www/bookmarks-export.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-export.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmarks-export.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmarks-export.tcl	6 Sep 2002 21:50:22 -0000	1.2
@@ -16,7 +16,7 @@
 
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue    
+    context:onevalue    
 
 } 
 
@@ -30,7 +30,7 @@
 
 set page_title "Export Bookmarks to Netscape File"
 
-set context_bar_args [bm_context_bar_args "\"$page_title\"" $viewed_user_id]
+set context [bm_context_bar_args "\"$page_title\"" $viewed_user_id]
 
 
 ad_return_template
Index: openacs-4/packages/bookmarks/www/bookmarks-import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmarks-import.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmarks-import.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 Here are the results of the import:
 
Index: openacs-4/packages/bookmarks/www/bookmarks-import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-import.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bookmarks/www/bookmarks-import.tcl	27 Sep 2001 01:37:50 -0000	1.3
+++ openacs-4/packages/bookmarks/www/bookmarks-import.tcl	6 Sep 2002 21:50:22 -0000	1.4
@@ -30,7 +30,7 @@
 } -properties {
 
     page_title:onevalue
-    context_bar_args:onevalue    
+    context:onevalue    
     import_list:onevalue
     return_url:onevalue
 
@@ -66,7 +66,7 @@
 
 set page_title "Import Statistics"
 
-set context_bar_args [bm_context_bar_args "\[list \"bookmark-add-import?[export_url_vars viewed_user_id return_url]\" \"Add/Import Bookmarks\"\] \"$page_title\"" $viewed_user_id]
+set context [bm_context_bar_args "\[list \"bookmark-add-import?[export_url_vars viewed_user_id return_url]\" \"Add/Import Bookmarks\"\] \"$page_title\"" $viewed_user_id]
 
 
 # set flags to be used parsing the input file.
Index: openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmarks-most-popular.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 <include src="most-popular">
 
Index: openacs-4/packages/bookmarks/www/bookmarks-most-popular.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-most-popular.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmarks-most-popular.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmarks-most-popular.tcl	6 Sep 2002 21:50:22 -0000	1.2
@@ -15,12 +15,12 @@
     @cvs-id $Id:
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
 }
 
 set page_title "Most Popular Bookmarks"
 
-set context_bar_args "\"$page_title\""
+set context [list $page_title]
 
 
 ad_return_template
Index: openacs-4/packages/bookmarks/www/bookmarks-user-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-user-list.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmarks-user-list.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmarks-user-list.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context"">@context@</property>
 
 
 <if @user_list:rowcount@ eq 0>
Index: openacs-4/packages/bookmarks/www/bookmarks-user-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmarks-user-list.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/bookmarks-user-list.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/bookmarks-user-list.tcl	6 Sep 2002 21:50:22 -0000	1.2
@@ -18,7 +18,7 @@
 
 set page_title "View other users bookmarks"
 
-set context_bar_args "\"$page_title\""
+set context [list $page_title]
 
 set browsing_user_id [ad_conn user_id]
 
Index: openacs-4/packages/bookmarks/www/complaint.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/complaint.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/complaint.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/complaint.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="bm-master">
-<property name=page_title>Problem with Your Input</property>
+<master>
+<property name="title">Problem with Your Input</property>
 
 We had
 <if @n_errors@ eq 1>
Index: openacs-4/packages/bookmarks/www/error.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/error.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/error.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/error.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,5 +1,5 @@
-<master src="bm-master">
-<property name=page_title>Application Error</property>
+<master>
+<property name="title">Application Error</property>
 
 We had
 <if @n_errors@ eq 1>
Index: openacs-4/packages/bookmarks/www/folder-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/folder-add.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/folder-add.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 
 <form action=folder-add-2 method=post>
Index: openacs-4/packages/bookmarks/www/folder-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/folder-add.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/folder-add.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/folder-add.tcl	6 Sep 2002 21:50:22 -0000	1.2
@@ -17,7 +17,7 @@
 
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
     bookmark_id:onevalue
     user_id:onevalue
     viewed_user_id:onevalue
@@ -33,7 +33,7 @@
 
 set page_title "Create Folder"
 
-set context_bar_args [bm_context_bar_args "\"$page_title\"" $viewed_user_id]
+set context [bm_context_bar_args "\"$page_title\"" $viewed_user_id]
 set user_id [ad_conn user_id]
 
 # get the next bookmark_id (used as primary key in bm_bookmarks)
Index: openacs-4/packages/bookmarks/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/bookmarks/www/index.adp	15 Feb 2002 19:25:04 -0000	1.2
+++ openacs-4/packages/bookmarks/www/index.adp	6 Sep 2002 21:50:22 -0000	1.3
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 <property name="head_contents"><script runat=client>function launch_window(file) {window.open(file,'bookmarks','toolbar=no,location=no,directories=no,status=no,scrollbars=auto,resizable=yes,copyhistory=no,width=350,height=480')}</script></property>
 
 <% set folder_bgcolor [ad_parameter FolderBGColor bookmarks "#f3f3f3"]
Index: openacs-4/packages/bookmarks/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/index.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/bookmarks/www/index.tcl	12 Oct 2001 23:42:23 -0000	1.4
+++ openacs-4/packages/bookmarks/www/index.tcl	6 Sep 2002 21:50:22 -0000	1.5
@@ -25,7 +25,7 @@
 
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
     bookmark:multirow
     browsing_user_id:onevalue
     viewed_user_id:onevalue
@@ -44,7 +44,7 @@
 if { ![info exists viewed_user_id] || [string equal $viewed_user_id $browsing_user_id] } {
     # The user is viewing his own bookmarks
     set viewed_user_id $browsing_user_id
-    set context_bar_args "" 
+    set context {}
 }
 
 set this_url_urlenc [ad_urlencode [ad_conn url]]
@@ -72,7 +72,7 @@
 
 set page_title [db_string bookmark_system_name "select acs_object.name(:package_id) from dual"]
 
-set context_bar_args [bm_context_bar_args "" $viewed_user_id]
+set context [bm_context_bar_args "" $viewed_user_id]
 
 if { ![string equal $viewed_user_id "0"] } {
     set root_folder_id [bm_get_root_folder_id [ad_conn package_id] $viewed_user_id]
Index: openacs-4/packages/bookmarks/www/one-host.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/one-host.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/one-host.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/one-host.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 <ul>
 <multiple name="user_urls">
Index: openacs-4/packages/bookmarks/www/one-host.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/one-host.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/one-host.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/one-host.tcl	6 Sep 2002 21:50:22 -0000	1.2
@@ -18,14 +18,14 @@
     
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
 
     user_urls:multirow
 }
 
 set page_title "Bookmarks for $host_url"
 
-set context_bar_args "\[list \"most-popular\" \"Most Popular\"\] \"[ad_quotehtml $page_title]\""
+set context [list [list "most-popular" "Most Popular"] [ad_quotehtml $page_title]]
 
 
 set old_name ""
Index: openacs-4/packages/bookmarks/www/permissions-reset-all.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/permissions-reset-all.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/permissions-reset-all.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 Are you sure that you want to delete the individual access permissions
 on the following bookmarks to make your default (root) permissions apply?
Index: openacs-4/packages/bookmarks/www/permissions-reset-all.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/permissions-reset-all.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/permissions-reset-all.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/permissions-reset-all.tcl	6 Sep 2002 21:50:22 -0000	1.2
@@ -20,7 +20,7 @@
 
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
     root_folder_id:onevalue
     viewed_user_id:onevalue
 }
@@ -29,7 +29,7 @@
 
 set page_title "Removal of Access Permission Settings"
 
-set context_bar_args "\[list bookmark-permissions?viewed_user_id=$viewed_user_id \"Manage Permissions on all Bookmarks\"\] \"$page_title\""
+set context [list [list bookmark-permissions?viewed_user_id=$viewed_user_id "Manage Permissions on all Bookmarks"] $page_title]
 
 
 db_multirow direct_permissions direct_bookmark_permissions {select bookmark_id, local_title from bm_bookmarks
@@ -38,7 +38,6 @@
 connect by prior bookmark_id = parent_id}
 
 
-ad_return_template
 
 
 
@@ -47,5 +46,3 @@
 
 
 
-
-
Index: openacs-4/packages/bookmarks/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/search.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/search.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/search.adp	6 Sep 2002 21:50:22 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 <% set img_html "<img border=0 src=pics/ftv2doc.gif align=top>"
 set edit_tag "<font size=-1>Edit</font>"%>
Index: openacs-4/packages/bookmarks/www/search.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/search.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/search.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/search.tcl	6 Sep 2002 21:50:22 -0000	1.2
@@ -26,7 +26,7 @@
 
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
     search_text:onevalue
     
     return_url:onevalue
@@ -46,7 +46,7 @@
 }
 
 set page_title "Searching for \"$search_text\""
-set context_bar_args [bm_context_bar_args "\"[ad_quotehtml $page_title]\"" $viewed_user_id]
+set context [bm_context_bar_args "\"[ad_quotehtml $page_title]\"" $viewed_user_id]
 
 set package_id [ad_conn package_id]
 
Index: openacs-4/packages/bookmarks/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/admin/index.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/admin/index.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/admin/index.adp	6 Sep 2002 21:50:23 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="../bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 <ul>
 
Index: openacs-4/packages/bookmarks/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/admin/index.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/admin/index.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/admin/index.tcl	6 Sep 2002 21:50:23 -0000	1.2
@@ -14,14 +14,14 @@
     @cvs-id $Id:
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
 }
 
 # Do we have to check for admin permissions here?
 
 set page_title "Bookmarks System Administration"
 
-set context_bar_args ""
+set context {}
 
 
 ad_return_template
Index: openacs-4/packages/bookmarks/www/admin/site-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/admin/site-info.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/admin/site-info.adp	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/admin/site-info.adp	6 Sep 2002 21:50:23 -0000	1.2
@@ -1,6 +1,6 @@
-<master src="../bm-master">
-<property name="page_title">@page_title@</property>
-<property name="context_bar_args">@context_bar_args@</property>
+<master>
+<property name="title">@page_title@</property>
+<property name="context">@context@</property>
 
 <include src="../check-include" meta_titles_p="t" return_url="">
 
Index: openacs-4/packages/bookmarks/www/admin/site-info.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/admin/site-info.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/bookmarks/www/admin/site-info.tcl	20 Apr 2001 20:51:09 -0000	1.1
+++ openacs-4/packages/bookmarks/www/admin/site-info.tcl	6 Sep 2002 21:50:23 -0000	1.2
@@ -13,12 +13,12 @@
     @cvs-id $Id:
 } -properties {
     page_title:onevalue
-    context_bar_args:onevalue
+    context:onevalue
 }
 
 set page_title "Checking urls and getting url meta info"
 
-set context_bar_args "\$page_title\""
+set context [list $page_title]
 
 
 ad_return_template
Index: openacs-4/packages/bulk-mail/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/bulk-mail/www/index.adp	4 Sep 2002 07:57:43 -0000	1.3
+++ openacs-4/packages/bulk-mail/www/index.adp	6 Sep 2002 21:50:25 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/bulk-mail/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/bulk-mail/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/one.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/bulk-mail/www/one.adp	4 Sep 2002 07:57:43 -0000	1.5
+++ openacs-4/packages/bulk-mail/www/one.adp	6 Sep 2002 21:50:25 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/calendar/www/cal-item-create-recurrence.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-create-recurrence.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/calendar/www/cal-item-create-recurrence.adp	4 Sep 2002 07:52:29 -0000	1.9
+++ openacs-4/packages/calendar/www/cal-item-create-recurrence.adp	6 Sep 2002 21:50:26 -0000	1.10
@@ -7,7 +7,7 @@
 -->
 
 
-<master src="master">
+<master>
 <property name="title">Calendars: Repeating Event</property>
 <property name="context">Repeat</property>
 
Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	4 Sep 2002 07:52:29 -0000	1.6
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	6 Sep 2002 21:50:26 -0000	1.7
@@ -7,7 +7,7 @@
 -->
 
 
-<master src="master">
+<master>
 <property name="title">Calendar Item Delete: @cal_item.name@</property>
 <property name="context">Delete</property>
 
Index: openacs-4/packages/calendar/www/cal-item-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/cal-item-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/cal-item-edit.adp	4 Sep 2002 07:52:29 -0000	1.2
+++ openacs-4/packages/calendar/www/cal-item-edit.adp	6 Sep 2002 21:50:26 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Calendar: Edit Item</property>
 <property name="context">Edit</property>
 
Index: openacs-4/packages/calendar/www/cal-item-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/cal-item-new.adp	4 Sep 2002 07:52:29 -0000	1.3
+++ openacs-4/packages/calendar/www/cal-item-new.adp	6 Sep 2002 21:50:26 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Calendar: Add Item</property>
 <property name="context">Add</property>
 
Index: openacs-4/packages/calendar/www/cal-item-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/calendar/www/cal-item-view.adp	4 Sep 2002 07:52:29 -0000	1.12
+++ openacs-4/packages/calendar/www/cal-item-view.adp	6 Sep 2002 21:50:26 -0000	1.13
@@ -7,7 +7,7 @@
 -->
 
 
-<master src="master">
+<master>
 <property name="title">Calendar Item: @cal_item.name@</property>
 <property name="context">Item</property>
 
Index: openacs-4/packages/calendar/www/calendar-choose.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/calendar-choose.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/calendar-choose.adp	4 Sep 2002 07:52:29 -0000	1.2
+++ openacs-4/packages/calendar/www/calendar-choose.adp	6 Sep 2002 21:50:26 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Calendar: Choose Calendar</property>
 <property name="context">Choose</property>
 
Index: openacs-4/packages/calendar/www/calendar-item-types.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/calendar-item-types.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/calendar-item-types.adp	4 Sep 2002 07:52:29 -0000	1.4
+++ openacs-4/packages/calendar/www/calendar-item-types.adp	6 Sep 2002 21:50:26 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Calendar Item Types</property>
 <property name="context">@context@</property>
 
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/calendar/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/view.adp	4 Sep 2002 07:52:29 -0000	1.4
+++ openacs-4/packages/calendar/www/view.adp	6 Sep 2002 21:50:26 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Calendars</property>
 <property name="context">Calendar</property>
 
Index: openacs-4/packages/calendar/www/admin/cal-item-permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/cal-item-permissions.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/admin/cal-item-permissions.adp	4 Sep 2002 07:52:32 -0000	1.4
+++ openacs-4/packages/calendar/www/admin/cal-item-permissions.adp	6 Sep 2002 21:50:27 -0000	1.5
@@ -6,7 +6,7 @@
      	@cvs-id $Id$
 -->
 
-<master src="master">
+<master>
 <property name="title">Calendar Item Administration </property>
 <property name="context"> "Calendar Item Permissions" </property>
 
Index: openacs-4/packages/calendar/www/admin/calendar-permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/calendar-permissions.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/admin/calendar-permissions.adp	4 Sep 2002 07:52:32 -0000	1.4
+++ openacs-4/packages/calendar/www/admin/calendar-permissions.adp	6 Sep 2002 21:50:27 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Calendar Administration: @party_name@ </property>
 <property name="context">"Calendar Permissions"</property>
 
Index: openacs-4/packages/calendar/www/admin/calendar-preferences.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/calendar-preferences.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/admin/calendar-preferences.adp	4 Sep 2002 07:52:32 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/calendar-preferences.adp	6 Sep 2002 21:50:27 -0000	1.4
@@ -6,7 +6,7 @@
      	@creation-date Dec 14, 2000
      	@cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="title">Calendar Administration: @party_name@ </property>
 <property name="context"> "Calendar Preferences" </property>
 
Index: openacs-4/packages/calendar/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/admin/index.adp	4 Sep 2002 07:52:32 -0000	1.4
+++ openacs-4/packages/calendar/www/admin/index.adp	6 Sep 2002 21:50:27 -0000	1.5
@@ -7,7 +7,7 @@
 -->
 
 
-<master src="master">
+<master>
 <property name="title">Calendar Administration for User # @user_id@</property>
 <property name="context">@context_bar@</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/calendar/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/calendar/www/admin/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/one.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/calendar/www/admin/one.adp	4 Sep 2002 07:52:32 -0000	1.4
+++ openacs-4/packages/calendar/www/admin/one.adp	6 Sep 2002 21:50:27 -0000	1.5
@@ -7,7 +7,7 @@
 -->
 
 
-<master src="master">
+<master>
 <property name="title">Calendar Administration@title@ </property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/chat/www/grant-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/grant-entry.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/grant-entry.adp	4 Sep 2002 08:12:50 -0000	1.2
+++ openacs-4/packages/chat/www/grant-entry.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date November 22, 2000
     @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/chat/www/html-chat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/html-chat.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/html-chat.adp	4 Sep 2002 08:12:50 -0000	1.2
+++ openacs-4/packages/chat/www/html-chat.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">@room_name@</property>
 
Index: openacs-4/packages/chat/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/index.adp	4 Sep 2002 08:12:50 -0000	1.2
+++ openacs-4/packages/chat/www/index.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
      @creation-date November 13, 2000
      @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">Chat main page</property>
 
Index: openacs-4/packages/chat/www/java-chat.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/java-chat.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/java-chat.adp	4 Sep 2002 08:12:50 -0000	1.2
+++ openacs-4/packages/chat/www/java-chat.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">@room_name@</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/chat/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/chat/www/message-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/message-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/message-delete.adp	4 Sep 2002 08:12:50 -0000	1.2
+++ openacs-4/packages/chat/www/message-delete.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date January 18, 2001
     @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">Confirm message delete</property>
 
Index: openacs-4/packages/chat/www/moderator-revoke.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/moderator-revoke.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/moderator-revoke.adp	4 Sep 2002 08:12:50 -0000	1.2
+++ openacs-4/packages/chat/www/moderator-revoke.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date November 22, 2000
     @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">Confirm revoke moderator</property>
 
Index: openacs-4/packages/chat/www/room-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/room-delete.adp	4 Sep 2002 08:12:51 -0000	1.2
+++ openacs-4/packages/chat/www/room-delete.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date November 22, 2000
     @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">Confirm room delete</property>
 
Index: openacs-4/packages/chat/www/room-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/room-entry.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/room-entry.adp	4 Sep 2002 08:12:51 -0000	1.2
+++ openacs-4/packages/chat/www/room-entry.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date November 17, 2000
     @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/chat/www/room.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/room.adp	4 Sep 2002 08:12:51 -0000	1.2
+++ openacs-4/packages/chat/www/room.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
      @creation-date November 13, 2000
      @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">Room Information</property>
 
Index: openacs-4/packages/chat/www/transcript-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/transcript-delete.adp	4 Sep 2002 08:12:51 -0000	1.2
+++ openacs-4/packages/chat/www/transcript-delete.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date November 28, 2000
     @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">Confirm chat transcript delete</property>
 
Index: openacs-4/packages/chat/www/transcript-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/transcript-entry.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/transcript-entry.adp	4 Sep 2002 08:12:51 -0000	1.2
+++ openacs-4/packages/chat/www/transcript-entry.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date November 17, 2000
     @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/chat/www/transcript-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/transcript-view.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/transcript-view.adp	4 Sep 2002 08:12:51 -0000	1.2
+++ openacs-4/packages/chat/www/transcript-view.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
      @creation-date November 27, 2000
      @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">Transcript preview</property>
 
Index: openacs-4/packages/chat/www/unauthorized.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/unauthorized.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/unauthorized.adp	4 Sep 2002 08:12:51 -0000	1.2
+++ openacs-4/packages/chat/www/unauthorized.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date November 24, 2000
     @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">Unauthorized</property>
 
Index: openacs-4/packages/chat/www/user-revoke.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/user-revoke.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/user-revoke.adp	4 Sep 2002 08:12:51 -0000	1.2
+++ openacs-4/packages/chat/www/user-revoke.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date November 22, 2000
     @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">Confirm revoke user</property>
 
Index: openacs-4/packages/chat/www/user-unban.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/user-unban.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/chat/www/user-unban.adp	4 Sep 2002 08:12:51 -0000	1.2
+++ openacs-4/packages/chat/www/user-unban.adp	6 Sep 2002 21:50:28 -0000	1.3
@@ -5,7 +5,7 @@
     @creation-date November 22, 2000
     @cvs-id $Id$
 -->
-<master src="master">
+<master>
 <property name="context">@context_bar@</property>
 <property name="title">Confirm unban user</property>
 
Index: openacs-4/packages/clickthrough/www/admin/all-from-local.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/all-from-local.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/all-from-local.adp	4 Sep 2002 08:35:44 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/all-from-local.adp	6 Sep 2002 21:50:30 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Clickthroughs from @local_url@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp	4 Sep 2002 08:35:44 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/all-to-foreign.adp	6 Sep 2002 21:50:30 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Clickthroughs to @foreign_url@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp	4 Sep 2002 08:35:44 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/by-foreign-url-aggregate.adp	6 Sep 2002 21:50:30 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Clickthroughs by foreign URL: summary report</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp	4 Sep 2002 08:35:44 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/by-foreign-url.adp	6 Sep 2002 21:50:30 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Clickthroughs by foreign URL</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp	4 Sep 2002 08:35:44 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/by-local-url-aggregate.adp	6 Sep 2002 21:50:30 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Clickthroughs by local URL: summary report</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/clickthrough/www/admin/by-local-url.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/by-local-url.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/by-local-url.adp	4 Sep 2002 08:35:44 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/by-local-url.adp	6 Sep 2002 21:50:30 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Clickthroughs by local URL</property>
 <property name="context">@context@</property>
 
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/clickthrough/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp	4 Sep 2002 08:35:44 -0000	1.3
+++ openacs-4/packages/clickthrough/www/admin/one-foreign-one-day.adp	6 Sep 2002 21:50:30 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Clickthroughs to @foreign_url@ on @query_date@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp	4 Sep 2002 08:35:44 -0000	1.3
+++ openacs-4/packages/clickthrough/www/admin/one-local-one-day.adp	6 Sep 2002 21:50:30 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Clickthroughs from @local_url@ on @query_date@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/clickthrough/www/admin/one-url-pair.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/one-url-pair.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/clickthrough/www/admin/one-url-pair.adp	4 Sep 2002 08:35:44 -0000	1.3
+++ openacs-4/packages/clickthrough/www/admin/one-url-pair.adp	6 Sep 2002 21:50:30 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>@local_url@ -&gt; @foreign_url@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/clickthrough/www/admin/report.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/clickthrough/www/admin/report.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/clickthrough/www/admin/report.adp	4 Sep 2002 08:35:44 -0000	1.2
+++ openacs-4/packages/clickthrough/www/admin/report.adp	6 Sep 2002 21:50:30 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Clickthroughs for @package_name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/all-metadata.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/all-metadata.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/all-metadata.adp	4 Sep 2002 12:05:21 -0000	1.2
+++ openacs-4/packages/download/www/all-metadata.adp	6 Sep 2002 21:50:31 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">All @pretty_name@</property>
 <property name="context">All Metadata</property>
 @table@
Index: openacs-4/packages/download/www/archive-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/archive-add.adp	4 Sep 2002 12:05:21 -0000	1.2
+++ openacs-4/packages/download/www/archive-add.adp	6 Sep 2002 21:50:31 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Add a New Software Archive</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/archive-version-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/archive-version-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/archive-version-add.adp	4 Sep 2002 12:05:21 -0000	1.2
+++ openacs-4/packages/download/www/archive-version-add.adp	6 Sep 2002 21:50:31 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Add a New Software Archive</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/download-verify.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/download-verify.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/download-verify.adp	4 Sep 2002 12:05:21 -0000	1.3
+++ openacs-4/packages/download/www/download-verify.adp	6 Sep 2002 21:50:31 -0000	1.4
@@ -1,4 +1,4 @@
-  <master src="master">
+  <master>
     <property name="title">Download @archive_name@ @version_name@</property>
     <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/help.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/help.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/help.adp	4 Sep 2002 12:05:21 -0000	1.2
+++ openacs-4/packages/download/www/help.adp	6 Sep 2002 21:50:31 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Help on @title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/index.adp	4 Sep 2002 12:05:21 -0000	1.3
+++ openacs-4/packages/download/www/index.adp	6 Sep 2002 21:50:31 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context"></property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/download/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/download/www/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/download/www/one-archive.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-archive.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/one-archive.adp	4 Sep 2002 12:05:21 -0000	1.2
+++ openacs-4/packages/download/www/one-archive.adp	6 Sep 2002 21:50:31 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">One Archive: @archive_name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/one-metadata.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-metadata.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/one-metadata.adp	4 Sep 2002 12:05:21 -0000	1.2
+++ openacs-4/packages/download/www/one-metadata.adp	6 Sep 2002 21:50:31 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">One @pretty_name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/one-revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/one-revision.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/one-revision.adp	4 Sep 2002 12:05:21 -0000	1.2
+++ openacs-4/packages/download/www/one-revision.adp	6 Sep 2002 21:50:31 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">One Revision: @archive_name@ ver. @version_name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/approve-or-reject.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/approve-or-reject.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/approve-or-reject.adp	4 Sep 2002 12:05:23 -0000	1.3
+++ openacs-4/packages/download/www/admin/approve-or-reject.adp	6 Sep 2002 21:50:32 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@pretty_noun@ @archive_name@ @version_name@</property>
 <property name="context">@pretty_noun@</property>
 
Index: openacs-4/packages/download/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/admin/index.adp	4 Sep 2002 12:05:23 -0000	1.2
+++ openacs-4/packages/download/www/admin/index.adp	6 Sep 2002 21:50:32 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@ Repository Administration</property>
 <property name="context"></property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/download/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/download/www/admin/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/download/www/admin/report-by-ip.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-ip.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/download/www/admin/report-by-ip.adp	4 Sep 2002 12:05:23 -0000	1.4
+++ openacs-4/packages/download/www/admin/report-by-ip.adp	6 Sep 2002 21:50:32 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Downloads by IP</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/report-by-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-by-user.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/report-by-user.adp	4 Sep 2002 12:05:23 -0000	1.3
+++ openacs-4/packages/download/www/admin/report-by-user.adp	6 Sep 2002 21:50:32 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Downloads by User</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/report-one-ip.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-ip.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/report-one-ip.adp	4 Sep 2002 12:05:23 -0000	1.3
+++ openacs-4/packages/download/www/admin/report-one-ip.adp	6 Sep 2002 21:50:32 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Downloads by IP @download_ip@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/report-one-user.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-one-user.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/report-one-user.adp	4 Sep 2002 12:05:23 -0000	1.3
+++ openacs-4/packages/download/www/admin/report-one-user.adp	6 Sep 2002 21:50:32 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Downloads by User @first_names@ @last_name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/report-version-downloads.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/download/www/admin/report-version-downloads.adp	4 Sep 2002 12:05:23 -0000	1.3
+++ openacs-4/packages/download/www/admin/report-version-downloads.adp	6 Sep 2002 21:50:32 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@archive_name@ Download History</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/repository-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/admin/repository-ae.adp	4 Sep 2002 12:05:23 -0000	1.2
+++ openacs-4/packages/download/www/admin/repository-ae.adp	6 Sep 2002 21:50:32 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Add/Edit Repository</property>
 <property name="context">{Add/Edit Repository}</property>
 
Index: openacs-4/packages/download/www/admin/repository-metadata-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-metadata-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/admin/repository-metadata-edit.adp	4 Sep 2002 12:05:23 -0000	1.2
+++ openacs-4/packages/download/www/admin/repository-metadata-edit.adp	6 Sep 2002 21:50:32 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Edit Metadata</property>
 <property name="context">{Metadata Edit}</property>
 
Index: openacs-4/packages/download/www/admin/repository-metadata.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-metadata.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/admin/repository-metadata.adp	4 Sep 2002 12:05:23 -0000	1.2
+++ openacs-4/packages/download/www/admin/repository-metadata.adp	6 Sep 2002 21:50:32 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/repository-reasons-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-reasons-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/admin/repository-reasons-edit.adp	4 Sep 2002 12:05:23 -0000	1.2
+++ openacs-4/packages/download/www/admin/repository-reasons-edit.adp	6 Sep 2002 21:50:32 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/repository-reasons.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-reasons.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/admin/repository-reasons.adp	4 Sep 2002 12:05:23 -0000	1.2
+++ openacs-4/packages/download/www/admin/repository-reasons.adp	6 Sep 2002 21:50:32 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/repository-types-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-types-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/admin/repository-types-edit.adp	4 Sep 2002 12:05:23 -0000	1.2
+++ openacs-4/packages/download/www/admin/repository-types-edit.adp	6 Sep 2002 21:50:32 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/repository-types.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/repository-types.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/admin/repository-types.adp	4 Sep 2002 12:05:23 -0000	1.2
+++ openacs-4/packages/download/www/admin/repository-types.adp	6 Sep 2002 21:50:32 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/download/www/admin/spam-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/spam-users.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/download/www/admin/spam-users.adp	4 Sep 2002 12:05:23 -0000	1.2
+++ openacs-4/packages/download/www/admin/spam-users.adp	6 Sep 2002 21:50:32 -0000	1.3
@@ -1,4 +1,4 @@
-  <master src="master">
+  <master>
     <property name="title">Spam Downloaders</property>
     <property name="context">"Spam downloaders"</property>
 
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.2 -r1.3
--- openacs-4/packages/edit-this-page/www/etp-master.adp	4 Sep 2002 13:01:46 -0000	1.2
+++ openacs-4/packages/edit-this-page/www/etp-master.adp	6 Sep 2002 21:50:34 -0000	1.3
@@ -1,12 +1,9 @@
 <master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
-<h2>@title@</h2>
-<%= [eval ad_context_bar $context ] %>
 
-<hr>
-
 <slave>
+
 <if @etp_link@ not nil>
 <table width="100%">
 <tr><td align="right">@etp_link@</td></tr>
Index: openacs-4/packages/faq/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/faq/www/index.adp	4 Sep 2002 13:28:32 -0000	1.4
+++ openacs-4/packages/faq/www/index.adp	6 Sep 2002 21:50:35 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">FAQs</property>
 
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/faq/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
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.4 -r1.5
--- openacs-4/packages/faq/www/one-faq.adp	4 Sep 2002 13:28:32 -0000	1.4
+++ openacs-4/packages/faq/www/one-faq.adp	6 Sep 2002 21:50:35 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@faq_name@</property>
 
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.2 -r1.3
--- openacs-4/packages/faq/www/one-question.adp	4 Sep 2002 13:28:32 -0000	1.2
+++ openacs-4/packages/faq/www/one-question.adp	6 Sep 2002 21:50:35 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">One Question</property>
 
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.2 -r1.3
--- openacs-4/packages/faq/www/admin/faq-edit.adp	4 Sep 2002 13:28:33 -0000	1.2
+++ openacs-4/packages/faq/www/admin/faq-edit.adp	6 Sep 2002 21:50:37 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
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.2 -r1.3
--- openacs-4/packages/faq/www/admin/faq-new.adp	4 Sep 2002 13:28:33 -0000	1.2
+++ openacs-4/packages/faq/www/admin/faq-new.adp	6 Sep 2002 21:50:37 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master"></master>
+<master></master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
   
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.2 -r1.3
--- openacs-4/packages/faq/www/admin/index.adp	4 Sep 2002 13:28:33 -0000	1.2
+++ openacs-4/packages/faq/www/admin/index.adp	6 Sep 2002 21:50:37 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">FAQ Admin</property>
 
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/faq/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
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.3 -r1.4
--- openacs-4/packages/faq/www/admin/one-faq.adp	4 Sep 2002 13:28:33 -0000	1.3
+++ openacs-4/packages/faq/www/admin/one-faq.adp	6 Sep 2002 21:50:37 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@faq_name@ Admin</property>
 
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.2 -r1.3
--- openacs-4/packages/faq/www/admin/one-question.adp	4 Sep 2002 13:28:33 -0000	1.2
+++ openacs-4/packages/faq/www/admin/one-question.adp	6 Sep 2002 21:50:37 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">One Question</property>
 
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.2 -r1.3
--- openacs-4/packages/faq/www/admin/q_and_a-edit.adp	4 Sep 2002 13:28:33 -0000	1.2
+++ openacs-4/packages/faq/www/admin/q_and_a-edit.adp	6 Sep 2002 21:50:37 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">One Question</property>
 
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.3 -r1.4
--- openacs-4/packages/faq/www/admin/q_and_a-new.adp	4 Sep 2002 13:28:33 -0000	1.3
+++ openacs-4/packages/faq/www/admin/q_and_a-new.adp	6 Sep 2002 21:50:37 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/file-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/file-storage/www/file-add.adp	5 Sep 2002 09:29:00 -0000	1.5
+++ openacs-4/packages/file-storage/www/file-add.adp	6 Sep 2002 21:50:38 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Upload New File</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/file-copy.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-copy.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/file-copy.adp	5 Sep 2002 09:29:00 -0000	1.3
+++ openacs-4/packages/file-storage/www/file-copy.adp	6 Sep 2002 21:50:38 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Copy</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/file-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/file-delete.adp	5 Sep 2002 09:29:00 -0000	1.3
+++ openacs-4/packages/file-storage/www/file-delete.adp	6 Sep 2002 21:50:38 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Delete @title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/file-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/file-edit.adp	5 Sep 2002 09:29:00 -0000	1.3
+++ openacs-4/packages/file-storage/www/file-edit.adp	6 Sep 2002 21:50:38 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Rename @title@</property>
 <property name="header">Rename @title@</property>
 <property name="context">@context@</property>
Index: openacs-4/packages/file-storage/www/file-move.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/file-move.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/file-move.adp	5 Sep 2002 09:29:00 -0000	1.3
+++ openacs-4/packages/file-storage/www/file-move.adp	6 Sep 2002 21:50:38 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Move</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/file.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/file-storage/www/file.adp	5 Sep 2002 09:29:00 -0000	1.7
+++ openacs-4/packages/file-storage/www/file.adp	6 Sep 2002 21:50:38 -0000	1.8
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="header">@title@</property>
 <property name="context">@context@</property>
Index: openacs-4/packages/file-storage/www/folder-contents.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/folder-contents.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/folder-contents.adp	5 Sep 2002 09:29:00 -0000	1.2
+++ openacs-4/packages/file-storage/www/folder-contents.adp	6 Sep 2002 21:50:38 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@folder_name@</property>
 <property name="header">@folder_name@</property>
 <property name="context">@context@</property>
Index: openacs-4/packages/file-storage/www/folder-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-create.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/folder-create.adp	5 Sep 2002 09:29:00 -0000	1.2
+++ openacs-4/packages/file-storage/www/folder-create.adp	6 Sep 2002 21:50:38 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Create New Folder</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/folder-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/folder-delete.adp	5 Sep 2002 09:29:00 -0000	1.2
+++ openacs-4/packages/file-storage/www/folder-delete.adp	6 Sep 2002 21:50:38 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Delete @folder_name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.adp,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/file-storage/www/index.adp	5 Sep 2002 09:29:00 -0000	1.15
+++ openacs-4/packages/file-storage/www/index.adp	6 Sep 2002 21:50:38 -0000	1.16
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@folder_name@</property>
 <property name="header">@folder_name@</property>
 <property name="context">@context@</property>
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/file-storage/www/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/file-storage/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/search.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/search.adp	5 Sep 2002 09:29:00 -0000	1.2
+++ openacs-4/packages/file-storage/www/search.adp	6 Sep 2002 21:50:38 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Search Results</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/simple-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/simple-add.adp	5 Sep 2002 09:29:00 -0000	1.3
+++ openacs-4/packages/file-storage/www/simple-add.adp	6 Sep 2002 21:50:38 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Create @pretty_name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/simple-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/simple-edit.adp	5 Sep 2002 09:29:00 -0000	1.2
+++ openacs-4/packages/file-storage/www/simple-edit.adp	6 Sep 2002 21:50:38 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Edit @pretty_name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/version-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/version-add.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/version-add.adp	5 Sep 2002 09:29:00 -0000	1.3
+++ openacs-4/packages/file-storage/www/version-add.adp	6 Sep 2002 21:50:38 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Upload New Version of @title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/file-storage/www/version-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/version-delete.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/file-storage/www/version-delete.adp	5 Sep 2002 09:29:00 -0000	1.3
+++ openacs-4/packages/file-storage/www/version-delete.adp	6 Sep 2002 21:50:38 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Delete @version_name@</property>
 <property name="context">@context@</property>
 
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.13 -r1.14
--- openacs-4/packages/forums/www/forum-view.adp	5 Sep 2002 09:50:45 -0000	1.13
+++ openacs-4/packages/forums/www/forum-view.adp	6 Sep 2002 21:50:39 -0000	1.14
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Forum: @forum.name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/forums/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/index.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/forums/www/index.adp	5 Sep 2002 09:50:45 -0000	1.12
+++ openacs-4/packages/forums/www/index.adp	6 Sep 2002 21:50:39 -0000	1.13
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Forums</property>
 <property name="context">@context@</property>
 
Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/master.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
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.4 -r1.5
--- openacs-4/packages/forums/www/message-email.adp	5 Sep 2002 09:50:45 -0000	1.4
+++ openacs-4/packages/forums/www/message-email.adp	6 Sep 2002 21:50:39 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Email Message: @message.forum_name@ - @message.subject@</property>
 <property name="context">@context@</property>
 
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.6 -r1.7
--- openacs-4/packages/forums/www/message-post-confirm.adp	5 Sep 2002 09:50:45 -0000	1.6
+++ openacs-4/packages/forums/www/message-post-confirm.adp	6 Sep 2002 21:50:39 -0000	1.7
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Confirm Post to Forum: @forum.name@</property>
 <property name="context">@context@</property>
 
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.5 -r1.6
--- openacs-4/packages/forums/www/message-post.adp	5 Sep 2002 09:50:45 -0000	1.5
+++ openacs-4/packages/forums/www/message-post.adp	6 Sep 2002 21:50:39 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Post to Forum: @forum.name@</property>
 <property name="context">@context@</property>
 <property name="focus">message.subject</property>
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.5 -r1.6
--- openacs-4/packages/forums/www/message-view-flat.adp	5 Sep 2002 09:50:45 -0000	1.5
+++ openacs-4/packages/forums/www/message-view-flat.adp	6 Sep 2002 21:50:39 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Forum @forum.name@: @message.subject@</property>
 <property name="context">@context@</property>
 
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.9 -r1.10
--- openacs-4/packages/forums/www/message-view.adp	5 Sep 2002 09:50:45 -0000	1.9
+++ openacs-4/packages/forums/www/message-view.adp	6 Sep 2002 21:50:39 -0000	1.10
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Forum @forum.name@: @message.subject@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/forums/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/search.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/forums/www/search.adp	5 Sep 2002 09:50:45 -0000	1.2
+++ openacs-4/packages/forums/www/search.adp	6 Sep 2002 21:50:39 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Search Forums</property>
 <property name="context">@context@</property>
 
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.5 -r1.6
--- openacs-4/packages/forums/www/user-history.adp	5 Sep 2002 09:50:45 -0000	1.5
+++ openacs-4/packages/forums/www/user-history.adp	6 Sep 2002 21:50:39 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Forums: Posting history for @user.full_name@</property>
 <property name="context">@context@</property>
 
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.5 -r1.6
--- openacs-4/packages/forums/www/admin/forum-edit.adp	5 Sep 2002 09:50:45 -0000	1.5
+++ openacs-4/packages/forums/www/admin/forum-edit.adp	6 Sep 2002 21:50:40 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="../master">
+<master>
 <property name="title">Edit Forum: @forum.name@</property>
 <property name="context">@context@</property>
 <property name="focus">forum.name</property>
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.3 -r1.4
--- openacs-4/packages/forums/www/admin/forum-new.adp	5 Sep 2002 09:50:45 -0000	1.3
+++ openacs-4/packages/forums/www/admin/forum-new.adp	6 Sep 2002 21:50:40 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="../master">
+<master>
 <property name="title">Create New Forum</property>
 <property name="context">@context@</property>
 <property name="focus">forum.name</property>
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.2 -r1.3
--- openacs-4/packages/forums/www/admin/index.adp	5 Sep 2002 09:50:45 -0000	1.2
+++ openacs-4/packages/forums/www/admin/index.adp	6 Sep 2002 21:50:40 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="../master">
+<master>
 <property name="title">Forums Administration</property>
 <property name="context"></property>
 
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.2 -r1.3
--- openacs-4/packages/forums/www/moderate/forum.adp	5 Sep 2002 09:50:46 -0000	1.2
+++ openacs-4/packages/forums/www/moderate/forum.adp	6 Sep 2002 21:50:42 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="../master">
+<master>
 <property name="title">Manage Forum: @forum.name@</property>
 <property name="context">Manage</property>
 
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.3 -r1.4
--- openacs-4/packages/forums/www/moderate/message-delete.adp	5 Sep 2002 09:50:46 -0000	1.3
+++ openacs-4/packages/forums/www/moderate/message-delete.adp	6 Sep 2002 21:50:42 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="../master">
+<master>
 <property name="title">Confirm Delete: @message.subject@</property>
 <property name="context">delete</property>
 
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.2 -r1.3
--- openacs-4/packages/forums/www/moderate/message-edit.adp	5 Sep 2002 09:50:46 -0000	1.2
+++ openacs-4/packages/forums/www/moderate/message-edit.adp	6 Sep 2002 21:50:42 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="../master">
+<master>
 <property name="title">Edit Message: @message.subject@</property>
 <property name="context">Edit</property>
 
Index: openacs-4/packages/general-comments/www/comment-ae-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-ae-2.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/general-comments/www/comment-ae-2.adp	5 Sep 2002 10:05:16 -0000	1.3
+++ openacs-4/packages/general-comments/www/comment-ae-2.adp	6 Sep 2002 21:50:44 -0000	1.4
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="page_title">@page_title@</property>
+<master>
+<property name="title">@page_title@</property>
 <property name="context">@context@</property>
 
 Here is how your comment would appear:
Index: openacs-4/packages/general-comments/www/comment-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/Attic/comment-ae.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/general-comments/www/comment-ae.adp	5 Sep 2002 10:05:16 -0000	1.4
+++ openacs-4/packages/general-comments/www/comment-ae.adp	6 Sep 2002 21:50:44 -0000	1.5
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="page_title">@page_title@</property>
+<master>
+<property name="title">@page_title@</property>
 <property name="context">@context@</property>
 <property name="focus">comment.title</property>
 
Index: openacs-4/packages/general-comments/www/delete-attachment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete-attachment.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/general-comments/www/delete-attachment.adp	5 Sep 2002 10:05:16 -0000	1.2
+++ openacs-4/packages/general-comments/www/delete-attachment.adp	6 Sep 2002 21:50:44 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="page_title">@page_title@</property>
+<master>
+<property name="title">@page_title@</property>
 <property name="context">@context@</property>
 
 Do you really wish to delete this attachment?
Index: openacs-4/packages/general-comments/www/file-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/general-comments/www/file-ae.adp	5 Sep 2002 10:05:16 -0000	1.2
+++ openacs-4/packages/general-comments/www/file-ae.adp	6 Sep 2002 21:50:44 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="page_title">@page_title@</property>
+<master>
+<property name="title">@page_title@</property>
 <property name="context">@context@</property>
 <property name="parent_id">@parent_id@</property>
 
Index: openacs-4/packages/general-comments/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/general-comments/www/index.adp	5 Sep 2002 10:05:17 -0000	1.2
+++ openacs-4/packages/general-comments/www/index.adp	6 Sep 2002 21:50:44 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="page_title">@page_title@</property>
+<master>
+<property name="title">@page_title@</property>
 <property name="context">@context@</property>
 
 <if @admin_p@ eq 1>
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/general-comments/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/general-comments/www/url-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/general-comments/www/url-ae.adp	5 Sep 2002 10:05:17 -0000	1.2
+++ openacs-4/packages/general-comments/www/url-ae.adp	6 Sep 2002 21:50:44 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="page_title">@page_title@</property>
+<master>
+<property name="title">@page_title@</property>
 <property name="context">@context@</property>
 <property name="parent_id">@parent_id@</property>
 
Index: openacs-4/packages/general-comments/www/view-comment.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/general-comments/www/view-comment.adp	5 Sep 2002 10:05:17 -0000	1.3
+++ openacs-4/packages/general-comments/www/view-comment.adp	6 Sep 2002 21:50:44 -0000	1.4
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="page_title">@page_title@</property>
+<master>
+<property name="title">@page_title@</property>
 <property name="context">@context@</property>
 <property name="return_url">@return_url@</property>
 <property name="object_name">@object_name@</property>
Index: openacs-4/packages/general-comments/www/view-image.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-image.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/general-comments/www/view-image.adp	5 Sep 2002 10:05:17 -0000	1.2
+++ openacs-4/packages/general-comments/www/view-image.adp	6 Sep 2002 21:50:44 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="page_title">@page_title@</property>
+<master>
+<property name="title">@page_title@</property>
 <property name="context">@context@</property>
 <property name="return_url">@return_url@</property>
 
Index: openacs-4/packages/general-comments/www/admin/delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/general-comments/www/admin/delete.adp	5 Sep 2002 10:05:17 -0000	1.2
+++ openacs-4/packages/general-comments/www/admin/delete.adp	6 Sep 2002 21:50:46 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="page_title">@page_title@</property>
+<master>
+<property name="title">@page_title@</property>
 <property name="context">@context@</property>
 
 <form action=delete-2 method=post>
Index: openacs-4/packages/general-comments/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/general-comments/www/admin/index.adp	5 Sep 2002 10:05:17 -0000	1.2
+++ openacs-4/packages/general-comments/www/admin/index.adp	6 Sep 2002 21:50:46 -0000	1.3
@@ -1,5 +1,5 @@
-<master src="master">
-<property name="page_title">@page_title@</property>
+<master>
+<property name="title">@page_title@</property>
 <property name="context">@context@</property>
 
 <p>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/general-comments/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/news/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/news/www/index.adp	5 Sep 2002 10:49:47 -0000	1.6
+++ openacs-4/packages/news/www/index.adp	6 Sep 2002 21:50:52 -0000	1.7
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/news/www/item-create-thankyou.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create-thankyou.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/news/www/item-create-thankyou.adp	5 Sep 2002 10:49:47 -0000	1.3
+++ openacs-4/packages/news/www/item-create-thankyou.adp	6 Sep 2002 21:50:52 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 
 <property name="context">@context@</property>
 <property name="title">@title@</property>
Index: openacs-4/packages/news/www/item-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/item-create.adp	5 Sep 2002 10:49:47 -0000	1.2
+++ openacs-4/packages/news/www/item-create.adp	6 Sep 2002 21:50:52 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/news/www/item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/item.adp	5 Sep 2002 10:49:47 -0000	1.2
+++ openacs-4/packages/news/www/item.adp	6 Sep 2002 21:50:52 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 
 <property name="context">@context@</property>
 <property name="title">@title@</property>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/news/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/news/www/preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/preview.adp	5 Sep 2002 10:49:47 -0000	1.2
+++ openacs-4/packages/news/www/preview.adp	6 Sep 2002 21:50:52 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/news/www/admin/approve.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/approve.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/admin/approve.adp	5 Sep 2002 10:49:47 -0000	1.2
+++ openacs-4/packages/news/www/admin/approve.adp	6 Sep 2002 21:50:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/news/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/news/www/admin/index.adp	5 Sep 2002 10:49:47 -0000	1.4
+++ openacs-4/packages/news/www/admin/index.adp	6 Sep 2002 21:50:53 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <p>
 <property name="title">@title@</property>
Index: openacs-4/packages/news/www/admin/item.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/item.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/admin/item.adp	5 Sep 2002 10:49:47 -0000	1.2
+++ openacs-4/packages/news/www/admin/item.adp	6 Sep 2002 21:50:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/news/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/news/www/admin/process.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/process.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/admin/process.adp	5 Sep 2002 10:49:47 -0000	1.2
+++ openacs-4/packages/news/www/admin/process.adp	6 Sep 2002 21:50:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/news/www/admin/revision-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/admin/revision-add.adp	5 Sep 2002 10:49:47 -0000	1.2
+++ openacs-4/packages/news/www/admin/revision-add.adp	6 Sep 2002 21:50:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/news/www/admin/revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/news/www/admin/revision.adp	5 Sep 2002 10:49:47 -0000	1.2
+++ openacs-4/packages/news/www/admin/revision.adp	6 Sep 2002 21:50:53 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/notifications/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/notifications/www/request-new.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/notifications/www/request-new.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/notifications/www/request-new.adp	5 Sep 2002 11:13:44 -0000	1.3
+++ openacs-4/packages/notifications/www/request-new.adp	6 Sep 2002 21:50:54 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@page_title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/press/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/press/www/index.adp	5 Sep 2002 13:12:12 -0000	1.3
+++ openacs-4/packages/press/www/index.adp	6 Sep 2002 21:50:58 -0000	1.4
@@ -6,7 +6,7 @@
      @cvs-id $Id$
 -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/press/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/press/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/index.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/index.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -6,7 +6,7 @@
      @cvs-id $Id$
 -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <p>
 <property name="title">@title@</property>
Index: openacs-4/packages/press/www/admin/item-create-thankyou.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/item-create-thankyou.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/item-create-thankyou.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/item-create-thankyou.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -1,6 +1,6 @@
 <!-- /packages/press/www/item-create-thankyou.adp -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/press/www/admin/item-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/item-create.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/item-create.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/item-create.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -4,7 +4,7 @@
 
  -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/press/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/press/www/admin/one-item-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/one-item-admin.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/one-item-admin.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/one-item-admin.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -4,7 +4,7 @@
 
 -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/press/www/admin/one-item-approve.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/one-item-approve.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/one-item-approve.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/one-item-approve.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -1,7 +1,7 @@
 <!-- /packages/press/www/one-item-approve.adp 
  $Id:  -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/press/www/admin/one-item-revision-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/one-item-revision-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/one-item-revision-add.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/one-item-revision-add.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -6,7 +6,7 @@
 
 -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/press/www/admin/preview.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/preview.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/preview.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/preview.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -6,7 +6,7 @@
 
 -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/press/www/admin/process.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/process.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/process.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/process.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -6,7 +6,7 @@
 
 -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/press/www/admin/template-admin.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/template-admin.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/template-admin.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/template-admin.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -7,7 +7,7 @@
      @cvs-id $Id$
 -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <p>
 <property name="title">@title@</property>
Index: openacs-4/packages/press/www/admin/template-ae-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/template-ae-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/template-ae-2.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/template-ae-2.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -4,7 +4,7 @@
 	@cvs-id $Id$
 -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name=title>@title@</property>
 
Index: openacs-4/packages/press/www/admin/template-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/template-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/template-ae.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/template-ae.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -6,7 +6,7 @@
 
 -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/press/www/admin/template-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/press/www/admin/template-delete.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/press/www/admin/template-delete.adp	5 Sep 2002 13:12:13 -0000	1.2
+++ openacs-4/packages/press/www/admin/template-delete.adp	6 Sep 2002 21:51:00 -0000	1.3
@@ -6,7 +6,7 @@
 
 -->
 
-<master src="master">
+<master>
 <property name="context">@context@</property>
 <property name="title">@title@</property>
 
Index: openacs-4/packages/simple-survey/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simple-survey/www/index.adp	5 Sep 2002 21:41:58 -0000	1.4
+++ openacs-4/packages/simple-survey/www/index.adp	6 Sep 2002 21:51:01 -0000	1.5
@@ -1,4 +1,4 @@
-  <master src="master">
+  <master>
     <property name=title>Surveys</property>
     <property name="context">@context@</property>
 
Fisheye: Tag 1.5 refers to a dead (removed) revision in file `openacs-4/packages/simple-survey/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/simple-survey/www/one-respondent.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one-respondent.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/one-respondent.adp	5 Sep 2002 21:41:58 -0000	1.2
+++ openacs-4/packages/simple-survey/www/one-respondent.adp	6 Sep 2002 21:51:01 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>One Survey: @name@</property>
 <property name="context">one survey</property>
 
Index: openacs-4/packages/simple-survey/www/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/one.adp,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/simple-survey/www/one.adp	5 Sep 2002 21:41:58 -0000	1.6
+++ openacs-4/packages/simple-survey/www/one.adp	6 Sep 2002 21:51:01 -0000	1.7
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>One Survey: @name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/process-response.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/process-response.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simple-survey/www/process-response.adp	5 Sep 2002 21:41:58 -0000	1.4
+++ openacs-4/packages/simple-survey/www/process-response.adp	6 Sep 2002 21:51:01 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Response Submitted for @survey_name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/description-edit-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/description-edit-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/description-edit-2.adp	5 Sep 2002 21:42:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/description-edit-2.adp	6 Sep 2002 21:51:03 -0000	1.3
@@ -1,4 +1,4 @@
-<master src=./master>
+<master>
 <property name=title>Edit Description Confirmation</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/description-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/description-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/description-edit.adp	5 Sep 2002 21:42:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/description-edit.adp	6 Sep 2002 21:51:03 -0000	1.3
@@ -1,4 +1,4 @@
-<master src=./master>
+<master>
 <property name=title>@survey_name@: Edit Description</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/index.adp	5 Sep 2002 21:42:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/index.adp	6 Sep 2002 21:51:03 -0000	1.3
@@ -1,4 +1,4 @@
-<master src=./master>
+<master>
 <property name=title>Survey Administration</property>
 <property name="context">@context@</property>
 
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `openacs-4/packages/simple-survey/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/simple-survey/www/admin/name-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/name-edit.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/name-edit.adp	5 Sep 2002 21:42:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/name-edit.adp	6 Sep 2002 21:51:03 -0000	1.3
@@ -1,4 +1,4 @@
-<master src=./master>
+<master>
 <property name=title>@survey_name@: Edit Name</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/one.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/one.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/simple-survey/www/admin/one.adp	5 Sep 2002 21:42:01 -0000	1.4
+++ openacs-4/packages/simple-survey/www/admin/one.adp	6 Sep 2002 21:51:03 -0000	1.5
@@ -1,4 +1,4 @@
-<master src=./master>
+<master>
 <property name=title>One Survey: @survey_name@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/question-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-add-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/question-add-2.adp	5 Sep 2002 21:42:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/question-add-2.adp	6 Sep 2002 21:51:03 -0000	1.3
@@ -1,4 +1,4 @@
-<master src=./master>
+<master>
 <property name=title>Survey Administration: Add a Question (cont.)</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/question-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-add.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/question-add.adp	5 Sep 2002 21:42:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/question-add.adp	6 Sep 2002 21:51:03 -0000	1.3
@@ -1,4 +1,4 @@
-<master src=./master>
+<master>
 <property name=title>@name@: New Question</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/question-modify-text.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/question-modify-text.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/question-modify-text.adp	5 Sep 2002 21:42:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/question-modify-text.adp	6 Sep 2002 21:51:03 -0000	1.3
@@ -1,4 +1,4 @@
-<master src=./master>
+<master>
 <property name=title>@survey_name@: Modify Question Text</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/respondents.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/respondents.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/simple-survey/www/admin/respondents.adp	5 Sep 2002 21:42:01 -0000	1.3
+++ openacs-4/packages/simple-survey/www/admin/respondents.adp	6 Sep 2002 21:51:03 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@survey_name@: Respondents</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/responses.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/responses.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/responses.adp	5 Sep 2002 21:42:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/responses.adp	6 Sep 2002 21:51:03 -0000	1.3
@@ -1,4 +1,4 @@
-<master src=./master>
+<master>
 <property name=title>@survey_name@: Responses</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp	5 Sep 2002 21:42:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/survey-create-confirm.adp	6 Sep 2002 21:51:03 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name=title>Survey Administration: Confirm New Survey</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/simple-survey/www/admin/survey-create.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/simple-survey/www/admin/survey-create.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/simple-survey/www/admin/survey-create.adp	5 Sep 2002 21:42:01 -0000	1.2
+++ openacs-4/packages/simple-survey/www/admin/survey-create.adp	6 Sep 2002 21:51:03 -0000	1.3
@@ -1,4 +1,4 @@
-<master src=./master>
+<master>
 <property name=title>Survey Administration: Create New Survey</property>
 <property name="context">@context@</property>
 
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.2 -r1.3
--- openacs-4/packages/site-wide-search/www/index.adp	5 Sep 2002 21:55:11 -0000	1.2
+++ openacs-4/packages/site-wide-search/www/index.adp	6 Sep 2002 21:51:04 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
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.2 -r1.3
--- openacs-4/packages/site-wide-search/www/intermedia-categories.adp	5 Sep 2002 21:55:11 -0000	1.2
+++ openacs-4/packages/site-wide-search/www/intermedia-categories.adp	6 Sep 2002 21:51:04 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">The categories for '@title@'</property>
 <property name="context">categories</property>
 
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.2 -r1.3
--- openacs-4/packages/site-wide-search/www/list-all.adp	5 Sep 2002 21:55:11 -0000	1.2
+++ openacs-4/packages/site-wide-search/www/list-all.adp	6 Sep 2002 21:51:04 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">All Content</property>
 <property name="context">"All Content"</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/site-wide-search/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
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.2 -r1.3
--- openacs-4/packages/site-wide-search/www/search.adp	5 Sep 2002 21:55:11 -0000	1.2
+++ openacs-4/packages/site-wide-search/www/search.adp	6 Sep 2002 21:51:04 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Search Results</property>
 <property name="context">result</property>
 
Index: openacs-4/packages/static-pages/www/admin/commentability.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/commentability.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/static-pages/www/admin/commentability.adp	6 Sep 2002 12:30:13 -0000	1.3
+++ openacs-4/packages/static-pages/www/admin/commentability.adp	6 Sep 2002 21:51:05 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/static-pages/www/admin/fs-scan.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/fs-scan.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/static-pages/www/admin/fs-scan.adp	6 Sep 2002 12:30:13 -0000	1.2
+++ openacs-4/packages/static-pages/www/admin/fs-scan.adp	6 Sep 2002 21:51:05 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/static-pages/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-pages/www/admin/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/static-pages/www/admin/index.adp	6 Sep 2002 12:30:13 -0000	1.2
+++ openacs-4/packages/static-pages/www/admin/index.adp	6 Sep 2002 21:51:05 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/static-pages/www/admin/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/wp-slim/www/attach-detail.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-detail.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/attach-detail.adp	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/attach-detail.adp	6 Sep 2002 21:51:10 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Details</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/attach-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/attach-list.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/attach-list.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">List of Attachments</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/create-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/create-presentation.adp	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/create-presentation.adp	6 Sep 2002 21:51:10 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Create Presentation</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/create-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/create-slide.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/create-slide.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Create A Slide</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/delete-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/delete-presentation.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/delete-presentation.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Delete Presentation</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/delete-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/delete-slide.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/delete-slide.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Delete a Slide</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/edit-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/edit-presentation.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/edit-presentation.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Edit Presentation</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/edit-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/edit-slide.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/edit-slide.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Edit Slide</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/index-unregistered.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index-unregistered.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/index-unregistered.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/index-unregistered.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">WimpyPoint</property>
 <property name="context"></property>
 
Index: openacs-4/packages/wp-slim/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/index.adp	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/index.adp	6 Sep 2002 21:51:10 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">WimpyPoint</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/invite-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/invite-2.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/invite-2.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Email Sent</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/invite.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/invite.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/invite.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Invite User</property>
 <property name="context">@context@</property>
 
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/master.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Confirm Add User</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Confirm Add Users</property>
 <property name="context">@context@</property>
 <form action="presentation-acl-add-group-3">
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp	6 Sep 2002 21:51:10 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Add Group</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/presentation-acl-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/presentation-acl-add.adp	6 Sep 2002 15:32:23 -0000	1.4
+++ openacs-4/packages/wp-slim/www/presentation-acl-add.adp	6 Sep 2002 21:51:10 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Add User</property>
 <property name="context">@context@</property>
 <form action="search">
Index: openacs-4/packages/wp-slim/www/presentation-acl.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/presentation-acl.adp	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/presentation-acl.adp	6 Sep 2002 21:51:10 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Authorization</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/presentation-revisions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/presentation-revisions.adp	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/presentation-revisions.adp	6 Sep 2002 21:51:10 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">All Revisions of This Presentation</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/presentation-top.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/presentation-top.adp	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/presentation-top.adp	6 Sep 2002 21:51:10 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@presentation_title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/serve-presentation-revision.adp	6 Sep 2002 15:32:23 -0000	1.4
+++ openacs-4/packages/wp-slim/www/serve-presentation-revision.adp	6 Sep 2002 21:51:10 -0000	1.5
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@pres_title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/serve-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/serve-presentation.adp	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/serve-presentation.adp	6 Sep 2002 21:51:10 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@pres_title@</property>
 <property name="context">"one presentation"</property>
 
Index: openacs-4/packages/wp-slim/www/serve-slide-revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/serve-slide-revision.adp	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/serve-slide-revision.adp	6 Sep 2002 21:51:10 -0000	1.4
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@slide_title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/serve-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/wp-slim/www/serve-slide.adp	6 Sep 2002 15:32:23 -0000	1.5
+++ openacs-4/packages/wp-slim/www/serve-slide.adp	6 Sep 2002 21:51:10 -0000	1.6
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">@slide_title@</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/slide-revisions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/slide-revisions.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/slide-revisions.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">All Revisions of This Slide</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/slides-reorder.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/slides-reorder.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/slides-reorder.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Reorder Slides</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/upload-attachments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/upload-attachments.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/upload-attachments.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/upload-attachments.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Upload Attachments</property>
 <property name="context">@context@</property>
 
Index: openacs-4/packages/wp-slim/www/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/users.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/users.adp	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/users.adp	6 Sep 2002 21:51:10 -0000	1.3
@@ -1,4 +1,4 @@
-<master src="master">
+<master>
 <property name="title">Wimpy Point Users</property>
 <property name="context">@context@</property>