- Fix folder/messagelist controls alignment - icons used (#1486072)

3 files changed, 19 insertions, 25 deletions

diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index b0325b5af..3aa9fdc34 100644
--- a/skins/default/templates/addressbook.html
+++ b/skins/default/templates/addressbook.html
@@ -72,7 +72,7 @@
 <div id="abookcountbar" class="pagenav">
   <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstpage" content=" " />
   <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previouspage" content=" " />
-  <roundcube:object name="recordsCountDisplay" style="padding:0 1em; float:left" />
+  <roundcube:object name="recordsCountDisplay" style="padding:0 .5em; float:left" />
   <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextpage" content=" " />
   <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastpage" content=" " />
 </div>
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 2d16f62bf..c0d9e33b4 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -36,9 +36,10 @@
 </script>
 
 <div id="mailboxcontrols">
-  <roundcube:label name="folder" />:&nbsp;
-  <roundcube:button command="expunge" label="compact" classAct="active" />&nbsp;
-  <roundcube:button command="purge" label="empty" classAct="active" />&nbsp;
+  <span><roundcube:label name="folder" />:&nbsp;</span>
+  <roundcube:button command="expunge" type="link" title="compact" class="buttonPas expunge" classAct="button expunge" classSel="button expungesel" content=" " />
+  <roundcube:button command="purge" type="link" title="empty" class="buttonPas purge" classAct="button purge" classSel="button purgesel" content=" " />
+  <roundcube:container name="mailboxcontrols" id="mailboxcontrols" />
 </div>
 </div>
 
@@ -75,37 +76,30 @@
 <roundcube:endif />
 </div>
 
-<div id="mailfooter">
-<table cellpadding="1" cellspacing="0" width="100%"><tr>
-  <td>
-    <span id="listcontrols">
-      <roundcube:label name="select" />:&nbsp;
-      <roundcube:button command="select-all" label="all" classAct="active" />&nbsp;
-      <roundcube:button command="select-all" prop="unread" label="unread" classAct="active" />&nbsp;
-      <roundcube:button command="select-all" prop="invert" label="invert" classAct="active" />&nbsp;
-      <roundcube:button command="select-none" label="none" classAct="active" /> &nbsp;
+<div id="listcontrols">
+      <span><roundcube:label name="select" />:&nbsp;</span>
+      <roundcube:button command="select-all" type="link" title="all" class="buttonPas all" classAct="button all" classSel="button allsel" content=" " />
+      <roundcube:button command="select-all" type="link" title="unread" class="buttonPas unread" classAct="button unread" classSel="button unreadsel" content=" "" />
+      <roundcube:button command="select-all" type="link" title="invert" class="buttonPas invert" classAct="button invert" classSel="button invertsel" content=" " />
+      <roundcube:button command="select-none" type="link" title="none" class="buttonPas none" classAct="button none" classSel="button nonesel" content=" " />
       <roundcube:container name="listcontrols" id="listcontrols" />
-    </span>
-  </td>
   <roundcube:if condition="env:quota" />
-  <td style="text-align:center">
-    <span id="quotabox"><roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" /></span>
-  </td>
+  <span style="margin-left: 20px"><roundcube:label name="quota" />:</span>
+  <roundcube:object name="quotaDisplay" display="image" width="100" height="14" id="quotadisplay" />
   <roundcube:endif />
-  <td id="countcontrols" class="pagenav">
+</div>
+
+<div id="countcontrols" class="pagenav">
     <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastmessages" content=" " />
     <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextmessages" content=" " />
-    <roundcube:object name="messageCountDisplay" style="padding:0 1em; float:right" />
+    <roundcube:object name="messageCountDisplay" style="padding:0 .5em; float:right" />
     <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previousmessages" content=" " />
     <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstmessages" content=" " />
-  </td>
-</tr></table>
 </div>
 
 </div>
 </div>
 
-
 <div id="messagetoolbar">
 <roundcube:button command="checkmail" type="link" class="button checkmail" classAct="button checkmail" classSel="button checkmailSel" title="checkmail" content=" " />
 <roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 852f4b44c..fcf55df0b 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -49,10 +49,10 @@
 </div>
 </div>
 
-<div id="messagecountbar" class="pagenav">
+<div id="countcontrols" class="pagenav">
   <roundcube:button command="lastmessage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastmessage" content=" " />
   <roundcube:button command="nextmessage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextmessage" content=" " />
-  <roundcube:object name="messageCountDisplay" style="padding:0 1em 0 1em; float:right" />
+  <roundcube:object name="messageCountDisplay" style="padding:0 .5em; float:right" />
   <roundcube:button command="previousmessage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previousmessage" content=" " />
   <roundcube:button command="firstmessage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstmessage" content=" " />
 </div>