From ca8911effe060c86fb7ec26dfc83e424a7dc0a37 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 27 Jul 2010 20:09:29 -0600
Subject: [PATCH] Some sidebar fixes

---
 horde/js/sidebar.js     | 10 +++++++---
 horde/themes/screen.css |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/horde/js/sidebar.js b/horde/js/sidebar.js
index 0cfa7c547..628f9841b 100644
--- a/horde/js/sidebar.js
+++ b/horde/js/sidebar.js
@@ -11,7 +11,11 @@ var HordeSidebar = {
 
     getCookie: function(name, deflt)
     {
-        var cookie = document.cookie.toQueryParams(';');
+        var cookie = document.cookie.toQueryParams('; ');
+        if (!cookie) {
+            cookie = document.cookie.toQueryParams(';');
+        }
+
         return cookie[name]
             ? unescape(cookie[name])
             : deflt;
@@ -39,7 +43,7 @@ var HordeSidebar = {
 
         // Expire in one year.
         expires.setTime(expires.getTime() + 31536000000);
-        document.cookie = 'horde_sidebar_expanded=' + !expanded + ';DOMAIN=' + this.domain + ';PATH=' + this.path + ';expires=' + expires.toGMTString();
+        document.cookie = 'horde_sidebar_expanded=' + Number(!expanded) + ';DOMAIN=' + this.domain + ';PATH=' + this.path + ';expires=' + expires.toGMTString();
     },
 
     updateSidebar: function()
@@ -69,7 +73,7 @@ var HordeSidebar = {
 
 document.observe('dom:loaded', function() {
     $('hiddenSidebar').hide();
-    if (HordeSidebar.getCookie('horde_sidebar_expanded', true).toString() != $('expandedSidebar').visible().toString()) {
+    if (HordeSidebar.getCookie('horde_sidebar_expanded', 1) != Number($('expandedSidebar').visible())) {
         HordeSidebar.toggleSidebar();
     }
     if (HordeSidebar.refresh) {
diff --git a/horde/themes/screen.css b/horde/themes/screen.css
index 5c603b08d..e16762b60 100644
--- a/horde/themes/screen.css
+++ b/horde/themes/screen.css
@@ -478,6 +478,10 @@ div.nicetitle {
     color: #000;
 }
 
+#hiddenSidebar img {
+    padding-right: 2px;
+}
+
 /* Main body. */
 .body {
     position: absolute;
-- 
2.11.0