summaryrefslogtreecommitdiff
path: root/skins/larry
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-06-14 01:13:13 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-06-14 01:13:13 +0200
commit4f53ab347e6ad026f69105b69ce66e21a7654c78 (patch)
treefb4bf5b2d3de9c0799d0b1a5139996a99cf5e5bc /skins/larry
parentbf305c181095cc05522b1c0fcee7093dea3043c1 (diff)
Add feature to import messages to the currently selected folder
Diffstat (limited to 'skins/larry')
-rw-r--r--skins/larry/templates/mail.html11
-rw-r--r--skins/larry/ui.js1
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) {