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.47.2.3 -r1.47.2.4
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	8 Jun 2009 14:52:35 -0000	1.47.2.3
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	9 Jun 2009 15:30:43 -0000	1.47.2.4
@@ -299,14 +299,20 @@
 
 
 ad_proc -public template::widget::richtext { element_reference tag_attributes } {
+
+    <p>
     Implements the richtext widget, which offers rich text editing options.
 
-    This version supports the xinha editor.
+    This version supports the <strong>xinha</strong> and <strong>tinymce</strong>
+    editors.
 
     If the acs-templating.UseHtmlAreaForRichtextP parameter is set to true (1), 
-    this will use the htmlArea WYSIWYG editor widget.
+    this will use the WYSIWYG editor widget set in the acs-templating.RichTextEditor 
+    parameter.
     Otherwise, it will use a normal textarea, with a drop-down to select a format. 
     The available formats are:
+    </p>
+
     <ul>
     <li>Enhanced text = Allows HTML, but automatically inserts line and paragraph breaks.
     <li>Plain text = Automatically inserts line and paragraph breaks, and quotes 
@@ -315,23 +321,26 @@
     for tabular data.
     <li>HTML = normal HTML.
     </ul>
+
+    <p>
     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.
     <p>
-    The default editor in wysigwig mode is rte. In oder to use xinha, one
-    has to use 'editor xinha' in the options of the form field. The following
-    options for xinha may be specified:
+    The available editors in wysigwig mode are xinha and tinymce. In order to 
+    use xinha, one has to use 'editor xinha' in the options of the form field. 
+    The following options for xinha may be specified:
     <ul>
     <li> <em>editor</em>: xinha
     <li> <em>height</em>: height of the xinha widget (e.g. 350px)
     <li> <em>width</em>: width of the xinha widget (e.g. 500px)
     <li> <em>plugins</em>: tcl list of plugins to be used in xinha. There
     is an a special plugin for the oacs file selector available, called OacsFs. 
     If no options are specified, the following plugins will be loaded:
-    <pre>
+    <code>
     GetHtml CharacterMap ContextMenu FullScreen
     ListType TableOperations EditTag LangMarks Abbreviation
-    </pre>
+    </code>
+    </ul>
     <p>
     These options are used by the OacsFs plugin
     <ul>
@@ -348,39 +357,61 @@
     type of the field. E.g. a value of %text/% allows any kind of text
     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>.
+    the xinha widget and its plugins. The configure object is called <code>xinha_config</code>.
+    </ul>
+
+    <p>
     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: 
+
+    <p>
+    Example for the use of the <strong>xinha</strong> widget with options: 
     <pre>
     text:richtext(richtext),nospell,optional 
     {label #xowiki.content#} 
     {options {editor xinha plugins OacsFs height 350px file_types %pdf%}}
     {html {rows 15 cols 50 style {width: 100%}}}
     </pre>
 
+    <p>
     Caveat: the three adp-files needed for the OpenACS file selector 
     (insert-image, insert-ilink and file-selector)
     are currently part of the xowiki package, since acs-templating
     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>.
+    Example for the use of the <strong>tinymce</strong> widget with options: 
+    <pre>
+    text:richtext(richtext),nospell,optional 
+    {label #acs-subsite.Biography#} 
+    {options {theme simple plugins "oacsimage,oacslink,style"}}
+    {html {rows 15 cols 50 style {width: 100%}}}
+    </pre>
     <p>
+    See <a href="http://wiki.moxiecode.com/index.php/TinyMCE:Configuration">TinyMCE 
+    documentation</a> for a full list of available options
+    <p>
+    Caveat: the scripts needed for the oacsimage and oacslink plugins require 
+    acs-templating to be mounted. This is a temporary situation until we find 
+    a better way to handle plugins.
+
+    <p>
+    Note that the richtext editors interact with <code>blank-master.tcl</code> and 
+    <code>blank-master.adp</code>.
+    <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
+    xinha support by gustaf.neumann@wu-wien.ac.at<br>
+    tinymce support by oct@openacs.org
 } {
 
     upvar $element_reference element