Bug #7831: Fix custom folder image display in dimp

diff --git a/imp/js/src/DimpBase.js b/imp/js/src/DimpBase.js
index 0b62e00..ff2707b 100644 (file)
--- a/imp/js/src/DimpBase.js
+++ b/imp/js/src/DimpBase.js
@@ -1886,7 +1886,7 @@ var DimpBase = {
 
         div = new Element('DIV', { className: ob.cl || 'base', id: fid + '_div' });
         if (ob.i) {
-            div.update(ob.i);
+            div.setStyle({ background-image: 'url("' + ob.i + '")' });
         }
         if (ob.ch) {
             div.writeAttribute({ className: 'exp' });

diff --git a/imp/lib/DIMP.php b/imp/lib/DIMP.php
index 9658c98..e36c455 100644 (file)
--- a/imp/lib/DIMP.php
+++ b/imp/lib/DIMP.php
@@ -421,8 +421,13 @@ class DIMP
         }
 
         if ($elt['user_icon']) {
-            $ob->cl = 'custom';
-            $ob->i = IMP::img($elt['icon'], $elt['alt'], '', $elt['icondir']);
+            $ob->cl = 'customimg';
+            $dir = empty($elt['icondir'])
+                ? $GLOBALS['registry']->getImageDir()
+                : $elt['icondir'];
+            $ob->i = empty($dir)
+                ? $elt['icon']
+                : $dir . '/' . $elt['icon'];
         }
 
         return $ob;

diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index 9777070..3f6d041 100644 (file)
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -380,7 +380,7 @@ div.msgSize img {
 #sidebarPanel li.folder a {
     display: inline;
 }
-#sidebarPanel .base, #sidebarPanel .col, #sidebarPanel .exp, #sidebarPanel .create, #sidebarPanel .drafts, #sidebarPanel .inbox, #sidebarPanel .sent, #sidebarPanel .spam, #sidebarPanel .trash {
+#sidebarPanel .base, #sidebarPanel .col, #sidebarPanel .exp, #sidebarPanel .create, #sidebarPanel .drafts, #sidebarPanel .inbox, #sidebarPanel .sent, #sidebarPanel .spam, #sidebarPanel .trash, #sidebarPanel .customimg {
     display: inline;
     float: left;
     width: 20px;