From e63ac283ebe2e537c98c905e52b09595f72d767d Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 19 Jan 2010 10:06:31 -0500
Subject: [PATCH] Fix for Bug 3951, Menu a mess in WebKit browsers

- removing inline image in favor of CSS background (inline image
  is used in the OPAC to better work with cart button css
- adding "display:none" to "more" menu. "visibility:hidden" by
  itself creates unwanted whitespace in WebKit browsers
- adding explicit width to toplevelmenu to correct display
  problem in WebKit browsers
---
 .../intranet-tmpl/prog/en/css/staff-global.css     | 14 ++++++++------
 .../intranet-tmpl/prog/en/includes/header.inc      |  2 +-
 koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 83ef418f98..548c1690fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -1546,6 +1546,7 @@ a.yuimenuitemlabel:hover {
 #toplevelnav {
 	float : left;
 	margin-left : .5em;
+	width : 30em;
 }
 
 ul#toplevelmenu {
@@ -1829,15 +1830,16 @@ h1#xml a {
 	text-align : center;
 	width : 180px;
 }
+#cartmenulink {
+        background: transparent url("../../img/cart-small.gif") 0 3px no-repeat;
+        padding-left : 15px;
+}
 #cartmenulink span#basketcount span {
 	display : inline;
 	font-size : 90%;
 	font-weight : normal;
 	padding : 0;
 }
-
-#cartmenulink img {
-	background-image : none;
-	display : inline;
-	padding : 3px 6px 0 0;
-}
\ No newline at end of file
+#moremenu {
+        display : none;
+}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 8e0320f5ce..95ce8dd83c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -7,7 +7,7 @@
                 <!-- TMPL_IF NAME="CAN_user_borrowers" --><li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="CAN_user_catalogue" --><li><a href="/cgi-bin/koha/catalogue/search.pl">Search</a></li><!-- /TMPL_IF -->
                 <!-- TMPL_IF NAME="intranetbookbag" -->
-                    <li><a href="#" id="cartmenulink"><img src="/intranet-tmpl/prog/img/cart-small.gif" alt="" border="0" />Cart<span id="basketcount"></span></a></li>
+                    <li><a href="#" id="cartmenulink">Cart<span id="basketcount"></span></a></li>
                 <!-- /TMPL_IF -->
                 <!-- TMPL_VAR name="IntranetNav" -->
                 <li class="more">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index 7810beff77..93a1d2bf40 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -31,6 +31,7 @@ function _(s) { return s } // dummy function for gettext
 				function onShowMoreClick(p_oEvent) {
                     // Position and display the menu        
                     positionoMoremenu();
+                        $("#moremenu").show();
                     oMoremenu.show();
                     // Stop propagation and prevent the default "click" behavior
                     YAHOO.util.Event.stopEvent(p_oEvent);	
-- 
2.39.5