From 1862552c883b5922c6c9c76d25002f9ef69ce191 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 2 Dec 2009 17:17:32 -0700
Subject: [PATCH] sidebarPanel -> sidebar

The DIMP sidebar shares minimal (3) CSS traits from its horde
counterpart.  Much better to simply do all styling within DIMP (since
most of the CSS rules are overwritten in DIMP anyway).
---
 imp/js/DimpBase.js                    |  8 +++----
 imp/templates/index/index-dimp.inc    |  2 +-
 imp/themes/bluewhite/screen-dimp.css  |  2 +-
 imp/themes/ie6_or_less-dimp.css       |  4 ++--
 imp/themes/ie7-dimp.css               |  6 ++---
 imp/themes/screen-dimp.css            | 43 +++++++++++++++++------------------
 imp/themes/silver/screen-dimp.css     |  4 ++--
 imp/themes/tango-blue/screen-dimp.css |  2 +-
 8 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js
index 5a45a6e2b..e88664476 100644
--- a/imp/js/DimpBase.js
+++ b/imp/js/DimpBase.js
@@ -294,7 +294,7 @@ var DimpBase = {
             return;
         }
 
-        var curr = $('sidebarPanel').down('.on'),
+        var curr = $('sidebar').down('.on'),
             elt = $(id);
 
         if (curr == elt) {
@@ -2620,10 +2620,10 @@ var DimpBase = {
         $('foldersSidebar').observe('mouseover', this.mouseoverHandler.bindAsEventListener(this));
 
         /* Show page now. */
-        $('sidebarPanel').setStyle({ width: DIMP.conf.sidebar_width });
+        $('sidebar').setStyle({ width: DIMP.conf.sidebar_width });
         $('dimpLoading').hide();
         $('dimpPage').show();
-        $('dimpmain').setStyle({ left: $('sidebarPanel').getWidth() + 'px' });
+        $('dimpmain').setStyle({ left: $('sidebar').getWidth() + 'px' });
 
         /* Create the folder list. Any pending notifications will be caught
          * via the return from this call. */
@@ -2714,7 +2714,7 @@ var DimpBase = {
     _resizeIE6: function()
     {
         if (DimpCore.is_ie6) {
-            var tmp = parseInt($('sidebarPanel').getStyle('width'), 10),
+            var tmp = parseInt($('sidebar').getStyle('width'), 10),
                 tmp1 = document.viewport.getWidth() - tmp - 30;
             $('normalfolders').setStyle({ width: tmp + 'px' });
             $('dimpmain').setStyle({ width: tmp1 + 'px' });
diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index b54357977..bc1f1e10f 100644
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -41,7 +41,7 @@ function _simpleButton($id, $text, $image)
 <div id="dimpPage" style="display:none">
  <div id="header"></div>
  <div id="pageContainer">
-  <div id="sidebarPanel">
+  <div id="sidebar">
    <div id="logo">
     <a id="logolink"><?php echo _("Horde") ?></a>
    </div>
diff --git a/imp/themes/bluewhite/screen-dimp.css b/imp/themes/bluewhite/screen-dimp.css
index 977a18586..eaeb5954f 100644
--- a/imp/themes/bluewhite/screen-dimp.css
+++ b/imp/themes/bluewhite/screen-dimp.css
@@ -1,4 +1,4 @@
-#sidebarPanel a:hover, #sidebarPanel a:hover span {
+#sidebar a:hover, #sidebar a:hover span {
     color: #006;
 }
 .tabset {
diff --git a/imp/themes/ie6_or_less-dimp.css b/imp/themes/ie6_or_less-dimp.css
index e04fe01aa..81294c68a 100644
--- a/imp/themes/ie6_or_less-dimp.css
+++ b/imp/themes/ie6_or_less-dimp.css
@@ -6,11 +6,11 @@
     height: auto;
 }
 
-#sidebarPanel .sepfull, .splitBar, .context div.sep {
+#sidebar .sepfull, .splitBar, .context div.sep {
     overflow: hidden;
 }
 
-#sidebarPanel li {
+#sidebar li {
     width: 100%;
 }
 
diff --git a/imp/themes/ie7-dimp.css b/imp/themes/ie7-dimp.css
index 96a736e67..c98fbbe22 100644
--- a/imp/themes/ie7-dimp.css
+++ b/imp/themes/ie7-dimp.css
@@ -2,10 +2,10 @@
  * CSS corrections for IE 7.
  */
 
-#sidebarPanel li {
+#sidebar li {
     overflow: hidden;
 }
-#sidebarPanel .folderlist {
+#sidebar .folderlist {
     overflow-y: auto;
 }
 
@@ -21,7 +21,7 @@
     border-width: 2px;
 }
 
-#sidebarPanel li.folder a:hover, #sidebarPanel li.custom a:hover, #sidebarPanel li.servicelink a:hover {
+#sidebar li.folder a:hover, #sidebar li.custom a:hover, #sidebar li.servicelink a:hover {
     font-weight: bold;
     text-decoration: underline;
 }
diff --git a/imp/themes/screen-dimp.css b/imp/themes/screen-dimp.css
index 0d4cf17fc..c1f9aec32 100644
--- a/imp/themes/screen-dimp.css
+++ b/imp/themes/screen-dimp.css
@@ -16,18 +16,15 @@ input {
 }
 
 /* Main container styles. */
-#sidebarPanel {
-    bottom: 0;
-    border-bottom: 0;
+#sidebar {
+    background: #eee;
+    border-right: 1px silver solid;
     cursor: default;
     left: 0;
     position: absolute;
     top: 0;
     padding: 5px 0 0 5px;
-    white-space: normal;
     z-index: 1;
-    -moz-border-radius-bottomright: 0;
-    -webkit-border-bottom-right-radius: 0;
 }
 #dimpmain {
     bottom: 0;
@@ -301,46 +298,48 @@ div.vpRowVert.flagUnseen {
 }
 
 /* Sidebar */
-#sidebarPanel .sepfull {
+#sidebar .sepfull {
     height: 1px !important;
     margin: 5px 0;
     background: silver;
 }
-#sidebarPanel .count {
+#sidebar .count {
     color: silver;
 }
-#sidebarPanel li {
+#sidebar li {
     list-style: none;
     height: 16px;
     line-height: 16px;
     padding-top: 1px;
     white-space: nowrap;
 }
-#sidebarPanel li a, #sidebarPanel li.folder, #sidebarPanel li.container, #sidebarPanel li.custom, #sidebarPanel li.servicelink {
+#sidebar li a, #sidebar li.folder, #sidebar li.container, #sidebar li.custom, #sidebar li.servicelink {
+    color: #000;
+    font-size: 95%;
     text-decoration: none;
 }
-#sidebarPanel li.servicelink a {
+#sidebar li.servicelink a {
     font-weight: bold;
 }
-#sidebarPanel li.custom {
+#sidebar li.custom {
     background: transparent none;
 }
-#sidebarPanel li.custom img {
+#sidebar li.custom img {
     float: left;
     padding: 1px 4px 0 0;
     margin-bottom: -1px;
 }
-#sidebarPanel li.on {
+#sidebar li.on {
     background: #ffa;
 }
-#sidebarPanel li.subfolders {
+#sidebar li.subfolders {
     height: auto;
     margin: 0;
 }
-#sidebarPanel li.subfolders ul {
+#sidebar li.subfolders ul {
     padding-left: 10px;
 }
-#sidebarPanel span.iconSpan {
+#sidebar span.iconSpan {
     display: inline;
     float: left;
     width: 20px;
@@ -350,10 +349,10 @@ div.vpRowVert.flagUnseen {
 #ctx_folder_sub span.contextImg, #ctx_folder_unsub span.contextImg, #ctx_folderopts_sub span.contextImg, #ctx_folderopts_unsub span.contextImg {
     background-image: url("graphics/folders/folder.png");
 }
-#sidebarPanel span.col, #ctx_folderopts_collapse span.contextImg, #ctx_container_collapse span.contextImg, #ctx_folder_collapse span.contextImg {
+#sidebar span.col, #ctx_folderopts_collapse span.contextImg, #ctx_container_collapse span.contextImg, #ctx_folder_collapse span.contextImg {
     background-image: url("graphics/folders/minus.png");
 }
-#sidebarPanel span.exp, #ctx_folderopts_expand span.contextImg, #ctx_container_expand span.contextImg, #ctx_folder_expand span.contextImg {
+#sidebar span.exp, #ctx_folderopts_expand span.contextImg, #ctx_container_expand span.contextImg, #ctx_folder_expand span.contextImg {
     background-image: url("graphics/folders/plus.png");
 }
 #normalfolders {
@@ -362,12 +361,12 @@ div.vpRowVert.flagUnseen {
 #normalfolders li.unsubFolder {
     font-style: italic;
 }
-#sidebarPanel .over a, #sidebarPanel li.folder:hover, #sidebarPanel li.custom:hover, #sidebarPanel li.servicelink:hover {
+#sidebar .over a, #sidebar li.folder:hover, #sidebar li.custom:hover, #sidebar li.servicelink:hover {
     cursor: pointer;
     font-weight: bold;
     text-decoration: underline;
 }
-#sidebarPanel .container span.iconSpan {
+#sidebar .container span.iconSpan {
     cursor: pointer;
 }
 
@@ -1082,7 +1081,7 @@ span.readonlyImg {
         display: block !important;
     }
 
-    #sidebarPanel, #dimpmain_folder_top, #msgSplitPane .msglist, div.sbdiv, .splitBar, #toggleHeaders, #Growler, #GrowlerLog, #writemsg, .dimpActions, .dimpOptions {
+    #sidebar, #dimpmain_folder_top, #msgSplitPane .msglist, div.sbdiv, .splitBar, #toggleHeaders, #Growler, #GrowlerLog, #writemsg, .dimpActions, .dimpOptions {
         display: none !important;
     }
 
diff --git a/imp/themes/silver/screen-dimp.css b/imp/themes/silver/screen-dimp.css
index 6fad4c0bc..45bc706cd 100644
--- a/imp/themes/silver/screen-dimp.css
+++ b/imp/themes/silver/screen-dimp.css
@@ -1,10 +1,10 @@
 #ctx_folder_sub span.contextImg, #ctx_folder_unsub span.contextImg, #ctx_folderopts_sub span.contextImg, #ctx_folderopts_unsub span.contextImg {
     background-image: url("graphics/folders/explore.png");
 }
-#sidebarPanel span.col, #ctx_folderopts_collapse span.contextImg, #ctx_container_collapse span.contextImg, #ctx_folder_collapse span.contextImg {
+#sidebar span.col, #ctx_folderopts_collapse span.contextImg, #ctx_container_collapse span.contextImg, #ctx_folder_collapse span.contextImg {
     background-image: url("graphics/folders/minus.png");
 }
-#sidebarPanel span.exp, #ctx_folderopts_expand span.contextImg, #ctx_container_expand span.contextImg, #ctx_folder_expand span.contextImg {
+#sidebar span.exp, #ctx_folderopts_expand span.contextImg, #ctx_container_expand span.contextImg, #ctx_folder_expand span.contextImg {
     background-image: url("graphics/folders/plus.png");
 }
 
diff --git a/imp/themes/tango-blue/screen-dimp.css b/imp/themes/tango-blue/screen-dimp.css
index 2e068f1e8..fe91bb77e 100644
--- a/imp/themes/tango-blue/screen-dimp.css
+++ b/imp/themes/tango-blue/screen-dimp.css
@@ -7,7 +7,7 @@
     background: #fff;
 }
 
-#sidebarPanel a:hover {
+#sidebar a:hover {
     color: black;
 }
 
-- 
2.11.0