Index: openacs-4/www/blank-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.adp,v
diff -u -N -r1.11.2.1 -r1.11.2.2
--- openacs-4/www/blank-master.adp	2 Jul 2004 23:21:41 -0000	1.11.2.1
+++ openacs-4/www/blank-master.adp	22 Nov 2004 22:14:32 -0000	1.11.2.2
@@ -24,6 +24,9 @@
   <body<multiple name="attribute"> @attribute.key@="@attribute.value@"</multiple>>
 
     <textarea id="holdtext" style="display: none;" rows="1" cols="1"></textarea>
+    <if @dotlrn_toolbar_p@ true>
+      <include src="/packages/dotlrn/lib/toolbar">
+    </if>
     <if @developer_support_p@ true>
       <include src="/packages/acs-developer-support/lib/toolbar">
     </if>
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -N -r1.12.2.3 -r1.12.2.4
--- openacs-4/www/blank-master.tcl	18 Aug 2004 20:22:49 -0000	1.12.2.3
+++ openacs-4/www/blank-master.tcl	22 Nov 2004 22:14:32 -0000	1.12.2.4
@@ -75,6 +75,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 { [apm_package_installed_p dotlrn ] } {
+    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]