Still working on YUI cart/lists buttons

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
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 78451b6..f58bcbc 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -1301,8 +1301,15 @@ body #opac-main-search #searchsubmit.yui-button {
 }
 
 body #opac-main-search #cartmenulink.yui-button , body #opac-main-search #listsmenulink.yui-button  {
+       font-size:105%;
        margin-bottom : -1em;
        margin-left : 1em;
+       line-height:185%;
+}
+
+a#cartmenulink, a#cartmenulink:hover {
+}
+a#listsmenulink, a#listsmenulink:hover {
 }
 
 body #opac-main-search #cartmenulink.yui-button {
@@ -1315,6 +1322,7 @@ body #opac-main-search #listsmenulink.yui-button {
        background-image : url(../../images/lists-button-background.gif);
        background-position : top left;
        background-repeat : repeat;
+       color:#006699;
 }
 
 body #opac-main-search #cartmenulink.yui-button a {
@@ -1323,6 +1331,43 @@ body #opac-main-search #cartmenulink.yui-button a {
        background-image : url(../../images/cart2.gif);
        background-repeat: no-repeat;
        background-position: left;
+       color:#336600;
+}
+
+body #opac-main-search #listsmenulink.yui-button a {
+       background-image : url(../../images/list.gif);
+       background-position : right;
+       background-repeat : no-repeat;
+       margin-right : 10px;
+       padding-right : 10px;
+}
+
+body #opac-main-search #cartmenulink.yui-button span#basket {
+       background-image : none;
+       display : inline;
+       height : auto;
+       position : relative;
+       margin : 0;
+       padding : 0;
+       left : auto;
+       right : auto;
+       top : auto;
+}
+
+body #opac-main-search #cartmenulink.yui-button span#basket span {
+       background-image : none;
+       background-color : #E6FCB7;
+       color : #000;
+       display : inline;
+       font-size : 80%;
+       font-weight : normal;
+       height : auto;
+       left : auto;
+       margin : 0 0 0 .5em;
+       padding : 0 .3em 0 .3em;
+       position : relative;
+       right : auto;
+       top : auto;
 }
 
 #export {

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 985d662..64bc039 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -64,7 +64,7 @@
         <!-- /TMPL_IF --><!-- /TMPL_IF -->
         <input type="submit" value="Go" id="searchsubmit" class="left" />
                <!-- TMPL_IF EXPR="opacbookbag || virtualshelves" -->
-<!-- TMPL_IF NAME="opacbookbag" --><span id="cmspan"></span><!-- /TMPL_IF --><!--TMPL_IF NAME="virtualshelves" --><a class="left" id="listsmenulink" href="/cgi-bin/koha/opac-shelves.pl">Lists</a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="opacbookbag" --><span id="cmspan"></span><!-- /TMPL_IF --><!--TMPL_IF NAME="virtualshelves" --><span id="listsmenulinkc"><a class="left" id="listsmenulink" href="/cgi-bin/koha/opac-shelves.pl">Lists</a></span><!-- /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/script.js b/koha-tmpl/opac-tmpl/prog/en/js/script.js
index 493df31..2a8e158 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/js/script.js
+++ b/koha-tmpl/opac-tmpl/prog/en/js/script.js
@@ -69,21 +69,15 @@ YAHOO.util.Event.onContentReady("listsmenu", function () {
     $("#cartDetails").css("display","block").css("visibility","hidden");
 
        $("#cmspan").html("<a id=\"cartmenulink\" class=\"left\" href=\"/cgi-bin/koha/opac-basket.pl\">Cart</a>");
+       $("#listsmenulinkc").empty();
            new YAHOO.widget.Button("searchsubmit");
            new YAHOO.widget.Button("cartmenulink");
-           new YAHOO.widget.Button("listsmenulink");
-       $("#cartmenulink").find("a").append(" <span class=\"cartcount\" style=\"background-color : #FFC; font-size : 79%; padding: 2px;\">18</span>");
-       $("#searchsubmit").click(function(){
-               $("#searchform").submit();
-       })
-         
-        // $("#cartmenulink").find("i:first").before("<img src=\"/opac-tmpl/prog/images/cart.gif\" alt=\"\" />");
-        // $("#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) } 
-   
-        var listMenu = new YAHOO.widget.Menu("listsmenu", { lazyload: true });
+               new YAHOO.widget.Button({  
+                                   type: "link",  
+                                   id: "listsmenulink",  
+                                   label: "Lists",
+                                   container: "listsmenulinkc" }); 
+       var listMenu = new YAHOO.widget.Menu("listsmenu", { lazyload: true });
                listMenu.render();
                listMenu.cfg.setProperty("context", ["listsmenulink", "tr", "br"]);
                listMenu.cfg.setProperty("effect",{effect:YAHOO.widget.ContainerEffect.FADE,duration:0.05});
@@ -92,7 +86,15 @@ YAHOO.util.Event.onContentReady("listsmenu", function () {
                     listMenu.align("tr", "br");
                }
                YAHOO.util.Event.addListener("listsmenulink", "click", listMenu.show, null, listMenu);
-               YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionlistMenu);
+               YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionlistMenu);     
+       $("#cartmenulink").find("a").append("<span id=\"basket\"></span>");
+       $("#searchsubmit").click(function(){
+               $("#searchform").submit();
+       })
+         
+         if(basketcount){ updateBasket(basketcount,document) } 
+   
+        
     });
     
 function init() {