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.1.2.15 -r1.1.2.16
--- openacs-4/packages/theme-zen/lib/lrn-master.adp	29 Mar 2007 00:13:35 -0000	1.1.2.15
+++ openacs-4/packages/theme-zen/lib/lrn-master.adp	31 Mar 2007 00:34:26 -0000	1.1.2.16
@@ -12,6 +12,10 @@
     <else>
     </else>
 
+<if @dotlrn_toolbar_p@ true>
+  <include src="/packages/dotlrn/lib/toolbar">
+</if>
+
 <div id="wrapper">
   <div id="skiptocontent"><a href="#content-wrapper" title="skip to main content" accesskey="k">Skip to Main Content</a></div>
   <div id="header">
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.1.2.19 -r1.1.2.20
--- openacs-4/packages/theme-zen/lib/lrn-master.tcl	27 Mar 2007 09:10:28 -0000	1.1.2.19
+++ openacs-4/packages/theme-zen/lib/lrn-master.tcl	31 Mar 2007 00:34:26 -0000	1.1.2.20
@@ -25,7 +25,7 @@
     set pvt_home_url [ad_pvt_home]
     set pvt_home_name [ad_pvt_home_name]
     if [empty_string_p $pvt_home_name] {
-	set pvt_home_name [_ acs-subsite.Your_Account]
+        set pvt_home_name [_ acs-subsite.Your_Account]
     }
     set logout_url [ad_get_logout_url]
 
@@ -93,8 +93,8 @@
     set comm_type [dotlrn_community::get_community_type_from_community_id $community_id]
 
     if {[dotlrn_community::subcommunity_p -community_id $community_id]} {
-	#The colors for a subgroup are set by the parent group with a few overwritten.
-	set comm_type [dotlrn_community::get_community_type_from_community_id [dotlrn_community::get_parent_id -community_id $community_id]]
+        #The colors for a subgroup are set by the parent group with a few overwritten.
+        set comm_type [dotlrn_community::get_community_type_from_community_id [dotlrn_community::get_parent_id -community_id $community_id]]
     }
 
   
@@ -105,7 +105,7 @@
     ]
 
     if {![empty_string_p $community_header_font]} {
-	set header_font "$community_header_font,$header_font"
+        set header_font "$community_header_font,$header_font"
     }
 
 
@@ -175,18 +175,18 @@
      [exists_and_not_null portal_id] } {
     
     if {[exists_and_not_null community_id]} {
-	set youarehere "[dotlrn_community::get_community_name $community_id]"
+        set youarehere "[dotlrn_community::get_community_name $community_id]"
     } else {
-	set youarehere "[_ theme-zen.MySpace]"
+        set youarehere "[_ theme-zen.MySpace]"
     }
 
     set extra_spaces "<img src=\"/resources/dotlrn/spacer.gif\" alt=\"\" border=0 width=15>"    
     set navbar [zen::portal_navbar]
     set subnavbar [zen::portal_subnavbar \
         -user_id $user_id \
         -control_panel_text $control_panel_text \
-	-pre_html "$extra_spaces" \
-	-post_html $extra_spaces \
+        -pre_html "$extra_spaces" \
+        -post_html $extra_spaces \
         -link_all $link_all
     ]
 } else {
@@ -220,6 +220,18 @@
 <script type="text/javascript" src="/resources/theme-zen/js/styleswitcher.js"></script>
 }]
 
+# 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 } {
+
+    append header_stuff {
+        <link rel="stylesheet" type="text/css" href="/resources/dotlrn/dotlrn-toolbar.css" media="all">
+    }
+    set dotlrn_toolbar_p 1
+} else {
+    set dotlrn_toolbar_p 0
+}
+
 if { [info exists text] } {
     set text [lang::util::localize $text]
 }