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.38 -r1.39
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 25 Aug 2008 18:36:21 -0000 1.38
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 25 Aug 2008 19:25:44 -0000 1.39
@@ -485,7 +485,9 @@
}
set ::acs_blank_master(xinha.options) $xinha_options
lappend ::acs_blank_master__htmlareas $attributes(id)
+
} elseif {$richtextEditor eq "tinymce"} {
+
append output "\n"
append output "\n"
lappend ::acs_blank_master__htmlareas $attributes(id)
@@ -513,7 +515,7 @@
{theme_openacs_buttons2_add_before "cut,copy,paste,pastetext,pasteword,separator,search,replace,separator"}
{theme_openacs_buttons3_add_before "tablecontrols,separator"}
{theme_openacs_buttons3_add "iespell,media,separator,print,separator,fullscreen"}
- {extended_valid_elements "img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"}}
+ {extended_valid_elements "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"}}
set tinymce_configs_list [parameter::get \
-package_id [apm_package_id_from_key "acs-templating"] \
-parameter "XinhaDefaultPlugins" \
@@ -522,9 +524,9 @@
foreach config_pair $tinymce_configs_list {
lappend pairslist "[lindex $config_pair 0]:\"[lindex $config_pair 1]\""
}
- lappend pairslist "elements : \"[join $tinymce_elements ","]\""
+ lappend pairslist "elements : \"[join $::acs_blank_master__htmlareas ","]\""
set tinymce_configs_js [join $pairslist ","]
- set ::acs_blank_master(tinymce.config) $timymce_configs_js
+ set ::acs_blank_master(tinymce.config) $tinymce_configs_js
}
} else {
# Display mode