Fixes for cart functionality, including additions to update cart toolip window

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index b544432..0ce0b5a 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1210,7 +1210,9 @@ div#changelanguage a.yuimenuitemlabel {
 #cartDetails {
        background-color : #FFF;
        border: 1px solid black;
-       padding : .5em;
+       color : black;
+       padding : .1em;
+       text-align : center;
 }
 
 body #listsmenulink.yui-button {

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
index e21907d..21f4c5b 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -27,13 +27,21 @@
 <script type="text/javascript" language="javascript">
        //<![CDATA[
     function _(s) { return s } // dummy function for gettext
-    var MSG_BASKET_EMPTY = _("You book bag is currently empty");
-    var MSG_RECORD_IN_BASKET = _("This item is already in your book bag");
-    var MSG_RECORD_ADDED = _("This item has been added to your book bag");
-    var MSG_NRECORDS_ADDED = _(" item(s) added to your book bag");
+    var MSG_BASKET_EMPTY = _("You cart is currently empty");
+    var MSG_RECORD_IN_BASKET = _("This item is already in your cart");
+    var MSG_RECORD_ADDED = _("This item has been added to your cart");
+    var MSG_NRECORDS_ADDED = _(" item(s) added to your cart");
     var MSG_NRECORDS_IN_BASKET = _("already in the bag");
     var MSG_NO_RECORD_SELECTED = _("No item was selected");
-    var MSG_NO_RECORD_ADDED = _("No item was added to your book bag");
+    var MSG_NO_RECORD_ADDED = _("No item was added to your cart");
+    var MSG_CONFIRM_DEL_BASKET = "Are you sure you want to empty your cart?"
+    var MSG_CONFIRM_DEL_RECORDS = "Are you sure you want to remove the selected items?";
+       $(document).ready(function(){
+               $('#cartmenulink').click(function(){
+                       openBasket(); return false;
+               });
+       });
+
        <!-- TMPL_IF NAME="AmazonContent" -->$(window).load(function() {
                        verify_images();
                 });<!-- /TMPL_IF -->

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 480ce8e..f7eb8c4 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -60,8 +60,6 @@
         <!-- /TMPL_IF --><!-- /TMPL_IF -->
         <input type="submit" value="Search" class="submit" />
     </form>
-
-<!--   <!-- TMPL_IF NAME="opacbookbag" --><a class="cart" href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF --> -->
        
        <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>
 
@@ -87,24 +85,29 @@ $(document).ready(function() {
     });<!-- /TMPL_IF -->
     
                <!-- TMPL_IF NAME="opacbookbag" -->function init() {
+                       
                        var cartOverlay = new YAHOO.widget.Overlay("cartDetails", { context:["cartmenulink","tr","br"],
-                                                                                                                                                                         visible:false,
-                                                                                                                                                                         width:"200px" } );
-                       // cartOverlay.setHeader("Overlay #3 from Script");
-                       cartOverlay.setBody("Your cart contains 3 items.");
-                       // cartOverlay.setFooter("End of Overlay #3");
-                       cartOverlay.render(document.body);
+                                                                                                                                         visible:false,
+                                                                                                                                         width:"200px" } );
+                       cartOverlay.render();
+                       
+       //              var cartOverlay = new YAHOO.widget.Overlay("cartDetails", { context:["cartmenulink","tr","br"],
+       //                                                                                                                                                                visible:false,
+       //                                                                                                                                                                width:"200px" } );
+       //              cartOverlay.setBody("Your cart has "+basketcount+" items in it");
+       //              cartOverlay.render(document.body);
 
                        YAHOO.util.Event.addListener("cartmenulink", "mouseover", cartOverlay.show, cartOverlay, true);
                        YAHOO.util.Event.addListener("cartmenulink", "mouseout", cartOverlay.hide, cartOverlay, true);
+                       YAHOO.util.Event.addListener("cartmenulink", "click", cartOverlay.hide, cartOverlay, true);
                }
 
                YAHOO.util.Event.addListener(window, "load", init);<!-- /TMPL_IF -->
 </script>
 
-<!-- TMPL_IF NAME="opacbookbag" --><a id="cartmenulink" href="#">Cart<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="opacbookbag" --><a id="cartmenulink" href="/cgi-bin/koha/opac-basket.pl">Cart<span id="basket"></span></a><!-- /TMPL_IF -->
 <!--TMPL_IF NAME="virtualshelves" --><a id="listsmenulink" href="#">Lists</a><!-- /TMPL_IF -->
-
+<!-- TMPL_IF NAME="opacbookbag" --><div id="cartDetails" style="visibility:hidden">Your cart is empty.</div><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="virtualshelves" -->
 <div id="listsmenu" class="yuimenu">
     <div class="bd">

diff --git a/koha-tmpl/opac-tmpl/prog/en/js/basket.js b/koha-tmpl/opac-tmpl/prog/en/js/basket.js
index 9aa460e..1a39aa6 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/js/basket.js
+++ b/koha-tmpl/opac-tmpl/prog/en/js/basket.js
@@ -11,7 +11,7 @@ var valCookie = readCookie(nameCookie);
 if(valCookie){
     var arrayRecords = valCookie.split("/");
     if(arrayRecords.length > 0){
-        var basketcount = " ("+(arrayRecords.length-1)+")";
+        var basketcount = arrayRecords.length-1;
     } else {
         var basketcount = "";
     }
@@ -357,7 +357,12 @@ function showLess() {
 
 function updateBasket(updated_value,target) {
     if(typeof document.getElementById != "undefined") {
-        target.getElementById('basket').innerHTML = " ("+updated_value+")";
+               if(target.getElementById('basket')){
+               target.getElementById('basket').innerHTML = " ("+updated_value+")";
+               }
+               if(target.getElementById('cartDetails')){
+                       target.getElementById('cartDetails').innerHTML = _("Your cart contains ")+updated_value+_(" items");
+               }
     } else if (typeof document.layers != "undefined") {
         target.layers['basket'].open();
         target.layers['basket'].write(" ("+updated_value+")");
@@ -366,6 +371,7 @@ function updateBasket(updated_value,target) {
 document.getElementById == "undefined") {
         target.all['basket'].innerHTML = " ("+updated_value+")";
     }
+       var basketcount = updated_value;
 }
 
 function openBiblio(dest,biblionumber) {

diff --git a/koha-tmpl/opac-tmpl/prog/en/js/script.js b/koha-tmpl/opac-tmpl/prog/en/js/script.js
index 006c826..4330224 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/js/script.js
+++ b/koha-tmpl/opac-tmpl/prog/en/js/script.js
@@ -35,24 +35,23 @@ function confirmDelete(message) {
 function Dopop(link) {
        newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
 }
+
+$(document).ready(function(){
+       if(basketcount){ updateBasket(basketcount,document) }   
+});
        
 YAHOO.util.Event.onContentReady("changelanguage", function () {
                 var oMenu = new YAHOO.widget.Menu("sublangs", { zindex: 2 });
-
                    function positionoMenu() {
                     oMenu.align("bl", "tl");
                 }
-
                 oMenu.subscribe("beforeShow", function () {
                     if (this.getRoot() == this) {
                                                positionoMenu();
                     }
                 });
-
                 oMenu.render();
-
                                oMenu.cfg.setProperty("context", ["showlang", "bl", "tl"]);
-
                                function onYahooClick(p_oEvent) {
                     // Position and display the menu        
                     positionoMenu();
@@ -60,8 +59,6 @@ YAHOO.util.Event.onContentReady("changelanguage", function () {
                     // Stop propagation and prevent the default "click" behavior
                     YAHOO.util.Event.stopEvent(p_oEvent);
                 }
-
                                YAHOO.util.Event.addListener("showlang", "click", onYahooClick);
-
                                YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionoMenu);
             });
\ No newline at end of file

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
index 009f38f..8b03e7a 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Sending Your Book Bag
-<!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding: 1em;">
 <!-- TMPL_IF NAME="email_add" -->