Finishing first round of OPAC updates. Lost of unstandardized interface elements...
authorOwen Leonard <oleonard@myacpl.org>
Mon, 19 Nov 2007 21:08:25 +0000 (15:08 -0600)
committerJoshua Ferraro <jmf@liblime.com>
Tue, 20 Nov 2007 22:27:05 +0000 (16:27 -0600)
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

29 files changed:
koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
koha-tmpl/opac-tmpl/prog/en/css/opac.css
koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc
koha-tmpl/opac-tmpl/prog/en/includes/navigation.inc
koha-tmpl/opac-tmpl/prog/en/includes/opac-bottom.inc
koha-tmpl/opac-tmpl/prog/en/js/basket.js
koha-tmpl/opac-tmpl/prog/en/js/main.js [deleted file]
koha-tmpl/opac-tmpl/prog/en/js/script.js
koha-tmpl/opac-tmpl/prog/en/modules/maintenance.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
koha-tmpl/opac-tmpl/prog/images/checkall.gif [new file with mode: 0644]
opac/opac-topissues.pl

index c6bd2f7..130de3a 100644 (file)
@@ -33,16 +33,14 @@ function confirm_deletion() {
        // prepare DOM for YUI Toolbar
 
         $(document).ready(function() {
-           $("#viewmarc").parent().remove();
-           $("#viewisbd").parent().remove();
-           $("#viewitems").parent().remove();
-               $("#viewmenuc").empty();
            $("#edititems").parent().remove();
            $("#duplicatebiblio").parent().remove();
                $("#deletebiblio").parent().remove();
            $("#editmenuc").empty();
                $("#addtoshelfc").empty();
                $("#printbiblioc").empty();
+               $("#export").remove();
+               $("#addtoshelfc").before("<li id=\"savemenuc\"></li>");
            yuiToolbar();
         });
 
@@ -55,20 +53,21 @@ function confirm_deletion() {
                { text: "Edit as New (Duplicate)", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=&amp;op=duplicate" },
                        { text: "Delete Record", url: "/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->",<!-- TMPL_IF NAME="count" -->disabled: true, <!-- /TMPL_IF --> onclick: {fn: confirm_deletion }}
            ];
-
-               var viewmenu = [
-               { text: "Normal Display", url: "/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->", selected: true },
-               { text: "MARC Display", url: "/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
-               { text: "ISBD Display", url: "/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" },
-               { text: "Items Display", url: "/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" }
-           ];
+               
+               var savemenu = [
+               { text: "MODS (XML)", url: "/cgi-bin/koha/catalogue/export.pl?format=mods&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
+               { text: "Dublin Core (XML)", url: "/cgi-bin/koha/catalogue/export.pl?format=dc&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
+               { text: "MARCXML", url: "/cgi-bin/koha/catalogue/export.pl?format=marcxml&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
+               { text: "MARC (non-Unicode/MARC-8)", url: "/cgi-bin/koha/catalogue/export.pl?format=marc8&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
+               { text: "MARC (Unicode/UTF-8)", url: "/cgi-bin/koha/catalogue/export.pl?format=utf8&op=export&bib=<!-- TMPL_VAR NAME="biblionumber" -->" },
+               ];
 
            new YAHOO.widget.Button({
                type: "menu",
-               label: "View",
-               name: "viewmenubutton",
-               menu: viewmenu,
-               container: "viewmenuc"
+               label: "Save",
+               name: "savemenubutton",
+               menu: savemenu,
+               container: "savemenuc"
            });
            
                new YAHOO.widget.Button({
@@ -113,11 +112,6 @@ function confirm_deletion() {
        <li><a id="duplicatebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Duplicate Record</a></li>
        <li><a id="deletebiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl?op=delete&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Delete</a></li>
        
-       <li id="viewmenuc"><a id="viewnormal" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Normal View</a></li>
-       <li><a id="viewmarc" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></li>
-       <li><a id="viewisbd" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD View</a></li>
-       <li><a id="viewitems" href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Items View</a></li>
-
        <li id="addtoshelfc"><a id="addtoshelf" href="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Add to shelf</a></li>
        <li id="printbiblioc"><a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
         <!-- TMPL_UNLESS name="bi_notforloan" -->
index b1d2a58..f0e2f88 100644 (file)
@@ -18,9 +18,9 @@
 
 <!-- TMPL_INCLUDE NAME="cat-toolbar.inc" -->
     <div class="yui-gb">
-    <h2><!-- TMPL_VAR NAME="title" --></h2>    
        <div id="catalogue_detail_biblio" class="yui-u first">
-
+               
+    <h3><!-- TMPL_VAR NAME="title" --></h3>    
         <p>
             [
             <!-- TMPL_IF name="description" -->
         <!-- TMPL_IF name="illus" -->
             <li><strong>Illustrator:</strong> <!-- TMPL_VAR name="illus" --></li>
         <!-- /TMPL_IF -->
-        <!-- TMPL_IF name="publishercode" -->
-            <li><strong>Publisher:</strong>
-                <a href="/cgi-bin/koha/catalogue/search.pl?q=pb,wrdl:<!-- TMPL_VAR NAME="publishercode" -->">
-                    <!-- TMPL_VAR NAME="publishercode" -->
-                </a>
-            </li>
-        <!-- /TMPL_IF -->
-        <!-- TMPL_IF name="publicationyear" -->
-            <li>in:<!-- TMPL_VAR NAME="publicationyear" --></li>
-        <!-- /TMPL_IF -->
+               <!-- TMPL_IF name="publishercode" -->
+    <li><strong>Published by:</strong>
+        <a href="/cgi-bin/koha/opac-search.pl?q=pb,wrdl:<!-- TMPL_VAR NAME="publishercode"-->">
+            <!-- TMPL_VAR NAME="publishercode" --> 
+        </a> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
+    </li>
+    <!-- /TMPL_IF -->
         <li><strong>Description:</strong>
                 <!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
                 <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->
                </ul>
                </div>
                
-
-<div class="yui-u">
-               <!-- TMPL_IF NAME="AmazonContent" -->
-               <a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="amazonisbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="amazonisbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Cover image" /></a>
-               <!-- TMPL_ELSE -->
-               <img src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="" border="0"/>
-               <!-- /TMPL_IF --></div>         
-               <div class="yui-u">
+<div class="yui-u"><!-- TMPL_IF NAME="AmazonContent" -->
+               <!-- TMPL_IF name="isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /></a>
+<!-- TMPL_ELSE -->
+       <img src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="" border="0"/>
+<!-- /TMPL_IF --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></div>
+               
+               <div class="yui-u" style="margin-top: 1em;">
                <ul>
         <!-- TMPL_IF name="isbn" -->
             <li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li>
 
 </div>
 
-<div class="yui-g">
+<div class="yui-g" style="margin-top : 1em;">
 <!-- TMPL_IF name="count" -->
     <div id="catalogue_detail_items">
-        <caption><!-- TMPL_VAR NAME="count" --> item(s)</caption>
         <table>
             <tr>
                 <th>Item type</th>
 <!-- /TMPL_LOOP -->
 </ul>
 <!-- /TMPL_IF -->
+</div>
 
-<!-- TMPL_IF NAME="AmazonContent" -->
-<!-- Amazon Reviews -->
-<div id="itemReviews">
-        <h2>Amazon Reader Reviews:</h2>
-        <h4>
-    <!-- TMPL_IF NAME="amazonisbn" -->
-        <a href="http://www.amazon.com/gp/customer-reviews/write-a-review.html/002-2970817-7876066?%5Fencoding=UTF8&asin=<!-- TMPL_VAR NAME="amazonisbn" -->&store=books">Add your own review</a></h4>
-    <!-- /TMPL_IF -->
-       <!-- TMPL_IF NAME="rating" -->
-               <h4>Rating (from Amazon.com):</h4>
-        <div id="starMT"><div id="starFull" style="width:<!-- TMPL_VAR NAME="rating" -->px"></div></div>
-        <!-- TMPL_LOOP NAME="AMAZONREVIEWS" -->
-            <div class="content_set">
-            <!-- TMPL_IF NAME="summary" -->
-            <h4 class="underline">  <!-- TMPL_VAR NAME="summary" --></h4>
-            <!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="comment" -->
-                <p><!-- TMPL_VAR NAME="comment" --></p>
-                       <!-- /TMPL_IF -->
-            </div>
-       <!-- /TMPL_LOOP -->
-    <!-- TMPL_ELSE -->
-
-    <div class="content_set">
-    <p class="error"> Sorry, there are no reviews available for this title. </p>
-    </div>
-
-    <!-- /TMPL_IF -->
-</div> <!-- itemReviews -->
-<!-- /TMPL_IF-->
-
-<!-- TMPL_IF NAME="SIMILAR_PRODUCTS" -->
-<h2>Similar Items</h2>
-
-<!-- TMPL_LOOP NAME="SIMILAR_PRODUCTS" -->
-<!-- TMPL_LOOP NAME="product" -->
-
-<li><img src="/opac-tmpl/prog/itemtypeimg/<!-- TMPL_VAR NAME="itemtype" -->.gif" title="<!-- TMPL_VAR NAME="itemtype" -->" />
-<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> by <!-- TMPL_VAR NAME="author" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" --></li>
-<img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._THUMBZZZ_PU_PU-5_.jpg" />
-    <!-- TMPL_LOOP NAME=items -->
-    <!-- TMPL_IF NAME="itype" --><img src="/opac-tmpl/prog/itemtypeimg/<!-- TMPL_VAR NAME="itype" -->.gif" title="<!-- TMPL_VAR NAME="itype" -->" /><!-- /TMPL_IF -->
-    barcode:<!-- TMPL_VAR NAME="barcode" -->
-    <!-- /TMPL_LOOP -->
-
-<!-- /TMPL_LOOP -->
-<!-- /TMPL_LOOP -->
-<!-- /TMPL_IF -->
-
-<div class="export">
+<div class="yui-g" id="export" style="margin-top: 1em;">
 <form method="get" action="/cgi-bin/koha/catalogue/export.pl">
-<TABLE BORDER=1 BGCOLOR="#FFFFDD" style="width:300px; margin-right: auto; margin-left:auto;">  <TR>
-      <TH>Save Record</TH>   </TR>
-  <TR>     <TD> Select Download Format:    <SELECT NAME=format>        
-               <OPTION VALUE=endnote>Endnote</OPTION>
-               <OPTION VALUE=mods>MODS (XML)</OPTION>
-        <OPTION VALUE=dc>Dublin Core (XML)</OPTION>        
-               <OPTION VALUE=marcxml>MARCXML</OPTION>
-        <OPTION VALUE=marc8>MARC (non-Unicode/MARC-8)</OPTION>
-        <OPTION VALUE=utf8>MARC (Unicode/UTF-8)</OPTION>    </SELECT>
-<INPUT TYPE="SUBMIT" NAME="SAVE" VALUE="Download Record"></TD>
-  </TR>  <TR><input type="hidden" name="op" value="export" /><INPUT TYPE="HIDDEN" NAME="bib" VALUE=<!-- TMPL_VAR NAME="biblionumber" -->/>
-  </TR></TABLE>
+<table>  <tr>
+      <th>Save Record</th>   </tr>
+  <tr>     <td> Select Download Format:    <select name="format">
+               <option value="mods">MODS (XML)</option>
+        <option value="dc">Dublin Core (XML)</option>
+               <option value="marcxml">MARCXML</option>
+        <option value="marc8">MARC (non-Unicode/MARC-8)</option>
+        <option value="utf8">MARC (Unicode/UTF-8)</option>    </select>
+               <input type="submit" name="save" value="Download Record" /></td>
+  </tr>
+  <tr><input type="hidden" name="op" value="export" /><input type="hidden" NAME="bib" VALUE="<!-- TMPL_VAR name="biblionumber" -->" />
+  </tr></table>
 </form>
 </div>
 
 
-</div>
 
 <!-- TMPL_IF name="subscriptionsnumber" -->
 <div class="yui-g">
index 1234038..6e7ccb2 100644 (file)
@@ -169,11 +169,17 @@ h6 {
 
 input[type=submit], input[type=button], input[type=reset] {
        background-color : #6BA037;
+       border:1px outset #666666;
        color : #FFFFFF;
+       font-size : 93%;
        font-weight : bold;
        padding : 2px;
 }
 
+input[type=submit]:active, input[type=button], input[type=reset] {
+       border: 1px inset #666666;
+}
+
 p.searchresults {
        background-color : #EFF1DC;
 }
@@ -183,6 +189,7 @@ table {
        margin : 1em 0;
        border-right : 1px solid #dddddd;
        border-top : 1px solid #dddddd;
+       width : 100%;
 }
 
 td,th {
@@ -623,4 +630,99 @@ h2 span.hint {
 }
 a.cancel {
        padding-left : 1em;
+}
+
+#usermenu {
+       margin-top : 1em;
+}
+
+#toolbar ul {
+       margin : 1em 0 0 0;
+       padding : 0;
+}
+
+#toolbar ul li {
+       display : inline;
+       list-style : none;
+}
+
+#toolbar ul li a {
+       border : 1px solid #afbccf;
+       padding : .3em;
+       text-decoration : none;
+       margin-right : .1em;
+}
+
+.searchresults input, .searchresults label, .searchresults select {
+       font-size: 90%;
+}
+
+.searchresults label {
+       float : right;
+       margin-top : 5px;
+}
+
+.searchresults p {
+       margin: 0;
+       padding: 0;
+       padding-top : .6em;
+}
+
+.searchresults p img {
+       vertical-align: middle;
+}
+
+.searchresults table td {
+       vertical-align: top;
+}
+
+p.searchresults {
+       background-color : #EFF1DC;
+       margin-top : -5px;
+       vertical-align : middle;
+       padding : 3px 3px 5px 5px;
+}
+
+.searchresults td, .searchresults th, .searchresults table {
+       border: 0;
+}
+
+.searchresults tr {
+       border-bottom : 1px solid #CCCCCC;
+}
+
+.searchresults table {
+       border-top : 0px solid #CCCCCC;
+}
+
+p.availability {
+       color:#666666;
+}
+
+.available {
+       font-size: 90%;
+}
+
+.searchresults a.reserve, .searchresults a.reserve:visited {
+       background-position:left top;
+       background-repeat:no-repeat;
+       float:right;
+       padding:2px 3px 2px 26px;
+}
+
+.searchresults a.reserve {
+       background-color:transparent;
+       color:#006699;
+}
+
+input.reserve, a.reserve {
+       background-image:url(/opac-tmpl/prog/images/placereserve.gif);
+}
+
+a.reserve {
+       background-color:#006699;
+       color:White;
+}
+.unavailable {
+       color: #990033;
 }
\ No newline at end of file
index ed1f4f4..e8a77e0 100644 (file)
@@ -24,7 +24,6 @@
         <![endif]-->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/jquery.js"></script>
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tabs.pack.js"></script>
-<script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/main.js"></script>
 <!-- TMPL_IF NAME="AmazonContent" --><script type="text/javascript" language="javascript" src="../..<!-- TMPL_VAR NAME="themelang" -->/js/amazonimages.js"></script><!-- /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>
     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>
\ No newline at end of file
+</script>
+<!-- TMPL_IF NAME="opacuserjs" -->
+<script language="JavaScript" type="text/javascript">
+       //<![CDATA[
+       <!-- TMPL_VAR NAME="opacuserjs" -->
+       //]]>
+</script>      
+<!-- /TMPL_IF -->
\ No newline at end of file
index 539a6e7..a043e26 100644 (file)
@@ -3,7 +3,17 @@
 </div>
 
 <div id="members">
-       <ul><!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</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-logout.pl">Log Out</a></li><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/opac-user.pl">Your Account</a></li><!-- /TMPL_IF -->
+       <ul>
+        <!-- TMPL_IF NAME="opacbookbag"-->
+            <li>
+                <a href="#" onclick="javascript:openBasket();" 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>
+            </li>
+            <!-- /TMPL_IF -->          
+       <!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</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-logout.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>
 
index c65101e..db3a0a4 100644 (file)
@@ -4,15 +4,7 @@
             <!-- TMPL_VAR NAME="OpacNav" -->
             <li><a href="/cgi-bin/koha/opac-main.pl">Search Home</a></li>
             <li><a href="/cgi-bin/koha/opac-search.pl">Advanced Search</a></li>
-                         <!-- TMPL_IF NAME="opacbookbag"-->
-            <li>
-                <a href="#" onclick="javascript:openBasket();" 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>
-            </li>
-            <!-- /TMPL_IF -->          
+                        
             <!-- TMPL_IF NAME="loggedinusername" -->
                 <!-- TMPL_IF name="virtualshelves" -->
                     <li><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a></li>
index 7d7c6f6..b65560b 100644 (file)
@@ -1,23 +1,4 @@
 </div>
-<!-- TMPL_IF NAME="opacuserlogin" -->
-<div id="login">
-    <!-- TMPL_IF NAME="loggedinusername" -->
-        <a href="/cgi-bin/koha/opac-user.pl"><b>User Info</b></a>
-        <p>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b></p>
-        <p><a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Log Out</a></p>
-    <!-- TMPL_ELSE -->
-        <form action="/cgi-bin/koha/opac-user.pl" method="post" name="auth" id="auth">
-            <p>Login:</p>
-            <input type="text" id="userid" size="10" name="userid" />
-            <p>Pass:</p>
-            <input type="password" id="password" size="10" name="password" />
-            <p>
-                <input type="submit" value="Log In" class="submit" />
-            </p>
-       </form>
-    <!-- /TMPL_IF -->
-</div>
-<!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="opaccredits" -->
 
         <!-- TMPL_VAR NAME="opaccredits" -->
index f889bdd..5fd91a2 100644 (file)
@@ -320,7 +320,7 @@ function sendBasket() {
 
     var loc = CGIBIN + "opac-sendbasket.pl?" + strCookie;
 
-    var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=400,top=50,left=100";
+    var optWin="dependant=yes,scrollbars=no,resizable=no,height=300,width=450,top=50,left=100";
     var win_form = open(loc,"win_form",optWin);
 }
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/js/main.js b/koha-tmpl/opac-tmpl/prog/en/js/main.js
deleted file mode 100644 (file)
index 2a8b6c9..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-// one window.onload to rule them all
-
-window.onload=kohajs;
-
-// check to see if functions exist before loading them
-function kohajs() {
-  if ( typeof window.verify_images == "function" ) verify_images();
-}
-
index bb44233..ce9f97a 100644 (file)
@@ -1,44 +1,3 @@
-function ValidateCode()
-{
- // Validating the patron id by Oscar R. Paredes
- // Please do not remove this line and the line above.
-  var patron_id = document.forms['auth'].userid.value;
-  var snumber = "Pp 0123456789";
-  var len = patron_id.length;
-  var new_patron_id = "";
-  var bOK = true
-  if (patron_id.length != 0)
-  {
-   for (i=0;(i<len)&&(bOK);i++)
-    { pos = snumber.indexOf(patron_id.substring(i,i+1));
-      if (pos <0 || pos > 12)
-        { alert("Your card number is invalid, please verify it.");
-          bOK = false;
-        }
-      else
-        { if (pos > 2)
-            car = patron_id.substring(i,i+1);
-          else
-            car = "";
-          new_patron_id = new_patron_id + car;
-        }
-    } // end for i
-   while (bOK && (new_patron_id.length < 7))
-     new_patron_id = "0" + new_patron_id;
-   if (new_patron_id.length > 7)
-     { alert("Your library card number is too long.");
-       bOK = false;
-     }
-   if (bOK)
-     document.forms['auth'].userid.value = new_patron_id;
-   else
-     {
-       document.forms['auth'].userid.value = "";
-       document.forms['auth'].userid.focus();
-     }
-  }
-}
-
 function CheckAll()
 {
 count = document.mainform.elements.length;
index f1c1bc6..ef8853a 100644 (file)
@@ -3,11 +3,14 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
 
-<div id="main">
+<div id="doc" class="yui-t7">
+   <div id="bd">
+       
    Site under maintenance.
     Please Come back later.
     If you still see this page, please contact <a href="mailto:<!--TMPL_VAR Name="KohaAdminEmailAddress"-->">me</a>
+
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
index 508c401..487cd2e 100644 (file)
@@ -1,5 +1,19 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- ISBD
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog &rsaquo; ISBD View
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/JavaScript" language="JavaScript">
+//<![CDATA[
+        $(document).ready(function() {
+                       var $tabs = $('#bibliodescriptions').tabs({
+                       onClick: function(tab) {
+                      if ( $(tab).is('.external') ) {
+                          location.href = tab.href;
+                          return false;
+                      }
+                  }
+               });
+        }); 
+//]]>
+</script>
 </head>
 <body>
 <!-- TMPL_INCLUDE name="masthead.inc" -->
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
-<div id="action">
+<div id="toolbar">
 
-<!-- TMPL_UNLESS NAME="norequests" -->
+<ul><!-- TMPL_UNLESS NAME="norequests" -->
        <!-- TMPL_IF NAME="RequestOnOpac" -->
-               <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+               <li><a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
                Place Reserve
-               </a>
+               </a></li>
        <!-- /TMPL_IF -->
 <!-- /TMPL_UNLESS -->
-        <a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+        <li><a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
             MARC View
-        </a>
-        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+        </a></li>
+        <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
             Normal
-        </a>
-        <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;">
+        </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>
+        </a></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;">
+       <li> <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>
+        </a></li>
     <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-        <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
+        <li><a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
             Add to My Book Bag
-        </a>
+        </a></li></ul>
 </div>
     
     <h1>ISBD</h1>
     <!-- TMPL_VAR name="ISBD" -->
-        <!-- TMPL_IF name="subscriptionsnumber" -->
+    
+       <div id="bibliodescriptions" class="toptabs">
+<ul>   
+<!-- TMPL_IF name="subscriptionsnumber" --><li>
+            <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#opac-isbd-subscriptions">Subscriptions</a>
+    </li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="reviewson" --><li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#opac-isbd-comments">Comments</a></li><!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="AmazonContent" --><li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->#opac-isbd-amazonreviews">Amazon Reviews</a></li><!-- /TMPL_IF -->
+
+      <li><a class="external"  href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Normal View</a></li>
+
+       <li> <a class="external" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+            MARC View
+        </a></li>
+</ul>
+
+       <div id="opac-isbd-subscriptions">    <!-- TMPL_IF name="subscriptionsnumber" -->
         <h2>
             We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscription(s) associated with this title.
         </h2>
                 <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
         <p><a href="/cgi-bin/koha/opac-serial-issues.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" title="Serial issues">Click here</a> for more information on subscription(s) history</p>
-    <!-- /TMPL_IF -->
+    <!-- /TMPL_IF --></div>
+       
 <!-- TMPL_IF NAME="reviewson" -->
-    <!-- TMPL_IF NAME="reviews" -->
+    <div id="opac-isbd-comments"><!-- TMPL_IF NAME="reviews" -->
     <h2>Reviews by members:</h2>
         <!--TMPL_LOOP NAME="reviews"-->
         <p>
         </a>
     <!-- TMPL_ELSE -->
         <br /><a href="/cgi-bin/koha/opac-user.pl">Log in to your account</a> to write a review here.
-    <!-- /TMPL_IF -->
+    <!-- /TMPL_IF --></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="AmazonContent" -->
 <!-- Amazon Reviews -->
-<div id="itemReviews">
+<div id="opac-isbd-amazonreviews">
         <h2>Amazon Reader Reviews:</h2>
         <h4>
     <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
     <!-- /TMPL_IF -->
 </div> <!-- itemReviews -->
 <!-- /TMPL_IF-->
+</div>
 
 </div>
 </div>
index 16248f5..cbd08d2 100644 (file)
@@ -2,37 +2,23 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
 
-<div id="action">
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
 
-<!-- TMPL_UNLESS NAME="norequests" -->
-       <!-- TMPL_IF NAME="RequestOnOpac" -->
-               <a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-               Place Reserve
-               </a>
-       <!-- /TMPL_IF -->
-<!-- /TMPL_UNLESS -->
-        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-            Normal
-        </a>
-        <a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-            ISBD
-        </a>
-        <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>
-<!-- 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 -->
-        <a href="#" onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" -->'); return false;">
-            Add to My Book Bag
-        </a>
+<div id="toolbar">
+
+<ul>
+       <!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="RequestOnOpac" --><li><a href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a></li><!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
+       <li><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Normal</a></li>
+       <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>
+</ul>
 </div>
 
 <h1>MARC View</h1>
         <!-- /TMPL_LOOP -->
     </table>
 <!-- TMPL_IF NAME="item_header_loop" -->
-<h3>Copies</h3>
         <table>
+                       <caption>Copies</caption>
                 <tr>
                     <!-- TMPL_LOOP name="item_header_loop" -->
                         <th>
         </table><!-- TMPL_ELSE -->
         <p>No copies available.</p>
     <!-- /TMPL_IF -->
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+
+</div>
+</div>
+</div>
+<div class="yui-b">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
index 58578ce..dc6da4b 100644 (file)
@@ -1,8 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Add to My Virtual Shelf
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog &rsaquo; Add to My Virtual Shelf
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<style type="text/css">
+   #custom-doc { width:34.62em;*width:33.78em;min-width:450px; margin:auto; margin-top: .4em;text-align:left; } 
+   </style>
 </head>
 <body>
+<div id="custom-doc" class="yui-t7">
+
 <!-- TMPL_IF NAME="multiple"-->
     <h1>Add these <!-- TMPL_VAR NAME="total"--> biblios to a shelf</h1>
         <!-- TMPL_LOOP NAME="biblios"-->
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="CGIvirtualshelves"-->
-<form name="f1" action="/cgi-bin/koha/opac-addbybiblionumber.pl" method="POST">
-    <p><b>Select an Existing Virtualshelf</b></p>
-    <label>Add to virtual shelf</label> <!-- TMPL_VAR NAME="CGIvirtualshelves" -->
+<form name="f1" action="/cgi-bin/koha/opac-addbybiblionumber.pl" method="post">
+    <fieldset class="rows"><legend>Select an Existing List</legend>
+<ol><li>    <label for="shelfnumber">Add to list:</label> <!-- TMPL_VAR NAME="CGIvirtualshelves" --></li></ol>
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-    <input type="hidden" name="modifyshelfcontents" value="1" />
-    <input type="submit" value="Add to virtual shelf" class="submit" />
+    <input type="hidden" name="modifyshelfcontents" value="1" /></fieldset>
+    <fieldset class="action"><input type="submit" value="Save" class="submit" /> <a class="cancel" href="#" onclick="closePopup();">Cancel</a></fieldset>
 </form>
 <p>...or...</p>
 <!-- /TMPL_IF -->
 
-<form name="f2" method="POST" action="/cgi-bin/koha/opac-addbybiblionumber.pl">
-    <b>Add to a New Virtualshelf:</b>
-        <p>
+<form name="f2" method="post" action="/cgi-bin/koha/opac-addbybiblionumber.pl">
+<fieldset class="rows">    <legend>Add to a New List:</legend>
+        <ol><li>
             <label for="newvirtualshelf">
                 Shelf Name:
             </label>
             <input type="text" name="newvirtualshelf" id="newvirtualshelf" size="40" />
-        </p>
-            <label for="category">Category:</label>
+        </li>
+         <li><label for="category">Category:</label>
             <select name="category" id="category">
                 <option value="1">Private</option>
                 <option value="2">Public</option>
-            </select>
+            </select></li></ol></fieldset>
     <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
-    <input type="submit" value="Add to virtual shelf" class="submit" /> 
+    <fieldset class="action"><input type="submit" value="Save" class="submit" /> <a class="cancel" href="#" onclick="closePopup();">Cancel</a></fieldset>
 </form>
 
 <p align="center">
index e4ff34c..90bb8db 100644 (file)
@@ -3,9 +3,13 @@
     Catalog -- Advanced Search
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body><!--TMPL_INCLUDE NAME="masthead-basic.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<body>
+<!-- TMPL_INCLUDE name="masthead-basic.inc" -->
 
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
 
 <form action="/cgi-bin/koha/opac-search.pl" method="get">
     <!-- TMPL_IF NAME="if_expanded_options_actually_worked" -->
         }
 </script>
 
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+</div>
+</div>
+</div>
+<div class="yui-b">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
index 6a84e83..2aae924 100644 (file)
@@ -1,75 +1,82 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> &rsaquo; Library Catalog &rsaquo; Authority Search
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
 
-<h1>Authority search</h1>
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
 
-<div id="bloc60">
-    <form name="f" action="/cgi-bin/koha/opac-authorities-home.pl" method="post">
-        <input type="hidden" name="op" value="do_search">
-        <input type="hidden" name="type" value="opac">
-        <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->">
-        <div class="details">
-            <h2>Search on
-                <select name="authtypecode">
+<form name="f" action="/cgi-bin/koha/opac-authorities-home.pl" method="post">
+        <input type="hidden" name="op" value="do_search" />
+        <input type="hidden" name="type" value="opac" />
+        <input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+<fieldset class="rows">
+<legend>Authority search</legend>
+<ol>
+ <li><label for="authtypecode">Search: : </label> <select name="authtypecode" id="authtypecode">
                 <!-- TMPL_LOOP NAME="authtypesloop" -->
                 <!-- TMPL_IF name="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="authtypetext" --></option>
                 <!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"> <!-- TMPL_VAR NAME="authtypetext" --></option>
                 <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
-                </select>
-            </h2>
-            <p>
-                <label class="label100">Main entry ($a only)</label>
-                <select name="operator">
+                </select></li>           <li>
+                <label for="operatora">Main entry ($a only): </label>
+                <select name="operator" id="operatora">
                     <option value="contains">contains</option>
                     <option value="start">starts by</option>
                     <option value="is">is exactly</option>
                 </select>
-                <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
-                <input type="hidden" name="marclist" value="mainmainentry">
-                <input type="hidden" name="and_or" value="and">
-                <input type="hidden" name="excluding" value="">
-            </p>
-            <p>
-                <label class="label100">Main entry</label>
-                <select name="operator">
+                <input type="text" name="value" id="mainentrya_value" value="<!-- TMPL_VAR NAME="value" -->" />
+                <input type="hidden" name="marclist" value="mainmainentry" />
+                <input type="hidden" name="and_or" value="and" />
+                <input type="hidden" name="excluding" value="" />
+            </li>
+            <li>
+                <label for="operator">Main entry: </label>
+                <select name="operator" id="operator">
                     <option value="contains">contains</option>
                     <option value="start">starts by</option>
                     <option value="is">is exactly</option>
                 </select>
-                <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
-                <input type="hidden" name="marclist" value="mainentry">
-                <input type="hidden" name="and_or" value="and">
-                <input type="hidden" name="excluding" value="">
-            </p>
-            <p>
-                <label class="label100">Anywhere</label>
-                <select name="operator">
+                <input type="text" name="value" id="mainentry_value" value="<!-- TMPL_VAR NAME="value" -->" />
+                <input type="hidden" name="marclist" value="mainentry" />
+                <input type="hidden" name="and_or" value="and" />
+                <input type="hidden" name="excluding" value="" />
+            </li>
+            <li>
+                <label for="anywhere">Anywhere: </label>
+                <select name="operator" id="anywhere">
                     <option value="contains">contains</option>
                     <option value="start">starts by</option>
                     <option value="is">is exactly</option>
 
                 </select>
-                <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
-                <input type="hidden" name="marclist" value="">
-                <input type="hidden" name="and_or" value="and">
-                <input type="hidden" name="excluding" value="">
-            </p>
-            <p><label>Order by :</label><select name="orderby">
+                <input type="text" name="value" id="anywhere_value" value="<!-- TMPL_VAR NAME="value" -->" />
+                <input type="hidden" name="marclist" value="" />
+                <input type="hidden" name="and_or" value="and" />
+                <input type="hidden" name="excluding" value="" />
+            </li>
+            <li><label for="orderby">Order by: </label><select name="orderby" id="orderby">
                 <option value="">None</option>
-                    <option value="HeadingAsc" selected="SELECTED">Heading Ascendant</option>
+                    <option value="HeadingAsc" selected="selected">Heading Ascendant</option>
                     <option value="HeadingDsc">Heading Descendant</option>
                 </select>
-            </p>
-            <p>
-                <input type="submit" value="OK" class="submit">
-            </p>
-        </div>
+            </li></ol>
+                       </fieldset>
+            <fieldset class="action">
+                <input type="submit" value="Submit" class="submit" />
+            </fieldset>
     </form>
-</div>
 
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+</div>
+</div>
+</div>
+<div class="yui-b">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
index ef30081..9d89759 100644 (file)
@@ -2,14 +2,6 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!-- TMPL_IF Name="displayhierarchy"-->
 <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/hierarchy.css">
-<!--/TMPL_IF-->
-</head>
-<body>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-
-<div id="main">
-<!-- TMPL_IF Name="displayhierarchy"-->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/hierarchy.css">
 <script language="JavaScript" type="text/javascript">
 function showParents(mynumber) {
   var parents=document.getElementsByName(mynumber+'p')
@@ -32,6 +24,18 @@ function showChildren(mynumber) {
   }
 }
 </script>
+<!--/TMPL_IF-->
+</head>
+<body>
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
+
+<!-- TMPL_IF Name="displayhierarchy"-->
 
 <div class="hierarchies">
 <!--TMPL_LOOP Name="loophierarchies" -->
@@ -71,5 +75,13 @@ function showChildren(mynumber) {
         <!-- /TMPL_LOOP -->
 </table>
 </div> 
+
+</div>
+</div>
+</div>
+<div class="yui-b">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
index a177624..e87438b 100644 (file)
@@ -1,9 +1,13 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> &rsaquo; Library Catalog &rsaquo; <!-- TMPL_IF name="total" -->Authority Search Result<!-- TMPL_ELSE -->No results found<!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
 
        <h1>Authority search results</h1>
        <div id="pages">
@@ -31,6 +35,7 @@
                        <!-- /TMPL_IF -->
                </div>
 
+                       <!-- TMPL_IF name="total" -->
 <div class="searchresults">
                <table>
                        <tr>
                                <!-- /TMPL_IF -->
                </p>
        </div>  
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+                       <!-- /TMPL_IF -->
+</div>
+</div>
+</div>
+<div class="yui-b">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
index 4e90b42..2036e92 100644 (file)
@@ -1,43 +1,31 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<!-- TMPL_VAR NAME="LibraryNameTitle" -->
-    Catalog -- Your Book Bag
-    <!-- TMPL_IF NAME="print_basket" -->
-        <!-- TMPL_INCLUDE NAME="doc-head-close-basket-print.inc" -->
-    <!-- TMPL_ELSE -->
-    <!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" -->
-<!-- /TMPL_IF -->
+<!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog &rsaquo; Your Book Bag
+    <!-- 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" />
+<meta http-equiv="Content-Language" content="en-us" />
+<style type="text/css"> 
+    @import url(<!-- TMPL_VAR NAME="themelang" -->/css/print.css);
+</style>
+    <!-- TMPL_ELSE --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" --><!-- /TMPL_IF -->
 </head>
 <body>
 
-<div> <!-- main -->
+<div id="doc" class="yui-t7">
 
 <!-- TMPL_UNLESS NAME="print_basket" -->
 <h1>Your Book Bag</h1>
 
-<div id="action">
-        <!-- TMPL_IF NAME="verbose" -->
-        <a href="opac-basket.pl" onclick="showLess(); return false;">Brief Display</a>
-        <!-- TMPL_ELSE -->
-        <a href="opac-basket.pl" onclick="showMore(); return false;">More Details</a>
-        <!-- /TMPL_IF -->
-        <a href="opac-basket.pl" onclick="sendBasket(); return false;">Send</a>
-        <a href="opac-basket.pl" onclick="printBasket(); return false;">Print</a>
-        <a href="opac-basket.pl" onclick="delBasket(); return false;">Empty and Close</a>
-        <a href="opac-basket.pl" onclick="quit(); return false;">Hide Window</a>
+<div id="toolbar">
+<ul>
+       <li><!-- TMPL_IF NAME="verbose" --><a href="opac-basket.pl" onclick="showLess(); return false;">Brief Display</a><!-- TMPL_ELSE --><a href="opac-basket.pl" onclick="showMore(); return false;">More Details</a><!-- /TMPL_IF --></li>
+       <li><a href="opac-basket.pl" onclick="sendBasket(); return false;">Send</a></li>
+       <li><a href="opac-basket.pl" onclick="printBasket(); return false;">Print</a></li>
+       <li><a href="opac-basket.pl" onclick="delBasket(); return false;">Empty and Close</a></li>
+       <li><a href="opac-basket.pl" onclick="quit(); return false;">Hide Window</a></li>
+</ul>
         <!-- /TMPL_UNLESS -->
 </div>
-<br />
-<p>
-<b>Selected items :</b>
-<a href="javascript:delSelRecords();">
-    Remove
-</a> | 
-<!-- TMPL_IF NAME="loggedinusername" -->
-    <a href="javascript:addSelToShelf();">
-        Add to a shelf
-    </a>
-<!-- /TMPL_IF -->
-</p>
 
 <!-- TMPL_IF NAME="verbose" -->
     <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
                 <!-- TMPL_IF name="subtitle" --> <!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
             <form>
-                <input type="checkbox"
-                        value="<!-- TMPL_VAR NAME="biblionumber" -->"
-                        name="bib<!-- TMPL_VAR NAME="biblionumber" -->"
-                        id="bib<!-- TMPL_VAR NAME="biblionumber" -->"
-                        onclick="selRecord(value,checked)" />
+                <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 -->
             </form>
         <!-- /TMPL_IF -->
     </h3>
     <table>
-    
+       
         <!-- TMPL_IF name="isbn" -->
         <tr>
             <th scope="row">ISBN</th>
     <!-- /TMPL_LOOP -->
 
 <!-- TMPL_ELSE -->
+       <form action="/cgi-bin/koha/opac-basket.pl" method="get" name="bookbag_form">
     <table>
+                               <!-- TMPL_UNLESS NAME="print_basket" --><tr><td><a href="#" onclick="SelectAll()"><img src="/opac-tmpl/prog/images/checkall.gif" alt="Check All" border="0" /></a></td><td colspan="3"><b>Selected items :</b>
+<a href="javascript:delSelRecords();">
+    Remove
+</a> | 
+<!-- TMPL_IF NAME="loggedinusername" -->
+    <a href="javascript:addSelToShelf();">
+        Add to a shelf
+    </a>
+<!-- /TMPL_IF --></td></tr><!-- /TMPL_UNLESS -->
         <!-- TMPL_LOOP NAME="BIBLIO_RESULTS" -->
             <!-- TMPL_IF NAME="even" -->
                 <tr class="highlight">
             <!-- TMPL_ELSE -->
                 <tr>
             <!-- /TMPL_IF -->
-            <td><form>
+            <td>
                     <!-- TMPL_UNLESS NAME="print_basket" -->
                         <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->">
                         </label>
index d672e19..20981ac 100644 (file)
@@ -3,8 +3,15 @@
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
         $(document).ready(function() {
-               $('#bibliodescriptions').tabs();
-        });
+                       var $tabs = $('#bibliodescriptions').tabs({
+                       onClick: function(tab) {
+                      if ( $(tab).is('.external') ) {
+                          location.href = tab.href;
+                          return false;
+                      }
+                  }
+               });
+        }); 
 //]]>
 </script>
 </head>
 
         <!-- TMPL_IF NAME="ISBD" --><li><a href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD View</a></li><!-- /TMPL_IF -->
 
-       <li> <a href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+       <li> <a class="external" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
             MARC View
         </a></li>
 </ul>
index 0877244..5ba899f 100644 (file)
@@ -2,8 +2,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
 
 
 <!-- TMPL_UNLESS name="popup" -->
@@ -68,5 +72,12 @@ function showlayer(numlayer)
 }
 
 </script>
-</body>
-</html>
+</div>
+</div>
+</div>
+<div class="yui-b">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
index 66bc625..8039b73 100644 (file)
 <!-- TMPL_ELSE -->
 
     <div class="searchresults">
-<form action="/cgi-bin/koha/opac-search.pl" method="post" name="myform" id="mainform">
+<form action="/cgi-bin/koha/opac-search.pl" method="post" name="bookbag_form" id="bookbag_form">
     
     <!-- TMPL_IF NAME="searchdesc" -->
     <input type="hidden" name="q" value="<!-- TMPL_VAR NAME="searchdesc" escape="html" -->" />
     <!-- /TMPL_IF -->
     
         
-        <!-- RE-SORT START -->
-        <p style="float: right;">
-            Re-sort results
-            <select id="sort_by" name="sort_by" onChange="javascript:document.myform.submit();">
-                <!--TMPL_INCLUDE Name="resort_form.inc"-->
-            </select>
-        </p>
-        <!-- RESORT END -->
-        
-        <!-- TMPL_IF name="opacbookbag" -->
-            <input type="button" class="button" value="Add checked items to book bag" onclick="addMultiple(); return false;" /> 
-            <input type="reset" value="Clear All" class="button" />
-        <!-- /TMPL_IF -->
+
                
         <!-- TABLE RESULTS START -->
         <table>
-            <tr>
-                <th><input type="checkbox" name="select_all" onclick="SelectAll()" /></th>
-                <th>Title</th>
-                <th>Item count</th>
-                <th>Location</th>
-                <!-- TMPL_IF NAME="RequestOnOpac" -->
-                <th>Reservation</th>
-                <!-- /TMPL_IF -->
-            </tr>
+               <tr><td colspan="3"><p class="searchresults">
+               <!-- RE-SORT START --> <label><select id="sort_by" name="sort_by" onchange="document.myform.submit();"> <!--TMPL_INCLUDE Name="resort_form.inc"--> </select></label> <!-- RESORT END -->
+        
+        <!-- TMPL_IF name="opacbookbag" --><a href="#" onclick="SelectAll()"><img src="/opac-tmpl/prog/images/checkall.gif" alt="Check All" border="0"></a>
+            <input type="button" class="button" value="Add checked items to book bag" onclick="addMultiple(); return false;" /> 
+            <input type="reset" value="Clear All" class="button" />
+        <!-- /TMPL_IF --></p></td></tr>
             <!-- Actual Search Results -->
             <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
             <!-- TMPL_IF name="even" -->
             <!-- TMPL_ELSE -->
                 <tr>
             <!-- /TMPL_IF -->
-                    <td>
-                        <!-- TMPL_IF name="opacbookbag" -->
-                            <input type="checkbox" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" title="Click to add to book bag" />
-                        <!-- /TMPL_IF -->
-                        <!-- TMPL_IF NAME="AmazonContent" -->
+                    <td>                        <!-- TMPL_IF NAME="AmazonContent" -->
                         <a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
                             <img src="<!-- TMPL_IF NAME="isbn" -->http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.TZZZZZZZ.jpg<!-- TMPL_ELSE -->http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif<!-- /TMPL_IF -->" alt="image" class="thumbnail" />
                         </a>
                         <!-- /TMPL_IF -->
                         <!-- /TMPL_IF -->
                     </td>
-                    <td>
-                        <p>
-                            <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
-                            <a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                                <b><!-- TMPL_VAR NAME="title" --></b>
-                            </a> <!-- TMPL_VAR NAME="subtitle" -->
-                            <!-- TMPL_ELSE -->
-                            <!-- TMPL_IF name="BiblioDefaultViewisbd" -->
-                            <a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                                <b><!-- TMPL_VAR NAME="title" --></b>
-                            </a> <!-- TMPL_VAR NAME="subtitle" -->
-                            <!-- TMPL_ELSE -->
-                            <a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">
-                                <b><!-- TMPL_VAR NAME="title" --></b>
-                            </a> <!-- TMPL_VAR NAME="subtitle" --><!-- TMPL_IF name="volume" -->,<!-- TMPL_VAR name="volume" --><!-- /TMPL_IF --> <!-- TMPL_IF name="volumeddesc" -->, <!-- TMPL_VAR name="volumeddesc" --><!-- /TMPL_IF -->
-                            <!-- /TMPL_IF -->
-                            <!-- /TMPL_IF -->
-                        </p>
-                        <!-- TMPL_IF name="summary" -->
-                        <p><!-- TMPL_VAR name="summary" --></p>
-                        <!-- TMPL_ELSE -->
-                        <p>
-                            <!-- TMPL_IF NAME="author" -->
-                            <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a>
-                            <!-- TMPL_ELSE -->
-                            &nbsp;
-                            <!-- /TMPL_IF -->
-                            <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
-                            <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
-                            <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
-                            <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
-                            <!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
-                            <!-- TMPL_IF name="timestamp" --> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->
-                        </p>
-                        <!-- /TMPL_IF -->
-                    </td>
-                    <td >
-                        <!-- TMPL_IF NAME="items_count" -->
-                        <!-- TMPL_VAR NAME="items_count" -->
-                        <!-- /TMPL_IF-->
-                    </td>          
-                    <td width="20%">
+                    <td><!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="author" -->by <a href="/search?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="author" --></a><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
+                               <p> <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF name="timestamp" --> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF --></p>
+                               <p class="availability">
+<!-- TMPL_IF NAME="items_loop" -->
+<span class="available"><strong>Copies available at:</strong> <!-- TMPL_LOOP NAME="items_loop" -->
+                <!-- <!-- TMPL_VAR NAME="branchcode" --> -->
+                <!-- TMPL_VAR NAME="branchname" -->
+                (<!-- TMPL_VAR NAME="count" -->),
+<!-- /TMPL_LOOP --></span>
+<!-- TMPL_ELSE -->
+<span class="unavailable">No copies available: </span>
+<!-- /TMPL_IF -->
+<span class="unavailable">
+<!-- TMPL_IF NAME="onloancount" --> On loan (<!-- TMPL_VAR NAME="onloancount" -->), <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="wthdrawncount" --> Withdrawn (<!-- TMPL_VAR NAME="wthdrawncount" -->), <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="itemlostcount" --> Lost (<!-- TMPL_VAR NAME="itemlostcount" -->)<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="orderedcount" --> On order (<!-- TMPL_VAR NAME="orderedcount" -->)<!-- /TMPL_IF --></span>
+                               </p>
+               <p><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Place Reserve</a><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!--TMPL_IF NAME="opacbookbag" --><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 NAME="opacbookbag" --></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>
+                                <!-- /TMPL_IF --></p> 
+                       </td>
+                    <!-- /TMPL_IF -->
+                                       <td width="20%">
                         <!-- TMPL_IF NAME="items_loop" -->
                         <span class="available">
                             <!-- TMPL_LOOP NAME="items_loop" -->
                         </span>
                         <!-- /TMPL_IF -->
                     </td>
-                    <!-- TMPL_IF NAME="RequestOnOpac" -->
-                    <td>
-                        <!-- TMPL_IF NAME="norequests" -->
-                        Not Reserveable
-                        <!-- TMPL_ELSE -->
-                        <a class="reserve" href="/cgi-bin/koha/opac-reserve.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                            Reserves
-                        </a>
-                        <!-- /TMPL_IF -->
-                    </td>
-                    <!-- /TMPL_IF -->
                 </tr>
                 <!-- /TMPL_LOOP -->
             </table>
index 1e89580..96b8ea1 100644 (file)
@@ -1,14 +1,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog -- Sending Your Book Bag
 <!-- TMPL_INCLUDE NAME="doc-head-close-basket.inc" -->
 </head>
-<body>
-<div id="window">
-<h3>Sending your book bag</h3>
-
+<body style="padding: 1em;">
 <!-- TMPL_IF NAME="email_add" -->
 
        <!-- TMPL_IF NAME="SENT" -->
+               <h3>Message Sent</h3>
            <p>The book bag 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>
 
 <form action="<!-- TMPL_VAR NAME="url" -->" method="post">
 
-    <p>
+<fieldset class="rows"> 
+<legend>Sending your book bag</legend>
+<ol>   <li>
         <label for="email_add">E-mail Address:</label>
-        <input type="text" id="email_add" name="email_add" size="35" />
-    </p>
-    <p>
-            <label for="comment">Comment</label><br />
-            <textarea id="comment" name="comment" rows="7" cols="50"></textarea>
-    </p>
-    <p>
-        <input type="submit" value="Send" />
+        <input type="text" id="email_add" name="email_add" size="43" />
+    </li>
+    <li>
+            <label for="comment">Comment:</label>
+            <textarea id="comment" name="comment" rows="4" cols="40"></textarea>
+    </li>
+    <li>
         <input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" />
-    </p>
+    </li></ol></fieldset>
+       <fieldset class="action"> <input type="submit" value="Send" /> <a class="cancel" href="#" onclick="window.close(); return false;">Cancel</a> </fieldset>
 </form>
 
 <!-- /TMPL_IF -->
-<p>
-
-    <form action="opac-sendbasket.pl" method="get" />
-        <input type="submit" value="Close Window" onclick="window.close(); return false;" />
-    </form>
-</p>
-
-</div>
 
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
index ccbe655..374ec16 100644 (file)
@@ -2,8 +2,13 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
 
 <h1>Issues for a subscription</h1>
        <a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button">Normal View</a>
        <!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
 
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+</div>
+</div>
+</div>
+<div class="yui-b">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
index 883f753..f35e45e 100644 (file)
@@ -1,15 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName" --> Catalog -- <!-- TMPL_IF Name="viewshelf" -->Contents of <!-- TMPL_VAR Name="shelfname" --><!-- TMPL_ELSE -->My Virtual Shelves<!-- /TMPL_IF --><!-- TMPL_INCLUDE name="doc-head-close.inc" -->
 </head>
-<!-- TMPL_IF NAME="OpacNav" --> <body id="withnav">
-<!--TMPL_ELSE-->
 <body>
-<!-- /TMPL_IF -->
 <!-- TMPL_INCLUDE name="masthead.inc" -->
-<!-- TMPL_INCLUDE name="usermenu.inc" -->
-<!-- TMPL_INCLUDE name="navigation.inc" -->
-<div id="main_wrapper">
-<div id="main" class="searchresults">
-<div class="content-block">
+
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
 <!-- TMPL_IF Name="viewshelf" -->
 <h3><a href="/cgi-bin/koha/opac-shelves.pl">Virtual Shelves</a> <img src="<!-- TMPL_VAR NAME="themelang" -->/images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> <!-- TMPL_IF NAME="itemsloop" --><em><!-- TMPL_VAR Name="shelfname" --></em><!-- TMPL_ELSE -->The Virtual Shelf <em><!-- TMPL_VAR Name="shelfname" --></em> is empty<!-- /TMPL_IF --></h3>
 <form class="inline" action="/cgi-bin/koha/opac-shelves.pl" method="post" name="myform">
 </div>
 </div>
 </div>
-
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+<div class="yui-b">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
index 8281ea9..3f72e1d 100644 (file)
@@ -2,8 +2,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
 
     <h1>Subject cloud</h1>
     <p>This "cloud" show you the most used topics in our catalogue. Click on one of them to see the documents related to it</p>
         <!-- TMPL_LOOP name="LOOP" -->
             <a href="/cgi-bin/koha/opac-search.pl?q=su:<!-- TMPL_VAR name="entry" ESCAPE="HTML" -->" style="font-size:<!-- TMPL_VAR name="weight" -->px;"><!-- TMPL_VAR name="entry" --></a>
         <!-- /TMPL_LOOP -->
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+
+</div>
+</div>
+</div>
+<div class="yui-b">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
index 866f15e..6ef8cf7 100644 (file)
@@ -1,19 +1,23 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryNameTitle" --> -- Library Catalog
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-</head>
-<body>
-<!--TMPL_INCLUDE NAME="masthead.inc" -->
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
-
 <script language="JavaScript" type="text/javascript">
 function Dopop(link) {
     newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 </script>
-    <fieldset>
-    <legend>Show</legend>
+</head>
+<body>
+<!-- TMPL_INCLUDE name="masthead.inc" -->
+
+<div id="doc3" class="yui-t1">
+   <div id="bd">
+       <div id="yui-main">
+       <div class="yui-b"><div class="yui-g">
+
         <form method="post">
-            <p>the <select name="limit">
+               <fieldset class="rows">
+               <legend>See the Most Popular Titles</legend>
+          <ol>  <li><label for="limit">Show the top </label> <select name="limit" id="limit">
                             <option value ="10" checked>10</option>
                             <option value ="15">15</option>
                             <option value ="20">20</option>
@@ -21,9 +25,11 @@ function Dopop(link) {
                             <option value ="40">40</option>
                             <option value ="50">50</option>
                             <option value ="100">100</option>
-                        </select>
-                most issued documents owned by branch 
-                <select name="branch">
+                        </select> titles
+                                               </li>
+                               <li>
+               <label for="branch">From: </label>
+                <select name="branch" id="branch">
                 <option value="">All branches</option>
                 <!-- TMPL_LOOP name="branchloop" -->
                     <option value="<!-- TMPL_VAR name="value" -->">
@@ -31,40 +37,43 @@ function Dopop(link) {
                     </option>
                 <!-- /TMPL_LOOP -->
                 </select>
-            </p>
-            <p>Limit palmares to
-                    <select name="itemtype">
+            </li>
+            <li><label for="itemtype">Limit to: </label>
+                    <select name="itemtype" id="itemtype">
                         <option value="">All item types</option>
                         <!-- TMPL_LOOP name="itemtypeloop" -->
                             <option value="<!-- TMPL_VAR name="value" -->">
                                 <!-- TMPL_VAR name="description" -->
                             </option>
                         <!-- /TMPL_LOOP -->
-                    </select>
-            acquired in the last <select name="timeLimit">
+                    </select></li>
+                       <li>
+            <label for="timeLimit">Acquired in the last:</label> <select name="timeLimit" id="timeLimit">
                 <option value="3">3 months</option>
                 <option value="6">6 months</option>
                 <option value="12">12 months</option>
                 <option value="999">No limit</option>
-            <p>
-        <input TYPE="submit" value="OK" class="button reports">
-        <input type="hidden" name="do_it" value="1">
+            <li></ol>
+        <input type="hidden" name="do_it" value="1" />
+    </fieldset><fieldset class="action">
+        <input type="submit" value="Submit" /></fieldset>
         </form>
-    </fieldset>
+
     <!-- TMPL_IF NAME="results_loop" -->
-    <h1>The <!-- TMPL_VAR NAME="limit"--> most issued 
+    
+        <table>
+               <caption>The <!-- TMPL_VAR NAME="limit"--> most checked-out 
         <!-- TMPL_IF name="itemtype" -->
             <!-- TMPL_VAR name="itemtype" -->
-        <!-- TMPL_ELSE --> documents<!-- /TMPL_IF -->
-        available at
+        <!-- TMPL_ELSE --> titles<!-- /TMPL_IF -->
         <!-- TMPL_IF name="branch" -->
+        at 
         <!-- TMPL_VAR name="branch" -->
-        <!-- TMPL_ELSE --> the library<!-- /TMPL_IF -->
+        <!-- /TMPL_IF -->
         <!-- TMPL_IF name="timeLimit" -->
-        since <!-- TMPL_VAR name="timeLimit" --> months
-        <!-- TMPL_ELSE --> (no time limit)<!-- /TMPL_IF -->
-    </h1>
-        <table>
+        in the past <!-- TMPL_VAR name="timeLimit" --> months
+        <!-- TMPL_ELSE --> of all time<!-- /TMPL_IF -->
+    </caption>
             <tr>
                 <th>Title</th>
                 <th>Itemtype</th>
@@ -91,4 +100,12 @@ function Dopop(link) {
         </table>
    <!-- /TMPL_IF -->
 
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
+</div>
+</div>
+</div>
+<div class="yui-b">
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+<!-- TMPL_INCLUDE name="usermenu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
diff --git a/koha-tmpl/opac-tmpl/prog/images/checkall.gif b/koha-tmpl/opac-tmpl/prog/images/checkall.gif
new file mode 100644 (file)
index 0000000..cc8c0a9
Binary files /dev/null and b/koha-tmpl/opac-tmpl/prog/images/checkall.gif differ
index b77c0ab..6e995ce 100755 (executable)
@@ -84,6 +84,8 @@ while (my $line= $sth->fetchrow_hashref) {
     push @results, $line;
 }
 
+if($timeLimit eq 999){ $timeLimit = 0 };
+
 $template->param(do_it => 1,
                 limit => $limit,
                 branch => $branches->{$branch}->{branchname},