Changeset 5683 in subversion

Timestamp:

Jan 1, 2012 2:10:53 PM (17 months ago)

Author:

alec

Message:

• Fix so editor selector is hidden when 'htmleditor' is listed in 'dont_override'

Location:

branches/release-0.7

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/compose.inc (modified) (6 diffs)
• skins/default/templates/compose.html (modified) (1 diff)

branches/release-0.7/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix so editor selector is hidden when 'htmleditor' is listed in 'dont_override'
 - Fix wrong (long) label usage (#1488283)
 - Fix handling of INBOX's subfolders in special folders config (#1488279)

branches/release-0.7/program/steps/mail/compose.inc

@@ -1239 +1239 @@
             'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id)),
           $button) . Q($a_prop['name']));
-        
+
         $jslist['rcmfile'.$id] = array('name' => $a_prop['name'], 'complete' => true, 'mimetype' => $a_prop['mimetype']);
     }
@@ -1253 +1253 @@
   $OUTPUT->set_env('attachments', $jslist);
   $OUTPUT->add_gui_object('attachmentlist', $attrib['id']);
-    
+
   return html::tag('ul', $attrib, $out, html::$common_attrib);
 }
@@ -1260 +1260 @@
 function rcmail_compose_attachment_form($attrib)
 {
-  global $RCMAIL, $OUTPUT;
+  global $OUTPUT;
 
   // add ID if not given
@@ -1301 +1301 @@
 {
   global $MESSAGE;
-  
+
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
@@ -1338 +1338 @@
 
   if (!isset($attrib['id']))
-    $attrib['id'] = 'receipt';  
+    $attrib['id'] = 'receipt';
 
   $attrib['name'] = '_receipt';
@@ -1381 +1381 @@
 function rcmail_editor_selector($attrib)
 {
-  global $CONFIG, $MESSAGE, $compose_mode;
-
   // determine whether HTML or plain text should be checked
   $useHtml = rcmail_compose_editor_mode();

branches/release-0.7/skins/default/templates/compose.html

@@ -113 +113 @@
             <div id="compose-editorfooter">
                 <span id="spellcheck-control" style="margin-right:10px"></span>
+                <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
                 <span>
                     <label><roundcube:label name="editortype" /></label>
                     <roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" />
                 </span>
+                <roundcube:endif />
             </div>
         </div>