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 -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/attach-detail.adp	15 Nov 2001 01:47:13 -0000	1.2
+++ openacs-4/packages/wp-slim/www/attach-detail.adp	6 Sep 2002 15:32:23 -0000	1.3
@@ -1,12 +1,7 @@
 <master src="master">
 <property name="title">Details</property>
+<property name="context">@context@</property>
 
-<h2>Details</h2>
-@nav_bar@
-<hr>
-
-<blockquote>
-
 Revision in <font color=red>red</font> is the current live revision.
 
 <ul>
@@ -42,4 +37,3 @@
 </multiple>
 </ul>
 
-</blockquote>
Index: openacs-4/packages/wp-slim/www/attach-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-detail.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/attach-detail.tcl	15 Nov 2001 01:47:13 -0000	1.3
+++ openacs-4/packages/wp-slim/www/attach-detail.tcl	6 Sep 2002 15:32:23 -0000	1.4
@@ -12,7 +12,7 @@
     attach_item_id:naturalnum,notnull
     file_name:notnull
 } -properties {
-    nav_bar
+    context
     slide_item_id
     attach_item_id
     revisions:multirow
@@ -30,7 +30,7 @@
     and   item_id = :slide_item_id
 }]
 
-set nav_bar [ad_context_bar [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "Details"]
+set context [list [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "Details"]
 
 db_multirow revisions revisions_get {
     select r.revision_id,
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/attach-list.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/attach-list.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,11 +1,7 @@
 <master src="master">
 <property name="title">List of Attachments</property>
+<property name="context">@context@</property>
 
-<h2>List of Attachments</h2>
-@nav_bar@
-<hr>
-
-<blockquote>
 <ul>
 <multiple name="att">
 <li>@att.name@ (<a href="attach-del?slide_item_id=@slide_item_id@&attach_item_id=@att.item_id@">remove</a> | <a href="attach-detail?slide_item_id=@slide_item_id@&attach_item_id=@att.item_id@&file_name=@att.name@">details</a>)
@@ -32,5 +28,3 @@
       <br><input type=radio name=inline_image_p value=f> Display a link the viewer can use to download the file
       <p><input type=submit value="Add the Attachment">
 </form>
-
-</blockquote>
\ No newline at end of file
Index: openacs-4/packages/wp-slim/www/attach-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/attach-list.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/attach-list.tcl	6 Sep 2002 15:32:23 -0000	1.3
@@ -12,7 +12,7 @@
     slide_item_id:naturalnum,notnull
 } -properties {
     slide_item_id
-    nav_bar
+    context
     att:multirow
 }
 
@@ -24,7 +24,7 @@
     and   item_id = :slide_item_id
 }]
 
-set nav_bar [ad_context_bar [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "List Attachemnts"]
+set context [list [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "List Attachments"]
 
 db_multirow att attachments_get {
     select name, item_id
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 -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/create-presentation.adp	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/create-presentation.adp	6 Sep 2002 15:32:23 -0000	1.3
@@ -1,8 +1,7 @@
 <master src="master">
 <property name="title">Create Presentation</property>
+<property name="context">@context@</property>
 
-@header@
-
 <form method=POST action="create-presentation-2">
 
 <table>
Index: openacs-4/packages/wp-slim/www/create-presentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/create-presentation.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/create-presentation.tcl	6 Sep 2002 15:32:23 -0000	1.3
@@ -7,19 +7,10 @@
      @cvs-id $Id$
 } {
 } -properties {
-    header
+    title:onevalue
+    context:onevalue
 }
 
-set package_id [ad_conn package_id]
-
-
 set title "Create Presentation"
+set context [list $title]
 
-#set presentation_id [db_nextval acs_object_id_seq]
-
-set header "<h2>$title</h2>
-[ad_context_bar  $title]
-<hr>"
-
-
-ad_return_template
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/create-slide.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/create-slide.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,11 +1,8 @@
 <master src="master">
 <property name="title">Create A Slide</property>
+<property name="context">@context@</property>
 
-<h2>@pres_title@</h2>
-@nav_bar@
-<hr>
 
-
 <form name=f action=create-slide-2 method=post>
 
 <input type=hidden name=pres_item_id value="@pres_item_id@">
Index: openacs-4/packages/wp-slim/www/create-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-slide.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/create-slide.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/create-slide.tcl	6 Sep 2002 15:32:23 -0000	1.3
@@ -9,7 +9,7 @@
     pres_item_id:naturalnum,notnull
     {sort_key:naturalnum,optional ""}
 } -properties {
-    nav_bar
+    context
     pres_item_id
     sort_key
     pres_title
@@ -26,7 +26,7 @@
 and   i.live_revision = p.presentation_id
 }
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "$pres_title"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "$pres_title"]
 
 if {[empty_string_p $sort_key]} {
     set sort_key [db_string get_sort_key {
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/delete-presentation.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/delete-presentation.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,10 +1,8 @@
 <master src="master">
 <property name="title">Delete Presentation</property>
+<property name="context">@context@</property>
 
 <form method=post action="delete-presentation-2">
-<h2>Delete Presentation</h2>
-@nav_bar@
-<hr>
 
 <input type=hidden name=pres_item_id value="@pres_item_id@">
 
Index: openacs-4/packages/wp-slim/www/delete-presentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/delete-presentation.tcl	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/delete-presentation.tcl	6 Sep 2002 15:32:23 -0000	1.2
@@ -11,12 +11,12 @@
     pres_item_id:naturalnum,notnull
     title:notnull
 } -properties {
-    nav_bar
+    context
     pres_item_id
 }
 
 ad_require_permission $pres_item_id wp_delete_presentation
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "Delete Presentation"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "Delete Presentation"]
 
 ad_return_template
\ No newline at end of file
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/delete-slide.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/delete-slide.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,10 +1,8 @@
 <master src="master">
 <property name="title">Delete a Slide</property>
+<property name="context">@context@</property>
 
 <form>
-<h2>Delete a Slide</h2>
-@nav_bar@
-<hr>
 
 Are you sure that you want to delete this slide?
 
Index: openacs-4/packages/wp-slim/www/delete-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/delete-slide.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/delete-slide.tcl	6 Sep 2002 15:32:23 -0000	1.3
@@ -13,6 +13,6 @@
 }
 
 
-set nav_bar [ad_context_bar "Delete a Slide"]
+set context [list "Delete a Slide"]
 
 ad_return_template
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/edit-presentation.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/edit-presentation.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,9 +1,7 @@
 <master src="master">
 <property name="title">Edit Presentation</property>
+<property name="context">@context@</property>
 
-<h2>Edit Presentation</h2>
-@nav_bar@
-<hr>
 
 <form name=f action=edit-presentation-2 method=post>
 
Index: openacs-4/packages/wp-slim/www/edit-presentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/edit-presentation.tcl	15 Nov 2001 01:47:13 -0000	1.3
+++ openacs-4/packages/wp-slim/www/edit-presentation.tcl	6 Sep 2002 15:32:23 -0000	1.4
@@ -7,7 +7,7 @@
 } {
     pres_item_id:integer
 } -properties {
-    nav_bar
+    context
     pres_item_id
     pres_title
     page_signature
@@ -45,6 +45,6 @@
     and r.revision_id = i.live_revision
 }
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]"  "$pres_title"] "Edit Presentation"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]"  "$pres_title"] "Edit Presentation"]
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/edit-slide-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide-2.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/edit-slide-2.tcl	13 Mar 2002 22:50:53 -0000	1.3
+++ openacs-4/packages/wp-slim/www/edit-slide-2.tcl	6 Sep 2002 15:32:23 -0000	1.4
@@ -20,7 +20,7 @@
 } -properties {
     slide_item_id
     pres_item_id
-    nav_bar
+    context
     attachment_count
 }
 
@@ -54,7 +54,7 @@
 }
 
 if {[regexp {Upload} $button]} {
-    set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "Presentation Top"] [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "$slide_title"]
+    set context [list [list "presentation-top?[export_url_vars pres_item_id]" "Presentation Top"] [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "$slide_title"]
     # get the number of attachments
     set attachment_count [db_string get_number_of_attachments {
 	select count(1) 
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/edit-slide.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/edit-slide.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,11 +1,7 @@
 <master src="master">
 <property name="title">Edit Slide</property>
+<property name="context">@context@</property>
 
-<h2>Edit Slide</h2>
-@nav_bar@
-<hr>
-
-
 <form name=f action=edit-slide-2 method=post>
 
 <input type=hidden name=slide_item_id value="@slide_item_id@">
Index: openacs-4/packages/wp-slim/www/edit-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/edit-slide.tcl	15 Nov 2001 01:47:13 -0000	1.3
+++ openacs-4/packages/wp-slim/www/edit-slide.tcl	6 Sep 2002 15:32:23 -0000	1.4
@@ -10,7 +10,7 @@
     pres_item_id:naturalnum,notnull
 } -properties {
     pres_item_id
-    nav_bar
+    context
     slide_title
     preamble
     postamble    
@@ -21,7 +21,7 @@
 }
 
 
-set nav_bar [ad_context_bar "Edit Slide"]
+set context [list "Edit Slide"]
 
 db_1row get_slide_info {
 select s.slide_title,
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/index-unregistered.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/index-unregistered.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,10 +1,7 @@
 <master src="master">
 <property name="title">WimpyPoint</property>
+<property name="context"></property>
 
-<h2>WimpyPoint</h2>
-<a href="/pvt/home">Your Workspace</a>: Wimpy Point
-<hr>
-
 <h2> Everyone's Presentations</h2>
 
 <ul>
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 -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/index.adp	16 Jun 2002 14:04:42 -0000	1.2
+++ openacs-4/packages/wp-slim/www/index.adp	6 Sep 2002 15:32:23 -0000	1.3
@@ -1,12 +1,9 @@
 <master src="master">
 <property name="title">WimpyPoint</property>
+<property name="context">@context@</property>
 
-<h2>WimpyPoint</h2>
-@context_bar@
-<hr>
+<h2>My Presentations</h2>
 
-<h2> My Presentations</h2>
-
 <ul>
 <multiple name=presentations>
 <li><a href="display/@presentations.pres_item_id@/">@presentations.pres_title@</a> created on @presentations.creation_date@ [ <a href="presentation-top?pres_item_id=@presentations.pres_item_id@">edit</a> ]
Index: openacs-4/packages/wp-slim/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/index.tcl	16 Jun 2002 14:04:42 -0000	1.3
+++ openacs-4/packages/wp-slim/www/index.tcl	6 Sep 2002 15:32:23 -0000	1.4
@@ -13,7 +13,7 @@
 
 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]
 
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/invite-2.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/invite-2.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,12 +1,9 @@
 <master src="master">
 <property name="title">Email Sent</property>
+<property name="context">@context@</property>
 
-<h2>Email Sent</h2>
-@nav_bar@
-<hr>
+@name@ (@email@) has been invited to work on the presentation test. The following E-mail was sent:
 
-Haolan Qin (qinhl@hotmail.com) has been invited to work on the presentation test. The following E-mail was sent:
-
 <blockquote><pre>
 @email_content@
 </pre></blockquote>
Index: openacs-4/packages/wp-slim/www/invite-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/invite-2.tcl	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/invite-2.tcl	6 Sep 2002 15:32:23 -0000	1.2
@@ -15,14 +15,14 @@
     email
     message
 } -properties {
-    nav_bar
+    context
     pres_item_id
     role
 }
 
 ad_require_permission $pres_item_id wp_admin_presentation
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] [list "invite?[export_url_vars pres_item_id role title]" "Invite User"] "Email Sent"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] [list "invite?[export_url_vars pres_item_id role title]" "Invite User"] "Email Sent"]
 
 set user_id [ad_verify_and_get_user_id]
 
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/invite.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/invite.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,10 +1,8 @@
 <master src="master">
 <property name="title">Invite User</property>
+<property name="context">@context@</property>
 
 <form action="invite-2" method=post>
-<h2>Invite User</h2>
-@nav_bar@
-<hr>
 
 <input type=hidden name=pres_item_id value="@pres_item_id@">
 <input type=hidden name=role value="@role@">
Index: openacs-4/packages/wp-slim/www/invite.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/invite.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/invite.tcl	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/invite.tcl	6 Sep 2002 15:32:23 -0000	1.2
@@ -12,15 +12,15 @@
     role:notnull
     title:notnull
 } -properties {
-    nav_bar
+    context
     pres_item_id
     role
     encoded_title
 }
 
 ad_require_permission $pres_item_id wp_admin_presentation
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Invite User"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Invite User"]
 
 set encoded_title [ad_urlencode $title]
 ad_return_template
\ No newline at end of file
Index: openacs-4/packages/wp-slim/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/master.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/master.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/master.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,19 +1,6 @@
-<html>
-<head>
-<title>
-    @title@
-</title>
-</head>
+<master>
+<property name="title">@title@</property>
+<property name="context">@context@</property>
 
-<body bgcolor="white">
-
 <slave>
 
-<hr>
-<address>
-<a href="mailto:<%=[ad_parameter -package_id [ad_acs_kernel_id] HostAdministrator]%>">
-  <%=[ad_parameter -package_id [ad_acs_kernel_id] HostAdministrator]%>
-</a>
-</address>
-</body>
-</html>
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-2.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,10 +1,8 @@
 <master src="master">
-<property name="title">Add User</property>
+<property name="title">Confirm Add User</property>
+<property name="context">@context@</property>
 
 <form action="presentation-acl-add-3">
-<h2>Confirm Add User</h2>
-@nav_bar@
-<hr>
 
 <input type=hidden name=pres_item_id value="@pres_item_id@">
 <input type=hidden name=user_id_from_search value="@user_id_from_search@">
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-2.tcl	6 Sep 2002 15:32:23 -0000	1.2
@@ -16,14 +16,14 @@
     last_name_from_search
     email_from_search:notnull
 } -properties {
-    nav_bar
+    context
     pres_item_id
     role
 }
 
 ad_require_permission $pres_item_id wp_admin_presentation
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Confirm Add User"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Confirm Add User"]
 
 
 set privilege [ad_decode $role "read" "wp_view_presentation" "write" "wp_edit_presentation" "admin" "wp_admin_presentation" ""]
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,10 +1,7 @@
 <master src="master">
 <property name="title">Confirm Add Users</property>
-
+<property name="context">@context@</property>
 <form action="presentation-acl-add-group-3">
-<h2>Confirm Add Users</h2>
-@nav_bar@
-<hr>
 
 <input type=hidden name=pres_item_id value="@pres_item_id@">
 <input type=hidden name=group_id value="@group_id@">
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group-2.tcl	6 Sep 2002 15:32:23 -0000	1.2
@@ -14,15 +14,15 @@
     title:notnull
     group_id:integer,notnull
 } -properties {
-    nav_bar
+    context
     pres_item_id
     role
     groups:multirow
 }
 
 ad_require_permission $pres_item_id wp_admin_presentation
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Confirm Add Users"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Confirm Add Users"]
 
 db_multirow group users_get {
     select p.first_names,
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 -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp	5 Jul 2002 15:56:54 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group.adp	6 Sep 2002 15:32:23 -0000	1.3
@@ -1,10 +1,8 @@
 <master src="master">
 <property name="title">Add Group</property>
+<property name="context">@context@</property>
 
 <form action="presentation-acl-add-group-2">
-<h2>Add Group</h2>
-@nav_bar@
-<hr>
 
 <input type=hidden name=pres_item_id value="@pres_item_id@">
 <input type=hidden name=role value="@role@">
Index: openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-acl-add-group.tcl	6 Sep 2002 15:32:23 -0000	1.2
@@ -13,15 +13,15 @@
     role:notnull
     title:notnull
 } -properties {
-    nav_bar
+    context
     pres_item_id
     role
     groups:multirow
 }
 
 ad_require_permission $pres_item_id wp_admin_presentation
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Add Group"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Add Group"]
 
 db_multirow groups groups_get {
     select group_id, group_name
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 -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/presentation-acl-add.adp	5 Jul 2002 15:56:54 -0000	1.3
+++ openacs-4/packages/wp-slim/www/presentation-acl-add.adp	6 Sep 2002 15:32:23 -0000	1.4
@@ -1,10 +1,7 @@
 <master src="master">
 <property name="title">Add User</property>
-
+<property name="context">@context@</property>
 <form action="search">
-<h2>Add User</h2>
-@nav_bar@
-<hr>
 
 @params@
 
@@ -23,4 +20,5 @@
 <hr>
 <input type=submit value=Search>
 </td></tr>
-</table></td></tr></table></p></center>
\ No newline at end of file
+</table></td></tr></table></p>
+</center>
\ No newline at end of file
Index: openacs-4/packages/wp-slim/www/presentation-acl-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl-add.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/presentation-acl-add.tcl	18 Jun 2002 15:13:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-acl-add.tcl	6 Sep 2002 15:32:23 -0000	1.3
@@ -12,15 +12,15 @@
     role:notnull
     title:notnull
 } -properties {
-    nav_bar
+    context
     pres_item_id
     role
     encoded_title
 }
 
 ad_require_permission $pres_item_id wp_admin_presentation
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Add User"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] [list "presentation-acl?[export_url_vars pres_item_id]" "Authorization"] "Add User"]
 
 set encoded_title [ns_urlencode $title]
 
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 -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/presentation-acl.adp	5 Jul 2002 15:56:54 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-acl.adp	6 Sep 2002 15:32:23 -0000	1.3
@@ -1,14 +1,9 @@
 <master src="master">
 <property name="title">Authorization</property>
+<property name="context">@context@</property>
 
 <form name=f>
 
-<h2>Authorization</h2>
-@nav_bar@
-<hr>
-
-
-
 <p>
 <table cellpadding=0 cellspacing=0>
 
Index: openacs-4/packages/wp-slim/www/presentation-acl.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/presentation-acl.tcl	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-acl.tcl	6 Sep 2002 15:32:23 -0000	1.2
@@ -10,7 +10,7 @@
 } {
     pres_item_id:naturalnum,notnull
 } -properties {
-    nav_bar
+    context
     public_p
     presentation_title
     pres_item_id
@@ -44,7 +44,7 @@
 
 set encoded_title [ns_urlencode $title]
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "Authorization"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "$title"] "Authorization"]
 
 
 
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 -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/presentation-revisions.adp	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-revisions.adp	6 Sep 2002 15:32:23 -0000	1.3
@@ -1,12 +1,8 @@
 <master src="master">
 <property name="title">All Revisions of This Presentation</property>
+<property name="context">@context@</property>
 
-<h2>All Revisions</h2>
-@nav_bar@
-<hr>
 
-<blockquote>
-
 Revision in <font color=red>red</font> is the current live revision.
 
 <ul>
@@ -29,4 +25,3 @@
 </ul>
 
 <p> <a href="edit-presentation?pres_item_id=@pres_item_id@">Create a new revision</a>
-</blockquote>
Index: openacs-4/packages/wp-slim/www/presentation-revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/presentation-revisions.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-revisions.tcl	6 Sep 2002 15:32:23 -0000	1.3
@@ -9,7 +9,7 @@
 } {
     pres_item_id:integer
 } -properties {
-    nav_bar
+    context
     pres_item_id
     
 }
@@ -32,7 +32,7 @@
     order by creation_date
 }
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]"  "Presentation"] "All Revisions"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]"  "Presentation"] "All Revisions"]
 
 set return_url [ns_urlencode "presentation-revisions?[export_url_vars pres_item_id]"]
 
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 -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/presentation-top.adp	15 Nov 2001 01:47:13 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-top.adp	6 Sep 2002 15:32:23 -0000	1.3
@@ -1,10 +1,7 @@
 <master src="master">
 <property name="title">@presentation_title@</property>
+<property name="context">@context@</property>
 
-<h2>@presentation_title@</h2>
-@nav_bar@
-<hr>
-
 <h3>The Slides</h3>
 
    <if  @slides:rowcount@ eq 0>
@@ -15,7 +12,7 @@
      <multiple name="slides">
      <tr>
      <td>@slides.sort_key@.</td>
-     <td> <a href="@subsite_name@/display/@pres_item_id@/@slides.slide_item_id@.wimpy">@slides.slide_title@</a> </td>
+     <td> <a href="@subsite_name@display/@pres_item_id@/@slides.slide_item_id@.wimpy">@slides.slide_title@</a> </td>
      <td>
 [ <a href="edit-slide?slide_item_id=@slides.slide_item_id@&pres_item_id=@pres_item_id@">edit</a> |
 <if @delete_p@ eq t>
Index: openacs-4/packages/wp-slim/www/presentation-top.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/presentation-top.tcl	15 Nov 2001 01:47:13 -0000	1.3
+++ openacs-4/packages/wp-slim/www/presentation-top.tcl	6 Sep 2002 15:32:23 -0000	1.4
@@ -12,7 +12,7 @@
 } {
     pres_item_id:naturalnum
 } -properties {
-    nav_bar
+    context
     slides:multirow
     viewers:multirow
     public_p
@@ -39,7 +39,7 @@
 }
 
 set encoded_title [ns_urlencode $presentation_title]
-set nav_bar [ad_context_bar "$presentation_title"]
+set context [list "$presentation_title"]
 set subsite_name [ad_conn package_url]
 
 db_multirow slides get_slides {
Index: openacs-4/packages/wp-slim/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/search.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/search.adp	18 Jun 2002 15:13:23 -0000	1.1
+++ openacs-4/packages/wp-slim/www/search.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,8 +1,8 @@
 <master>
 <property name=title>User Search <if @group_name@ not nil>in @group_name@</if></property>
+<property name="context">@context@</property>
 
-<h2>User Search <if @group_name@ not nil>in @group_name@</if></h2>
-
+Search 
 <if @search_type@ eq "keyword">
   for name or email matching "@keyword@"
  </if><else>
@@ -12,8 +12,6 @@
   for last name "@last_name@"
 </else></else>
 
-<hr>
-
 <ul>
 
 <multiple name="user_search">
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 -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/serve-presentation-revision.adp	15 Nov 2001 01:47:13 -0000	1.3
+++ openacs-4/packages/wp-slim/www/serve-presentation-revision.adp	6 Sep 2002 15:32:23 -0000	1.4
@@ -1,10 +1,7 @@
 <master src="master">
 <property name="title">@pres_title@</property>
+<property name="context">@context@</property>
 
-<h2>@pres_title@</h2>
-@nav_bar@
-<hr>
-
 <h3>One Revision</h3>
 
 <blockquote>
Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl	15 Nov 2001 01:47:13 -0000	1.3
+++ openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl	6 Sep 2002 15:32:23 -0000	1.4
@@ -53,6 +53,6 @@
     and r.revision_id = pb.id
 }   
 
-set nav_bar [ad_context_bar [list "$subsite_name/presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "One Revision"]
+set context [list [list "$subsite_name/presentation-top?[export_url_vars pres_item_id]" "$pres_title"] "One Revision"]
 
 ad_return_template
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 -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/serve-presentation.adp	15 Nov 2001 01:47:13 -0000	1.2
+++ openacs-4/packages/wp-slim/www/serve-presentation.adp	6 Sep 2002 15:32:23 -0000	1.3
@@ -1,7 +1,7 @@
 <master src="master">
 <property name="title">@pres_title@</property>
+<property name="context">"one presentation"</property>
 
-
 <table align=right>
 <tr>
    <td><a href="@subsite_name@">done</a> | 
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 -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/serve-slide-revision.adp	5 Jul 2002 15:56:54 -0000	1.2
+++ openacs-4/packages/wp-slim/www/serve-slide-revision.adp	6 Sep 2002 15:32:23 -0000	1.3
@@ -1,9 +1,7 @@
 <master src="master">
 <property name="title">@slide_title@</property>
+<property name="context">@context@</property>
 
-<h2>@slide_title@</h2>
-<hr>
-
 <if @show_modified_p@ eq t>
 <i>Last modified @modified_date@</i>
 </if>
Index: openacs-4/packages/wp-slim/www/serve-slide-revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/serve-slide-revision.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/serve-slide-revision.tcl	6 Sep 2002 15:32:23 -0000	1.3
@@ -20,6 +20,7 @@
     page_signature
     href_back_forward
     attach_list:multirow
+    context:onevalue
     subsite_name
 }
 
@@ -50,6 +51,8 @@
     and   ao.object_id = s.slide_id
 }
 
+set context [list [list "$subsite_name/display/$pres_item_id" "one presentation"] "one slide"]
+
 db_1row get_presentation_page_signature {
     select p.page_signature,
     p.show_modified_p
@@ -65,5 +68,3 @@
     where i.parent_id = :slide_item_id
     and   i.live_revision = x.attach_id
 }
-
-ad_return_template
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 -N -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/serve-slide.adp	15 Nov 2001 01:47:13 -0000	1.4
+++ openacs-4/packages/wp-slim/www/serve-slide.adp	6 Sep 2002 15:32:23 -0000	1.5
@@ -1,13 +1,12 @@
 <master src="master">
 <property name="title">@slide_title@</property>
+<property name="context">@context@</property>
 
 <table align=right>
 <tr>
         <td>@href_back_forward@</td>
 </tr>
 </table>
-<h2>@slide_title@</h2>
-<hr>
 
 <if @show_modified_p@ eq t>
 <i>Last modified @modified_date@</i>
Index: openacs-4/packages/wp-slim/www/serve-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.tcl,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/wp-slim/www/serve-slide.tcl	10 Jul 2002 07:31:09 -0000	1.4
+++ openacs-4/packages/wp-slim/www/serve-slide.tcl	6 Sep 2002 15:32:23 -0000	1.5
@@ -18,6 +18,7 @@
     page_signature
     href_back_forward
     attach_list:multirow
+    context:onevalue
     subsite_name
 }
 
@@ -55,6 +56,8 @@
     and   i.live_revision = p.presentation_id
 }
 
+set context [list [list "$subsite_name/display/$pres_item_id" "one presentation"] "one slide"]
+
 # Figure out what the previous slide link should be.
 if {$sort_key == 1} {
     set href_back "<a href=\"$subsite_name/display/$pres_item_id/\">top</a> | "
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/slide-revisions.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/slide-revisions.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,10 +1,7 @@
 <master src="master">
 <property name="title">All Revisions of This Slide</property>
+<property name="context">@context@</property>
 
-<h2>All Revisions</h2>
-@nav_bar@
-<hr>
-
 <blockquote>
 
 Revision in <font color=red>red</font> is the current live revision.
Index: openacs-4/packages/wp-slim/www/slide-revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/slide-revisions.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/slide-revisions.tcl	6 Sep 2002 15:32:23 -0000	1.3
@@ -12,14 +12,14 @@
     pres_item_id:naturalnum,notnull
 } -properties {
     pres_item_id
-    nav_bar
+    context
     subsite_name
 }
 
 
 set subsite_name [ad_conn package_url]
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]" "Presentation"] "Slide Revisions"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]" "Presentation"] "Slide Revisions"]
 
 
 db_multirow revisions revisions_get {
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/slides-reorder.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/slides-reorder.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,10 +1,7 @@
 <master src="master">
 <property name="title">Reorder Slides</property>
+<property name="context">@context@</property>
 
-<h2>Reorder Slides</h2>
-@nav_bar@
-<hr>
-
 <form name=f>
 To move a slide in your presentation, select its title and click the Up or Down arrow.
 When you're done, click <i>Save Changes</i>.
Index: openacs-4/packages/wp-slim/www/slides-reorder.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/slides-reorder.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/slides-reorder.tcl	6 Sep 2002 15:32:23 -0000	1.3
@@ -17,7 +17,7 @@
 set header [ad_header "Reorder Slides"]
 
 
-set nav_bar [ad_context_bar [list "presentation-top?[export_url_vars pres_item_id]"  "presentation"] "Reorder Slides"]
+set context [list [list "presentation-top?[export_url_vars pres_item_id]"  "presentation"] "Reorder Slides"]
 
 set counter 0
 
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/upload-attachments.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/upload-attachments.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,11 +1,7 @@
 <master src="master">
 <property name="title">Upload Attachments</property>
+<property name="context">@context@</property>
 
-<h2>Upload Attachments</h2>
-@nav_bar@
-<hr>
-
-
 <form enctype=multipart/form-data action=attach method=post>
 <input type=hidden name=slide_item_id value="@slide_item_id@">
 <input type=hidden name=pres_item_id value="@pres_item_id@">
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 -N -r1.1 -r1.2
--- openacs-4/packages/wp-slim/www/users.adp	20 Apr 2001 20:51:24 -0000	1.1
+++ openacs-4/packages/wp-slim/www/users.adp	6 Sep 2002 15:32:23 -0000	1.2
@@ -1,9 +1,7 @@
 <master src="master">
 <property name="title">Wimpy Point Users</property>
+<property name="context">@context@</property>
 
-<h2>Wimpy Point Users</h2>
-@nav_bar@
-<hr>
 Select an author from this list of users who have created presentations (number of presentations shown in parentheses.)
 
 <ul>
Index: openacs-4/packages/wp-slim/www/users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/users.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/wp-slim/www/users.tcl	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/wp-slim/www/users.tcl	6 Sep 2002 15:32:23 -0000	1.3
@@ -9,7 +9,7 @@
     starts_with:html,optional
     bulk_copy:naturalnum,optional
 } -properties {
-    nav_bar
+    context
     users:multirow
 }
 
@@ -19,7 +19,7 @@
 # What presentations that users has created (but only if the current user has permission to see/view
 # those presentations.)
 
-set nav_bar "[ad_context_bar "All Authors"]"
+set context "[list "All Authors"]"
 
 db_multirow users get_wp_users {
     select p.person_id, p.first_names, p.last_name, parties.email, count(i.item_id) as num_presentations