Index: openacs-4/www/blank-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.adp,v
diff -u -N -r1.19.2.8 -r1.19.2.9
--- openacs-4/www/blank-master.adp	13 Mar 2007 15:50:29 -0000	1.19.2.8
+++ openacs-4/www/blank-master.adp	20 Mar 2007 01:39:52 -0000	1.19.2.9
@@ -12,6 +12,8 @@
 <if @head@ not nil>@head;noquote@</if>
 </head>
 <body<if @body.class@ not nil> class="@body.class;noquote@"</if><if @body.id@ not nil> id="@body.id;noquote@"</if><if @event_handlers@ not nil>@event_handlers;noquote@</if>>
-<slave />
+<multiple name="body_script">    <script type="@body_script.type;noquote@"<if @body_script.src@ not nil> src="@body_script.src;noquote@"</if><if @body_script.charset@ not nil> charset="@body_script.charset;noquote@"</if><if @body_script.defer@ not nil> defer="@body_script.defer;noquote@"</if>><if @body_script.content@ not nil>@body_script.content;noquote@</if></script>
+</multiple>
+<slave>
 </body>
 </html>
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -N -r1.20.2.6 -r1.20.2.7
--- openacs-4/www/blank-master.tcl	20 Mar 2007 00:47:31 -0000	1.20.2.6
+++ openacs-4/www/blank-master.tcl	20 Mar 2007 01:39:52 -0000	1.20.2.7
@@ -18,6 +18,7 @@
   @property meta:multirow     A multirow of <meta> tags to render.
   @property link:multirow     A multirow of <link> tags to render.
   @property script:multirow   A multirow of <script> tags to render in the head.
+  @property body_script:multirow   A multirow of <script> tags to render in the body.
 
   ad_conn -set language       Must be used to override the document language
                               if necessary.
@@ -77,6 +78,10 @@
 }
 template::multirow append script text/javascript /resources/acs-subsite/core.js "" "" ""
 
+if {![template::multirow exists body_script]} {
+    template::multirow create body_script type src charset defer content
+}
+
 # Handle richtext widgets, which needs special javascript and css 
 # in the page header and body.
 
@@ -85,7 +90,7 @@
 
 global acs_blank_master__htmlareas acs_blank_master
 
-if {[info exists acs_blank_master__htmlareas] } {
+if { [info exists acs_blank_master__htmlareas] } {
 
     if {[info exists acs_blank_master(rte)]} {
         foreach htmlarea_id [lsort -unique $acs_blank_master__htmlareas] {
@@ -94,13 +99,15 @@
         template::multirow append script text/javascript /resources/acs-templating/rte/richtext.js "" "" ""
     }
 
-    if {[info exists acs_blank_master(xinha)]} {
+    if { [info exists acs_blank_master(xinha)] } {
         set xinha_dir /resources/acs-templating/xinha-nightly/
+        set editor_lang [expr { $doc(lang) eq "en" || $doc(lang) eq "de" ? $doc(lang) : "en" }]
         template::multirow append script text/javascript "" "" "" "
-            _editor_url  = \"$xinha_dir\"
-            _editor_lang = \"[expr { $doc(lang) eq \"en\" || $doc(lang) eq \"de\"? $doc(lang) : en }]\";"
+            _editor_url  = \"$xinha_dir\";
+            _editor_lang = \"$editor_lang\";
+        "
         template::multirow append script text/javascript ${xinha_dir}htmlarea.js "" "" ""
-        template::multirow append script text/javascript "" "" "" "
+        template::multirow append body_script text/javascript "" "" "" "
 	    xinha_editors = null;
 	    xinha_init = null;
 	    xinha_config = null;
@@ -118,7 +125,7 @@
                 xinha_editors = HTMLArea.makeEditors(xinha_editors, xinha_config, xinha_plugins);
                 HTMLArea.startEditors(xinha_editors);
             \}
-            Xinha._addEvent(window,'load', xinha_init);
+	    window.onload = xinha_init;
         "
     }
 }