add attachment names, fix star to work on all platforms

--HG--
branch : gloda-facet
extra : rebase_source : 5a0c8946d213687404f50386d478682099adde99

mail/base/content/glodaFacetBindings.xml

@@ -949,7 +949,6 @@
     <html:div class="message-header">
       <html:div class="message-meta">
         <html:div anonid="oldestMessageDate" class="message-oldestMessageDate"></html:div>
-        <html:div anonid="attachments" class="message-attachments"></html:div>
       </html:div>
       <html:div class="message-line">
         <html:div anonid="addresses-group" class="message-addresses-group">
@@ -960,8 +959,9 @@
           <html:div anonid="recipients-group" class="message-recipients-group">
             <html:span anonid="to" class="message-to-label"></html:span>
             <html:div anonid="recipients" class="message-recipients"/>
+            <html:div anonid="date" class="message-date"></html:div>
+            <html:div anonid="attachments" class="message-attachments"></html:div>
           </html:div>
-          <html:span anonid="date" class="message-date"></html:span>
         </html:div>
         <html:div class="message-subject-group">
           <html:span anonid="star" class="message-star"></html:span>
@@ -1016,11 +1016,27 @@
           }
         }
         
+        // - Starred
         let starNode = anonElem("star");
         if (message.starred) {
           starNode.setAttribute("starred", "true")
         }
 
+        // - Attachments
+        if (message.attachmentNames) {
+          let attachmentsNode = anonElem("attachments");
+          let imgNode = document.createElement("div");
+          imgNode.setAttribute("class", "message-attachment-icon");
+          attachmentsNode.appendChild(imgNode);
+          for each (let [, attach] in Iterator(message.attachmentNames)) {
+            let attachNode = document.createElement("div");
+            attachNode.setAttribute("class", "message-attachment");
+            dump('attach = ' + attach + '\n');
+            attachNode.textContent = attach;
+            attachmentsNode.appendChild(attachNode);
+          }
+        }
+
         // - Tags
         let tagsNode = anonElem("tags");
         if ("tags" in message && message.tags.length) {

mail/base/content/glodaFacetView.css

@@ -151,18 +151,8 @@ h1, h2, h3 {
   font-size: medium;
 }
 
-.facet-included-header,
+.facet-included[state="empty"],
-.facet-excluded-header {
+.facet-excluded[state="empty"] {
-  margin: 0;
-  font-size: 80%;
-}
-.facet-included-header[state="empty"],
-.facet-excluded-header[state="empty"] {
-  display: none;
-}
-
-.facet-included-header[state="empty"] + .facet-included,
-.facet-excluded-header[state="empty"] + .facet-excluded {
   display: none;
 }
 
@@ -294,7 +284,7 @@ h1, h2, h3 {
   color: #2D7BB2;
   text-decoration: none;
   display: block;
-  padding: 0.3em 4em 0.3em 0.5em;
+  padding: 0.3em 2em 0.3em 0.5em;
   position: relative;
   z-index: 2;
 }
@@ -303,15 +293,20 @@ h1, h2, h3 {
   color: #333;
 }
 
-.bar-count {
+.bar-percent {
   display: block;
   position: absolute;
-  right: 16px;
   top: 0;
-  margin: 0 0.3em;
+  left: 0;
-  text-align: right;
+  height: 100%;
-  color: #999;
+  background: #e9f2f5;
-  line-height: 2em;
+  text-indent: -9999px;
+  overflow: hidden;
+  line-height: 1.6em;
+}
+
+.bar:hover > .bar-percent {
+  background: #ceeaf5;
 }
 
 .bar-exclude {
@@ -413,7 +408,6 @@ h1, h2, h3 {
 .message {
   display: block;
   padding: 0.2em 0em;
-  padding-right: 1em;
 }
 
 .message-header,
@@ -431,19 +425,19 @@ h1, h2, h3 {
   color: #999;
   font-size: 90%;
 }
+
 .message-attachments {
-  padding-right: 18px;
+}
+
+.message-attachment {
+  display: inline-block;
+}
+
+.message-attachment-icon {
+  display: inline-block;
+  width: 18px;
+  height: 18px;
   background: url("chrome://messenger/skin/icons/attachment.png") transparent no-repeat center right;
-  display: none;
-}
-.message-attachments[count] {
-  display: inline;
-}
-.message-attachments:before {
-  content: "(";
-}
-.message-attachments:after {
-  content: ")";
 }
 
 .message-line {
@@ -457,21 +451,21 @@ h1, h2, h3 {
 
 .message-date {
   color: #999;
-  float: right;
 }
 
 .message-star[starred="true"] {
   display: inline-block;
-  width: 16px !important;
+  width: 12px !important;
-  height: 16px;
+  height: 12px;
+  background-image: url("chrome://messenger/skin/icons/flag-col.png");
 }
 
 .message-addresses-group {
   padding-left: 1em;
+  padding-right: 0.5em;
 }
 
 .message-subject-group {
-  margin-right: 1em;
   padding-left: .5em;
 }
 

mail/themes/gnomestripe/mail/glodaFacetView.css

@@ -1,6 +1,2 @@
 @import url("chrome://messenger/content/glodaFacetView.css");
-
+s
-.message-star[starred="true"] {
-  background-image: url("chrome://messenger/skin/icons/flag-col.png");
-}
-

mail/themes/pinstripe/jar.mn

@@ -134,6 +134,7 @@ classic.jar:
   skin/classic/messenger/icons/check.png                         (mail/icons/check.png)
   skin/classic/messenger/icons/dot.png                           (mail/icons/dot.png)
   skin/classic/messenger/icons/flagcol.png                       (mail/icons/flagcol.png)
+  skin/classic/messenger/icons/flag-col.png                      (mail/icons/flag-col.png)
   skin/classic/messenger/icons/flaggedmail.png                   (mail/icons/flaggedmail.png)
   skin/classic/messenger/icons/folder-archive.png                (mail/icons/folder-archive.png)
   skin/classic/messenger/icons/folder-closed.png                 (mail/icons/folder-closed.png)

mail/themes/pinstripe/mail/glodaFacetView.css

@@ -1,6 +1 @@
 @import url("chrome://messenger/content/glodaFacetView.css");
-
-.message-star[starred="true"] {
-  background-image: url("chrome://messenger/skin/icons/flaggedmail.png");
-}
-

mail/themes/qute/mail/glodaFacetView.css

@@ -1,6 +1 @@
 @import url("chrome://messenger/content/glodaFacetView.css");
-
-.message-star[starred="true"] {
-  background-image: url("chrome://messenger/skin/icons/flag-col.png");
-}
-