From 35ad5e837eb01a9ccde028049480cc3ddc4cabc2 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 7 Feb 2008 00:11:44 -0600
Subject: [PATCH] Re-marking basket count with spans to avoid validation errors

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css      | 20 +++++++++++++++----
 .../opac-tmpl/prog/en/includes/masthead.inc   |  2 +-
 koha-tmpl/opac-tmpl/prog/en/js/basket.js      |  2 +-
 koha-tmpl/opac-tmpl/prog/en/js/script.js      |  3 ++-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 02fc171d88..2dba97d5e9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1183,20 +1183,32 @@ a#cartmenulink, a#cartmenulink:hover {
 	position : relative;
 }
 
-#cartmenulink.btn div {
+#cartmenulink.btn span#basket {
 	background-image : none;
 	display : inline;
+	height : auto;
+	position : relative;
+	margin : 0;
+	padding : 0;
+	left : auto;
+	right : auto;
+	top : auto;
 }
 
-#cartmenulink.btn div div {
+#cartmenulink.btn span#basket span {
 	background-image : none;
 	background-color : #E6FCB7;
 	color : #000;
 	display : inline;
 	font-size : 80%;
 	font-weight : normal;
-	margin : 0 .5em;
-	padding : 0 .3em;
+	height : auto;
+	left : auto;
+	margin : 0 .5em 0 .5em;
+	padding : 0 .3em 0 .3em;
+	position : relative;
+	right : auto;
+	top : auto;
 }
 
 #cartmenulink.btn img {
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 8efe8b97c4..858d375b5f 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -62,7 +62,7 @@
         <!-- /TMPL_IF --><!-- /TMPL_IF -->
         <input type="submit" value="Go" id="searchsubmit" class="btn blue left" />
 		<!-- TMPL_IF EXPR="opacbookbag || virtualshelves" -->
-<!-- TMPL_IF NAME="opacbookbag" --><a id="cartmenulink" class="btn green left" href="/cgi-bin/koha/opac-basket.pl">Cart<div id="basket"></div></a><!-- /TMPL_IF --><!--TMPL_IF NAME="virtualshelves" --><a class="btn blue left" id="listsmenulink" href="#">Lists</a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="opacbookbag" --><a id="cartmenulink" class="btn green left" href="/cgi-bin/koha/opac-basket.pl">Cart</a><!-- /TMPL_IF --><!--TMPL_IF NAME="virtualshelves" --><a class="btn blue left" id="listsmenulink" href="/cgi-bin/koha/opac-shelves.pl">Lists</a><!-- /TMPL_IF --><!-- /TMPL_IF -->
     </form>
 
 <div id="moresearches"><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a><!-- TMPL_IF name="OpacBrowser" --> | <a href="/cgi-bin/koha/opac-browser.pl">Browse by Hierarchy</a><!-- /TMPL_IF --><!-- TMPL_IF name="OpacAuthorities" --> | <a href="/cgi-bin/koha/opac-authorities-home.pl">Browse by Subject</a><!-- /TMPL_IF --><!-- TMPL_IF name="OpacCloud" --> | <a href="/cgi-bin/koha/opac-tags_subject.pl">Tag Cloud</a><!-- /TMPL_IF --><!-- TMPL_IF name="OpacTopissue" --> | <a href="/cgi-bin/koha/opac-topissues.pl">Most Popular</a><!-- /TMPL_IF --></div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/js/basket.js b/koha-tmpl/opac-tmpl/prog/en/js/basket.js
index 3c9e20c3cc..5505879b69 100644
--- a/koha-tmpl/opac-tmpl/prog/en/js/basket.js
+++ b/koha-tmpl/opac-tmpl/prog/en/js/basket.js
@@ -358,7 +358,7 @@ function showLess() {
 function updateBasket(updated_value,target) {
     if(typeof document.getElementById != "undefined") {
 		if(target.getElementById('basket')){
-        	target.getElementById('basket').innerHTML = "<div>"+updated_value+"</div>";
+        	target.getElementById('basket').innerHTML = "<span>"+updated_value+"</span>";
 		}
 		if(target.getElementById('cartDetails')){
 			target.getElementById('cartDetails').innerHTML = _("Your cart contains ")+updated_value+_(" items");
diff --git a/koha-tmpl/opac-tmpl/prog/en/js/script.js b/koha-tmpl/opac-tmpl/prog/en/js/script.js
index 76dfb1021f..018473f9f4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/js/script.js
+++ b/koha-tmpl/opac-tmpl/prog/en/js/script.js
@@ -83,7 +83,8 @@ YAHOO.util.Event.onContentReady("listsmenu", function () {
 	})
 	  
 	  $("#cartmenulink").find("i:first").before("<img src=\"/opac-tmpl/prog/images/cart.gif\" alt=\"\" />");
-	  $("#cartmenulink").find("i:last").before("<div id=\"basket\"></div>");
+	  $("#cartmenulink").find("i:last").before("<span id=\"basket\"></span>");
+	  
 	  $("#listsmenulink").find("i:last").before("<img src=\"/opac-tmpl/prog/images/list.gif\" alt=\"\" />");
 	  if(basketcount){ updateBasket(basketcount,document) }	
    
-- 
2.39.5