Index: openacs-4/www/blank-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.adp,v
diff -u -r1.19.2.10 -r1.19.2.11
--- openacs-4/www/blank-master.adp	22 Mar 2007 17:37:25 -0000	1.19.2.10
+++ openacs-4/www/blank-master.adp	24 Mar 2007 21:50:52 -0000	1.19.2.11
@@ -18,5 +18,10 @@
   <include src="/packages/acs-developer-support/lib/toolbar">
 </if>
 <slave>
+
+<if @developer_support_p@ true>
+  <include src="/packages/acs-developer-support/lib/footer">
+</if>
+
 </body>
 </html>
Index: openacs-4/www/site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.adp,v
diff -u -r1.26.2.1 -r1.26.2.2
--- openacs-4/www/site-master.adp	2 Mar 2007 16:12:35 -0000	1.26.2.1
+++ openacs-4/www/site-master.adp	24 Mar 2007 21:50:52 -0000	1.26.2.2
@@ -52,18 +52,8 @@
     TODO: remove this and add a more systematic / package independent way 
     TODO  of getting this content here
 </comment>
-<if @dotlrn_toolbar_p@ true><include src="/packages/dotlrn/lib/toolbar"></if>
+<slave>
 
-<if @developer_support_p@ true>
-  <include src="/packages/acs-developer-support/lib/toolbar">
-</if>
-
-<slave />
-
-<if @developer_support_p@ true>
-  <include src="/packages/acs-developer-support/lib/footer">
-</if>
-
 <if @translator_mode_p@ true>
   <include src="/packages/acs-lang/lib/messages-to-translate">
 </if>
Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.22.2.1 -r1.22.2.2
--- openacs-4/www/site-master.tcl	2 Mar 2007 16:12:35 -0000	1.22.2.1
+++ openacs-4/www/site-master.tcl	24 Mar 2007 21:50:52 -0000	1.22.2.2
@@ -69,13 +69,6 @@
     "all"
 
 #
-# Add standard javascript
-#
-template::multirow append script \
-    "text/javascript" \
-    "/resources/acs-subsite/core.js" 
-
-#
 # Process focus variable in onload
 # 
 if { ![template::util::is_nil focus] } {
@@ -145,39 +138,3 @@
 #
 set translator_mode_p [lang::util::translator_mode_p]
 
-#
-# Determine whether 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::multirow append link \
-        stylesheet \
-        "text/css" \
-        "/resources/acs-developer-support/acs-developer-support.css" \
-        "Developer Support Styles" \
-        en \
-        "all"
-}
-
-# 
-# dotLRN specific toolbar
-#   TODO: remove this and add a more systematic / package independent way 
-#   TODO  of getting this content here
-#
-set dotlrn_toolbar_p [expr {
-    [llength [namespace eval :: info procs dotlrn_toolbar::show_p]] == 1 
-}]
-
-if {$dotlrn_toolbar_p} {
-    template::multirow append link \
-        stylesheet \
-        "text/css" \
-        "/resources/dotlrn/dotlrn-toolbar.css" \
-        "dotLRN Toolbar Styles" \
-        en \
-        "all"
-}
-