From 0bcaa4cc518ecf6071cdbf5bd6eb682f8acdedde Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 21 Mar 2011 18:32:07 +0100
Subject: [PATCH] * New icon and parameter for the 'Drafts' folder, * Fixed a
 refresh issue when removing a top folder (ie. with no parent) that is the
 current selection.

---
 extensions/webmail/lib.py                 |   3 ++-
 extensions/webmail/main.py                |   3 +++
 extensions/webmail/static/css/folders.css |   7 ++++++-
 extensions/webmail/static/js/fdmenu.js    |   3 +++
 static/pics/draft.png                     | Bin 0 -> 317 bytes
 5 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 static/pics/draft.png

diff --git a/extensions/webmail/lib.py b/extensions/webmail/lib.py
index 2f31177f0..85cfcc753 100644
--- a/extensions/webmail/lib.py
+++ b/extensions/webmail/lib.py
@@ -257,7 +257,8 @@ class IMAPconnector(object):
 
     def getfolders(self, user):
         md_folders = [{"name" : "INBOX", "class" : "inbox"},
-                      {"name" : 'Drafts'},
+                      {"name" : parameters.get_user(user, "DRAFTS_FOLDER"), 
+                       "class" : "drafts"},
                       {"name" : 'Junk'},
                       {"name" : parameters.get_user(user, "SENT_FOLDER")},
                       {"name" : parameters.get_user(user, "TRASH_FOLDER"),
diff --git a/extensions/webmail/main.py b/extensions/webmail/main.py
index 0ec493e98..1e1a1cff8 100644
--- a/extensions/webmail/main.py
+++ b/extensions/webmail/main.py
@@ -43,6 +43,9 @@ def init():
     parameters.register_user("SENT_FOLDER", type="string", deflt="Sent",
                              label=_("Sent folder"),
                              help=_("Folder where copies of sent messages go"))
+    parameters.register_user("DRAFTS_FOLDER", type="string", deflt="Drafts",
+                             label=_("Drafts folder"),
+                             help=_("Folder where drafts go"))
     parameters.register_user("SIGNATURE", type="text", deflt="",
                              label=_("Signature text"),
                              help=_("User defined email signature"))
diff --git a/extensions/webmail/static/css/folders.css b/extensions/webmail/static/css/folders.css
index 14511c42f..25400f3ef 100644
--- a/extensions/webmail/static/css/folders.css
+++ b/extensions/webmail/static/css/folders.css
@@ -74,7 +74,7 @@ a.block {
 }
 
 img.aligned {
-    float: left;
+    float: right;
 }
 
 img.footer {
@@ -98,6 +98,11 @@ li.folder {
     background-repeat: no-repeat;
 }
 
+li.drafts {
+    background-image: url("/static/pics/draft.png");
+    background-repeat: no-repeat;
+}
+
 li.subfolders {
     background-image: url("/static/pics/folder.png");
     background-repeat: no-repeat;
diff --git a/extensions/webmail/static/js/fdmenu.js b/extensions/webmail/static/js/fdmenu.js
index f178aa404..567e3d497 100644
--- a/extensions/webmail/static/js/fdmenu.js
+++ b/extensions/webmail/static/js/fdmenu.js
@@ -54,6 +54,9 @@ var FdMenu = new Class({
                 infobox.info(gettext("Folder deleted."));
                 if (dfolder == current_anchor.base) {
                   var pfolder = ((this.current_folder.split(".")).slice(0, -1)).join(".");
+                  if (pfolder == "") {
+                    pfolder = "INBOX";
+                  }
                   current_anchor.baseurl(pfolder, 1);
                 }
                 current_anchor.update.delay(500, current_anchor, 1);
diff --git a/static/pics/draft.png b/static/pics/draft.png
new file mode 100644
index 0000000000000000000000000000000000000000..663cbadddefa3c7f74f35faa702b752eb251f599
GIT binary patch
literal 317
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<V%*gMwA5S
zr<If^7Ns(jmzV2h=4BTrCl;jY<rk&TerF>ERCM0c#WBR9cj@HUTulxFt>;%oC#+8w
zH~lQC^g^)d-50K<e@}}0wAlU?P%&M;q_Hu!?eknq?$sWTYAkKK7D+62&s@9tYLP9Y
zXU=!&Z)*={dQU32x3cozpOdu)5@G4fEqx}1h`3+eQ<l%zbl`txw_ii<?f;DHuFux^
zA*I+SF5jxMT8wehhBv?Vl(XEQf3m@V$7;@LGq(;0p=qh6MOq9j4jQf#mPse{IL^9v
zlw;oWlhQuRC*Nw`n#>`+<DEyzdMC|L_KdZgA6H&~ZLOV}%J6}yYQe@Ti#?uyfnH<q
MboFyt=akR{0RLrujQ{`u

literal 0
HcmV?d00001