Removing some unused include files; Correcting nomenclature for cart; hiding quick...

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 253cf9c..1b20e5e 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -632,10 +632,6 @@ fieldset.brief div.hint, fieldset.rows div.hint {
        margin : .4em;
 }
 
-#menu {
-       margin-top: 1em;
-}
-
 h2 span.hint {
        font-size: 76%;
        font-weight : normal;
@@ -649,10 +645,6 @@ a.cancel {
        padding-left : 1em;
 }
 
-#usermenu {
-       margin-top : 1em;
-}
-
 #toolbar ul {
        margin : 1em 0 0 0;
        padding : 0;
@@ -1222,4 +1214,43 @@ a#cartmenulink, a#cartmenulink:hover {
        * html .btn.blue { border-color: #2ae; }
        * html .btn.green { border-color: #9d4; }
        * html .btn:hover { border-color: #a00; }
-       #cartmenulink { margin-right :  1em;    }
\ No newline at end of file
+       #cartmenulink { margin-right :  1em;    }
+       
+       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;
+       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;
+}
+
+div#menu li a:hover {
+       background : #E8F0F6 url(../../images/side-tab-gradient-hover.gif) repeat-y top right;
+}
+
+div#menu li.active a:hover {
+       background-color: #fff;
+       color :  #0000CC;
+}
+
+#menu ul li {
+       list-style-type: none;
+}
+
+#menu ul li.active a {
+       background-color: #FFF;
+       background-image : none;
+       border-right: 0;
+       font-weight: bold;
+}
\ No newline at end of file

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
deleted file mode 100644 (file)
index 5f0868d..0000000
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket-print.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
-<meta http-equiv="Content-Language" content="en-us" />
-<style type="text/css"> 
-    @import url(<!-- TMPL_VAR NAME="themelang" -->/css/print.css);
-</style>
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/script.js"></script>
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"></script>
-    <script type="text/javascript" language="javascript">
-        var MSG_NO_RECORD_SELECTED = "No biblio selected";
-        var MSG_NO_RECORD_ADDED = "No biblio added";
-        var MSG_CONFIRM_DEL_BASKET = "Are you sure you want to empty your book bag?"
-        var MSG_CONFIRM_DEL_RECORDS = "Are you sure you want to remove the selected items?";
-    </script>
\ No newline at end of file

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc
deleted file mode 100644 (file)
index 0241f39..0000000
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-basket.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="Content-Language" content="en-us" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
-<!-- TMPL_IF name="opacstylesheet" --><style type="text/css"> 
-            @import url(<!-- TMPL_VAR NAME="opacstylesheet" -->);
-        </style>
-<!-- TMPL_ELSE -->
-<!-- TMPL_IF name="opaccolorstylesheet" -->
-        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
-    <!-- TMPL_ELSE -->
-        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/opac.css" />
-    <!-- /TMPL_IF -->
-    <style type="text/css">
-        @import url(<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
-    </style>
-<!-- /TMPL_IF -->
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/script.js" ></script>
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js" ></script>
-<script type="text/javascript" language="javascript">
-    var MSG_NO_RECORD_SELECTED = "No biblio selected";
-    var MSG_NO_RECORD_ADDED = "No biblio added";
-    var MSG_CONFIRM_DEL_BASKET = "Are you sure you want to empty your book bag?"
-    var MSG_CONFIRM_DEL_RECORDS = "Are you sure you want to remove the selected items?";
-</script>
\ No newline at end of file

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc
deleted file mode 100644 (file)
index e483ecb..0000000
--- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close-results.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-</title>
-<!-- TMPL_IF NAME="TemplateEncoding" --><meta http-equiv="Content-Type" content="text/html; charset=<!-- TMPL_VAR NAME='TemplateEncoding' -->" /><!-- TMPL_ELSE --><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /><!-- /TMPL_IF -->
-<meta http-equiv="Content-Language" content="en-us" />
-<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang">/includes/favicon.ico" type="image/x-icon" />
-<!-- TMPL_IF name="opacstylesheet" --><style type="text/css">
-    @import url(<!-- TMPL_VAR NAME='themelang' -->/css/<!-- TMPL_VAR NAME="opacstylesheet" -->);
-</style><!-- TMPL_ELSE --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaccolorstylesheet" -->" />
-<style type="text/css">
-    @import url(<!-- TMPL_VAR NAME="themelang" -->/css/<!-- TMPL_VAR NAME="opaclayoutstylesheet" -->);
-</style><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="livesearch" --><style type="text/css">
-       @import url(<!-- TMPL_VAR NAME="themelang" -->/css/livesearch.css);
-</style><!-- /TMPL_IF -->
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"></script>
-<script type="text/javascript" language="javascript">
-       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_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";
-</script>
-<!-- TMPL_IF NAME="opacuserjs" -->
-<script language="JavaScript" type="text/javascript">
-       <!-- TMPL_VAR NAME="opacuserjs" -->
-</script>      
-<!-- /TMPL_IF -->
-<script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/main.js"></script>

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 bdb91e5..38820be 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
@@ -33,7 +33,7 @@
     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_NRECORDS_IN_BASKET = _("already in your cart");
     var MSG_NO_RECORD_SELECTED = _("No item was selected");
     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?"

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc
deleted file mode 100644 (file)
index 60349ef..0000000
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="yui-g"><div id="corner"><!-- 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 -->
-<!-- TMPL_IF NAME="opaclanguagesdisplay" --><div id="language">
-       <ul><!-- TMPL_LOOP NAME="languages" --><li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=<!-- TMPL_VAR NAME="language" -->"><!-- TMPL_VAR NAME="label" --></a> </li><!-- /TMPL_LOOP -->
-       </ul></div><!-- /TMPL_IF --></div></div>
-
-<div id="members">
-       <ul>
-       <!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">Lists</a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="loggedinusername" --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></span></li><li><a class="logout" href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></li><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li><!-- /TMPL_IF -->
-       </ul>   
-</div>
-
-<div id="opac-main-search" class="clearfix">
-
-   <div id="masthead">
-   <h1 id="libraryname"><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>

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
index 25086a6..78180e3 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
@@ -11,7 +11,7 @@
 <div id="fluid">
 <div id="fluid-offset">
 <div id="fluid-content-1">
-    <form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
+    <!-- TMPL_UNLESS NAME="itemtypeloop" --><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" -->
@@ -62,6 +62,8 @@
     </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>
+<!-- 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">

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
index 1b9a69a..02506f1 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
@@ -1,4 +1,4 @@
-<div id="menu">
+<div>
             <ul>
             <!-- TMPL_VAR NAME="OpacNav" -->
                <!-- TMPL_IF name="suggestion" --><!-- TMPL_IF NAME="AnonSuggestions" --><li><a href="/cgi-bin/koha/opac-suggestions.pl">purchase suggestions</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-basket-bottom.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-basket-bottom.inc
deleted file mode 100644 (file)
index 691287b..0000000
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-basket-bottom.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-</body>
-</html>
\ No newline at end of file

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
index 10a1066..dea7cf5 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc
@@ -1,6 +1,6 @@
-<!-- TMPL_IF NAME="loggedinusername" --><div id="usermenu">
+<!-- TMPL_IF NAME="loggedinusername" --><div id="menu">
                <ul>
-                       <li><a href="/cgi-bin/koha/opac-user.pl">my summary</a></li>
+                       <li class="active"><a href="/cgi-bin/koha/opac-user.pl">my summary</a></li>
                        <li><a href="/cgi-bin/koha/opac-account.pl">my fines</a></li>
                        <li><a href="/cgi-bin/koha/opac-userdetails.pl">my personal details</a></li>
                        <!-- TMPL_IF NAME="OpacPasswordChange" --><li><a href="/cgi-bin/koha/opac-passwd.pl">change my password</a></li><!-- /TMPL_IF -->

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
index cc1595d..135e7a9 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
@@ -49,7 +49,7 @@
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
         <li><a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
-            Add to My Book Bag
+            Add to My Cart
         </a></li></ul>
 </div>
     

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
index d941538..ec18b7e 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
@@ -17,7 +17,7 @@
        <li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li>
        <li><a href="/cgi-bin/koha/opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Print</a></li>
        <li><!-- TMPL_IF name="virtualshelves" --><!-- TMPL_IF NAME="loggedinusername" --><a href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book List</a><!-- /TMPL_IF --><!-- /TMPL_IF --></li>
-       <li><a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Book Bag</a></li>
+       <li><a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">Add to My Cart</a></li>
 </ul>
 </div>
 </div>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
index 9631bb2..013439a 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.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; Your Book Bag
+<!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Your Cart
     <!-- TMPL_IF NAME="print_basket" --></title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
@@ -14,7 +14,7 @@
 <div id="doc" class="yui-t7">
 
 <!-- TMPL_UNLESS NAME="print_basket" -->
-<h1>Your Book Bag</h1>
+<h1>Your Cart</h1>
 
 <div id="toolbar">
 <ul>
@@ -34,7 +34,7 @@
             <!-- TMPL_VAR NAME="title" -->
                 <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
-            <form>
+            <form action="opac-basket.pl" method="get">
                 <input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked)" />
                 <!-- TMPL_VAR NAME="title" -->
                 <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
@@ -171,21 +171,16 @@
             <!-- TMPL_ELSE -->
                 <tr>
             <!-- /TMPL_IF -->
-            <td>
-                    <!-- TMPL_UNLESS NAME="print_basket" -->
+            <!-- TMPL_UNLESS NAME="print_basket" --><td>
+                    
                         <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->">
                         </label>
                         <br />
-                        <input type="checkbox"
-                            value="<!-- TMPL_VAR NAME="biblionumber" -->"
-                            name="bib<!-- TMPL_VAR NAME="biblionumber" -->"
-                            id="bib<!-- TMPL_VAR NAME="biblionumber" -->"
-                            onclick="selRecord(value,checked);">
-                    <!-- /TMPL_UNLESS -->
-                </form></td>
+                        <input type="checkbox" value="<!-- TMPL_VAR NAME="biblionumber" -->" name="bib<!-- TMPL_VAR NAME="biblionumber" -->" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" onclick="selRecord(value,checked);" />
+                   
+                </td> <!-- /TMPL_UNLESS -->
             <td><!-- TMPL_VAR name="itemtype" --></td>
-            <td><p>
-                    <a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)">
+            <td><a href="#" onclick="openBiblio('<!-- TMPL_VAR name="dest" -->',<!-- TMPL_VAR name="biblionumber" -->)">
                         <!-- TMPL_VAR NAME="title" -->
                     </a>
                         <!-- TMPL_VAR NAME="author" -->
@@ -200,13 +195,15 @@
             <td><!-- TMPL_VAR NAME="classification" --></td>
             </tr>
         <!-- /TMPL_LOOP -->
-    </table>
+    </table></form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_UNLESS NAME="print_basket" -->
-<form name="myform">
+<form name="myform" action="opac-basket.pl" method="get">
     <input type="hidden" name="records" id="records" />
 </form>
 <!-- /TMPL_UNLESS -->
 
-<!-- TMPL_INCLUDE NAME="opac-basket-bottom.inc" -->
+</div>
+</body>
+</html>
\ No newline at end of file

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
index 8bdda33..7abe3f3 100755 (executable)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
@@ -168,7 +168,7 @@
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
         <li><a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
-            Add to My Book Bag
+            Add to My Cart
         </a></li>
 </ul>
 </div>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl
index 949d9ba..ac2ddc9 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detailprint.tmpl
@@ -1,5 +1,11 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Details for: <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_LOOP -->
-<!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" -->
+</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME="themelang" -->/includes/favicon.ico" type="image/x-icon" />
+<meta http-equiv="Content-Language" content="en-us" />
+<style type="text/css"> 
+    @import url(<!-- TMPL_VAR NAME="themelang" -->/css/print.css);
+</style>
 </head>
 <body>
 <div id="window">
@@ -61,7 +67,6 @@
 <th>Due Date</th>
 <th>Last Seen</th>
 <th>Barcode</th></tr>
-<tbody>
 <!--INFORMATION ROWS-->
 <!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
 <tr><td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="description" -->.gif" align="left" title="<!-- TMPL_VAR NAME="barcode" -->" alt="" /><!-- TMPL_VAR NAME="description" --></td>
@@ -71,11 +76,11 @@
 <td><!-- TMPL_VAR NAME="datelastseen" --></td>
 <td><!-- TMPL_VAR NAME="barcode" --></td></tr>
 <!-- /TMPL_LOOP -->
-</tbody>
 </table>
 <!-- TMPL_ELSE -->
 <table><tr><td>No copies available.</td></tr></table>
 <!-- /TMPL_IF -->
+</div>
 <script language="javascript" type="text/javascript">
 function docprint() {
        window.print();

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 6ce4bf6..0846a5e 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -214,7 +214,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 book bag" /> <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" 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" -->
                                     <a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="classification" ESCAPE="URL" -->">
                                         <!-- TMPL_VAR NAME="classification" -->
                                     </a>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
index 2ed2aa2..ea50856 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tmpl
@@ -1,10 +1,10 @@
 <SUBJECT>
-Your Book Bag
+Your Cart
 <END_SUBJECT>
 
 <HEADER>
 Hi,
-Here is your Book Bag, sent from the Koha Online Catalog by <!-- TMPL_VAR name="email_sender" -->
+Here is your cart, sent from the Koha Online Catalog by <!-- TMPL_VAR name="email_sender" -->
 <END_HEADER>
 
 <MESSAGE>

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 8b03e7a..71ebddb 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,4 +1,4 @@
-<!-- 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-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo;  Sending Your Cart
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding: 1em;">
@@ -6,11 +6,11 @@
 
        <!-- TMPL_IF NAME="SENT" -->
                <h3>Message Sent</h3>
-           <p>The book bag was sent to: <!-- TMPL_VAR NAME="email_add" --></p>
+           <p>The cart was sent to: <!-- TMPL_VAR NAME="email_add" --></p>
                <p><a href="#" onclick="window.close(); return false;">Close window</a></p>
        <!-- /TMPL_IF  -->
        <!-- TMPL_IF NAME="error" -->
-       <p>Problem sending the book bag...</p>
+       <p>Problem sending the cart...</p>
        <!-- /TMPL_IF -->
        
 <!-- TMPL_ELSE -->
@@ -18,7 +18,7 @@
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post">
 
 <fieldset class="rows"> 
-<legend>Sending your book bag</legend>
+<legend>Sending your cart</legend>
 <ol>   <li>
         <label for="email_add">E-mail Address:</label>
         <input type="text" id="email_add" name="email_add" size="43" />
@@ -34,5 +34,5 @@
 </form>
 
 <!-- /TMPL_IF -->
-
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+</body>
+</html>

diff --git a/koha-tmpl/opac-tmpl/prog/images/side-tab-gradient-hover.gif b/koha-tmpl/opac-tmpl/prog/images/side-tab-gradient-hover.gif
new file mode 100644 (file)
index 0000000..9fcdc96
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/side-tab-gradient-hover.gif differ

diff --git a/koha-tmpl/opac-tmpl/prog/images/side-tab-gradient.gif b/koha-tmpl/opac-tmpl/prog/images/side-tab-gradient.gif
new file mode 100644 (file)
index 0000000..af3addb
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/side-tab-gradient.gif differ