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.8 -r1.9
--- openacs-4/packages/calendar/www/cal-item-create-recurrence.adp	22 Jul 2002 21:46:19 -0000	1.8
+++ openacs-4/packages/calendar/www/cal-item-create-recurrence.adp	4 Sep 2002 07:52:29 -0000	1.9
@@ -9,7 +9,7 @@
 
 <master src="master">
 <property name="title">Calendars: Repeating Event</property>
-<property name="context_bar">Repeat</property>
+<property name="context">Repeat</property>
 
 You are choosing to make this event recurrent, so that it appears more
 than once in your calendar. The event's details are:
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.5 -r1.6
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	3 Jun 2002 07:26:55 -0000	1.5
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	4 Sep 2002 07:52:29 -0000	1.6
@@ -9,7 +9,7 @@
 
 <master src="master">
 <property name="title">Calendar Item Delete: @cal_item.name@</property>
-<property name="context_bar">Delete</property>
+<property name="context">Delete</property>
 
 <table>
 
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.1 -r1.2
--- openacs-4/packages/calendar/www/cal-item-edit.adp	3 Jun 2002 04:08:17 -0000	1.1
+++ openacs-4/packages/calendar/www/cal-item-edit.adp	4 Sep 2002 07:52:29 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Calendar: Edit Item</property>
-<property name="context_bar">Edit</property>
+<property name="context">Edit</property>
 
 <table width="95%">
 
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.2 -r1.3
--- openacs-4/packages/calendar/www/cal-item-new.adp	5 Jul 2002 15:56:53 -0000	1.2
+++ openacs-4/packages/calendar/www/cal-item-new.adp	4 Sep 2002 07:52:29 -0000	1.3
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Calendar: Add Item</property>
-<property name="context_bar">Add</property>
+<property name="context">Add</property>
 
 <table width="95%">
 
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.11 -r1.12
--- openacs-4/packages/calendar/www/cal-item-view.adp	10 Jul 2002 14:58:25 -0000	1.11
+++ openacs-4/packages/calendar/www/cal-item-view.adp	4 Sep 2002 07:52:29 -0000	1.12
@@ -9,7 +9,7 @@
 
 <master src="master">
 <property name="title">Calendar Item: @cal_item.name@</property>
-<property name="context_bar">Item</property>
+<property name="context">Item</property>
 
 <table>
 
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.1 -r1.2
--- openacs-4/packages/calendar/www/calendar-choose.adp	17 Aug 2002 18:21:30 -0000	1.1
+++ openacs-4/packages/calendar/www/calendar-choose.adp	4 Sep 2002 07:52:29 -0000	1.2
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Calendar: Choose Calendar</property>
-<property name="context_bar">Choose</property>
+<property name="context">Choose</property>
 
 <table width="95%">
 
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.3 -r1.4
--- openacs-4/packages/calendar/www/calendar-item-types.adp	11 Jun 2002 21:09:59 -0000	1.3
+++ openacs-4/packages/calendar/www/calendar-item-types.adp	4 Sep 2002 07:52:29 -0000	1.4
@@ -1,6 +1,6 @@
-<master>
+<master src="master">
 <property name="title">Calendar Item Types</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context@</property>
 
 <ul>
 <%
@@ -12,12 +12,13 @@
             continue
         }
 
-        template::adp_puts "<li> \[ <a href=\"item-type-delete?calendar_id=$calendar_id&item_type_id=$item_type_id\">delete</a> \]  &nbsp; $type\n"
+      template::adp_puts "<li> \[ <a href=\"item-type-delete?calendar_id=$calendar_id&item_type_id=$item_type_id\">delete</a> \]  &nbsp; $type</li>\n"
 }
 %>
-<form method=POST action=item-type-new>
-<INPUT TYPE=hidden name=calendar_id value=@calendar_id@>
-New Type: <INPUT TYPE=text name=type size=40>
-<INPUT TYPE=submit value=add>
-</FORM>
 </ul>
+<form method="post" action="item-type-new">
+<input type="hidden" name="calendar_id" value="@calendar_id@" />
+New Type: <input type="text" name="type" size="40" />
+<input type="submit" value="add" />
+</form>
+
Index: openacs-4/packages/calendar/www/calendar-item-types.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/calendar-item-types.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/calendar-item-types.tcl	18 Mar 2002 18:15:22 -0000	1.1
+++ openacs-4/packages/calendar/www/calendar-item-types.tcl	4 Sep 2002 07:52:29 -0000	1.2
@@ -1,4 +1,3 @@
-
 ad_page_contract {
 
     Manage the calendar item types
@@ -16,8 +15,7 @@
 
 # List the item types and allow addition of a new one
 set item_types [calendar::get_item_types -calendar_id $calendar_id]
-set context_bar {{Item Types}}
+set context [list "Item Types"]
 
-ad_return_template
 
 
Index: openacs-4/packages/calendar/www/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/Attic/master.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/calendar/www/master.adp	23 Jan 2002 09:36:48 -0000	1.2
+++ openacs-4/packages/calendar/www/master.adp	4 Sep 2002 07:52:29 -0000	1.3
@@ -1,9 +1,10 @@
 <master>
 <property name="title">@title@</property>
+<property name="context">@context@</property>
 
 <h2>@title@</h2>
- <if @context_bar@ not nil>
-  <%= [eval ad_context_bar $context_bar] %>
+ <if @context@ not nil>
+  <%= [eval ad_context_bar $context] %>
  </if>
 <hr>
 <slave>
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/calendar/www/view.adp	5 Jul 2002 15:56:53 -0000	1.3
+++ openacs-4/packages/calendar/www/view.adp	4 Sep 2002 07:52:29 -0000	1.4
@@ -1,6 +1,6 @@
 <master src="master">
 <property name="title">Calendars</property>
-<property name="context_bar">Calendar</property>
+<property name="context">Calendar</property>
 
 <table width="95%">
 
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.3 -r1.4
--- openacs-4/packages/calendar/www/admin/cal-item-permissions.adp	13 Mar 2002 22:50:53 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/cal-item-permissions.adp	4 Sep 2002 07:52:32 -0000	1.4
@@ -8,7 +8,7 @@
 
 <master src="master">
 <property name="title">Calendar Item Administration </property>
-<property name="context_bar"> "Calendar Item Permissions" </property>
+<property name="context"> "Calendar Item Permissions" </property>
 
 <if @action@ eq list>
   <table>
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.3 -r1.4
--- openacs-4/packages/calendar/www/admin/calendar-permissions.adp	13 Mar 2002 22:50:53 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/calendar-permissions.adp	4 Sep 2002 07:52:32 -0000	1.4
@@ -1,15 +1,6 @@
-<!--	
-	The template for assigning permission to audiences of 
-	the calendar
-	
-	@author Gary Jin (gjin@arsidigta.com)
-     	@creation-date Jan 09, 2000
-     	@cvs-id $Id$
--->
-
 <master src="master">
 <property name="title">Calendar Administration: @party_name@ </property>
-<property name="context_bar"> Calendar Permissions </property>
+<property name="context">"Calendar Permissions"</property>
 
 
 <if @action@ eq view>
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.2 -r1.3
--- openacs-4/packages/calendar/www/admin/calendar-preferences.adp	9 Jan 2002 23:56:31 -0000	1.2
+++ openacs-4/packages/calendar/www/admin/calendar-preferences.adp	4 Sep 2002 07:52:32 -0000	1.3
@@ -8,7 +8,7 @@
 -->
 <master src="master">
 <property name="title">Calendar Administration: @party_name@ </property>
-<property name="context_bar"> "Calendar Preferences" </property>
+<property name="context"> "Calendar Preferences" </property>
 
 
 <table>
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.3 -r1.4
--- openacs-4/packages/calendar/www/admin/index.adp	13 Mar 2002 22:50:53 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/index.adp	4 Sep 2002 07:52:32 -0000	1.4
@@ -9,7 +9,7 @@
 
 <master src="master">
 <property name="title">Calendar Administration for User # @user_id@</property>
-<property name="context_bar">@context_bar@</property>
+<property name="context">@context_bar@</property>
 
 
 <p>
Index: openacs-4/packages/calendar/www/admin/master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/master.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/admin/master.adp	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/www/admin/master.adp	4 Sep 2002 07:52:32 -0000	1.2
@@ -1,15 +1,10 @@
-<!--	
-	The master template
-	
-	@author Gary Jin (gjin@arsidigta.com)
-     	@creation-date Dec 14, 2000
-     	@cvs-id $Id$
--->
+<master>
+<property name="title">@title@</property>
+<property name="context">@context@</property>
 
-<%= [ad_header $title] %>
 <h2>@title@</h2>
-<%= [eval ad_context_bar $context_bar] %>
+ <if @context@ not nil>
+  <%= [eval ad_context_bar $context] %>
+ </if>
 <hr>
 <slave>
-<%= [ad_footer] %>
-
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.3 -r1.4
--- openacs-4/packages/calendar/www/admin/one.adp	12 Feb 2002 14:13:58 -0000	1.3
+++ openacs-4/packages/calendar/www/admin/one.adp	4 Sep 2002 07:52:32 -0000	1.4
@@ -9,7 +9,7 @@
 
 <master src="master">
 <property name="title">Calendar Administration@title@ </property>
-<property name="context_bar"> @context_bar@ </property>
+<property name="context">@context@</property>
 
 <if @action@ eq view>
 	Calendar detail: listing all the info about the individual calendar
Index: openacs-4/packages/calendar/www/admin/one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/admin/Attic/one.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/calendar/www/admin/one.tcl	23 Apr 2001 23:09:38 -0000	1.1
+++ openacs-4/packages/calendar/www/admin/one.tcl	4 Sep 2002 07:52:32 -0000	1.2
@@ -22,7 +22,7 @@
     calendar_permission:onevalue
 
     title:onevalue
-    context_bar:onevalue
+    context:onevalue
 
     audiences:multirow
 }
@@ -41,7 +41,7 @@
     if { ![empty_string_p $calendar_id] } {
 
 	#set context bar and title
-	set context_bar "Edit"
+	set context "Edit"
 	set title ": Edit a Calendar"
 
 	# get calendar name
@@ -63,31 +63,31 @@
 } elseif { [string equal $action "add" ] } {
 
     #set context bar and title
-    set context_bar "Create"
+    set context "Create"
     set title ": Create a Calendar"
 
 
 # action is view    
 } elseif { [string equal $action "view"] } {
 
     #set context bar and title
-    set context_bar "Create"
+    set context "Create"
     set title ": Create a Calendar"
 
 
 # action is delete
 } elseif { [string equal $action "delete"] } {
 
     #set context bar and title
-    set context_bar "Delete"
+    set context "Delete"
     set title ": Delete a Calendar"
 
 
 # action is permission
 } elseif { [string equal $action "permission"] } {
 
     #set context bar and title
-    set context_bar "permissions"
+    set context "permissions"
     set title ": Manage Calendar Permissions"
 
     # get calendar_name