From 4debe83e60c49f2ab4290e19766469505f5e4a7e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sat, 1 Mar 2008 18:31:54 +1300 Subject: [PATCH] More corrections for the cart and lists buttons. Looking better in Internet Explorer now, but not perfect. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- koha-tmpl/opac-tmpl/prog/en/css/opac.css | 312 +++++++++--------- .../opac-tmpl/prog/en/includes/masthead.inc | 8 +- koha-tmpl/opac-tmpl/prog/en/js/script.js | 17 +- koha-tmpl/opac-tmpl/prog/images/cart.gif | Bin 338 -> 330 bytes 4 files changed, 165 insertions(+), 172 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css index 49a3c1c872..5ee87a5715 100644 --- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css +++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css @@ -1131,19 +1131,6 @@ div#changelanguage a.yuimenuitemlabel { text-align : center; } -a#listsmenulink, a#listsmenulink:hover { - color : #006699; - font-size : 105%; - line-height : 185%; -} - -a#cartmenulink, a#cartmenulink:hover { - color : #336600; - font-size : 105%; - line-height : 185%; - margin-left : 1.5em; -} - #login #userid, #login #password { width : 98%; } @@ -1161,154 +1148,6 @@ a#cartmenulink, a#cartmenulink:hover { padding : 2px; } -.btn { - display : block; - position : relative; - padding : 5px; - text-decoration : none; - cursor : default; - margin-left : .5em; -} - -.btn * { - font-style : normal; - background-image : url('../../images/button-background.png'); - background-repeat : no-repeat; - display : block; - position : relative; -} - -#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 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 .5em 0 .5em; - padding : 0 .3em 0 .3em; - position : relative; - right : auto; - top : auto; -} - -#cartmenulink.btn img { - background-image : none; - float : left; - padding : 3px 3px 0 3px; -} - -#listsmenulink.btn img { - background-image : none; - display : inline; - padding : 0 0 2px 3px; -} - -.btn i { - background-position : top left; - position : absolute; - margin-bottom : -5px; - top : 0; - left : 0; - width : 5px; - height : 5px; -} - -.btn span { - background-position : bottom left; - left : -5px; - padding : 0 0 5px 10px; - margin-bottom : -5px; -} - -.btn span i { - background-position : bottom right; - margin-bottom : 0; - position : absolute; - left : 100%; - width : 10px; - height : 100%; - top : 0; -} - -.btn span span { - background-position : top right; - position : absolute; - right : -10px; - margin-left : 10px; - top : -5px; - height : 0; -} - -* html .btn span, * html .btn i { - float : left; - width : auto; - background-image : none; - cursor : pointer; -} - -.btn.blue { - background : #9fbfff; -} - -.btn.blue:hover { - background-color : #6699FF; - background-image : none; -} - -.btn.green { - background : #98CB58; -} - -.btn.green:hover { - background-color : #98CB58; - background-image : none; -} - -.btn:active { - background-color : #444; -} - -.btn[class] { - background-image : url('../../images/button-background-gradient.png'); - background-position : 0 0; -} - -.btn[class]:hover { - background-image : url('../../images/button-background-gradient.png'); - background-position : 0 -200px; -} - -* html .btn { - border : 1px solid #aaa; -} - -* html .btn.blue { - border-color : #2ae; -} - -* html .btn.green { - border-color : #9d4; -} - -* html .btn:hover { - border-color : #a00; -} - div#menu { border-right : 1px solid #979797; font-size : 94%; @@ -1397,6 +1236,157 @@ div#menu li.active a:hover { width: 100px; } +#cartmenulink, #listsmenulink { + display : block; + position : relative; + background : #aaa; + padding : 5px; + float : left; + color : #333; + text-decoration : none; + cursor : pointer; +} + + #cartmenulink *, #listsmenulink * { + font-style : normal; + background-image : url(../../images/button-background.png); + background-repeat : no-repeat; + display : block; + position : relative; +} + + #cartmenulink i, #listsmenulink i { + background-position : top left; + position : absolute; + margin-bottom : -5px; + top : 0; + left : 0; + width : 5px; + height : 5px; +} + + #cartmenulink span, #listsmenulink span { + background-position : bottom left; + left : -5px; + padding : 0 0 5px 10px; + margin-bottom : -5px; +} + + #cartmenulink span i, #listsmenulink span i { + background-position : bottom right; + margin-bottom : 0; + position : absolute; + left : 100%; + width : 10px; + height : 100%; + top : 0; +} + + #cartmenulink span span, #listsmenulink span span { + background-position : top right; + position : absolute; + right : -10px; + margin-left : 10px; + top : -5px; + height : 0; +} + +* html #cartmenulink span, * html #cartmenulink i, * html #listsmenulink span, * html #listsmenulink i { + float : left; + width : auto; + background-image : none; + cursor : pointer; +} + +#listsmenulink { + background : #9FBFFF; +} + +#cartmenulink { + background : #98CB58; + color : #336600; + font-size : 105%; +} + +#cartmenulink:active, #listsmenulink:active { + background-color : #cc3399; +} + +#cartmenulink[class], #listsmenulink[class] { + background-image : url(../../images/button-background-gradient.png); + background-position : left top; +} + +#listsmenulink:hover { + background-color : #6699FF; +} + +#cartmenulink:hover { + background-color : #BFDE96; +} + +#cartmenulink img { + background-image : none; + display : inline; + padding : 3px 3px 0 3px; +} + +#cartmenulink span#basket { + background-image : none; + display : inline; + height : auto; + position : relative; + margin : 0; + padding : 0 5px 0 0; + left : auto; + right : auto; + top : auto; +} + +#cartmenulink span#basket span { + background-image : none; + background-color : #E6FCB7; + color : #000; + display : inline; + font-size : 80%; + font-weight : normal; + margin : 0 0 0 .9em; + padding : 0 .3em 0 .3em; + position : relative; + right : auto; + top : auto; +} + +a#listsmenulink, a#listsmenulink:hover { + color : #006699; + font-size : 105%; + font-weight : bold; + line-height : 185%; + margin-left : 1.5em; +} + +a#cartmenulink, a#cartmenulink:hover { + color : #336600; + font-size : 105%; + font-weight : bold; + line-height : 185%; + margin-left : 1.5em; +} + +#listsmenulink img { + background-image : none; + display : inline; + padding : 0 0 2px 0; +} + +* html #cartmenulink { + border : 1px solid #66ff00; +} + +* html #listsmenulink { + border : 1px solid #99ccff; +} + ul.ui-tabs-nav li { margin-right : .5em; } diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc index ba4bb10807..16b2b5abab 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -62,7 +62,13 @@ -Lists + + Cart + +Lists + + + diff --git a/koha-tmpl/opac-tmpl/prog/en/js/script.js b/koha-tmpl/opac-tmpl/prog/en/js/script.js index e14d88f5cf..1c7c925a95 100644 --- a/koha-tmpl/opac-tmpl/prog/en/js/script.js +++ b/koha-tmpl/opac-tmpl/prog/en/js/script.js @@ -68,8 +68,8 @@ YAHOO.util.Event.onContentReady("listsmenu", function () { $("#listsmenu").css("display","block").css("visibility","hidden"); $("#cartDetails").css("display","block").css("visibility","hidden"); - $("#cmspan").html("Cart"); - if(!$.browser.msie){ +/* $("#cmspan").html("Cart");*/ + /*if(!$.browser.msie){ $('.btn').each(function(){ var b = $(this); var tt = b.text() || b.val(); @@ -80,15 +80,15 @@ YAHOO.util.Event.onContentReady("listsmenu", function () { b.text('').css({cursor:'pointer'}). prepend('') .append( $('').text(tt).append('') ); }); - } + }*/ $("#searchsubmit").click(function(){ $("#searchform").submit(); }) - +/* $("#cartmenulink").find("i:first").before("\"\""); $("#cartmenulink").find("i:last").before(""); - $("#listsmenulink").find("i:last").before("\"\""); + $("#listsmenulink").find("i:last").before("\"\"");*/ if(basketcount){ updateBasket(basketcount,document) } var listMenu = new YAHOO.widget.Menu("listsmenu", { lazyload: true }); @@ -101,11 +101,8 @@ YAHOO.util.Event.onContentReady("listsmenu", function () { } YAHOO.util.Event.addListener("listsmenulink", "click", listMenu.show, null, listMenu); YAHOO.widget.Overlay.windowResizeEvent.subscribe(positionlistMenu); - $("#cartmenulink").find("a").append(""); - $("#searchsubmit").click(function(){ - $("#searchform").submit(); - }) - +/* $("#cartmenulink").find("a").append("");*/ + if(basketcount){ updateBasket(basketcount,document) } diff --git a/koha-tmpl/opac-tmpl/prog/images/cart.gif b/koha-tmpl/opac-tmpl/prog/images/cart.gif index bad8ac36c2597c5f5c28bbd37cf24e884d026510..560cc288f976dacc5e2ee8e7c8ce3f56d9e8fb9e 100644 GIT binary patch delta 130 zcmcb_bc%`7-P6s&GLesgZzAW#0wBe}z?Sa7)#|Dv)!Bdi)d`h(vwWBqU33tz;NWod zzQe-Qn*T~#Pe7c>QKMI^frWd~5~G iFi)N8qbd>LF0MA)MTMPj5gQvjn>!cRN+lOZ25SJ3>mv35 delta 138 zcmV;50CoS$0@4BrM@dFFIbjw65RnPdcoqN<000JWK$dVwEEvw4~( z35Z4mLEs=D1aNZ`2o%bx^10Al2n3