Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -r1.41 -r1.42
--- openacs-4/packages/acs-templating/acs-templating.info	25 Sep 2007 15:22:38 -0000	1.41
+++ openacs-4/packages/acs-templating/acs-templating.info	19 Jan 2008 16:53:57 -0000	1.42
@@ -36,7 +36,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultListFilterStyle"  default="filters" description="The default list filter template to use if a particular listfilter tag does not explicitly specify the list filter style to use. <br> Relative to [acs_root_dir]/packages/acs-templating/resources/lists. If it starts with '/' then it is relative to [acs_root_dir]"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultListStyle"  default="table" description="The default list template to use if a particular list does not explicitly specify the list style to use. <br> Relative to [acs_root_dir]/packages/acs-templating/resources/lists. If it starts with '/' then it is relative to [acs_root_dir]"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RefreshCache"  default="as needed" description="When to re-translate templates.  Values: never, as needed, always."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RichTextEditor"  default="rte" description="Use the specified javascript text editor when UseHtmlAreaForRichtextP is activated. Valid arguments are &quot;rte&quot; or &quot;xinha&quot;."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RichTextEditor"  default="xinha" description="Use the specified javascript text editor when UseHtmlAreaForRichtextP is activated. Valid arguments are &quot;xinha&quot;."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowCompiledTemplatesP"  default="0" description="Show thecompiled template (for debugging) at .cmp URL"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowDataDictionariesP"  default="0" description="Offer data dictionaries on .dat/.fmt URL."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="SpellcheckDialectsP"  default="0" description="Do you care about dialects or not? If this is set to '1' all available dictionary dialects for all available languages will appear as choices in the pull-down menu. If the param is set to '0', only the base-language(s) will be shown. However, it only works with aspell - on ispell you'll simply get a 'yes' and 'no' option, no matter how this param is set, where 'yes' will use ispell's default dictionary. NOTE! You'll need to restart the server for this param to take effect."/>
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 -r1.32 -r1.33
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	21 Nov 2007 14:08:44 -0000	1.32
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	19 Jan 2008 16:53:57 -0000	1.33
@@ -301,7 +301,7 @@
 ad_proc -public template::widget::richtext { element_reference tag_attributes } {
   Implements the richtext widget, which offers rich text editing options.
 
-  This version supports the rte and xinha editor.
+  This version supports the xinha editor.
 
   If the acs-templating.UseHtmlAreaForRichtextP parameter is set to true (1), 
   this will use the htmlArea WYSIWYG editor widget.
@@ -429,25 +429,12 @@
 				$options(editor) : [parameter::get \
 							-package_id $package_id_templating \
 							-parameter "RichTextEditor" \
-							-default "rte"]}]
+							-default "xinha"]}]
       # Tell the blank-master to include the special stuff 
       # for the richtext widget in the page header
       set ::acs_blank_master($richtextEditor) 1
 
-      if {$richtextEditor eq "rte"} {
-	lappend ::acs_blank_master__htmlareas $element(form_id)
-	# quote contents for javascript.
-	set contents [string map {\n \\n \r {} "'" "&\#39"} $contents]
-
-	# What we are generating here is the call to write the richtext widget 
-	# but we also need to pass what to generate in for browsers for 
-	# which the richtext widget won't work but which do have js enabled 
-	# should output since we need the format widget (this for Safari among 
-	# some others)
-          set noscript_output "$output <br>[_ acs-templating.Format]: $format_menu\n"
-
-	set output "<script type='text/javascript'><!--\nwriteRichText('$element(id)','$contents',500,200,true,false,'<input name=\"$element(id).format\" value=\"text/html\" type=\"hidden\">','[string map {\n \\n \r {} "'" "&\#39"} $output]'); //--></script><noscript id=\"rte-noscr-$element(id)\">$noscript_output</noscript>"
-      } elseif {$richtextEditor eq "xinha"} {
+      if {$richtextEditor eq "xinha"} {
 	append output "<script type='text/javascript'>document.write(\"<input name='$element(id).format' value='text/html' type='hidden'>\");</script>\n"
           append output "<noscript><br/>[_ acs-templating.Format]: $format_menu</noscript>\n"