Index: openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp	15 May 2007 20:14:25 -0000	1.3
+++ openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp	19 Dec 2007 12:28:52 -0000	1.4
@@ -1,6 +1,5 @@
 <master src="@dotlrn_master@">
   <if @title@ not nil><property name="title">@title;noquote@</property></if>
-  <if @header_stuff@ not nil><property name="header_stuff">@header_stuff;noquote@</property></if>
   <if @context@ not nil><property name="context">@context;noquote@</property></if>
   <if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if>
   <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
Index: openacs-4/packages/dotlrn/www/dotlrn-master-kelp.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-kelp.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/dotlrn-master-kelp.adp	18 Dec 2007 21:20:10 -0000	1.3
+++ openacs-4/packages/dotlrn/www/dotlrn-master-kelp.adp	19 Dec 2007 12:28:52 -0000	1.4
@@ -1,10 +1,4 @@
 <master src="/www/site-master-kelp">
-  <property name="header_stuff">
-     <link rel="stylesheet" type="text/css" href="/resources/dotlrn/dotlrn-master-kelp.css" media="all">
-     <link rel="stylesheet" type="text/css" href="/resources/calendar/calendar.css" media="all">
-     @header_stuff;noquote@
-     @header_customized_css;noquote@ 
-  </property>
   <if @context@ not nil>
      <property name="context">@context;noquote@</property>
   </if>
@@ -30,4 +24,4 @@
   <div style="clear: both;"></div>
   </div><!-- main-container -->
 
-</div><!-- page-body -->
\ No newline at end of file
+</div><!-- page-body -->
Index: openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl	18 Dec 2007 21:20:10 -0000	1.3
+++ openacs-4/packages/dotlrn/www/dotlrn-master-kelp.tcl	19 Dec 2007 12:28:52 -0000	1.4
@@ -304,41 +304,13 @@
     set navbar "<br>"
 }
 
+template::head::add_css -href "/resources/dotlrn/dotlrn-master-kelp.css"
+template::head::add_css -href "/resources/calendar/calendar.css"
 
-if { ![info exists header_stuff] } {
-    set header_stuff ""
-}
-
 if { [info exists text] } {
     set text [lang::util::localize $text]
 }
 
-# Focus
-multirow create attribute key value
-
-if { ![template::util::is_nil focus] } {
-    # Handle elements wohse name contains a dot
-    if { [regexp {^([^.]*)\.(.*)$} $focus match form_name element_name] } {
-
-        # Add safety code to test that the element exists '
-        set header_stuff "$header_stuff
-          <script language=\"JavaScript\">
-            function acs_focus( form_name, element_name ){
-                if (document.forms == null) return;
-                if (document.forms\[form_name\] == null) return;
-                if (document.forms\[form_name\].elements\[element_name\] == null) return;
-                if (document.forms\[form_name\].elements\[element_name\].type == 'hidden') return;
-
-                document.forms\[form_name\].elements\[element_name\].focus();
-            }
-          </script>
-        "
-        
-        template::multirow append \
-                attribute onload "javascript:acs_focus('${form_name}', '${element_name}')"
-    }
-}
-
 # Developer-support support
 set ds_enabled_p [parameter::get_from_package_key \
     -package_key acs-developer-support \
@@ -560,20 +532,12 @@
     }
 }
     
-set header_customized_css "
-
-<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
-<STYLE TYPE=\"text/css\">
-
+template::head::add_style -style "
 $recolor_css
 
 .page-body {
     FONT-SIZE: $header_font_size;
     COLOR: $header_font_color;
     FONT-FAMILY: $header_font;
 }
-
-</STYLE>
-
 "
-	
Index: openacs-4/packages/dotlrn/www/dotlrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.adp,v
diff -u -r1.43 -r1.44
--- openacs-4/packages/dotlrn/www/dotlrn-master.adp	18 Dec 2007 21:20:10 -0000	1.43
+++ openacs-4/packages/dotlrn/www/dotlrn-master.adp	19 Dec 2007 12:28:52 -0000	1.44
@@ -1,10 +1,4 @@
 <master src="/www/site-compat">
-  <property name="header_stuff">
-    <link rel="stylesheet" type="text/css" href="/resources/dotlrn/dotlrn-master.css" media="all">
-    <link rel="stylesheet" type="text/css" href="/resources/calendar/calendar.css" media="all">
-    @header_stuff;noquote@
-    @header_customized_css;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/dotlrn/www/dotlrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master.tcl,v
diff -u -r1.38 -r1.39
--- openacs-4/packages/dotlrn/www/dotlrn-master.tcl	18 Dec 2007 21:20:10 -0000	1.38
+++ openacs-4/packages/dotlrn/www/dotlrn-master.tcl	19 Dec 2007 12:28:52 -0000	1.39
@@ -316,40 +316,13 @@
 }
 
 
-if { ![info exists header_stuff] } {
-    set header_stuff ""
-}
+template::head::add_css -href "/resources/dotlrn/dotlrn-master.css"
+template::head::add_css -href "/resources/calendar/calendar.css"
 
 if { [info exists text] } {
     set text [lang::util::localize $text]
 }
 
-# Focus
-multirow create attribute key value
-
-if { ![template::util::is_nil focus] } {
-    # Handle elements wohse name contains a dot
-    if { [regexp {^([^.]*)\.(.*)$} $focus match form_name element_name] } {
-
-        # Add safety code to test that the element exists '
-        set header_stuff "$header_stuff
-          <script language=\"JavaScript\">
-            function acs_focus( form_name, element_name ){
-                if (document.forms == null) return;
-                if (document.forms\[form_name\] == null) return;
-                if (document.forms\[form_name\].elements\[element_name\] == null) return;
-                if (document.forms\[form_name\].elements\[element_name\].type == 'hidden') return;
-
-                document.forms\[form_name\].elements\[element_name\].focus();
-            }
-          </script>
-        "
-        
-        template::multirow append \
-                attribute onload "javascript:acs_focus('${form_name}', '${element_name}')"
-    }
-}
-
 # Developer-support support
 set ds_enabled_p [parameter::get_from_package_key \
     -package_key acs-developer-support \
@@ -570,19 +543,12 @@
     }
 }
     
-set header_customized_css "
-
-<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
-<STYLE TYPE=\"text/css\">
-
+template::head::add_style -style "
 $recolor_css
 
 .page-body {
     FONT-SIZE: $header_font_size;
     COLOR: $header_font_color;
     FONT-FAMILY: $header_font;
 }
-
-</STYLE>
-
 "
Index: openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp	13 Jan 2005 13:57:21 -0000	1.10
+++ openacs-4/packages/dotlrn/www/admin/dotlrn-admin-master.adp	19 Dec 2007 12:28:53 -0000	1.11
@@ -25,14 +25,6 @@
   <if @context@ not nil><property name="context">@context;noquote@</property></if>
     <else><if @context_bar@ not nil><property name="context">@context_bar;noquote@</property></if></else>
   <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
-  <property name="header_stuff">
-<style type="text/css">
-/* Re-enable the breadcrumb bar -- useful for site-wide admins */
-#breadcrumbs {
-  display: inline;
-}
-</style>
-  </property>
 
 <slave>