Fixed editor selector labels, added TinyMCE spellchecker to editor configuration

2 files changed, 18 insertions, 9 deletions

diff --git a/program/js/editor.js b/program/js/editor.js
index 333559c2e..0af5968e9 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -21,7 +21,7 @@ function rcmail_editor_init(skin_path)
                   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 5077d5c16..51ae6193e 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -787,8 +787,8 @@ function rcmail_editor_selector($attrib)
   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 @@ function rcmail_editor_selector($attrib)
     }
 
   $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';
-
-    $selector .= sprintf("<input type='radio' name='_editorSelect' value='%s' %s onclick='return rcmail_toggle_editor(this)'>%s</input>\n",
-                          $value, $checked, $text);
+    if ((($value == 'html') && $useHtml) ||
+        (($value != 'html') && !$useHtml))
+      $attrib['checked'] = 'true';
+    else
+      unset($attrib['checked']);
+
+    $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;