- Fix so editor selector is hidden when 'htmleditor' is listed in 'dont_ove...

alecpl

2012-01-01 7152f59f04fc2ecfc0bcfb9a50758c3757c119f8

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

 program/steps/mail/compose.inc

@@ -1241,7 +1241,7 @@
            'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", JS_OBJECT_NAME, $id),
            'class' => 'delete'),
          $button) . Q($a_prop['name']));
        

        $jslist['rcmfile'.$id] = array('name' => $a_prop['name'], 'complete' => true, 'mimetype' => $a_prop['mimetype']);
    }
  }
@@ -1255,14 +1255,14 @@

  $OUTPUT->set_env('attachments', $jslist);
  $OUTPUT->add_gui_object('attachmentlist', $attrib['id']);
    

  return html::tag('ul', $attrib, $out, html::$common_attrib);
}


function rcmail_compose_attachment_form($attrib)
{
  global $RCMAIL, $OUTPUT;
  global $OUTPUT;

  // set defaults
  $attrib += array('id' => 'rcmUploadbox', 'buttons' => 'yes');
@@ -1302,7 +1302,7 @@
function rcmail_priority_selector($attrib)
{
  global $MESSAGE;
  

  list($form_start, $form_end) = get_form_tags($attrib);
  unset($attrib['form']);

@@ -1339,7 +1339,7 @@
  unset($attrib['form']);

  if (!isset($attrib['id']))
    $attrib['id'] = 'receipt';  
    $attrib['id'] = 'receipt';

  $attrib['name'] = '_receipt';
  $attrib['value'] = '1';
@@ -1382,8 +1382,6 @@

function rcmail_editor_selector($attrib)
{
  global $CONFIG, $MESSAGE, $compose_mode;

  // determine whether HTML or plain text should be checked
  $useHtml = rcmail_compose_editor_mode();


 skins/default/templates/compose.html

@@ -112,10 +112,12 @@
            </div>
            <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>
    </div>

 skins/larry/templates/compose.html

@@ -109,10 +109,12 @@
    </span>
    
    <div id="composeoptions">
        <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
        <span class="composeoption">
            <label><roundcube:label name="editortype" />
                <roundcube:object name="editorSelector" editorid="composebody" tabindex="12" /></label>
        </span>
        <roundcube:endif />
        <span class="composeoption">
            <label><label for="rcmcomposepriority"><roundcube:label name="priority" />
                <roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></label>