Re-locate the move-message toolbar button to be next to the related delete icon; synchronize toolbars in larry and classic skin

5 files changed, 12 insertions, 12 deletions

diff --git a/skins/classic/images/mail_toolbar.png b/skins/classic/images/mail_toolbar.png
index 6406a92d8..357357795 100644
--- a/skins/classic/images/mail_toolbar.png
+++ b/skins/classic/images/mail_toolbar.png
diff --git a/skins/classic/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
index 639557da6..b6b16d635 100644
--- a/skins/classic/includes/messagetoolbar.html
+++ b/skins/classic/includes/messagetoolbar.html
@@ -17,12 +17,13 @@
 <span id="forwardmenulink" onclick="rcmail_ui.show_popup('forwardmenu');return false"></span>
 </span>
 <roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletemessage" content=" " />
+<roundcube:if condition="template:name == 'message'" />
+    <roundcube:button command="move" type="link" class="buttonPas move" classAct="button move" classSel="button moveSel" label="move" title="moveto" content=" " data-menu-pos="bottom" />
+    <roundcube:button command="print" type="link" class="buttonPas print" classAct="button print" classSel="button printSel" label="print" title="printmessage" content=" " />
+<roundcube:endif />
 <roundcube:container name="toolbar" id="messagetoolbar" />
 <roundcube:button name="markmenulink" id="markmenulink" type="link" class="button markmessage" title="markmessages" onclick="rcmail_ui.show_popup('markmenu');return false" content=" " />
 <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button messagemenu" title="moreactions" onclick="rcmail_ui.show_popup('messagemenu');return false" content=" " />
-<roundcube:if condition="template:name == 'message'" />
-<roundcube:button command="move" type="link" class="buttonPas move" classAct="button move" classSel="button moveSel" label="move" title="moveto" content=" " data-menu-pos="bottom" />
-<roundcube:endif />
 </div>
 
 <div id="forwardmenu" class="popupmenu">
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index e80ad4e6a..b1c8a0ea9 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -108,11 +108,11 @@
 }
 
 #messagetoolbar a.print {
-  background-position: -224px 0;
+  background-position: -256px 0;
 }
 
 #messagetoolbar a.printSel {
-  background-position: -224px -32px;
+  background-position: -256px -32px;
 }
 
 #messagetoolbar a.markmessage {
@@ -120,7 +120,8 @@
 }
 
 #messagetoolbar a.messagemenu {
-  background-position: -322px 0;
+  background-position: -320px 0;
+  width: 34px;
 }
 
 #messagetoolbar a.spellcheck {
@@ -164,11 +165,11 @@
 }
 
 #messagetoolbar a.move {
-  background-position: -578px 0;
+  background-position: -580px 0;
 }
 
 #messagetoolbar a.moveSel {
-  background-position: -578px -32px;
+  background-position: -580px -32px;
 }
 
 #messagetoolbar a.download {
diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html
index 912cac6e2..ac08a3200 100644
--- a/skins/larry/includes/mailtoolbar.html
+++ b/skins/larry/includes/mailtoolbar.html
@@ -11,13 +11,11 @@
 </span>
 <roundcube:button command="delete" type="link" class="button delete disabled" classAct="button delete" classSel="button delete pressed" label="delete" title="deletemessage" />
 <roundcube:if condition="template:name == 'message'" />
+<roundcube:button command="move" type="link" class="button move disabled" classAct="button move" classSel="button move pressed" label="move" title="moveto" data-menu-pos="bottom" />
 <roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="printmessage" />
 <roundcube:endif />
 <roundcube:container name="toolbar" id="mailtoolbar" />
 <roundcube:button name="markmenulink" id="markmessagemenulink" type="link" class="button markmessage" label="mark" title="markmessages" onclick="UI.show_popup('markmessagemenu');return false" />
-<roundcube:if condition="template:name == 'message'" />
-<roundcube:button command="move" type="link" class="button move disabled" classAct="button move" classSel="button move pressed" label="move" title="moveto" data-menu-pos="bottom" />
-<roundcube:endif />
 <roundcube:button name="messagemenulink" id="messagemenulink" type="link" class="button more" label="more" title="moreactions" onclick="UI.show_popup('messagemenu');return false" />
 
 <div id="forwardmenu" class="popupmenu">
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 96ffbb272..18ba49ae2 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1896,7 +1896,7 @@ ul.proplist li {
 }
 
 .toolbar a.button.move {
-	background-position: center -1972px;
+	background-position: center -1971px;
 }
 
 .toolbar a.button.more {