- Move quota indicator to mailboxlist footer

- Fix groupcontrols on IE6 (use gif)

6 files changed, 29 insertions, 16 deletions

diff --git a/skins/default/common.css b/skins/default/common.css
index 881160f02..f3af5f1a6 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -286,7 +286,7 @@ img
   overflow: hidden;
   height: 22px;
   border-top: 1px solid #999;
-  background: url('images/listheader.gif') top left repeat-x #CCC;
+  background: url(images/listheader.gif) top left repeat-x #CCC;
 }
 
 .boxfooter a.button,
@@ -299,7 +299,7 @@ img
   padding: 0px;
   margin: 0;
   overflow: hidden;
-  background: url('images/icons/groupactions.png') 0 0 no-repeat transparent;
+  background: url(images/icons/groupactions.png) 0 0 no-repeat transparent;
   opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
 }
 
diff --git a/skins/default/ie6hacks.css b/skins/default/ie6hacks.css
index 9fa3eb804..f1d74e6ce 100644
--- a/skins/default/ie6hacks.css
+++ b/skins/default/ie6hacks.css
@@ -49,6 +49,18 @@ img
   padding-right: 10px;
 }
 
+.boxfooter a.button,
+.boxfooter a.buttonPas
+{
+  background-image: url(images/icons/groupactions.gif);
+}
+
+.pagenav a.button,
+.pagenav a.buttonPas
+{
+  background-image: url(images/pagenav.gif);
+}
+
 #listcontrols a.button,
 #listcontrols a.buttonPas {
   background-image: url(images/mail_footer.gif);
diff --git a/skins/default/images/icons/groupactions.gif b/skins/default/images/icons/groupactions.gif
new file mode 100644
index 000000000..15649045e
--- /dev/null
+++ b/skins/default/images/icons/groupactions.gif
diff --git a/skins/default/images/quota.gif b/skins/default/images/quota.gif
new file mode 100644
index 000000000..9896d4cae
--- /dev/null
+++ b/skins/default/images/quota.gif
diff --git a/skins/default/mail.css b/skins/default/mail.css
index fae7a82a5..70770a50e 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -373,16 +373,17 @@ td.formlinks a:visited
 #quota
 {
   position: absolute;
-  bottom: 12px;
-  left: 20px;
+  top: 3px;
+  right: 8px;
+  width: 100px;
 }
 
-#quota span
+#quotaimg
 {
-  display: block;
-  float: left;
-  font-size: 11px;
-  color: #666;
+  position: absolute;
+  top: 3px;
+  right: 6px;
+  z-index: 101;
 }
 
 
diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
index 75acbcdd6..2a150dd98 100644
--- a/skins/default/templates/mail.html
+++ b/skins/default/templates/mail.html
@@ -33,6 +33,13 @@
 <div class="boxfooter">
   <!--<roundcube:button name="togglequota" type="link" title="showquota" class="buttonPas showinfo" classAct="button showinfo" onclick="rcmail_ui.toggle_quotadisplay();return false" content=" " />-->
   <roundcube:button name="mboxactions" id="mboxactionslink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_mailboxmenu();return false" content=" " />
+
+<roundcube:if condition="env:quota" />
+<img id="quotaimg" src="/images/quota.gif" alt="" />
+<div id="quota">
+  <roundcube:object name="quotaDisplay" display="image" width="100" height="14" id="quotadisplay" />
+</div>
+<roundcube:endif />
 </div>
 </div>
 
@@ -215,13 +222,6 @@
 </div>
 </div>
 
-<roundcube:if condition="env:quota" />
-<div id="quota">
-  <span style="margin-right: 5px"><roundcube:label name="quota" />:</span>
-  <roundcube:object name="quotaDisplay" display="image" width="100" height="14" id="quotadisplay" />
-</div>
-<roundcube:endif />
-
 <div id="rcmversion"><roundcube:object name="productname" /> <roundcube:object name="version" /></div>
 
 </body>