summaryrefslogtreecommitdiff
path: root/program/steps/settings
diff options
context:
space:
mode:
authorsvncommit <devs@roundcube.net>2008-04-15 21:22:00 +0000
committersvncommit <devs@roundcube.net>2008-04-15 21:22:00 +0000
commitd9344fc349e8c5765898c90bf5061e56cd21c8a0 (patch)
treea5916f5f3f88df8d6336b43dde8cdbb49cb47bdc /program/steps/settings
parentd7a411f099596cbc8e749e1f0802ac2bb2c6289e (diff)
HTML editing fixes, upgrade to TinyMCE v3.0.6
Diffstat (limited to 'program/steps/settings')
-rw-r--r--program/steps/settings/edit_identity.inc12
1 files changed, 7 insertions, 5 deletions
diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 7309d4b02..d8802ca8c 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -40,10 +40,10 @@ function rcube_identity_form($attrib)
global $IDENTITY_RECORD, $OUTPUT;
$OUTPUT->include_script('tiny_mce/tiny_mce_src.js');
- $OUTPUT->add_script("tinyMCE.init({ mode : 'specific_textareas'," .
+ $OUTPUT->add_script("tinyMCE.init({ mode : 'textareas'," .
+ "editor_selector : 'mce_editor'," .
"apply_source_formatting : true," .
"content_css : '\$__skin_path' + '/editor_content.css'," .
- "editor_css : '\$__skin_path' + '/editor_ui.css'," .
"theme : 'advanced'," .
"theme_advanced_toolbar_location : 'top'," .
"theme_advanced_toolbar_align : 'left'," .
@@ -69,7 +69,7 @@ function rcube_identity_form($attrib)
'reply-to' => array('type' => 'text', 'label' => 'replyto'),
'bcc' => array('type' => 'text'),
'signature' => array('type' => 'textarea', 'size' => "40", 'rows' => "6"),
- 'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail.toggle_editor(this, \'_signature\');'),
+ 'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail.toggle_editor(this, \'rcmfd_signature\');'),
'standard' => array('type' => 'checkbox', 'label' => 'setdefault'));
@@ -104,13 +104,15 @@ function rcube_identity_form($attrib)
{
$attrib['size'] = $colprop['size'];
$attrib['rows'] = $colprop['rows'];
- $attrib['mce_editable'] = $IDENTITY_RECORD['html_signature'] ? "true" : "false";
+ if ($IDENTITY_RECORD['html_signature'])
+ {
+ $attrib['class'] = "mce_editor";
+ }
}
else
{
unset($attrib['size']);
unset($attrib['rows']);
- unset($attrib['mce_editable']);
}
$label = strlen($colprop['label']) ? $colprop['label'] : $col;