Revert r2844: mailfooter should align with message list

3 files changed, 24 insertions, 20 deletions

diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
index 96efad746..5b250fa9f 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 .5em; float:left" />
+  <roundcube:object name="recordsCountDisplay" style="padding:0 1em; 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 e9e10dd48..ebdf9f8d2 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -24,19 +24,24 @@
 <roundcube:include file="/includes/header.html" />
 
 <div id="mainscreen">
-
 <div id="mailleftcontainer">
 <div id="mailboxlist-container">
 <h3 id="mailboxlist-header"><roundcube:label name="mailboxlist" /></h3>
 <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="16" />
 </div>
-</div>
 
 <script type="text/javascript">
   var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailleftcontainer', p2: 'mailrightcontainer', orientation: 'v', relative: true, start: 165});
   rcmail.add_onload('mailviewsplitv.init()');
 </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;
+</div>
+</div>
+
 <div id="mailrightcontainer">
 <div id="mailrightcontent">
 <div id="mailcontframe">
@@ -68,37 +73,36 @@
 </div>
 
 <roundcube:endif />
-
-</div>
-</div>
 </div>
 
 <div id="mailfooter">
-  <span 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>
-  <span id="listcontrols">
+<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;
       <roundcube:container name="listcontrols" id="listcontrols" />
-  </span>
+    </span>
+  </td>
   <roundcube:if condition="env:quota" />
-  <span id="quotabox">
-    <roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" />
-  </span>
+  <td style="text-align:center">
+    <span id="quotabox"><roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" /></span>
+  </td>
   <roundcube:endif />
-</div>
-<div id="countcontrols" class="pagenav">
+  <td 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 .5em; float:right" />
+    <roundcube:object name="messageCountDisplay" style="padding:0 1em; 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>
 
 
diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
index 933d13171..852f4b44c 100644
--- a/skins/default/templates/message.html
+++ b/skins/default/templates/message.html
@@ -52,7 +52,7 @@
 <div id="messagecountbar" 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 .5em; float:right" />
+  <roundcube:object name="messageCountDisplay" style="padding:0 1em 0 1em; 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>