summaryrefslogtreecommitdiff
path: root/skins/larry
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-07-01 10:22:14 +0200
committerAleksander Machniak <alec@alec.pl>2013-07-01 10:22:14 +0200
commita45f9b7bf58475ccc812e819f159638403c00419 (patch)
tree2853fa82a74bf3cf61eb9212b2b012c1c4bd763a /skins/larry
parent049ba0aed21590dbbc3286d68b45a7f46d28b142 (diff)
Contacts drag-n-drop default action is to move contacts (#1488751)
Added possibility to choose to move or copy contacts from drag-n-drop menu (#1488751) Use consistent naming: 'moveto' -> 'move'
Diffstat (limited to 'skins/larry')
-rw-r--r--skins/larry/templates/addressbook.html7
-rw-r--r--skins/larry/templates/mail.html2
-rw-r--r--skins/larry/templates/message.html2
-rw-r--r--skins/larry/ui.js12
4 files changed, 18 insertions, 5 deletions
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index d9e491f99..b33ebd999 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -106,6 +106,13 @@
</ul>
</div>
+<div id="dragcontactmenu" class="popupmenu">
+ <ul class="toolbarmenu">
+ <li><roundcube:button command="move" onclick="return rcmail.drag_menu_action('move')" label="move" classAct="active" /></li>
+ <li><roundcube:button command="copy" onclick="return rcmail.drag_menu_action('copy')" label="copy" classAct="active" /></li>
+ </ul>
+</div>
+
<roundcube:include file="/includes/footer.html" />
</body>
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 575cb792a..6b6ffd7ae 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -140,7 +140,7 @@
<div id="dragmessagemenu" class="popupmenu">
<ul class="toolbarmenu">
- <li><roundcube:button command="moveto" onclick="return rcmail.drag_menu_action('moveto')" label="move" classAct="active" /></li>
+ <li><roundcube:button command="move" onclick="return rcmail.drag_menu_action('move')" label="move" classAct="active" /></li>
<li><roundcube:button command="copy" onclick="return rcmail.drag_menu_action('copy')" label="copy" classAct="active" /></li>
</ul>
</div>
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index 7ac7e5b55..32dc1a46b 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -17,7 +17,7 @@
<roundcube:endif />
<roundcube:include file="/includes/mailtoolbar.html" />
<div class="toolbarselect">
- <roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mailboxlist decorated" folder_filter="mail" />
+ <roundcube:object name="mailboxlist" type="select" noSelection="move" maxlength="25" onchange="rcmail.command('move', this.options[this.selectedIndex].value)" class="mailboxlist decorated" folder_filter="mail" />
</div>
</div>
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index 7dc9b57b1..19f05cca4 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -19,7 +19,7 @@ function rcube_mail_ui()
searchmenu: { editable:1, callback:searchmenu },
attachmentmenu: { },
listoptions: { editable:1 },
- dragmessagemenu: { sticky:1 },
+ dragmenu: { sticky:1 },
groupmenu: { above:1 },
mailboxmenu: { above:1 },
spellmenu: { callback: spellmenu },
@@ -90,8 +90,8 @@ function rcube_mail_ui()
var dragmenu = $('#dragmessagemenu');
if (dragmenu.length) {
- rcmail.gui_object('message_dragmenu', 'dragmessagemenu');
- popups.dragmessagemenu = dragmenu;
+ rcmail.gui_object('dragmenu', 'dragmessagemenu');
+ popups.dragmenu = dragmenu;
}
if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
@@ -206,6 +206,12 @@ function rcube_mail_ui()
new rcube_scroller('#directorylist-content', '#directorylist-header', '#directorylist-footer');
}
+
+ var dragmenu = $('#dragcontactmenu');
+ if (dragmenu.length) {
+ rcmail.gui_object('dragmenu', 'dragcontactmenu');
+ popups.dragmenu = dragmenu;
+ }
}
// turn a group of fieldsets into tabs