diff options
| -rw-r--r-- | program/steps/mail/compose.inc | 12 | ||||
| -rw-r--r-- | skins/default/templates/compose.html | 2 | ||||
| -rw-r--r-- | skins/larry/templates/compose.html | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index c23c606e4..855fbab67 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -1241,7 +1241,7 @@ function rcmail_compose_attachment_list($attrib) '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 @@ function rcmail_compose_attachment_list($attrib) $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_compose_attachment_field($attrib) function rcmail_priority_selector($attrib) { global $MESSAGE; - + list($form_start, $form_end) = get_form_tags($attrib); unset($attrib['form']); @@ -1339,7 +1339,7 @@ function rcmail_receipt_checkbox($attrib) 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_dsn_checkbox($attrib) function rcmail_editor_selector($attrib) { - global $CONFIG, $MESSAGE, $compose_mode; - // determine whether HTML or plain text should be checked $useHtml = rcmail_compose_editor_mode(); diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html index 2dcf8b0c1..4921bbf0f 100644 --- a/skins/default/templates/compose.html +++ b/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> diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html index aad516d14..67d94f631 100644 --- a/skins/larry/templates/compose.html +++ b/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> |