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.34.2.17 -r1.34.2.18
--- openacs-4/packages/acs-templating/acs-templating.info 3 May 2006 22:06:35 -0000 1.34.2.17
+++ openacs-4/packages/acs-templating/acs-templating.info 14 May 2006 17:07:25 -0000 1.34.2.18
@@ -12,17 +12,17 @@
Templating library.
2006-05-03
OpenACS
- The templating system provides the tag library and support routines
-that allow developers and graphic designers to work
-independently. Templates specify the layout of the page seperately
-from the contents of the page. Graphic designers work primarily on the
-layout part of the template (the template), while programmers work
-primarily a script that generates the the content part of the template
-(the code). In addition, the template system provides a way to use a
-single layout specification for many physical pages, so the overall
-layout of a site can be more easily administered.
+ The templating system provides the tag library and support routines
+that allow developers and graphic designers to work
+independently. Templates specify the layout of the page seperately
+from the contents of the page. Graphic designers work primarily on the
+layout part of the template (the template), while programmers work
+primarily a script that generates the the content part of the template
+(the code). In addition, the template system provides a way to use a
+single layout specification for many physical pages, so the overall
+layout of a site can be more easily administered.
- GPL version 2
+ GPL version 2
3
@@ -36,11 +36,13 @@
+
+
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.19.2.10 -r1.19.2.11
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 21 Apr 2006 18:04:38 -0000 1.19.2.10
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl 14 May 2006 17:07:25 -0000 1.19.2.11
@@ -352,17 +352,16 @@
array set options [expr {[info exists element(options)] ?
$element(options) : ""}]
- set richtextEditor [expr {[info exists options(editor)] ?
- $options(editor) : "rte"}]
if { $element(mode) eq "edit" } {
set attributes(id) "richtext__$element(form_id)__$element(id)"
+ set package_id_templating [apm_package_id_from_key "acs-templating"]
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"] \
+ -package_id $package_id_templating \
-parameter "UseHtmlAreaForRichtextP" \
-default 0]
}
@@ -371,9 +370,14 @@
set output [textarea_internal $element(id) attributes $contents]
if { $htmlarea_p } {
+ # figure out, which rich text editor to use
+ set richtextEditor [expr {[info exists options(editor)] ?
+ $options(editor) : [parameter::get \
+ -package_id $package_id_templating \
+ -parameter "RichTextEditor" \
+ -default "rte"]}]
# 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"} {
@@ -398,10 +402,16 @@
# The following options are supported:
# editor plugins width height folder_id fs_package_id
#
- set plugins {GetHtml CharacterMap ContextMenu FullScreen
- ListType TableOperations EditTag LangMarks Abbreviation}
if {[info exists options(plugins)]} {
set plugins $options(plugins)
+ } else {
+ set plugins [parameter::get \
+ -package_id $package_id_templating \
+ -parameter "XinhaDefaultPlugins" \
+ -default ""]
+
+ # GetHtml CharacterMap ContextMenu FullScreen
+ # ListType TableOperations EditTag LangMarks Abbreviation
}
set quoted [list]
foreach e $plugins {lappend quoted '$e'}