Merge pull request #101 from Dennis1993/patch-9

Aleksander Machniak

2013-09-01 471628e9ab6d6414712ee1c2e91ba958295d70e2

Merge pull request #101 from Dennis1993/patch-9

Removed not allowed syntax

 program/steps/mail/compose.inc

@@ -1420,7 +1420,7 @@

  $out = html::div($attrib,
    $OUTPUT->form_tag(array('id' => $attrib['id'].'Frm', 'name' => 'uploadform', 'method' => 'post', 'enctype' => 'multipart/form-data'),
      html::div(null, rcmail_compose_attachment_field(array('size' => $attrib['attachmentfieldsize']))) .
      html::div(null, rcmail_compose_attachment_field()) .
      html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
      (get_boolean($attrib['buttons']) ? html::div('buttons',
        $button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .

 program/steps/mail/func.inc

@@ -1926,7 +1926,6 @@
  $fileinput = new html_inputfield(array(
      'type' => 'file',
      'name' => '_file[]',
      'size' => $attrib['attachmentfieldsize'],
      'multiple' => 'multiple',
      'accept' => ".eml, .mbox, message/rfc822, text/*",
  ));

 skins/larry/templates/compose.html

@@ -85,25 +85,25 @@
    </tr><tr id="compose-cc">
        <td class="title top">
            <label for="_cc"><roundcube:label name="cc" /></label>
            <a href="#cc" onclick="return UI.hide_header_row('cc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
            <a href="#cc" onclick="return UI.hide_header_row('cc');" class="iconbutton cancel" title="<roundcube:label name='delete' />">x</a>
        </td>
        <td class="editfield"><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="1" tabindex="3" /></td>
    </tr><tr id="compose-bcc">
        <td class="title top">
            <label for="_bcc"><roundcube:label name="bcc" /></label>
            <a href="#bcc" onclick="return UI.hide_header_row('bcc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
            <a href="#bcc" onclick="return UI.hide_header_row('bcc');" class="iconbutton cancel" title="<roundcube:label name='delete' />">x</a>
        </td>
        <td colspan="2" class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="1" tabindex="4" /></td>
    </tr><tr id="compose-replyto">
        <td class="title top">
            <label for="_replyto"><roundcube:label name="replyto" /></label>
            <a href="#replyto" onclick="return UI.hide_header_row('replyto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
            <a href="#replyto" onclick="return UI.hide_header_row('replyto');" class="iconbutton cancel" title="<roundcube:label name='delete' />">x</a>
        </td>
        <td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td>
    </tr><tr id="compose-followupto">
        <td class="title top">
            <label for="_followupto"><roundcube:label name="followupto" /></label>
            <a href="#followupto" onclick="return UI.hide_header_row('followupto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
            <a href="#followupto" onclick="return UI.hide_header_row('followupto');" class="iconbutton cancel" title="<roundcube:label name='delete' />">x</a>
        </td>
        <td class="editfield"><roundcube:object name="composeHeaders" part="followupto" form="form" id="_followupto" size="70" tabindex="7" /></td>
    </tr><tr>
@@ -185,7 +185,7 @@
</div><!-- end mainscreen -->

<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='addattachment' />">
    <roundcube:object name="composeAttachmentForm" id="uploadform" attachmentFieldSize="40" buttons="no" />
    <roundcube:object name="composeAttachmentForm" id="uploadform" buttons="no" />
    <div class="formbuttons">
        <roundcube:button command="send-attachment" type="input" class="button mainaction" label="upload" />
        <roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />

 skins/larry/templates/mail.html

@@ -228,7 +228,7 @@
</div>

<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='importmessages' />">
    <roundcube:object name="messageimportform" id="uploadform" attachmentFieldSize="40" buttons="no" />
    <roundcube:object name="messageimportform" id="uploadform" buttons="no" />
    <div class="formbuttons">
        <roundcube:button command="import-messages" type="input" class="button mainaction" label="upload" />
        <roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />