From 6b1fc027cb8a7b7581747e939f2cfbb387c09aba Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Wed, 27 Sep 2006 01:18:55 -0400
Subject: [PATCH] Fixed editor selector labels, added TinyMCE spellchecker to editor configuration
---
CHANGELOG | 6 ++++++
program/steps/mail/compose.inc | 23 ++++++++++++++++-------
program/js/editor.js | 2 +-
skins/default/templates/compose.html | 4 ++--
4 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 4144b5a..ae8dffa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
CHANGELOG RoundCube Webmail
---------------------------
+2006/09/26 (estadtherr)
+----------
+- Added spellchecker plugin to TinyMCE configuration
+- Fixed HTML/Plain toggle labels
+
+
2006/09/24 (thomasb)
----------
- Partial client re-write with a common list class
diff --git a/program/js/editor.js b/program/js/editor.js
index 333559c..0af5968 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -21,7 +21,7 @@
accessibility_focus : false,
apply_source_formatting : true,
theme : 'advanced',
- plugins : 'emotions,table,searchreplace',
+ plugins : 'emotions,table,searchreplace,spellchecker',
theme_advanced_buttons1 : 'bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,outdent,indent,separator,forecolor,backcolor,formatselect,fontselect,fontsizeselect',
theme_advanced_buttons2 : 'undo,redo,image,hr,link,unlink,emotions,charmap,code,separator,search,replace,spellchecker,separator,tablecontrols',
theme_advanced_buttons3 : '',
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 5077d5c..51ae619 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -787,8 +787,8 @@
global $CONFIG, $MESSAGE, $compose_mode;
$choices = array(
- 'html' => 'HTML',
- 'plain' => 'Plain text'
+ 'html' => 'htmltoggle',
+ 'plain' => 'plaintoggle'
);
// determine whether HTML or plain text should be checked
@@ -806,15 +806,24 @@
}
$selector = '';
+
+ $attrib['name'] = '_editorSelect';
+ $attrib['onclick'] = 'return rcmail_toggle_editor(this)';
foreach ($choices as $value => $text)
{
$checked = '';
- if ((($text == 'HTML') && $useHtml) ||
- (($text != 'HTML') && !$useHtml))
- $checked = 'checked';
+ if ((($value == 'html') && $useHtml) ||
+ (($value != 'html') && !$useHtml))
+ $attrib['checked'] = 'true';
+ else
+ unset($attrib['checked']);
- $selector .= sprintf("<input type='radio' name='_editorSelect' value='%s' %s onclick='return rcmail_toggle_editor(this)'>%s</input>\n",
- $value, $checked, $text);
+ $attrib['id'] = '_' . $value;
+ $rb = new radiobutton($attrib);
+ $selector .= sprintf("<td>%s</td><td class=\"title\"><label for=\"%s\">%s</label></td>",
+ $rb->show($value),
+ $attrib['id'],
+ rcube_label($text));
}
return $selector;
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 2c11e00..f2bfc1d 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -107,8 +107,8 @@
<roundcube:label name="charset" />: <roundcube:object name="charsetSelector" tabindex="8" />
</td>
<td align="right">
- <roundcube:label name="editortype" />: <roundcube:object name="editorSelector" tabindex="9" />
-</td>
+ <roundcube:label name="editortype" />: </td>
+<roundcube:object name="editorSelector" tabindex="9" />
</tr></tbody></table>
</td>
--
Gitblit v1.9.1