summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/steps/mail/compose.inc8
-rw-r--r--skins/default/templates/compose.html2
2 files changed, 5 insertions, 5 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 8b821c8ea..4a03cd7c3 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -831,15 +831,15 @@ function rcmail_compose_attachment_form($attrib)
$max_filesize = $max_postsize;
$max_filesize = show_bytes($max_filesize);
- $button = new html_inputfield(array('type' => 'button', 'class' => 'button'));
+ $button = new html_inputfield(array('type' => 'button'));
$out = html::div($attrib,
$OUTPUT->form_tag(array('name' => 'form', 'method' => 'post', 'enctype' => 'multipart/form-data'),
- html::div(null, rcmail_compose_attachment_field(array())) .
+ html::div(null, rcmail_compose_attachment_field(array('size' => $attrib[attachmentfieldsize]))) .
html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
html::div('buttons',
- $button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) . ' ' .
- $button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
+ $button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) . ' ' .
+ $button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
)
)
);
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 7a5aa8dc6..12d5e945e 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -99,7 +99,7 @@
</form>
-<roundcube:object name="composeAttachmentForm" id="attachment-form" />
+<roundcube:object name="composeAttachmentForm" id="attachment-form" attachmentFieldSize="40" />
</body>
</html>