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.5 -r1.6
--- openacs-4/packages/theme-zen/lib/lrn-master.adp	18 Dec 2007 21:42:12 -0000	1.5
+++ openacs-4/packages/theme-zen/lib/lrn-master.adp	20 Dec 2007 12:42:12 -0000	1.6
@@ -2,7 +2,7 @@
   <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>
-  <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
+  <if @doc@ defined><property name="&doc">doc</property></if>
 
 <div id="wrapper">
   <div id="skiptocontent"><a href="#content-wrapper" title="#theme-zen.skip_to_main_content#" accesskey="k">#theme-zen.skip_to_main_content#</a></div>
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.7 -r1.8
--- openacs-4/packages/theme-zen/lib/lrn-master.tcl	19 Dec 2007 11:09:38 -0000	1.7
+++ openacs-4/packages/theme-zen/lib/lrn-master.tcl	20 Dec 2007 12:42:12 -0000	1.8
@@ -156,8 +156,9 @@
     set user_name [acs_user::get_element -user_id [ad_conn untrusted_user_id] -element name]
 }
 
-if {![exists_and_not_null title]} {
-    set title [ad_system_name]
+# Set page title
+if { ![info exists doc(title)] && [exists_and_not_null title] } {
+    set doc(title) $title
 }
 
 if {[empty_string_p [dotlrn_community::get_parent_community_id -package_id [ad_conn package_id]]]} {
@@ -204,9 +205,6 @@
 template::head::add_meta -name "robots" -content "all"
 template::head::add_meta -name "keywords" -content "accessibility, portals, elearning, design"
 
-template::head::add_css -href "/resources/acs-templating/lists.css"
-template::head::add_css -href "/resources/acs-templating/forms.css"
- 
 template::head::add_css -href "/resources/acs-subsite/default-master.css" -media "screen"
 template::head::add_css -href "/resources/theme-zen/css/main.css" -media "screen"
 template::head::add_css -href "/resources/theme-zen/css/print.css" -media "print"
@@ -217,7 +215,6 @@
 template::head::add_css -alternate -href "/resources/theme-zen/css/508.css" -title "508"
 
 template::head::add_javascript -src "/resources/theme-zen/js/styleswitcher.js"
-template::head::add_javascript -src "/resources/acs-subsite/core.js"
 
 if { [info exists text] } {
     set text [lang::util::localize $text]
@@ -270,4 +267,3 @@
     template::head::add_css -href "/resources/dotlrn/dotlrn-toolbar.css"
     template::add_header -src "/packages/dotlrn/lib/toolbar"
 }
-