Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/www/blank-master.tcl	24 Jul 2004 08:34:46 -0000	1.15
+++ openacs-4/www/blank-master.tcl	13 Jan 2005 13:58:54 -0000	1.16
@@ -18,6 +18,10 @@
     set title [ad_conn instance_name]  
 }
 
+#AG: Markup in <title> tags doesn't render well.
+set title [ns_striphtml $title]
+
+
 if { ![info exists header_stuff] } {
     set header_stuff {} 
 }
@@ -49,6 +53,16 @@
     multirow append attribute onload [join $onload " "]
 }
 
+# Additional Body Attributes
+
+if {[exists_and_not_null body_attributes]} {
+    foreach body_attribute $body_attributes {
+	multirow append attribute [lindex $body_attribute 0] [lindex $body_attribute 1]
+    }
+} else {
+    set body_attributes ""
+}
+
 # Header links (stylesheets, javascript)
 multirow create header_links rel type href media
 multirow append header_links "stylesheet" "text/css" "/resources/acs-templating/lists.css" "all"
@@ -65,6 +79,15 @@
     set developer_support_p 0
 }
 
+# dotlrn toolbar : We include that here, so that master template authors don't have to worry about it
+
+if { [llength [namespace eval :: info procs dotlrn_toolbar::show_p]] == 1 } {
+    multirow append header_links "stylesheet" "text/css" "/resources/dotlrn/dotlrn-toolbar.css" "all"
+    set dotlrn_toolbar_p 1
+} else {
+    set dotlrn_toolbar_p 0
+}
+
 set translator_mode_p [lang::util::translator_mode_p]
 
 set openacs_version [ad_acs_version]