From d15accde64192887086726417362f70af335ab35 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 1 Sep 2009 20:20:08 +0000
Subject: [PATCH] Changed "dot/disable" icon in web mail module.

Monotone-Parent: fb56e362d93bce06baf63f26f919dedfbafe8a51
Monotone-Revision: d827927aae09ada2944dc065c0dd5d1c40bd8dee

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-09-01T20:20:08
Monotone-Branch: ca.inverse.sogo
---
 UI/MailerUI/product.plist                 |   7 ++-----
 UI/Templates/MailerUI/UIxMailListView.wox |   4 ++--
 UI/WebServerResources/MailerUI.js         |  14 +++++++-------
 UI/WebServerResources/dot.png             | Bin 0 -> 208 bytes
 UI/WebServerResources/icon_read.gif       | Bin 841 -> 0 bytes
 5 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 UI/WebServerResources/dot.png
 delete mode 100644 UI/WebServerResources/icon_read.gif

diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index fc31aac67..722f929b0 100644
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -52,11 +52,8 @@
 		     "message-mail.png",
 		     "message-mail-read.png",
 
-		     "icon_mark_flagged.gif",
-		     "icon_mark_read.gif",
-		     "icon_mark_unflagged.gif",
-		     "icon_mark_unread.gif",
-		     "icon_read.gif",
+		     "dot.png",
+		     "flag.png",
 		     "icon_unread.gif",
 
 		     "title_attachment_14x14.png",
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index dc59caeda..631bac945 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -71,7 +71,7 @@
                 ><img rsrc:src="flag.png" const:class="messageIsFlagged" 
               /></var:if
             ><var:if condition="isMessageFlagged" const:negate="YES"
-                ><img rsrc:src="flag-col.png" 
+                ><img rsrc:src="dot.png" 
               /></var:if
             ></td
           ></var:if>
@@ -110,7 +110,7 @@
           ><var:if condition="currentColumn.value" const:value="Unread"
             ><td class="messageFlagColumn"
               ><var:if condition="isMessageRead"
-                ><img rsrc:src="icon_read.gif"
+                ><img rsrc:src="dot.png"
                 class="mailerReadIcon"
                 label:title="Mark Unread"
                 label:title-markread="Mark Read"
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 4374eb44a..f7f45735c 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -114,14 +114,14 @@ function flagMailInWindow (win, msguid, flagged) {
     var row = win.$("row_" + msguid);
 
     if (row) {
-        var col = $$("TR#row_"+msguid+" TD.messageFlag").first ();
-        var img = col.childElements ().first ();
+        var col = row.select("TD.messageFlag").first();
+        var img = col.select("img").first();
         if (flagged) {
-            img.src = img.src.replace (/-col/, "");
-            img.addClassName ("messageIsFlagged");
+            img.setAttribute("src", ResourcesURL + "/flag.png");
+            img.addClassName("messageIsFlagged");
         }
         else {
-            img.src = img.src.replace (/.png/, "-col.png");
+            img.setAttribute("src", ResourcesURL + "/dot.png");
             img.removeClassName ("messageIsFlagged");
         }
     }
@@ -142,7 +142,7 @@ function markMailInWindow(win, msguid, markread) {
                     img.removeClassName("mailerUnreadIcon");
                     img.addClassName("mailerReadIcon");
                     img.setAttribute("id", "readdiv_" + msguid);
-                    img.setAttribute("src", ResourcesURL + "/icon_read.gif");
+                    img.setAttribute("src", ResourcesURL + "/dot.png");
                     var title = img.getAttribute("title-markunread");
                     if (title)
                         img.setAttribute("title", title);
@@ -1460,7 +1460,7 @@ function openInbox(node) {
 
 function initFlagIcons () {
     var icons = $$("TABLE#messageList TBODY TR.mailer_listcell_regular TD.messageFlag");
-    for (var i = 0; i < icons.length; i++) 
+    for (var i = 0; i < icons.length; i++)
       icons[i].onclick = mailListFlagMessageToggle;
 }
 
diff --git a/UI/WebServerResources/dot.png b/UI/WebServerResources/dot.png
new file mode 100644
index 0000000000000000000000000000000000000000..a62a523d69d691059b2428847e68bed75d4feac2
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`>?NMQuI$%1c!fpyWbZ3}1qyK%
zctjR6F!(8eFr!%Q%zHpVmUKs7M+SzC{oH>NS%Lg`PZ!6Kid)GE60FSp5`~^Q_x4x{
zc%1$5`@8<(etG*#%1TOR3BkvkPB*;2zyJJ?@9*c|m~US%(a`3@&NVUZz;yk12PsJh
zHU{29FIj8YmN1((@BQ%q|9_rcY;QCa1Q{3-84Pz$Ni?VcTE*b$>gTe~DWM4f=;1;$

literal 0
HcmV?d00001

diff --git a/UI/WebServerResources/icon_read.gif b/UI/WebServerResources/icon_read.gif
deleted file mode 100644
index 6c7c104e3b0ffb41799f22614a1e00317e6db1b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 841
zcmXAoy=&895XUc&AwrcFu~U|05F!r3ffxjb4!#V9F5QIUa{odHJN!V*;3Nov+X}vb
zgP{2f>Y~Nm+%63c845+PnXHs>exAn%!t-37=e}>3JbLo*-tgI~T$4XbVKw#B)UBav
zngiC!!G|B`?RLA<>8z}*tgWrBudjEz-G0A67!0<zw>LL8H#Rng!(r|<xwUm9Z{k<}
zKKgcgdi3ezYZWmO7YV>sRK-+WB~-HBsfn4mNtk4PsxIc@F5!~3Q$sAoLn0(Or+7+a
zK?Kr-4xVUM0#!9tR}IyyeAH&@reT_uo@;Y;*Kp0MhSwJAp%I$3(^5S(QnLz0I7*RL
z`Qd~FRAA`iZLz@@EH{g42}%lg3%9HeQQ%<_menn4JS`GK#TlN9sA3e`IG_hbcrA%Q
zg$eM$Kw3T0;NhM%EX+Vm9pPEC!yDXOM|##M$)2Q%mMn>lkVu6X@Qqi@;ReyPArp0#
zzk(K2V9E@5&OKkSvW|qva0n}P5?>uA(_<_Qfz*kaT*;E*kroLN2|c)HmRQ77=`S+N
zXpsXygdhS*E6=&4q8Why8#|}>(%aeD+1=e8jYi|~csiX<CX?gi<JoLBpU=<E&K8Ts
z#l=Nlp6~C!YnrC~a8j~v?3`G=zwMUDQf_l8<v$^vn{s)j`}p(z*B71Zx1Ju}={?xH
ax>!CxT>aU4b)$Fp<nYVe?=M>|x&IF;VU?Ny