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.13 -r1.14
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	7 Oct 2007 22:36:55 -0000	1.13
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.adp	17 Dec 2007 14:10:37 -0000	1.14
@@ -1,10 +1,6 @@
   <master>
     <property name="title">#calendar.Calendar_Item_Delete#: @cal_item.name;noquote@</property>
     <property name="context">#calendar.Delete#</property>
-    <property name="header_stuff">
-      <link href="/resources/calendar/calendar.css" rel="stylesheet" type="text/css">
-    </property>
-    <if @link:rowcount@ not nil><property name="&link">link</property></if>
 
     <table>
 
Index: openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	7 Oct 2007 22:36:55 -0000	1.9
+++ openacs-4/packages/calendar/www/cal-item-delete-confirm.tcl	17 Dec 2007 14:10:37 -0000	1.10
@@ -22,16 +22,7 @@
 
 set date $cal_item(start_date)
 
-# To be replaced by a call to template::head API
-if {![template::multirow exists link]} {
-    template::multirow create link rel type href title lang media
-}
-template::multirow append link \
-    stylesheet \
-    "text/css" \
-    "/resources/calendar/calendar.css" \
-    "" \
-    en \
-    "all"
+# Header stuff
+template::head::add_css -href "/resources/calendar/calendar.css" -media all
 
 ad_return_template
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.19 -r1.20
--- openacs-4/packages/calendar/www/cal-item-new.adp	7 Oct 2007 22:36:55 -0000	1.19
+++ openacs-4/packages/calendar/www/cal-item-new.adp	17 Dec 2007 14:10:37 -0000	1.20
@@ -2,18 +2,12 @@
 <if @ad_form_mode@ eq display>
   <property name="title">#calendar.Calendar_Edit_Item#</property>
   <property name="context">#calendar.Edit#</property>
-  <property name="focus">cal_item.title</property>
 </if>
 <else>
   <property name="title">#calendar.Calendar_Add_Item#</property>
   <property name="context">#calendar.Add#</property>
-  <property name="focus">cal_item.title</property>
 </else>
-<property name="onload">TimePChanged()</property>
-<property name="header_stuff">
-  <link href="/resources/calendar/calendar.css" rel="stylesheet" type="text/css">
-</property>
-<if @link:rowcount@ not nil><property name="&link">link</property></if>
+<property name="focus">cal_item.title</property>
 
 <script type="text/javascript" language="JavaScript">
     function disableTime(form_name) {
Index: openacs-4/packages/calendar/www/cal-item-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-new.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/calendar/www/cal-item-new.tcl	7 Oct 2007 22:36:55 -0000	1.34
+++ openacs-4/packages/calendar/www/cal-item-new.tcl	17 Dec 2007 14:10:37 -0000	1.35
@@ -31,17 +31,9 @@
 set calendar_list [calendar::calendar_list]
 set calendar_options [calendar::calendar_list -privilege create]
 
-# To be replaced by a call to template::head API
-if {![template::multirow exists link]} {
-    template::multirow create link rel type href title lang media
-}
-template::multirow append link \
-    stylesheet \
-    "text/css" \
-    "/resources/calendar/calendar.css" \
-    "" \
-    en \
-    "all"
+# Header stuff
+template::add_body_handler -event "onload" -script "TimePChanged()"
+template::head::add_css -href "/resources/calendar/calendar.css" -media all
 
 # TODO: Move into ad_form
 if { ![ad_form_new_p -key cal_item_id] } {
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.30 -r1.31
--- openacs-4/packages/calendar/www/cal-item-view.adp	7 Oct 2007 22:36:55 -0000	1.30
+++ openacs-4/packages/calendar/www/cal-item-view.adp	17 Dec 2007 14:10:37 -0000	1.31
@@ -1,10 +1,6 @@
 <master>
 <property name="title">#calendar.Calendar_Item#: @cal_item.name;noquote@</property>
 <property name="context">#calendar.Item#</property>
-<property name="header_stuff">
-  <link href="/resources/calendar/calendar.css" rel="stylesheet" type="text/css">
-</property>
-<if @link:rowcount@ not nil><property name="&link">link</property></if>
 <property name="displayed_object_id">@cal_item_id@</property>
 
 
Index: openacs-4/packages/calendar/www/cal-item-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/cal-item-view.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/calendar/www/cal-item-view.tcl	7 Oct 2007 22:36:55 -0000	1.20
+++ openacs-4/packages/calendar/www/cal-item-view.tcl	17 Dec 2007 14:10:37 -0000	1.21
@@ -44,17 +44,8 @@
 set cal_item_new_url [export_vars -base "cal-item-new" {cal_item_id return_url}]
 set cal_item_delete_url [export_vars -base "cal-item-delete" {cal_item_id return_url}]
 
-# To be replaced by a call to template::head API
-if {![template::multirow exists link]} {
-    template::multirow create link rel type href title lang media
-}
-template::multirow append link \
-    stylesheet \
-    "text/css" \
-    "/resources/calendar/calendar.css" \
-    "" \
-    en \
-    "all"
+# Header stuff
+template::head::add_css -href "/resources/calendar/calendar.css" -media all
 
 ad_return_template 
 
Index: openacs-4/packages/calendar/www/view-list-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.adp,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/calendar/www/view-list-display.adp	15 May 2007 20:14:21 -0000	1.12
+++ openacs-4/packages/calendar/www/view-list-display.adp	17 Dec 2007 14:10:37 -0000	1.13
@@ -1,4 +1,4 @@
-<table class="cal-table-display" cellpadding="1" cellspacing="2" width="99%">
+<table class="cal-table-display" cellpadding="1" cellspacing="2" width="75%">
 <tr><td align="right" nowrap="nowrap">
 [&nbsp;<a href="@period_url_1@" title="#calendar.events_over_1d#">1</a>
 &nbsp;|&nbsp;
Index: openacs-4/packages/calendar/www/view-month-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/calendar/www/view-month-display.adp	7 Oct 2007 22:36:55 -0000	1.19
+++ openacs-4/packages/calendar/www/view-month-display.adp	17 Dec 2007 14:10:37 -0000	1.20
@@ -1,15 +1,15 @@
 <% ns_log notice "DAVEB 103 view-month-display.adp" %>
 
-    <h1 align="center">
+    <h1 class="calendar-back-forward" style="text-align:center">
       <a href="@previous_month_url@#calendar" title="#calendar.prev_month#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_month#" ></a>
       &nbsp;@month_string@ @year@&nbsp;
     <a href="@next_month_url@#calendar" title="#calendar.next_month#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_month#" ></a>
     </h1>
 
-<table class="cal-table-display" cellpadding="0" cellspacing="0" border="0" width="99%" summary="calendar grid display for @month_string@ @year@">
+<table class="cal-table-display" cellpadding="0" cellspacing="0" border="0" width="75%" summary="calendar grid display for @month_string@ @year@">
   <tr>
     <multiple name="weekday_names">
-      <th width="14%" class="cal-month-day-title">
+      <th width="10%" class="cal-month-day-title">
         @weekday_names.weekday_short@
       </th>
     </multiple>
@@ -31,14 +31,14 @@
               </if>
 
               <if @items.outside_month_p@ true>
-                <td class="cal-month-day-inactive" width="14%">&nbsp;</td>
+                <td class="cal-month-day-inactive" width="10%">&nbsp;</td>
               </if>     
               <else>
                 <if @items.today_p@ true>
-                  <td class="cal-month-today"  width="14%" onclick="javascript:location.href='@items.add_url@';" onkeypress="javascript:acs_KeypressGoto('@items.add_url@',event);">
+                  <td class="cal-month-today"  width="10%" onclick="javascript:location.href='@items.add_url@';" onkeypress="javascript:acs_KeypressGoto('@items.add_url@',event);">
                 </if>
                 <else>
-                  <td class="cal-month-day"  width="14%" onclick="javascript:location.href='@items.add_url@';"onkeypress="javascript:acs_KeypressGoto('@items.add_url@',event);">
+                  <td class="cal-month-day"  width="10%" onclick="javascript:location.href='@items.add_url@';"onkeypress="javascript:acs_KeypressGoto('@items.add_url@',event);">
                 </else>
                   &nbsp;<span class="screen-reader-only">[</span><a href="@items.day_url@" title="#calendar.goto_day_items_day_number#">@items.day_number@</a><span class="screen-reader-only"> ]</span>
 
Index: openacs-4/packages/calendar/www/view-one-day-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.adp,v
diff -u -r1.21 -r1.22
--- openacs-4/packages/calendar/www/view-one-day-display.adp	7 Oct 2007 22:36:55 -0000	1.21
+++ openacs-4/packages/calendar/www/view-one-day-display.adp	17 Dec 2007 14:10:37 -0000	1.22
@@ -6,7 +6,7 @@
   </tr>
   <tr>
     <td>
-     <table id="cal-table-day" cellpadding="0" cellspacing="1" border="0" width="100%">
+     <table id="cal-table-day" cellpadding="0" cellspacing="1" border="0" width="75%">
         <tr>
 			<td style="vertical-align: top;"> <div class="day-time-1"><p><a href="@grid_first_add_url@" title="#calendar.Add_item_beginning_at#">@grid_first_hour@</a></p></div></td>
 			<td style="vertical-align: top;" class="day-event-1" width="80%" valign="top">
Index: openacs-4/packages/calendar/www/view-week-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.adp,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/calendar/www/view-week-display.adp	7 Oct 2007 22:36:55 -0000	1.16
+++ openacs-4/packages/calendar/www/view-week-display.adp	17 Dec 2007 14:10:37 -0000	1.17
@@ -4,11 +4,11 @@
 		<table width="@week_width@@width_units@">
 			<tr>
 				<td align="center">
-		<h1>
+          <h1 class="calendar-back-forward">
 		  <a href="@previous_week_url@" title="#calendar.prev_week#"><img src="/resources/calendar/images/left.gif" alt="#calendar.prev_week#"></a>
-		  &nbsp;#calendar.Week_of# @week_start_month@ @week_start_day@ @week_start_year@ &ndash; @week_end_month@ @week_end_day@ @week_end_year@&nbsp;
-		  <a href="@next_week_url@" title="#calendar.next_week#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_week#" ></a>
-		</h1>
+                &nbsp;#calendar.Week_of# @week_start_month@ @week_start_day@ @week_start_year@ &ndash; @week_end_month@ @week_end_day@ @week_end_year@&nbsp;
+		  <a href="@next_week_url@" title="#calendar.next_week#"><img src="/resources/calendar/images/right.gif" alt="#calendar.next_week#"></a>
+          </h1>
               </td>
           </tr>
         </table>
Index: openacs-4/packages/calendar/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.adp,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/calendar/www/view.adp	7 Oct 2007 22:36:55 -0000	1.31
+++ openacs-4/packages/calendar/www/view.adp	17 Dec 2007 14:10:37 -0000	1.32
@@ -1,9 +1,5 @@
 <master>
 <property name="title">#calendar.Calendars#</property>
-<property name="header_stuff">
-  <link href="/resources/calendar/calendar.css" rel="stylesheet" type="text/css">
-</property>
-<if @link:rowcount@ not nil><property name="&link">link</property></if>
 
 <include src="/packages/calendar/www/navbar" view="@view@" base_url="@ad_conn_url@" date="@date@">
 
Index: openacs-4/packages/calendar/www/view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view.tcl,v
diff -u -r1.25 -r1.26
--- openacs-4/packages/calendar/www/view.tcl	7 Oct 2007 22:36:55 -0000	1.25
+++ openacs-4/packages/calendar/www/view.tcl	17 Dec 2007 14:10:37 -0000	1.26
@@ -62,16 +62,7 @@
                             -url [ad_conn url] \
                            ]
 
-# To be replaced by a call to template::head API
-if {![template::multirow exists link]} {
-    template::multirow create link rel type href title lang media
-}
-template::multirow append link \
-    stylesheet \
-    "text/css" \
-    "/resources/calendar/calendar.css" \
-    "" \
-    en \
-    "all"
+# Header stuff
+template::head::add_css -href "/resources/calendar/calendar.css" -media all 
 
 ad_return_template