diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-06-15 15:36:45 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-06-15 15:36:45 +0200 |
| commit | 1dcd9406bdbfe356bbf744be1714646bb941cd89 (patch) | |
| tree | 52d1add1692985e786d4b7574632477ac859a4fc /skins/larry | |
| parent | 0185a2790767caab93f2c504ad38d7edca70d043 (diff) | |
| parent | 9a7c575650ef8405403011c5716aa560df81e9c1 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'skins/larry')
| -rw-r--r-- | skins/larry/templates/mail.html | 11 | ||||
| -rw-r--r-- | skins/larry/ui.js | 1 |
2 files changed, 11 insertions, 1 deletions
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html index 85cd5203b..575cb792a 100644 --- a/skins/larry/templates/mail.html +++ b/skins/larry/templates/mail.html @@ -148,7 +148,8 @@ <div id="mailboxmenu" class="popupmenu"> <ul class="toolbarmenu" id="mailboxoptionsmenu"> <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li> - <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li> + <li><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li> + <li><roundcube:button name="messageimport" type="link" class="active" label="importmessages" onclick="UI.show_uploadform()" /></li> <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li> <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" /> </ul> @@ -226,6 +227,14 @@ </div> </div> +<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='importmessages' />"> + <roundcube:object name="messageimportform" id="uploadform" attachmentFieldSize="40" 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()" /> + </div> +</div> + <roundcube:include file="/includes/footer.html" /> </body> diff --git a/skins/larry/ui.js b/skins/larry/ui.js index f7428f4da..ec4d03d00 100644 --- a/skins/larry/ui.js +++ b/skins/larry/ui.js @@ -152,6 +152,7 @@ function rcube_mail_ui() rcmail.addEventListener('setquota', update_quota); rcmail.addEventListener('enable-command', enable_command); + rcmail.addEventListener('afterimport-messages', show_uploadform); } if ($('#mailview-left').length) { |