Trying to get float correct for cart and lists button

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 1f42c05..e15c2a3 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -847,7 +847,7 @@ a:active.nav {
 
 input.icon {
        background-position: left;
-       /*  background-repeat: no-repeat;  */
+       background-repeat: no-repeat;
        font-size : 96%;
        font-weight: bold;
        padding: 2px 2px 2px 22px;
@@ -961,31 +961,15 @@ width: 120px;
 }
 
 #fluid {
-float: right;
-width: 100%;
-margin-left: -120px;
-}
-
-#fluid-offset {
-margin-left: 119px;
+margin-left: 124px;
 margin-top : .4em;
+padding-left : 1em;
 }
 
-#fluid-content-1 {
-float: left;
-width: 65%;
-margin : .3em -1px 0 2%;
-display: inline /* fix IE6 */;
-line-height : 15px;
-}
-
-#fluid-content-2 {
-float: left;
-width: 28%;
-margin-left: 2%;
-display: inline /* fix IE6 */;
-margin-right: -1px /* fix IE6 */;
-line-height : 25px;
+#fluid-offset {
+margin-left: 125px;
+float : right;
+width: 100%;
 }
 
 .clearfix:after {
@@ -1033,10 +1017,11 @@ div.message {
 }
 
 #moresearches {
+       clear : left;
        color : #000099;
        font-size : 90%;
        line-height : 110%;
-       margin : .6em 0 .3em 2%;
+       margin : .6em 0 .3em 0;
 }
 
 #moresearches a:link, #moresearches a:visited {
@@ -1061,7 +1046,7 @@ div.message {
        background-image : url("../../images/listmenu-container-bg.gif");
        background-position : top right;
        background-repeat : repeat-y;
-       padding-right: 1em;
+       padding : .3em 1em 0 0;
        // margin : 3em 0 0 0;
 }
 #opac-main-search #listsmenu .yui-menu-shadow {
@@ -1170,10 +1155,15 @@ div#changelanguage a.yuimenuitemlabel {
 
 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 {
@@ -1181,7 +1171,7 @@ a#cartmenulink, a#cartmenulink:hover {
 }
 
 #opac-main-search input.submit {
-       background : #b8d0e6 url(../../images/submit-bg.gif) no-repeat 0 0;
+       background : #b8d0e6 url(../../images/submit-bg.gif) repeat-x 0 0;
        background-color : #b8d0e6;
        border-top: 1px solid #cccccc;
        border-left: 1px solid #cccccc;
@@ -1192,49 +1182,146 @@ a#cartmenulink, a#cartmenulink:hover {
        font-size : 80%;
        padding : 2px;
 }
-       .btn { display: block; position: relative; background: #aaa; padding: 5px; float: right; color: #fff; text-decoration: none; cursor: pointer; }
-       .btn * { font-style: normal; background-image: url('../../images/button-background.png'); background-repeat: no-repeat; display: block; position: relative; }
-       .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; }
+       .btn {
+       display : block;
+       position : relative;
+       background : #aaa;
+       padding : 5px;
+       color : #fff;
+       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 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: #6699FF; }
-       .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: 3px double #aaa; }
-       * html .btn.blue { border-color: #2ae; }
-       * html .btn.green { border-color: #9d4; }
-       * html .btn:hover { border-color: #a00; }
-       #cartmenulink { margin-right :  1em;    }
+       * html .btn i {
+       float : left;
+       width : auto;
+       background-image : none;
+       cursor : pointer;
+}
 
-       
-       div#menu {
-       border-right: 1px solid #979797;
-       font-size : 94%;
-       margin-right: .5em;
-       padding-top: 1em;
-       padding-bottom: 2em;
+       .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 : 3px double #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%;
+       margin-right : .5em;
+       padding-top : 1em;
+       padding-bottom : 2em;
+}
 
 div#menu li a {
-       text-decoration: none;
-       display: block;
+       text-decoration : none;
+       display : block;
        background : #EEE url(../../images/side-tab-gradient.gif) repeat-y top right;
-       border: 1px solid #979797;
-       font-size: 111%;
-       margin: .5em 0;
-       padding: .4em .3em;
-       margin-right :  -1px;
+       border : 1px solid #979797;
+       font-size : 111%;
+       margin : .5em 0;
+       padding : .4em .3em;
+       margin-right : -1px;
 }
 
 div#menu li a:hover {
@@ -1242,18 +1329,31 @@ div#menu li a:hover {
 }
 
 div#menu li.active a:hover {
-       background-color: #fff;
-       color :  #0000CC;
+       background-color : #fff;
+       color : #0000CC;
 }
 
 #menu ul li {
-       list-style-type: none;
+       list-style-type : none;
 }
 
 #menu ul li.active a {
-       background-color: #FFF;
+       background-color : #FFF;
        background-image : none;
-       border-right: 0;
-       font-weight: bold;
+       border-right : 0;
+       font-weight : bold;
+}
+
+.left {
+       float : left;
 }
 
+.right {
+       float : right;
+}
+
+#go {
+       cursor : default;
+       font-size : 87%;
+       margin-top : -.2em;
+}
\ No newline at end of file

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index e7cea15..1334b31 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -5,21 +5,15 @@
 
 <div id="opac-main-search" class="yui-g">
    <div id="masthead">
-<!-- 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>
+   <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>
    </div>
 
 <div id="fluid">
 <div id="fluid-offset">
-<div id="fluid-content-1">
-    <!-- TMPL_UNLESS NAME="advsearch" --><form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
-       <label for="masthead_search"> Search <!-- TMPL_IF name="mylibraryfirst" --> <!-- TMPL_IF name="loggedinusername" -->(in <!-- TMPL_VAR name="LoginBranchcode" --> only)<!-- /TMPL_IF --><!-- /TMPL_IF --></label>
-       <select name="idx" id="masthead_search">
-               <!-- TMPL_IF NAME="ms_kw" -->
+<!-- TMPL_UNLESS NAME="advsearch" --><form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
+       <label for="masthead_search" class="left"> Search <!-- TMPL_IF name="mylibraryfirst" --> <!-- TMPL_IF name="loggedinusername" -->(in <!-- TMPL_VAR name="LoginBranchcode" --> only)<!-- /TMPL_IF --><!-- /TMPL_IF --></label>
+       <select name="idx" id="masthead_search" class="left">
+       <!-- TMPL_IF NAME="ms_kw" -->
         <option selected="selected" value="">Library Catalog</option>
                <!-- TMPL_ELSE -->
         <option value="">Library Catalog</option>
@@ -53,32 +47,32 @@
         <option selected="selected" value="callnum">Call Number</option>
                <!-- TMPL_ELSE -->
         <option value="callnum">Call Number</option>
-               <!-- /TMPL_IF -->
-       </select>
-       <!-- TMPL_IF NAME="ms_value" -->
-        <input type="text" name="q" value="<!-- TMPL_VAR NAME="ms_value" -->"  style="width: 40%;" />
-       <!-- TMPL_ELSE -->
-        <input type="text" name="q" style="width: 40%;" />
-       <!-- /TMPL_IF -->
-       <!-- TMPL_IF name="mylibraryfirst" --><!-- TMPL_IF name="loggedinusername" -->
-               <input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
-       <!-- /TMPL_IF --><!-- /TMPL_IF -->
-               <input type="submit" value="Search" class="submit" />
-               
+               <!-- /TMPL_IF --></select>
+<!-- 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%;" />
+<!-- /TMPL_IF -->
+        <!-- TMPL_IF name="mylibraryfirst" --><!-- TMPL_IF name="loggedinusername" -->
+            <input name="limit" value="<!-- TMPL_VAR name="LoginBranchcode" -->" type="hidden" />
+        <!-- /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 -->
     </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>
+
+<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>
 <!-- TMPL_ELSE -->
 <div id="moresearches"><!-- 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><!-- /TMPL_UNLESS -->
 
 </div>
-<div id="fluid-content-2">
-<!--TMPL_IF NAME="virtualshelves" --><a class="btn blue" id="listsmenulink" href="#">Lists</a><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="opacbookbag" --><a id="cartmenulink" class="btn green" href="/cgi-bin/koha/opac-basket.pl">Cart<span id="basket"></span></a><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="opacbookbag" --><div id="cartDetails" style="visibility:hidden">Your cart is empty.</div><!-- /TMPL_IF -->
+</div>
+
+
+<!-- TMPL_IF NAME="opacbookbag" --><div id="cartDetails" style="display: none">Your cart is empty.</div><!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="virtualshelves" -->
-<div id="listsmenu" class="yuimenu">
+<div id="listsmenu" class="yuimenu" style="display: none">
     <div class="bd">
        <h4>Public Lists</h4>
                <!-- TMPL_IF NAME="barshelves" -->
@@ -99,37 +93,29 @@
                <!-- /TMPL_IF -->
 
                        <ul class="second-of-type">
-                       <li class="yuimenuitem"><a class="yuimenuitemlabel" href="/cgi-bin/koha/opac-shelves.pl">Manage Lists</a></li>
-                       </ul>
-<!-- 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 -->
+            <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 -->
          </div>
 </div>
 <!-- /TMPL_IF -->
-
-
 </div>
-</div>
-</div>
-
-</div>
-
        <div id="breadcrumbs" class="yui-g">
 
-<!-- TMPL_IF NAME="searchdesc" -->
-<p>
-  <!-- TMPL_IF NAME="total" --><strong>&ldquo;<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->&rdquo; </strong>returned <!-- TMPL_VAR NAME="total" --> results.
-       <!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="searchdesc" --><p><!-- TMPL_IF name="total" --><strong>&ldquo;<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->&rdquo; </strong>returned <!-- TMPL_VAR NAME="total" --> results. <!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->). <!-- /TMPL_IF -->
 
 <!-- TMPL_ELSE -->
-       <strong>No Result found !</strong>
-       </p><p>
-       <!-- TMPL_IF NAME="searchdesc" -->
+<!-- TMPL_IF NAME="searchdesc" -->
+<strong>No Result found !</strong>
+<p>
     No results match your search for <span style="font-weight: bold;">&ldquo;<!-- TMPL_VAR NAME="query_desc" --><!-- TMPL_VAR NAME="limit_desc" -->&rdquo;</span> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog.
-       <!-- TMPL_ELSE -->
+</p>
+<!-- TMPL_ELSE -->
+<strong> No result found !</strong>
+<p>
     You did not specify any search criteria.
-       <!-- /TMPL_IF -->
-       </p>
-  <!-- /TMPL_IF -->
+</p>
+</div>
 <!-- /TMPL_IF -->
+<!-- /TMPL_IF --></p><!-- /TMPL_IF -->
 </div>