Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v
diff -u -r1.35 -r1.36
--- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	15 May 2007 20:14:23 -0000	1.35
+++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl	18 Dec 2007 21:42:11 -0000	1.36
@@ -55,6 +55,9 @@
     set show_calendar_name_p 0
 }
 
+# Styles for calendar
+template::head::add_css -href "/resources/calendar/calendar.css"
+
 # set the period_days for calendar's list view, therefore we need
 # to check which instance of calendar is currently displayed
 if {[apm_package_installed_p dotlrn]} {
Index: openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl	15 May 2007 20:14:23 -0000	1.11
+++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl	18 Dec 2007 21:42:11 -0000	1.12
@@ -101,4 +101,7 @@
 set url_template "?view=list&sort_by=\$order_by&page_num=$page_num" 
 set url_stub_callback "calendar_portlet_display::get_url_stub" 
 
+# Stylesheet
+template::head::add_css -href "/resources/calendar/calendar.css"
+
 ad_return_template
Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl,v
diff -u -r1.30 -r1.31
--- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	15 May 2007 20:14:23 -0000	1.30
+++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl	18 Dec 2007 21:42:11 -0000	1.31
@@ -166,5 +166,6 @@
     set url_template "?view=list&sort_by=\$order_by&page_num=$page_num" 
 }
 
+template::head::add_css -href "/resources/calendar/calendar.css"
 
 ad_return_template
Index: openacs-4/packages/theme-zen/lib/lrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/theme-zen/lib/lrn-master.adp	18 Dec 2007 21:20:11 -0000	1.4
+++ openacs-4/packages/theme-zen/lib/lrn-master.adp	18 Dec 2007 21:42:12 -0000	1.5
@@ -1,7 +1,4 @@
 <master src="/www/blank-master">
-  <property name="header_stuff">
-    @header_stuff;noquote@
-  </property>
   <if @context@ not nil><property name="context">@context;noquote@</property></if>
     <else><if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if></else>
   <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
Index: openacs-4/packages/theme-zen/lib/lrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/theme-zen/lib/lrn-master.tcl	18 Dec 2007 21:20:11 -0000	1.5
+++ openacs-4/packages/theme-zen/lib/lrn-master.tcl	18 Dec 2007 21:42:12 -0000	1.6
@@ -149,20 +149,6 @@
     set text ""
 }
 
-# Header_stuff to be removed once new-portal fixed (i.e. uses template::head)
-if { ![info exists header_stuff] } {
-    set header_stuff ""
-}
-
-if {[exists_and_not_null portal_page_p]} {
-    if { [set page_num [ns_queryget page_num]] eq "" } {
-        set page_num 0
-    }
-    append header_stuff [portal::get_page_header_stuff \
-                            -portal_id $portal_id \
-                            -page_num $page_num]
-}
-
 # Set up some basic stuff
 if { [ad_conn untrusted_user_id] == 0 } {
     set user_name {}