Index: openacs-4/www/blank-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/www/blank-master.adp	11 Dec 2003 21:40:16 -0000	1.4
+++ openacs-4/www/blank-master.adp	7 Jan 2004 00:17:32 -0000	1.5
@@ -9,15 +9,20 @@
 </head>
 <body<multiple name=attribute> @attribute.key@="@attribute.value@"</multiple>>
 
+<if @developer_support_p@ true>
+  <include src="/packages/acs-developer-support/lib/toolbar">
+</if>
+
 <slave>
 
-@ds_link;noquote@
+<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>
 
-<if @lang_admin_p@ true><a href="@toggle_translator_mode_url@">Toggle translator mode</a></if>
 
 </body>
 </html>
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/www/blank-master.tcl	11 Dec 2003 21:40:16 -0000	1.6
+++ openacs-4/www/blank-master.tcl	7 Jan 2004 00:17:32 -0000	1.7
@@ -74,19 +74,16 @@
 
 # Developer-support: We include that here, so that master template authors don't have to worry about it
 
+if { [llength [namespace eval :: info procs ds_show_p]] == 1 } {
+    set developer_support_p 1
+} else {
+    set developer_support_p 0
+}
+
 if { [llength [namespace eval :: info procs ds_link]] == 1 } {
      set ds_link [ds_link]
 } else {
-    set ds_link ""
+    set ds_link {}
 }
 
 set translator_mode_p [lang::util::translator_mode_p]
-
-# Toggle translator mode link
-
-set acs_lang_url [apm_package_url_from_key "acs-lang"]
-set lang_admin_p [permission::permission_p \
-                      -object_id [site_node::get_element -url $acs_lang_url -element object_id] \
-                      -privilege admin \
-                      -party_id [ad_conn untrusted_user_id]]
-set toggle_translator_mode_url [export_vars -base "${acs_lang_url}admin/translator-mode-toggle" { { return_url [ad_return_url] } }]
Index: openacs-4/www/site-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.adp,v
diff -u -r1.11 -r1.12
--- openacs-4/www/site-master.adp	5 Jan 2004 12:39:34 -0000	1.11
+++ openacs-4/www/site-master.adp	7 Jan 2004 00:17:32 -0000	1.12
@@ -42,29 +42,27 @@
 
     <td align="right" style="padding-right: 8px;" class="button-bar">
       <if @admin_url@ not nil>
-        &nbsp;
         <a href="@admin_url@" title="#acs-subsite.Site_wide_administration#">#acs-subsite.Admin#</a>
       </if>
       <if @devhome_url@ not nil>
-        &nbsp;
         <a href="@devhome_url@" title="#acs-subsite.Developers_Admin#">#acs-subsite.DevAdmin#</a>
       </if>
       <if @pvt_home_url@ not nil>
-        &nbsp;
         <a href="@pvt_home_url@" title="#acs-subsite.Change_pass_email_por#">@pvt_home_name@</a>
       </if>
       <if @login_url@ not nil>
-        &nbsp;
         <a href="@login_url@" title="#acs-subsite.Log_in_to_system#">#acs-subsite.Log_In#</a>
       </if>
       <if @logout_url@ not nil>
-        &nbsp;
         <a href="@logout_url@" title="#acs-subsite.Logout_from_system#">#acs-subsite.Logout#</a>
       </if>
     </td>
   </tr>
 </table>
 
+<if @sw_admin_p@ true>
+</if>
+
 <slave>
 
 <if @num_of_locales@ gt 1>
Index: openacs-4/www/site-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/site-master.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/www/site-master.tcl	5 Jan 2004 12:39:34 -0000	1.11
+++ openacs-4/www/site-master.tcl	7 Jan 2004 00:17:32 -0000	1.12
@@ -30,6 +30,7 @@
 set system_url [ad_url]
 
 # Get user information
+set sw_admin_p 0
 set user_id [ad_conn user_id]
 set untrusted_user_id [ad_conn untrusted_user_id]
 if { $untrusted_user_id != 0 } {