Fixes for display of cart contents number, other minor markup corrections

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 e15c2a3..02fc171 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -278,11 +278,11 @@ p.availability {
 
 /* css styles for reserves color alerts */
 .onloan {
-       background-color : #FFED3D;
+       background-color : #eeeeee;
 }
 
 .other {
-       background-color : #FF0000;
+       background-color : #ffcccc;
 }
 
 /* "problem" enhancement */
@@ -416,26 +416,19 @@ a .term {
        border-top : 1px solid #335599;
        border-bottom : 1px solid #335599;
        padding : .7em 0 .4em .5em;
-       color : #FFFFCC;
        font-size : 108%;
        line-height : 116%;
 }
 
-#opac-main-search a, #opac-main-search a, #opac-main-search a:visited {
-       color : #FFFFCC;
-}
-
-#opac-main-search a:hover {
-       color : #FFFFFF;
-}
-
 #opac-main-search form {
        display : inline;
        padding-right : 1em;
 }
 
 #opac-main-search label {
+       color : #FFFFCC;
        font-weight : bold;
+       margin : .2em .3em 0 0;
 }
 
 
@@ -846,22 +839,12 @@ a:active.nav {
 }
 
 input.icon {
-       background-position: left;
-       background-repeat: no-repeat;
-       font-size : 96%;
-       font-weight: bold;
-       padding: 2px 2px 2px 22px;
-       background-color: #6699CC;
-       border: 1px outset #666666;
-       color: #FFFFCC;
 }
 
 input.shelf, a.shelf {
-       background-image: url(../../images/addtobasket.gif);
 }
 
 input.clearall, a.clearall {
-       background-image: url(../../images/clearbasket.gif);
 }
 
 /* Tabs */
@@ -1149,7 +1132,7 @@ div#changelanguage a.yuimenuitemlabel {
        background-color : #FFF;
        border: 1px solid #739acf;
        color : black;
-       padding : .1em;
+       padding : .3em;
        text-align : center;
 }
 
@@ -1182,18 +1165,17 @@ a#cartmenulink, a#cartmenulink:hover {
        font-size : 80%;
        padding : 2px;
 }
-       .btn {
+
+.btn {
        display : block;
        position : relative;
-       background : #aaa;
        padding : 5px;
-       color : #fff;
        text-decoration : none;
        cursor : default;
        margin-left : .5em;
 }
 
-       .btn * {
+.btn * {
        font-style : normal;
        background-image : url('../../images/button-background.png');
        background-repeat : no-repeat;
@@ -1201,6 +1183,22 @@ a#cartmenulink, a#cartmenulink:hover {
        position : relative;
 }
 
+#cartmenulink.btn div {
+       background-image : none;
+       display : inline;
+}
+
+#cartmenulink.btn div div {
+       background-image : none;
+       background-color : #E6FCB7;
+       color : #000;
+       display : inline;
+       font-size : 80%;
+       font-weight : normal;
+       margin : 0 .5em;
+       padding : 0 .3em;
+}
+
 #cartmenulink.btn img {
        background-image : none;
        float : left;
@@ -1213,7 +1211,7 @@ a#cartmenulink, a#cartmenulink:hover {
        padding : 0 0 2px 3px;
 }
 
-       .btn i {
+.btn i {
        background-position : top left;
        position : absolute;
        margin-bottom : -5px;
@@ -1223,14 +1221,14 @@ a#cartmenulink, a#cartmenulink:hover {
        height : 5px;
 }
 
-       .btn span {
+.btn span {
        background-position : bottom left;
        left : -5px;
        padding : 0 0 5px 10px;
        margin-bottom : -5px;
 }
 
-       .btn span i {
+.btn span i {
        background-position : bottom right;
        margin-bottom : 0;
        position : absolute;
@@ -1240,7 +1238,7 @@ a#cartmenulink, a#cartmenulink:hover {
        top : 0;
 }
 
-       .btn span span {
+.btn span span {
        background-position : top right;
        position : absolute;
        right : -10px;
@@ -1249,59 +1247,58 @@ a#cartmenulink, a#cartmenulink:hover {
        height : 0;
 }
 
-       * html .btn span,
-       * html .btn i {
+* html .btn span,      * html .btn i {
        float : left;
        width : auto;
        background-image : none;
        cursor : pointer;
 }
 
-       .btn.blue {
+.btn.blue {
        background : #9fbfff;
 }
 
-       .btn.blue:hover {
+.btn.blue:hover {
        background-color : #6699FF;
        background-image : none;
 }
 
-       .btn.green {
+.btn.green {
        background : #98CB58;
 }
 
-       .btn.green:hover {
+.btn.green:hover {
        background-color : #98CB58;
        background-image : none;
 }
 
-       .btn:active {
+.btn:active {
        background-color : #444;
 }
 
-       .btn[class] {
+.btn[class] {
        background-image : url('../../images/button-background-gradient.png');
        background-position : 0 0;
 }
 
-        .btn[class]:hover {
+.btn[class]:hover {
        background-image : url('../../images/button-background-gradient.png');
        background-position : 0 -200px;
 }
 
-       * html .btn {
+* html .btn {
        border : 3px double #aaa;
 }
 
-       * html .btn.blue {
+* html .btn.blue {
        border-color : #2ae;
 }
 
-       * html .btn.green {
+* html .btn.green {
        border-color : #9d4;
 }
 
-       * html .btn:hover {
+* html .btn:hover {
        border-color : #a00;
 }
 

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 784eb1b..8efe8b9 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -5,7 +5,11 @@
 
 <div id="opac-main-search" class="yui-g">
    <div id="masthead">
-   <h1 id="libraryname" <!-- TMPL_IF NAME="opacsmallimage" -->style="background-image: url('<!-- TMPL_VAR NAME="opacsmallimage" -->');"><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-main.pl"><!-- TMPL_IF NAME="LibraryName" --><!-- TMPL_VAR NAME="LibraryName" --><!-- TMPL_ELSE -->Koha Online Catalog<!-- /TMPL_IF --></a></h1>
+   <!-- TMPL_IF NAME="opacsmallimage" -->
+   <h1 id="libraryname" style="background-image: url('<!-- TMPL_VAR NAME="opacsmallimage" -->');">
+   <!-- TMPL_ELSE -->
+   <h1 id="libraryname">
+   <!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-main.pl"><!-- TMPL_IF NAME="LibraryName" --><!-- TMPL_VAR NAME="LibraryName" --><!-- TMPL_ELSE -->Koha Online Catalog<!-- /TMPL_IF --></a></h1>
    </div>
 
 <div id="fluid">
@@ -51,7 +55,7 @@
 <!-- TMPL_IF NAME="ms_value" -->
         <input type="text" name="q" value="<!-- TMPL_VAR NAME="ms_value" -->" class="left" style="width: 40%;" />
 <!-- TMPL_ELSE -->
-        <input type="text" name="q" class="left" style="width: 35%;" />
+        <input type="text" name="q" class="left" style="width: 35%; font-size: 111%;" />
 <!-- /TMPL_IF -->
         <!-- TMPL_IF name="mylibraryfirst" --><!-- TMPL_IF name="loggedinusername" -->
             <input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
@@ -94,7 +98,7 @@
                        <ul class="second-of-type">
             <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl">Manage Lists</a></li>
         </ul>
-               </li><!-- TMPL_ELSE --><ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Create Your Own Lists</a></li></ul><!-- /TMPL_IF -->
+               <!-- TMPL_ELSE --><ul class="first-of-type"><li><a href="/cgi-bin/koha/opac-user.pl">Log in to Create Your Own Lists</a></li></ul><!-- /TMPL_IF -->
          </div>
 </div>
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/opac-tmpl/prog/en/js/basket.js b/koha-tmpl/opac-tmpl/prog/en/js/basket.js
index 1a39aa6..3c9e20c 100644 (file)
--- 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 = " ("+updated_value+")";
+               target.getElementById('basket').innerHTML = "<div>"+updated_value+"</div>";
                }
                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 9a3ad7f..76dfb10 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/js/script.js
+++ b/koha-tmpl/opac-tmpl/prog/en/js/script.js
@@ -37,7 +37,6 @@ function Dopop(link) {
 }
 
 $(document).ready(function(){
-       if(basketcount){ updateBasket(basketcount,document) }   
        $(".close").click(function(){
                window.close();
        });
@@ -84,7 +83,9 @@ 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>");
          $("#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 });
                listMenu.render();

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 76a4edf..63d039b 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -215,7 +215,7 @@ $(document).ready(function(){
                                        </span>
                                </p>
 
-                               <p><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!--TMPL_IF EXPR="opacbookbag || virtualshelves" --><input type="checkbox" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" title="Click to add to cart" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><!-- /TMPL_IF --><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR NAME="ccode" -->" /><!--TMPL_IF EXPR="opacbookbag || virtualshelves" --></label><!-- /TMPL_IF --> <!-- TMPL_IF name="classification" -->
+                               <p><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!--TMPL_IF EXPR="opacbookbag || virtualshelves" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" title="Click to add to cart" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"><!-- /TMPL_IF --><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="Item Type <!-- TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR NAME="ccode" -->" /><!--TMPL_IF EXPR="opacbookbag || virtualshelves" --></label><!-- /TMPL_IF --> <!-- TMPL_IF name="classification" -->
                                     <a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->">
                                         <!-- TMPL_VAR NAME="classification" -->
                                     </a>