Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -r1.36 -r1.37
--- openacs-4/www/blank-master.tcl	12 Dec 2007 00:06:48 -0000	1.36
+++ openacs-4/www/blank-master.tcl	19 Dec 2007 13:08:24 -0000	1.37
@@ -81,6 +81,21 @@
 # AG: Markup in <title> tags doesn't render well.
 set doc(title) [ns_striphtml $doc(title)]
 
+# Determine if developer support is installed and enabled
+#
+set developer_support_p [expr {
+    [llength [info procs ::ds_show_p]] == 1 && [ds_show_p]
+}]
+
+if {$developer_support_p} {
+    template::head::add_css \
+        -href "/resources/acs-developer-support/acs-developer-support.css" \
+        -media "all"
+ 
+    template::add_header -src "/packages/acs-developer-support/lib/toolbar"
+    template::add_footer -src "/packages/acs-developer-support/lib/footer"
+}
+
 # Generate the <meta /> tag multirow
 variable ::template::head::metas
 template::multirow create meta name content http_equiv scheme lang
Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.29 -r1.30
--- openacs-4/www/site-master.tcl	19 Dec 2007 11:09:38 -0000	1.29
+++ openacs-4/www/site-master.tcl	19 Dec 2007 13:08:24 -0000	1.30
@@ -124,20 +124,3 @@
     template::add_footer -src "/packages/acs-lang/lib/messages-to-translate"
 }
 
-# DRB: Devsup and dotlrn toolbars moved here temporarily until we rewrite 
-#  things so packages can push tool bars up to the blank master.
-#
-# Determine if developer support is installed and enabled
-#
-set developer_support_p [expr {
-    [llength [info procs ::ds_show_p]] == 1 && [ds_show_p]
-}]
-
-if {$developer_support_p} {
-    template::head::add_css \
-        -href "/resources/acs-developer-support/acs-developer-support.css" \
-        -media "all"
- 
-    template::add_header -src "/packages/acs-developer-support/lib/toolbar"
-    template::add_footer -src "/packages/acs-developer-support/lib/footer"
-}