Merge commit 'kc/master'
[srvgit] / koha-tmpl / opac-tmpl / prog / en / modules / opac-user.tmpl
index f7df0d6..2b62407 100644 (file)
-<!-- TMPL_INCLUDE name="doc-head-open.inc" -->
-<!-- TMPL_VAR NAME="LibraryNameTitle" --> Catalog &rsaquo; Library Home for
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Library Home for
 <!-- TMPL_LOOP name="BORROWER_INFO" -->
-    <!-- TMPL_VAR name="firstname" --><!-- TMPL_VAR name="surname" -->
+    <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
 <!-- /TMPL_LOOP -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
-        $(document).ready(function() {
-               $('#opac-user-views').tabs();
-        });
+var MSG_CONFIRM_DELETE_HOLD = _("Are you sure you want to cancel this hold?");
+$.tablesorter.addParser({
+    id: 'articles', 
+    is: function(s) {return false;  }, 
+    format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); }, 
+    type: 'text' 
+});
+            $(function() {
+            $('#opac-user-views > ul').tabs();
+                       $("#holdst").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
+               dateFormat: 'uk',<!-- /TMPL_IF -->
+                               widgets : ['zebra'],
+                               sortList: [[0,0]],
+                       headers: { 0: { sorter: 'articles' },5: { sorter: false }
+                               }
+                       }); 
+                       $("#checkoutst").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
+               dateFormat: 'uk',<!-- /TMPL_IF -->
+                               widgets : ['zebra'],
+                               <!-- TMPL_IF NAME="JacketImages" -->
+                                       sortList: [[3,0]],
+                                               <!-- TMPL_IF NAME="item-level_itypes" -->
+                                                       headers: { 0: { sorter: false }, 1: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }}
+                                               <!-- TMPL_ELSE -->
+                                                       headers: { 0: { sorter: false }, 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }}
+                                               <!-- /TMPL_IF -->
+                               <!-- TMPL_ELSE -->
+                                               <!-- TMPL_IF NAME="item-level_itypes" -->
+                                                       sortList: [[2,0]],
+                                                       headers: { 0: { sorter: 'articles' },3: { sorter: false },4: { sorter: false }}
+                                               <!-- TMPL_ELSE -->
+                                                       sortList: [[3,0]],
+                                                       headers: { 0: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }}
+                                       <!-- /TMPL_IF -->
+                               <!-- /TMPL_IF -->
+                       }); 
+                       $("#overduest").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
+               dateFormat: 'uk',<!-- /TMPL_IF -->
+                               widgets : ['zebra'],
+                               <!-- TMPL_IF NAME="JacketImages" -->
+                                       sortList: [[1,0]],
+                                               <!-- TMPL_IF NAME="item-level_itypes" -->
+                                                       headers: { 0: { sorter: false }, 1: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }}
+                                               <!-- TMPL_ELSE -->
+                                                       headers: { 0: { sorter: false }, 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }}
+                                               <!-- /TMPL_IF -->
+                               <!-- TMPL_ELSE -->
+                                               <!-- TMPL_IF NAME="item-level_itypes" -->
+                                                       sortList: [[0,0]],
+                                                       headers: { 0: { sorter: 'articles' },3: { sorter: false }}
+                                               <!-- TMPL_ELSE -->
+                                                       sortList: [[0,0]],
+                                                       headers: { 0: { sorter: 'articles' },1: { sorter: false },3: { sorter: false }}
+                                       <!-- /TMPL_IF -->
+                               <!-- /TMPL_IF -->
+                       });
+<!-- TMPL_IF NAME="GoogleJackets" -->KOHA.Google.GetCoverFromIsbn();<!-- /TMPL_IF -->
+            });
 //]]>
 </script>
 </head>
-<body>
-<!-- TMPL_INCLUDE name="masthead.inc" -->
-
+<body id="opac-user">
 <div id="doc3" class="yui-t1">
    <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b"><div class="yui-g">
+<!-- TMPL_INCLUDE NAME="masthead.inc" -->
+
+    <div id="yui-main">
+    <div class="yui-b"><div class="yui-g">
+       <div id="userdetails" class="container">
+
+       <!-- TMPL_IF NAME="bor_messages" -->
+              <div class="dialog message">
+                      <h3>Messages For You</h3>
+                      <ul>
+                              <!--TMPL_LOOP NAME="bor_messages_loop" -->
+                                       <li>
+                                               <strong><!--TMPL_VAR NAME="message"--></strong><br>
+                                               &nbsp;&nbsp;&nbsp;<i>Written on <!--TMPL_VAR NAME="message_date_formatted"--> by <!--TMPL_VAR NAME="branchname"--></i>
+                                       </li>
+                               <!-- /TMPL_LOOP -->
 
+                               <!-- TMPL_IF NAME="opacnote" --><li><!-- TMPL_VAR name="opacnote" --></li><!-- /TMPL_IF -->
+                      </ul>
+              </div>
+       <!-- /TMPL_IF -->
     <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
-        <h2>Hello, <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> <span class="hint">(<a href="/cgi-bin/koha/opac-logout.pl">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)</span></h2>
+        <h2>Hello, <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> <span class="hint">(<a href="/cgi-bin/koha/opac-main.pl?logout.x=1">Click here</a> if you're not <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->)</span></h2>
         
-        <!-- TMPL_IF name="textmessaging"-->
-            <h3>Message from the library</h3>
-            <p><!-- TMPL_VAR name="textmessaging" --></p>
-        <!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="patronupdate" --><div class="dialog message"><h3>Thank you!</h3><p>Your corrections have been submitted to the library, and a staff member will update your record as soon as possible.</p></div><!-- /TMPL_IF -->
+               
+
         <!-- TMPL_IF NAME="flagged" -->
+               <div class="dialog alert">
         <ul>
             <!-- TMPL_IF NAME="debarred" -->
                 <li><strong>Please note:</strong> Your account has been frozen. Usually the reason for freezing an account is old overdues or damage fees.If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.</li>
             <!-- TMPL_IF NAME="lost" -->
                 <li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</li>
             <!-- /TMPL_IF -->
-        </ul>
+            <!-- TMPL_IF NAME="renewal_blocked_fines" -->
+                <li><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">more than <!-- TMPL_VAR NAME="renewal_blocked_fines" --></a> in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li>
+            <!-- /TMPL_IF -->
+        </ul></div>
         <!-- /TMPL_IF -->
-               
+        
 <div id="opac-user-views" class="toptabs">
-               <ul>
-                       <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">Checked Out</a></li>
-                       <!-- TMPL_IF NAME="overdues_count" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">Overdue</a></li><!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="amountoverfive" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Fines</a></li><!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="amountoverzero" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Fines</a></li><!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="amountlessthanzero" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Credits</a></li><!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="waiting_count" --><!-- TMPL_IF NAME="atdestination" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-waiting">Waiting</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->
-                       <!-- TMPL_IF NAME="reserves_count" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">Holds</a></li><!-- /TMPL_IF -->
-               </ul>
-               
+        <ul>
+            <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">Checked Out</a></li>
+            <!-- TMPL_IF NAME="overdues_count" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">Overdue</a></li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="OPACFinesTab" -->
+            <!-- TMPL_IF NAME="amountoverfive" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Fines</a></li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="amountoverzero" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Fines</a></li><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="amountlessthanzero" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Credits</a></li><!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="waiting_count" --><!-- TMPL_IF NAME="atdestination" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-waiting">Waiting</a></li><!-- /TMPL_IF --><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="reserves_count" --><li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">Holds</a></li><!-- /TMPL_IF -->
+        </ul>
+        
+<!-- TMPL_IF NAME="OPACFinesTab" -->
         <!-- FINES BOX -->
         <!-- TMPL_IF NAME="amountoverfive" -->
-            <div id="opac-user-fines">
+            <div id="opac-user-fines"> <h3>Fines and Charges</h3>
             <table>
-                               <caption>Fines and Charges</caption>
                 <tr><th colspan="2">Amount</th></tr>
                 <tr>
                     <td>You currently owe fines and charges amounting to:</td>
             </table></div>
         <!-- /TMPL_IF -->
 
-        <!-- TMPL_IF NAME"amountlessthanzero" -->
+        <!-- TMPL_IF NAME="amountlessthanzero" -->
           <div id="opac-user-fines">  <h3>Credits</h3>
             <table>
             <tr><th colspan="2">Amount</th></tr>
             <tr><td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl"><!-- TMPL_VAR NAME="amountoutstanding" --></a></td></tr>
             </table></div>
         <!-- /TMPL_IF -->
-       
+<!-- /TMPL_IF -->
+    
     <!-- /TMPL_LOOP -->
 
     <!-- TMPL_IF NAME="waiting_count" -->
     <!-- TMPL_IF NAME="atdestination" -->
     <div id="opac-user-waiting">
-        <table>
-                       <caption>Holds Waiting</caption>
-            <tr>
+        <table id="waitingt">
+            <caption>Holds Waiting</caption>
+           <thead> <tr>
                 <th colspan="2">Title</th>
                 <th>Hold date</th>
-                <th>Pick Up Branch</th>
-            </tr>
-            <!-- TMPL_LOOP NAME="WAITING" -->
+                <th>Pick Up Library</th>
+            </tr></thead>
+            <tbody><!-- TMPL_LOOP NAME="WAITING" -->
                 <tr>
-                    <td>
-                        <img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
-                    </td>
-                    <td>
-                        <a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+                    <td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" /></td>
+                    <td><a href="opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
                             <!-- TMPL_VAR NAME="waiting_title" -->
-                        </a>
-                        <span class="item-details">
+                        </a><span class="item-details">
                             <!-- TMPL_VAR NAME="author" -->
-                        </span>
-                    </td>
-                    <td>
-                        <!-- TMPL_VAR NAME="reservedate" -->
-                    </td>
-                    <td>
-                        <!-- TMPL_IF NAME="atdestination" -->
-                        <strong>Waiting</strong> at <!-- TMPL_VAR Name="branch" -->
+                        </span></td>
+                    <td><!-- TMPL_VAR NAME="reservedate" --></td>
+                    <td><!-- TMPL_IF NAME="atdestination" --><strong>Waiting</strong> at <!-- TMPL_VAR NAME="branch" -->
                         <!-- TMPL_ELSE -->
-                        In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="branch" -->
-                        <!-- /TMPL_IF -->
-                    </td>
+                        In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR NAME="branch" -->
+                        <!-- /TMPL_IF --></td>
                 </tr>
-            <!-- /TMPL_LOOP -->
+            <!-- /TMPL_LOOP --></tbody>
         </table></div>
         <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
 
     <div id="opac-user-checkouts"><!-- TMPL_IF NAME="issues_count" -->
-        <table>
-               <caption>Issues (<!-- TMPL_VAR NAME="issues_count" --> total)</caption>
-        <!-- ISSUES TABLE ROWS --><tr>
-        <th colspan="2">Title</th>
+        <table id="checkoutst">
+        <caption><!-- TMPL_VAR NAME="issues_count" --> Items Checked Out</caption>
+       <thead><tr>
+               <!-- TMPL_IF NAME="JacketImages" --><th>&nbsp;</th><!-- /TMPL_IF -->
+        <th>Title</th>
+               <!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th> <!-- /TMPL_UNLESS -->
         <th>Call No.</th>
         <th>Due</th>
+        <!-- TMPL_IF name="OpacRenewalAllowed" -->
         <!-- TMPL_UNLESS name="patron_flagged" --><th>Renew</th><!-- /TMPL_UNLESS -->
+        <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="OPACFinesTab" -->
         <th>Fines</th>
-        </tr>
-        <!-- TMPL_LOOP NAME="ISSUES" -->
-            <!-- TMPL_IF NAME="overdue" -->
-                <tr class="overdue">
-            <!-- TMPL_ELSE -->
-                <tr>
-            <!-- /TMPL_IF -->
-                <td>
-                    <!-- TMPL_IF name="imageurl" -->
-                        <img src="<!-- TMPL_VAR name="imageurl" --><!-- TMPL_VAR NAME="itemtype" -->.gif" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" />
-                    <!-- TMPL_ELSE -->
-                        <!-- TMPL_VAR name="description" -->
-                    <!-- /TMPL_IF -->
-                </td>
-                <td><!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="isbn" --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" /></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
-                    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a>
-                    <span class="item-details">
+<!-- /TMPL_IF -->
+        </tr></thead>
+        <tbody>
+               <!-- FIXME: the styling for highlight overrides the overdue red background,
+                               so currently we don't use this conditional as the first thing inside the LOOP:
+        <!-- TMPL_UNLESS NAME="__odd__" -->
+           <tr<!-- TMPL_IF NAME="overdue" --> class="overdue"<!-- /TMPL_IF -->>
+        <!-- TMPL_ELSE -->
+           <tr class="<!-- TMPL_IF NAME="overdue" -->overdue <!-- /TMPL_IF -->highlight">
+        <!-- /TMPL_UNLESS -->
+               -->
+               <!-- TMPL_LOOP NAME="ISSUES" -->
+        <!-- TMPL_IF NAME="overdue" --><tr class="overdue"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="JacketImages" --><td class="jacketcell">
+
+<!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.THUMBZZZ.jpg" alt="Cover Image" /></a><!-- TMPL_ELSE --><a href="#"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="display:block;" title="Click to view in Google Books" class="<!-- TMPL_VAR NAME="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><a href="http://books.google.com/books?q=<!-- TMPL_VAR NAME="title" escape="url" -->"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- BakerTaylor needs normalized_isbn! --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="SyndeticsEnabled" --><!-- TMPL_IF NAME="SyndeticsCoverImages" --><!-- TMPL_IF NAME="using_https" -->
+<img src="https://secure.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&amp;type=xw10&amp;upc=<!-- TMPL_VAR NAME="normalized_upc" -->&amp;oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->" alt="" class="thumbnail" />
+<!--TMPL_ELSE -->
+<img src="http://www.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&amp;type=xw10&amp;upc=<!-- TMPL_VAR NAME="normalized_upc" -->&amp;oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->" alt="" class="thumbnail" /><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+</td><!-- /TMPL_IF -->
+
+                <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><span class="item-details">
                         <!-- TMPL_VAR NAME="author" -->
-                    </span>
-                </td>
-                <td><!-- TMPL_VAR NAME="classification" --></td>
+                    </span></td>
+                <!-- TMPL_UNLESS NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="description" --></td><!-- /TMPL_UNLESS -->
+                <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
                 <!-- TMPL_IF NAME="overdue" -->
                     <td class="overdue"><!-- TMPL_VAR NAME="date_due" --></td>
                 <!-- TMPL_ELSE -->
                     <td><!-- TMPL_VAR NAME="date_due" --></td>
                 <!-- /TMPL_IF -->
-                <!-- TMPL_UNLESS name="patron_flagged" -->
-                <td>
-                    <!-- TMPL_IF NAME="status" -->
-                        <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a> <span class="renewals">(<!-- TMPL_VAR NAME="renewsleft" --> of <!-- TMPL_VAR NAME="renewsallowed" --> renewals remaining)</span>
-                    <!-- TMPL_ELSE -->
-                        Not renewable
-                    <!-- /TMPL_IF -->
-                </td>
-                <!-- /TMPL_UNLESS -->
+                <!-- TMPL_IF name="OpacRenewalAllowed" -->
+                    <!-- TMPL_UNLESS name="patron_flagged" -->
+                    <td><!-- TMPL_IF NAME="status" --><a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a> <span class="renewals">(<!-- TMPL_VAR NAME="renewsleft" --> of <!-- TMPL_VAR NAME="renewsallowed" --> renewals remaining)</span>
+                        <!-- TMPL_ELSE -->
+                        Not renewable<!-- TMPL_IF NAME="too_many" --> <span class="renewals">(<!-- TMPL_VAR NAME="renewsleft" --> of <!-- TMPL_VAR NAME="renewsallowed" --> renewals remaining)</span><!-- TMPL_ELSE --><!-- TMPL_IF NAME="on_reserve" --> <span class="renewals">(On hold)</span><!-- /TMPL_IF --><!-- /TMPL_IF --> 
+                        <!-- /TMPL_IF --></td>
+                    <!-- /TMPL_UNLESS -->
+                <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="OPACFinesTab" -->
                 <td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+<!-- /TMPL_IF -->
             </tr>
-        <!-- /TMPL_LOOP -->
+        <!-- /TMPL_LOOP --></tbody>
         </table>
+               <!-- TMPL_IF name="OpacRenewalAllowed" -->
                <form action="/cgi-bin/koha/opac-renew.pl" method="post">
                        <input type="hidden" name="from" value="opac_user" />
                        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
                        <!-- TMPL_LOOP NAME="ISSUES" -->
                        <input type="hidden" name="item" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
                        <!-- /TMPL_LOOP -->
-                       <input type="submit" value="Renew All" />
+                       <!-- TMPL_UNLESS name="patron_flagged" --><input type="submit" value="Renew All" /><!-- /TMPL_UNLESS -->
                </form>
+               <!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
         <table>
-            <caption>Issues</caption>
             <tr><td>You have nothing checked out</td></tr>
         </table>
     <!-- /TMPL_IF --></div>
-       
-       
+    
+    
 <!-- TMPL_IF NAME="overdues_count" -->
-<div id="opac-user-overdues"><table>
+<div id="opac-user-overdues"><table id="overduest">
 <caption>Overdues <span class="count">(<!-- TMPL_VAR NAME="overdues_count" --> total)</span></caption>
 <!-- OVERDUES TABLE ROWS -->
-<tr>
-<th colspan="2">Title</th><th>Call No.</th>
+<thead><tr>
+<!-- TMPL_IF NAME="JacketImages" --><th>&nbsp;</th><!-- /TMPL_IF -->
+<th>Title</th>
+<!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th> <!-- /TMPL_UNLESS -->
+<th>Call No.</th>
 <th>Due</th>
-<th>Renew</th>
-<!-- <th>Fine to Date</th> -->
-</tr>
+<!-- TMPL_IF name="OpacRenewalAllowed" -->
+                    <!-- TMPL_UNLESS name="patron_flagged" --><th>Renew</th><!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
+<!-- TMPL_IF NAME="OPACFinesTab" -->
+<th>Fines</th>
+<!-- /TMPL_IF -->
+</tr></thead>
 
-<!-- TMPL_LOOP NAME="OVERDUES" -->
+<tbody><!-- TMPL_LOOP NAME="OVERDUES" -->
 <tr>
-<td><img src="<!-- TMPL_VAR NAME="themelang" -->/images/<!-- TMPL_VAR NAME="ccode" -->.gif" alt="<!-- TMPL_VAR NAME="ccode" -->" title="<!-- TMPL_VAR NAME="ccode" -->" /></td>
-<td><!-- TMPL_IF NAME="AmazonContent" --><!-- TMPL_IF NAME="isbn" --><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" /></a><!-- /TMPL_IF --><!-- /TMPL_IF --> <a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><span class="item-details">
-<!-- TMPL_VAR NAME="author" --></span></td>
-<td><!-- TMPL_VAR NAME="classification" --></td>
+<!-- TMPL_IF NAME="JacketImages" --><td class="jacketcell">
+
+<!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.THUMBZZZ.jpg" alt="" class="thumbnail" /></a><!-- TMPL_ELSE --><a href="#"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="display:block;" title="Click to view in Google Books" class="<!-- TMPL_VAR NAME="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><a href="http://books.google.com/books?q=<!-- TMPL_VAR NAME="title" escape="url" -->"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="BakerTaylorEnabled" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="https://<!-- TMPL_VAR NAME="BakerTaylorBookstoreURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->"><img alt="See Baker &amp; Taylor" src="<!-- TMPL_VAR NAME="BakerTaylorImageURL" ESCAPE="HTML" --><!-- TMPL_VAR NAME="normalized_isbn" -->" /></a><!-- TMPL_ELSE --><!-- BakerTaylor needs normalized_isbn! --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="SyndeticsCoverImages" -->
+<!-- TMPL_IF NAME="using_https" -->
+<img src="https://secure.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&amp;upc=<!-- TMPL_VAR NAME="normalized_upc" -->&amp;oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->&amp;type=xw10" alt="" class="thumbnail"/>
+<!-- TMPL_ELSE -->
+<img src="http://www.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/SC.GIF&amp;client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&amp;upc=<!-- TMPL_VAR NAME="normalized_upc" -->&amp;oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->&amp;type=xw10" alt="" class="thumbnail"/>
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+</td><!-- /TMPL_IF -->
+
+<td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> <span class="item-details"><!-- TMPL_VAR NAME="author" --></span></td>
+
+<!-- TMPL_UNLESS NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="description" --></td><!-- /TMPL_UNLESS -->
+<td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
 <td><!-- TMPL_VAR NAME="date_due" --></td>
+                <!-- TMPL_IF name="OpacRenewalAllowed" -->
+                    <!-- TMPL_UNLESS name="patron_flagged" -->
 <td>
 <!-- TMPL_IF NAME="debarred" -->Account Frozen
-<!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="status" -->
+<!-- TMPL_ELSIF NAME="status" -->
 <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bornum=<!-- TMPL_VAR NAME="borrowernumber" -->">Renew</a> <span class="renewals">(<!-- TMPL_VAR NAME="renewsleft" --> of <!-- TMPL_VAR NAME="renewsallowed" --> renewals remaining)</span>
-<!-- TMPL_ELSE -->
-<!-- TMPL_IF NAME="onreserve" -->
-On Reserve
-<!-- TMPL_ELSE -->
-No renewals left
+<!-- TMPL_ELSIF NAME="onreserve" -->On Reserve
+<!-- TMPL_ELSE -->No renewals left
 <!-- /TMPL_IF -->
+</td><!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
+<!-- TMPL_IF NAME="OPACFinesTab" -->
+<td><!-- TMPL_IF NAME="charges" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
 <!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
-</td>
-<!-- <td><!-- TMPL_VAR NAME="charges" --></td> -->
 </tr>
-<!-- /TMPL_LOOP -->
+<!-- /TMPL_LOOP --></tbody>
 </table></div>
-<!-- /TMPL_IF --><!-- /TMPL_IF -->
-       
+<!-- /TMPL_IF -->
+    
 
     <!-- TMPL_IF NAME="reserves_count" -->
         <div id="opac-user-holds">
-        <table>
-               <caption>Holds <span class="count">(<!-- TMPL_VAR NAME="reserves_count" --> total)</span></caption>
+        <table id="holdst">
+        <caption>Holds <span class="count">(<!-- TMPL_VAR NAME="reserves_count" --> total)</span></caption>
             <!-- RESERVES TABLE ROWS -->
-            <tr>
+            <thead><tr>
                 <th>Title</th>
                 <th>Placed On</th>
+               <th>Expires On</th>
                 <th>Pick Up Location</th>
+               <!-- TMPL_IF NAME="showpriority" -->
+                       <th>Priority</th>
+               <!-- /TMPL_IF -->
                 <th>Status</th>
-            </tr>
+               <th>Modify</th>
+            </tr></thead>
+                       <tbody>
             <!-- TMPL_LOOP NAME="RESERVES" -->
-            <tr>
-                <td>
-                    <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="reserves_title" --></a>
+           <!-- TMPL_IF NAME="wait" -->
+                        <!-- TMPL_IF NAME="atdestination" -->
+                            <!-- TMPL_IF NAME="found" -->
+                            <tr class="reserved">
+                            <!-- TMPL_ELSE -->
+                            <tr>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_ELSE -->
+                            <tr class="transfered">
+                        <!-- /TMPL_IF -->
+                    <!-- TMPL_ELSE -->
+                            <tr>
+                    <!-- /TMPL_IF -->
+                <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="reserves_title" --></a>
                     <!-- TMPL_VAR NAME="author" -->
                 </td>
                 <td><!-- TMPL_VAR NAME="reservedate" --></td>
-                <td><!-- TMPL_VAR Name="branch" --></td>
+               <td><!-- TMPL_IF NAME="expirationdate" --><!-- TMPL_VAR NAME="expirationdate" --><!-- TMPL_ELSE -->Never Expires<!-- /TMPL_IF --></td>
+                <td><!-- TMPL_VAR NAME="branch" --></td>
+                               <!-- TMPL_IF NAME="showpriority" -->
+                               <td><!-- TMPL_VAR NAME="priority" --> </td>
+                               <!-- /TMPL_IF -->
                 <td>
-                    <!-- TMPL_IF Name="wait" -->
+                    <!-- TMPL_IF NAME="wait" -->
                         <!-- TMPL_IF NAME="atdestination" -->
-                            <!-- TMPL_IF name="found" -->
-                            Document waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b>
+                            <!-- TMPL_IF NAME="found" -->
+                            Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b>
                             <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcd" -->" />
-                        <!-- TMPL_ELSE -->
-                            Waiting to be pulled
+                            <!-- TMPL_ELSE -->
+                            Item waiting to be pulled from <b> <!-- TMPL_VAR NAME="wbrname" --></b>
                         <!-- /TMPL_IF -->
                         <!-- TMPL_ELSE -->
-                        Document being transfered to <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcd" -->" />
+                            Item in transit to <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcd" -->" />
                         <!-- /TMPL_IF -->
                     <!-- TMPL_ELSE -->
-                        Not ready
+                            <!-- TMPL_IF NAME="intransit" -->
+                                Item in transit from <b> <!-- TMPL_VAR NAME="frombranch" --></b> since 
+                                <!-- TMPL_VAR NAME="datesent" -->
+                            <!-- TMPL_ELSE -->
+                                Pending
+                            <!-- /TMPL_IF -->
                     <!-- /TMPL_IF -->
                 </td>
+               <td>
+               <!-- TMPL_IF NAME="cancelable" -->
+                       <form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
+                       <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+                       <input type="submit" name="submit" class="icon delete cancel" value="Cancel" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);" /></form>
+               <!-- TMPL_ELSE -->
+                       &nbsp;
+               <!-- /TMPL_IF -->
+               </td>
+
             </tr>
             <!-- /TMPL_LOOP -->
+                       </tbody>
         </table>
-        <p>If you no longer want a reserve, please send us an e-mail, or go to the circulation desk at your library to get it removed.</p></div>
+    </div>
     <!-- /TMPL_IF -->
-       </div><!-- /opac-user views -->
-       
+    </div><!-- /opac-user views -->
+    </div><!-- /userdetails -->
 </div>
 </div>
 </div>
 <div class="yui-b">
+<div class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
+</div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->