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.25 -r1.26
--- openacs-4/packages/acs-templating/acs-templating.info	27 Feb 2004 19:39:25 -0000	1.25
+++ openacs-4/packages/acs-templating/acs-templating.info	4 Mar 2004 18:41:54 -0000	1.26
@@ -34,11 +34,12 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultFormStyle"  default="standard" description="The default form template to use if a particular form does not explicitly specify the form style to use."/>
             <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."/>
             <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."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RefreshCache"  default="as needed" description="When to re-translate templates.  Speical values: 'always', 'never', 'as needed'"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RefreshCache"  default="as needed" description="When to re-translate templates.  Speical values: "/>
             <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."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SpellcheckFormWidgets"  default="textarea 0 richtext 0" description="The widgets that you specify here will be spellcheck enabled in all forms (that use ad_form / form builder). Adding a 'nospell' flag to a form element overrides this parameter and disables spellchecking of that element. The format of this parameter is such: 'widget 1 widget 0 ...', where 'widget' stands for one of the form widgets that are possible to spellcheck enable: text, textarea, richtext. '1' after 'widget' indicates that the default should be to spellcheck; '0' means the user has to manually state that spellchecking should be performed on the form element. In order to enable spellchecking via this parameter either the aspell or ispell binary (or both, in which case aspell takes precedence) must be installed on the server. The path to the binary is auto-detected on server startup. If the parameter is left blank, spellchecking will be disabled altogether."/>
+            <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="UseHtmlAreaForRichtextP"  default="0" description="Should the richtext widget use the htmlArea widget for richtext editing. 1 = yes, 0 = no."/>
         </parameters>
 
     </version>
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.15 -r1.16
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	29 Jan 2004 15:37:22 -0000	1.15
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	4 Mar 2004 18:41:54 -0000	1.16
@@ -162,7 +162,19 @@
 }
 
 ad_proc -public template::widget::richtext { element_reference tag_attributes } {
+    Implements the richtext widget, which offers rich text editing options.
 
+    If the acs-templating.UseHtmlAreaForRichtextP parameter is set to true (1), this will use the htmlArea WYSIWYG editor widget.
+    Otherwise, it will use a normal textarea, with a drop-down to select a format. The available formats are:
+    <ul>
+    <li>Enhanced text = Allows HTML, but automatically inserts line and paragraph breaks.
+    <li>Plain text = Automatically inserts line and paragraph breaks, and quotes all HTML-specific characters, such as less-than, greater-than, etc.
+    <li>Fixed-width text = Same as plain text, but conserves spacing; useful for tabular data.
+    <li>HTML = normal HTML.
+    </ul>
+    You can also parameterize the richtext widget with a 'htmlarea_p' attribute, which can be true or false, and which will override the parameter setting.
+} {
+
   upvar $element_reference element
 
   if { [info exists element(html)] } {
@@ -184,8 +196,29 @@
   if { [string equal $element(mode) "edit"] } {
       append output {<script language="javascript"><!--} \n {acs_RichText_WriteButtons();  //--></script>}
       
+      set attributes(id) "richtext__$element(form_id)__$element(id)"
+      
+      if { [exists_and_not_null element(htmlarea_p)] } {
+          set htmlarea_p [template::util::is_true $element(htmlarea_p)]
+      } else {
+          set htmlarea_p [parameter::get \
+                              -package_id [apm_package_id_from_key "acs-templating"] \
+                              -parameter "UseHtmlAreaForRichtextP" \
+                              -default 0]
+      }
+
+      if { $htmlarea_p } {
+          # Tell the blank-master to include the special stuff for htmlArea in the page header
+          global acs_blank_master__htmlareas
+          lappend acs_blank_master__htmlareas $attributes(id)
+      }
+
       append output [textarea_internal "$element(id)" attributes $contents]
-      append output "<br>Format: [menu "$element(id).format" [template::util::richtext::format_options] $format attributes]"
+      if { $htmlarea_p } {
+          append output "<input name=\"$element(id).format\" value=\"text/html\" type=\"hidden\">"
+      } else {
+          append output "<br>Format: [menu "$element(id).format" [template::util::richtext::format_options] $format attributes]"
+      }
           
       # Spell-checker
       array set spellcheck [template::util::spellcheck::spellcheck_properties -element_ref element]