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

7 files changed, 117 insertions, 93 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 7a5ae92a3..d462bf19f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix folder/messagelist controls alignment - icons used (#1486072)
 - Fix LDAP addressbook shows 'Contact not found' error sometimes (#1486178)
 - Fix cache status checking + improve cache operations performance (#1486104)
 - Prevent from setting INBOX as any of special folders (#1486114)
diff --git a/skins/default/iehacks.css b/skins/default/iehacks.css
index 1c6d0b367..aee5d55fc 100644
--- a/skins/default/iehacks.css
+++ b/skins/default/iehacks.css
@@ -71,6 +71,13 @@ input, textarea
   background-image: url('images/mail_toolbar.gif');
 }
 
+#listcontrols a.buttonPas,
+#mailboxcontrols a.buttonPas
+{
+  filter: alpha(opacity=35);
+  background-image: url('images/mail_footer.png');
+}
+
 #messagetoolbar select.mboxlist
 {
   margin: 0 8px;
@@ -261,3 +268,8 @@ ul.toolbarmenu li a
   -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
   filter: alpha(opacity=80);
 }
+
+#countcontrols
+{
+  padding-right: 10px;
+}
diff --git a/skins/default/images/mail_footer.png b/skins/default/images/mail_footer.png
new file mode 100644
index 000000000..ff756503e
--- /dev/null
+++ b/skins/default/images/mail_footer.png
diff --git a/skins/default/mail.css b/skins/default/mail.css
index a095fd15d..f63c3f2cd 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -312,12 +312,6 @@ ul.toolbarmenu li.separator_above
   font-size: 11px;
 }
 
-#listcontrols a,
-#listcontrols a:active,
-#listcontrols a:visited,
-#mailboxcontrols a,
-#mailboxcontrols a:active,
-#mailboxcontrols a:visited,
 td.formlinks a,
 td.formlinks a:visited
 {
@@ -326,46 +320,12 @@ td.formlinks a:visited
   text-decoration: none;
 }
 
-#listcontrols a.active,
-#listcontrols a.active:active,
-#listcontrols a.active:visited,
-#mailboxcontrols a.active,
-#mailboxcontrols a.active:active,
-#mailboxcontrols a.active:visited,
 td.formlinks a,
 td.formlinks a:visited
 {
   color: #CC0000;
 }
 
-#listcontrols a.active:hover,
-#mailboxcontrols a.active:hover
-{
-  text-decoration: underline;
-}
-
-#listcontrols
-{
-  padding-right: 2em;
-}
-
-#messagecountbar
-{
-  position: absolute;
-  bottom: 0px;
-  right: 0px;
-  width: 300px;
-  height: 16px;
-  text-align: right;
-  white-space: nowrap;
-}
-
-#messagecountbar span
-{
-  font-size: 11px;
-  color: #333333;
-}
-
 #mainscreen
 {
   position: absolute;
@@ -391,6 +351,7 @@ td.formlinks a:visited
   left: 170px;
   bottom: 0px;
   right: 0px;
+  min-width: 600px;
 }
 
 #mailrightcontent
@@ -629,48 +590,111 @@ td.formlinks a:visited
   font-weight: normal;
 }
 
-#mailfooter
+#listcontrols,
+#mailboxcontrols
 {
   position: absolute;
+  white-space: nowrap;
   left: 0px;
   bottom: 0px;
-  height: 16px;
-  width: 100%;
+  height: 15px;
+  width: auto;
+  min-width: 300px;
 }
 
-#mailfooter table tr td
+#listcontrols > a,
+#listcontrols > span,
+#mailboxcontrols > a,
+#mailboxcontrols > span
 {
-  white-space: nowrap;
-  vertical-align: bottom;
+  display: block;
+  float: left;
+  font-size: 11px;
 }
 
-#mailboxcontrols
+#listcontrols a.button,
+#listcontrols a.buttonPas,
+#mailboxcontrols a.button,
+#mailboxcontrols a.buttonPas
 {
-  position: absolute;
-  left: 0px;
-  bottom: 0px;
-  height: 16px;
-  width: auto;
-  font-size: 11px;
+  display: block;
+  float: left;
+  width: 15px;
+  height: 15px;
+  padding: 0;
+  margin-right: 2px;
+  overflow: hidden;
+  background: url('images/mail_footer.png') 0 0 no-repeat transparent;
+  opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
 }
 
-#listcontrols,
-#countcontrols,
-#quotabox
+#listcontrols a.buttonPas,
+#mailboxcontrols a.buttonPas
 {
-  white-space: nowrap;
-  font-size: 11px;
+  opacity: 0.35;
+}
+
+#mailboxcontrols a.expunge {
+  background-position: 0 0;
+}
+
+#mailboxcontrols a.expungesel {
+  background-position: 0 -15px;
+}
+
+#mailboxcontrols a.purge {
+  background-position: -15px 0;
+}
+
+#mailboxcontrols a.purgesel {
+  background-position: -15px -15px;
+}
+
+#listcontrols a.all {
+  background-position: -30px 0;
+}
+
+#listcontrols a.allsel {
+  background-position: -30px -15px;
+}
+
+#listcontrols a.unread {
+  background-position: -45px 0;
+}
+
+#listcontrols a.unreadsel {
+  background-position: -45px -15px;
+}
+
+#listcontrols a.invert {
+  background-position: -60px 0;
+}
+
+#listcontrols a.invertsel {
+  background-position: -60px -15px;
+}
+
+#listcontrols a.none {
+  background-position: -75px 0;
+}
+
+#listcontrols a.nonesel {
+  background-position: -75px -15px;
 }
 
 #countcontrols
 {
+  height: 15px;
+  position: absolute;
+  bottom: 0;
+  right: 0;
   min-width: 25em;
+  white-space: nowrap;
+  font-size: 11px;
 }
 
 #countcontrols a.button,
-#countcontrols a.buttonPas,
-#messagecountbar a.button,
-#messagecountbar a.buttonPas
+#countcontrols a.buttonPas
 {
   float: right;
 }
@@ -871,15 +895,8 @@ body.messagelist
   color: #CCCCCC;
 }
 
-#quotadisplay
-{
-  color: #666666;
-  font-size: 11px;
-}
-
 #quotadisplay img
 {
-  vertical-align: middle;
   margin-left: 4px;
   border: 1px solid #999;
 }
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>