Index: openacs-4/packages/theme-selva/www/selva-lrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-lrn-master.adp,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/theme-selva/www/selva-lrn-master.adp	18 Dec 2007 21:20:10 -0000	1.6
+++ openacs-4/packages/theme-selva/www/selva-lrn-master.adp	4 Jan 2008 18:47:18 -0000	1.7
@@ -1,7 +1,5 @@
 <master src="/packages/theme-selva/www/selva-site-master">
-  <property name="header_stuff">
-    @header_stuff;noquote@
-  </property>
+  <if @doc@ defined><property name="&doc">doc</property></if>
   <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-selva/www/selva-lrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-lrn-master.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/theme-selva/www/selva-lrn-master.tcl	18 Dec 2007 21:20:10 -0000	1.8
+++ openacs-4/packages/theme-selva/www/selva-lrn-master.tcl	4 Jan 2008 18:47:18 -0000	1.9
@@ -290,41 +290,11 @@
 }
 
 
-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\" type=\"text/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 \
@@ -355,6 +325,3 @@
                       -party_id [ad_conn untrusted_user_id]]
 set toggle_translator_mode_url [export_vars -base "${acs_lang_url}admin/translator-mode-toggle" { { return_url [ad_return_url] } }]
 
-# Curriculum bar
-set curriculum_bar_p [llength [site_node::get_children -all -filters { package_key "curriculum" } -node_id $community_id]]
-
Index: openacs-4/packages/theme-selva/www/selva-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-master.adp,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/theme-selva/www/selva-master.adp	15 Dec 2006 22:45:47 -0000	1.12
+++ openacs-4/packages/theme-selva/www/selva-master.adp	4 Jan 2008 18:47:18 -0000	1.13
@@ -4,10 +4,9 @@
 <else>
 	<master src="/packages/theme-selva/www/selva-site-master">
 </else>
-  <property name="title">@title;noquote@</property>
+  <if @doc@ defined><property name="&doc">doc</property></if>
   <property name="context">@context;noquote@</property>
   <property name="displayed_object_id">@displayed_object_id@</property>
-  <property name="header_stuff">@header_stuff;noquote@</property>
   <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
 
 <slave>
Index: openacs-4/packages/theme-selva/www/selva-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-master.tcl,v
diff -u -N -r1.12 -r1.13
--- openacs-4/packages/theme-selva/www/selva-master.tcl	29 Sep 2005 08:22:46 -0000	1.12
+++ openacs-4/packages/theme-selva/www/selva-master.tcl	4 Jan 2008 18:47:18 -0000	1.13
@@ -9,18 +9,14 @@
     set displayed_object_id ""
 }
 
-if {![exists_and_not_null title]} {
-    set title ""
+if {[exists_and_not_null title]} {
+    set doc(title) $title
 }
 
 if {![exists_and_not_null context]} {
     set context ""
 }
 
-if {![exists_and_not_null header_stuff]} {
-    set header_stuff ""
-}
-
 set dotlrn_installed_p [apm_package_installed_p dotlrn]
 
 append url [ad_url] [ad_return_url]
Index: openacs-4/packages/theme-selva/www/selva-site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-site-master.adp,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/theme-selva/www/selva-site-master.adp	15 May 2007 20:14:55 -0000	1.17
+++ openacs-4/packages/theme-selva/www/selva-site-master.adp	4 Jan 2008 18:47:18 -0000	1.18
@@ -1,19 +1,11 @@
-<master src="/www/blank-compat">
-  <if @title@ not nil>
-    <property name="title">@title;noquote@</property>
-  </if>
+<master src="/www/blank-master">
+  <if @doc@ defined><property name="&doc">doc</property></if>
   <if @signatory@ not nil>
     <property name="signatory">@signatory;noquote@</property>
   </if>
   <if @focus@ not nil>
     <property name="focus">@focus;noquote@</property>
   </if>
-  <property name="header_stuff">
-    <link rel="shortcut icon" href="/resources/theme-selva/Selva/default/images/myicon.ico">
-    <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
-    
-    @header_stuff;noquote@
-  </property>
 
   
 <div id="wrapper">
Index: openacs-4/packages/theme-selva/www/selva-site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-site-master.tcl,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/theme-selva/www/selva-site-master.tcl	8 Aug 2006 21:27:21 -0000	1.7
+++ openacs-4/packages/theme-selva/www/selva-site-master.tcl	4 Jan 2008 18:47:18 -0000	1.8
@@ -11,10 +11,6 @@
     set section {}
 }
 
-if { ![info exists header_stuff] } {
-    set header_stuff {}
-}
-
 if { [template::util::is_nil subnavbar_link] } {
     set subnavbar_link ""
 }
@@ -119,3 +115,6 @@
 if {[parameter::get_from_package_key -package_key "theme-selva" -parameter "isLogoActivated" -default "1"] == 1} {
 	set is_logo_url [parameter::get_from_package_key -package_key "theme-selva" -parameter "logoUrl" -default "/resources/theme-selva/Selva/default/images/logo.gif"]
 }
+
+template::head::add_link -rel "shortcut icon" -href "/resources/theme-selva/Selva/default/images/myicon.ico"
+template::head::add_css -href $css_url