diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-09-08 18:00:15 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-09-08 18:00:15 +0000 |
| commit | 7718c5ae2a275104ea31b94b296c5d87a1af48b4 (patch) | |
| tree | 538ca50ff09292e7d6daa96f34b5c444a394a0fa | |
| parent | 5a9c7e7cbb38234fa2eb733250bcf99585913b75 (diff) | |
- Re-add 'Close' button in upload form (#1486930, #1486823)
git-svn-id: https://svn.roundcube.net/trunk@3949 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/compose.inc | 2 | ||||
| -rw-r--r-- | roundcubemail/skins/default/functions.js | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index fe99086f8..4ce835ee7 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -18,6 +18,7 @@ CHANGELOG RoundCube Webmail - Fix timezone string in sent mail (#1486961) - Show disabled checkboxes for protected folders instead of dots (#1485498) - Added fieldsets in Identity form, added 'identity_form' hook +- Re-added 'Close' button in upload form (#1486930, #1486823) RELEASE 0.4 ----------- diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc index a788840a7..6150fffac 100644 --- a/roundcubemail/program/steps/mail/compose.inc +++ b/roundcubemail/program/steps/mail/compose.inc @@ -994,7 +994,7 @@ function rcmail_compose_attachment_form($attrib) 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('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' . + $button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' . $button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)")) ) ) diff --git a/roundcubemail/skins/default/functions.js b/roundcubemail/skins/default/functions.js index 873c7f710..45c47c605 100644 --- a/roundcubemail/skins/default/functions.js +++ b/roundcubemail/skins/default/functions.js @@ -36,7 +36,8 @@ function rcube_mail_ui() groupmenu: {id:'groupoptionsmenu', above:1}, mailboxmenu: {id:'mailboxoptionsmenu', above:1}, composemenu: {id:'composeoptionsmenu', editable:1}, - uploadmenu: {id:'attachment-form', editable:1, above:1, toggle:bw.safari&&bw.win } + // toggle: #1486823, #1486930 + uploadmenu: {id:'attachment-form', editable:1, above:1, toggle:!bw.ie&&!bw.linux } }; var obj; |