Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -N -r1.19.2.11 -r1.19.2.12
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	14 May 2006 17:07:25 -0000	1.19.2.11
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	19 May 2006 11:12:39 -0000	1.19.2.12
@@ -312,6 +312,16 @@
       files to be selected, while %pdf% could be used for pdf-files. If
       nothing is specified, all file-types are presented.
     </ul>
+    <li> <em>javascript</em>: provide javascript code to configure 
+     the xinha widget and its plugins. The configure object is called <tt>xinha_config</tt>.
+     Example to use xinha with only a few controls:
+     <pre>
+         {options {editor xinha plugins {OacsFs} height 350px javascript {
+           xinha_config.toolbar = [
+             ['popupeditor', 'bold','italic','createlink','insertimage','separator'],
+             ['killword','removeformat'] ];
+         }}}
+     </pre>
   </ul>
   
   Example for the use of the xinha widget with options: 
@@ -328,6 +338,9 @@
      is per default not mounted. This is hopefully only a temporal situation
      and we find a better place.
   <p>
+  Note that the rich-rext editor interacts with <tt>blank-master.tcl</tt> and 
+  <tt>blank-master.adp</tt>.
+  <p>
   Derived from the htmlarea richtext widget for htmlarea by lars@pinds.com<br/>
   modified for RTE http://www.kevinroth.com/ by davis@xarg.net<br/>
   xinha support by gustaf.neumann@wu-wien.ac.at
@@ -420,9 +433,12 @@
 	set xinha_options ""
 	foreach e {width height folder_id fs_package_id file_types} {
 	  if {[info exists options($e)]} {
-	    append xinha_options "xinha_config.$e = '[ad_urlencode $options($e)]';\n"
+	    append xinha_options "xinha_config.$e = '$options($e)';\n"
 	  }
 	}
+	if {[info exists options(javascript)]} {
+	  append xinha_options $options(javascript) \n
+	}
 	set ::acs_blank_master(xinha.options) $xinha_options
 	lappend ::acs_blank_master__htmlareas $attributes(id)
       } 
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.4 -r1.18.2.5
--- openacs-4/www/blank-master.adp	11 Nov 2005 21:25:30 -0000	1.18.2.4
+++ openacs-4/www/blank-master.adp	19 May 2006 11:12:39 -0000	1.18.2.5
@@ -71,8 +71,8 @@
            </multiple>
 	];
        xinha_config = xinha_config ? xinha_config() : new HTMLArea.Config();
-       @xinha_params@
-       @xinha_options@
+       @xinha_params;noquote@
+       @xinha_options;noquote@
         xinha_editors = HTMLArea.makeEditors(xinha_editors, xinha_config, xinha_plugins);
        HTMLArea.startEditors(xinha_editors);
     }
Index: openacs-4/www/blank-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/blank-master.tcl,v
diff -u -N -r1.17.2.3 -r1.17.2.4
--- openacs-4/www/blank-master.tcl	11 Nov 2005 21:25:30 -0000	1.17.2.3
+++ openacs-4/www/blank-master.tcl	19 May 2006 11:12:39 -0000	1.17.2.4
@@ -48,7 +48,7 @@
   if {[info exists acs_blank_master(xinha)]} {
     set xinha_dir /resources/acs-templating/xinha-nightly/
     set xinha_plugins $acs_blank_master(xinha.plugins)
-    set xinha_params "xinha_config.height = '350px';"
+    set xinha_params ""
     set xinha_options $acs_blank_master(xinha.options)
     # setting language
     set lang [lang::conn::language]