Index: openacs-4/www/blank-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.adp,v
diff -u -N -r1.18.2.2 -r1.18.2.3
--- openacs-4/www/blank-master.adp	4 Jul 2005 11:49:43 -0000	1.18.2.2
+++ openacs-4/www/blank-master.adp	2 Nov 2005 03:45:55 -0000	1.18.2.3
@@ -7,31 +7,89 @@
       <link rel="stylesheet" type="text/css" href="/resources/acs-developer-support/acs-developer-support.css" media="all">
     </if>
     <multiple name="header_links">
-      <link rel="@header_links.rel@" type="@header_links.type@" href="@header_links.href@" media="@header_links.media@">
+      <link rel="@header_links.rel@" type="@header_links.type@" href="@header_links.href@" media="@header_links.media@" />
     </multiple>
 
-    <if @acs_blank_master__htmlareas@ not nil><script type="text/javascript" src="/resources/acs-templating/rte/richtext.js"></script></if>
+    <if @acs_blank_master__xinha@ not nil>
+      <if @htmlarea_support:rowcount@ ne 0>
+       <script type="text/javascript">
+        _editor_url  = "/resources/acs-templating/xinha-nightly/"  // (preferably absolute)URL (including trailing slash) where Xinha is installed   
+        _editor_lang = "@lang@";
+       </script>
+       <script type="text/javascript" src="/resources/acs-templating/xinha-nightly/htmlarea.js" language="javascript"></script>
+      </if>
+    </if>
 
-    <script type="text/javascript" src="/resources/acs-subsite/core.js"></script>
+    <if @acs_blank_master__rte@ not nil>
+      <if @acs_blank_master__htmlareas@ not nil>
+        <script language="JavaScript" type="text/javascript" 
+             src="/resources/acs-templating/rte/richtext.js">
+         </script>
+      </if>
+    </if>
 
+    <script type="text/javascript" src="/resources/acs-subsite/core.js" language="javascript"></script>
+
     @header_stuff;noquote@
   </head>
   <body<multiple name="attribute"> @attribute.key@="@attribute.value@"</multiple>>
-  <div><textarea id="holdtext" style="display: none;" rows="1" cols="1"></textarea></div>
-  <if @acs_blank_master__htmlareas@ not nil>
-    <script type="text/javascript"><!--
-      //Usage: initRTE(imagesPath, includesPath, cssFile)
-      initRTE("/resources/acs-templating/rte/images/", "/resources/acs-templating/rte/", "");
-      // --></script></if>
+  <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>
 
+    <if @acs_blank_master__rte@ not nil>
+     <if @acs_blank_master__htmlareas@ not nil>
+       <script language="JavaScript" type="text/javascript"><!--
+           initRTE("/resources/acs-templating/rte/images/", "/resources/acs-templating/rte/", "/resources/acs-templating/rte/rte.css");
+      // -->
+       </script>
+     </if>
+  </if>
+
+  <if @acs_blank_master__xinha@ not nil>
+    <if @htmlarea_support:rowcount@ ne 0>
+      <script type="text/javascript">
+	xinha_editors = null;
+	xinha_init = null;
+	xinha_config = null;
+	xinha_plugins = null;
+	xinha_init = xinha_init ? xinha_init : function()
+	{
+	xinha_plugins = xinha_plugins ? xinha_plugins :
+	[
+	'GetHtml',
+	'CharacterMap',
+	'ContextMenu',
+	'FullScreen',
+	'ListType',
+	'TableOperations',
+	'EditTag',
+	'LangMarks',
+	'Abbreviation'
+	];
+	// THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :)
+	if(!HTMLArea.loadPlugins(xinha_plugins, xinha_init)) return;
+	xinha_editors = xinha_editors ? xinha_editors :
+	[
+           <multiple name="htmlarea_support" delimiter=",">
+             '@htmlarea_support.id@'
+           </multiple>
+	];
+       xinha_config = xinha_config ? xinha_config() : new HTMLArea.Config();
+       xinha_config.height = '350px';
+       xinha_editors = HTMLArea.makeEditors(xinha_editors, xinha_config, xinha_plugins);
+       HTMLArea.startEditors(xinha_editors);
+    }
+    window.onload = xinha_init;
+    </script>
+   </if>
+  </if>
+
     <slave>
 
     <if @developer_support_p@ true>