Bug 5917 tracking template changes

diff --git a/koha-tt/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tt/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index b3a6367..376b6cf 100644 (file)
--- a/koha-tt/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -18,6 +18,11 @@ function Check(ff) {
         ok=1;
                     _alertString += "\n- " + _("Title cannot be empty");
     }
+    
+    if(isNull(ff.budget_id,1)){
+               ok=1;
+                                       _alertString += "\n- "+ _("You must select a budget");
+    }
 
     if (!(isNum(ff.quantity,0))){
         ok=1;
@@ -64,7 +69,39 @@ ff.submit();
 
 }
 
-
+$(document).ready(function() 
+    {
+        //We apply the fonction only for modify option
+        [% IF ( quantityrec ) %]
+        $('#quantity').blur(function() 
+        {
+            // if user decreases the quantity
+            if($(this).val() < [% quantityrec %]) 
+            {
+                alert("You have deleted item(s) in the order, don't forget to delete it(them) in the catalog");   
+                return true;
+            } 
+            else 
+            {
+                // if user increases the quantity
+                alert("You can't add a new item, please create a new order line");
+                // and we replace the original value
+                $(this).val([% quantityrec %])
+                return false;
+            }
+        });
+        [% END %]
+        
+        $('#showallbudgets').click(function() {
+            if ( $('#budget_id .b_inactive').is(":visible") )
+            {
+            $('#budget_id .b_inactive').hide();
+            }
+            else {
+            $('#budget_id .b_inactive').show();
+            }
+        });
+    });
 //]]>
 </script>
 </head>
@@ -83,7 +120,7 @@ ff.submit();
 
 <h2>
     [% IF ( ordernumber ) %]
-        Modify order details (line #[% ordernumber %])
+        Modify order line
     [% ELSE %]
         New order
     [% END %]
@@ -132,7 +169,10 @@ ff.submit();
 <form action="/cgi-bin/koha/acqui/addorder.pl" method="post" id="Aform">
 
 <fieldset class="rows">
-        <legend>Catalog details</legend>
+        <legend>
+            Catalog details
+            <span><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% biblionumber %]"> Edit record</a></span>
+        </legend>
         [% UNLESS ( existing ) %]
         <input type="hidden" name="existing" value="no" />
         [% END %]
@@ -273,10 +313,14 @@ ff.submit();
                     [% IF ( budget_loo.b_sel ) %]
                         <option value="[% budget_loo.b_id %]" selected="selected">[% budget_loo.b_txt %]</option>
                     [% ELSE %]
-                        <option value="[% budget_loo.b_id %]">[% budget_loo.b_txt %]</option>
+                        [% IF ( budget_loo.b_active ) %]<option value="[% budget_loo.b_id %]">[% budget_loo.b_txt %]</option>
+                        [% ELSE %]<option value="[% budget_loo.b_id %]" class="b_inactive" style="display : none;">[% budget_loo.b_txt %]</option>    
+                        [% END %]
                     [% END %]
                 [% END %]
                 </select>
+                <label for="showallbudgets" style="float:none;width:auto;">&nbsp;Show all:</label>
+                <input type="checkbox" id="showallbudgets" />
                 [% END %]
             </li>
                <li>
@@ -361,10 +405,10 @@ ff.submit();
             </li>
             <li>
                 <label for="notes">Notes: </label>
-                <textarea id="notes" cols="30" rows="3" name="notes">[% notes %]</textarea>
+                <textarea id="notes" cols="30" rows="3" name="notes"></textarea>
             </li>
             <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
-                <label for="sort1">Planning value1: </label>
+                <label for="sort1">Statistic 1: </label>
 
                 [% IF ( CGIsort1 ) %]
                     [% CGIsort1 %]
@@ -374,7 +418,7 @@ ff.submit();
                 [% END %]
             </li>
             <li>
-                <label for="sort2">Planning value2: </label>
+                <label for="sort2">Statistic 2: </label>
 
                 [% IF ( CGIsort2 ) %]
                     [% CGIsort2 %]

diff --git a/koha-tt/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tt/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index e429966..0642344 100644 (file)
--- a/koha-tt/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -252,6 +252,7 @@
                <th>Order Line</th>
                <th>Summary</th>
                <th>View Record</th>
+               <th>Quantity</th>  
                <th>Est cost</th>
                <th>Actual cost</th>
                <th>TOTAL</th>
@@ -260,20 +261,22 @@
 <tfoot>
            <tr>
                <td colspan="4" class="total">SUBTOTAL</td>
-               <td>&nbsp;</td>
+               <td colspan="2">&nbsp;</td>
                <td>[% totalprice %]</td>
                <td>[% tototal %]</td>
            </tr>
+             
              [% IF ( totalfreight ) %]
                    <tr>
-               <td colspan="5">&nbsp;
+                       <td colspan="6">&nbsp;
                </td>
                            <td>Shipping</td>
                <td>[% totalfreight %]</td>
-           </tr> [% END %]
+               </tr> 
+           [% END %]
              [% IF ( gst ) %]
                    <tr>
-               <td colspan="5">
+                       <td colspan="6">
                <p class="message">
                            <b>HELP</b><br />
                    The total at the bottom of the page should be within a few cents of the total for the invoice.
@@ -281,9 +284,11 @@
                </td>
                            <td><b>Tax rate</b></td>
                <td>[% gst %]</td>
-           </tr> [% END %]
+               </tr> 
+           [% END %]
            <tr>
            <td colspan="4" class="total">TOTAL</td>
+               <td>[% totalquantity %]</td>
                <td colspan="2">&nbsp;</td>
                <td>[% grandtot %]</td>
            </tr>
@@ -303,6 +308,7 @@
                 [% IF ( loop_receive.publishercode ) %]<br />Publisher :[% loop_receive.publishercode %][% END %]
                 </td>
                 <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_receive.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% loop_receive.biblionumber %]" title="MARC" rel="gb_page_center[600,500]">Card</a></td>
+                <td>[% loop_receive.quantityreceived %]</td>
                 <td>[% loop_receive.ecost %]</td>
                 <td>[% loop_receive.unitprice %]</td>
                 <td>[% loop_receive.total %]</td>
@@ -351,3 +357,4 @@
 </div>
 </div>
 [% INCLUDE 'intranet-bottom.inc' %]
+ 

diff --git a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 158609b..8bbdb13 100644 (file)
--- a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -248,9 +248,9 @@ function verify_images() {
                           [% END %]
                         [% END %]</td>
                     [% END %]
-                    <td class="location">[% UNLESS ( singlebranchmode ) %][% itemloo.branchname %] [% END %]</td>
+                    <td class="location">[% UNLESS ( itemloo.singlebranchmode ) %][% itemloo.branchname %] [% END %]</td>
                     <td class="homebranch">[% itemloo.homebranch %]<span class="shelvingloc">[% itemloo.location %]</span> </td>
-                   [% IF ( itemdata_ccode ) %]<td>[% itemloo.ccode %]</td>[% END %]
+                   [% IF ( itemloo.itemdata_ccode ) %]<td>[% itemloo.ccode %]</td>[% END %]
                     <td class="itemcallnumber">[% IF ( itemloo.itemcallnumber ) %] [% itemloo.itemcallnumber %][% END %]</td>
                     <td class="status">
 
@@ -258,7 +258,7 @@ function verify_images() {
                                                <span class="datedue">Checked out
                     [% UNLESS ( itemloo.NOTSAMEBRANCH ) %]
                           to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.borrowernumber %]">
-                         [% IF ( hidepatronname ) %]
+                         [% IF ( itemloo.hidepatronname ) %]
                              [% itemloo.cardnumber %]
                          [% ELSE %]
                              [% itemloo.firstname %] [% itemloo.surname %]
@@ -315,8 +315,8 @@ function verify_images() {
                     [% ELSE %]
                         On hold
                     [% END %]
-                    [% IF ( canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">
-                       [% IF ( hidepatronname ) %]
+                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">
+                       [% IF ( itemloo.hidepatronname ) %]
                            [% itemloo.Reservedcardnumber %]
                        [% ELSE %]
                            [% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]
@@ -341,24 +341,24 @@ function verify_images() {
                     <td class="datelastseen">[% itemloo.datelastseen %]</td>
                     <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?type=[% itemloo.type %]&amp;itemnumber=[% itemloo.itemnumber %]&amp;biblionumber=[% itemloo.biblionumber %]&amp;bi=[% itemloo.biblioitemnumber %]#item[% itemloo.itemnumber %]">[% itemloo.barcode %]</a></td>
                                [% IF ( itemloo.volinfo ) %]    <td class="enumchron">
-                                       [% IF ( itemdata_enumchron ) %]
+                                       [% IF ( itemloo.itemdata_enumchron ) %]
                                                [% IF ( itemloo.enumchron ) %]
                                                [% itemloo.enumchron %][% IF ( itemloo.serialseq ) %] -- [% END %]
                                                [% END %]
                                        [% END %]
                                        [% itemloo.serialseq %][% IF ( itemloo.publisheddate ) %] ([% itemloo.publisheddate %])[% END %]
                                </td>[% END %]
-                               [% IF ( itemdata_uri ) %]
+                               [% IF ( itemloo.itemdata_uri ) %]
                                        <td class="uri"><a href="[% itemloo.uri %]">[% itemloo.uri %]</a></td>
                                [% END %]
-                               [% IF ( itemdata_copynumber ) %]
+                               [% IF ( itemloo.itemdata_copynumber ) %]
                                        <td class="copynumber">[% itemloo.copynumber %]</td>
                                [% END %]
-                [% IF ( itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
+                [% IF ( itemloo.itemdata_itemnotes ) %]<td><div class="itemnotes">[% itemloo.itemnotes %]</div></td>[% END %]
                 [% IF ( itemloo.type ) %]
                     <td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=[% itemloo.biblioitemnumber %]&amp;item=[% itemloo.itemtype %]">Fix Itemtype</a></td>
                 [% END %]
-               [% IF ( SpineLabelShowPrintOnBibDetails ) %]
+               [% IF ( itemloo.SpineLabelShowPrintOnBibDetails ) %]
                        <td><a href="/cgi-bin/koha/labels/spinelabel-print.pl?barcode=[% itemloo.barcode %]" >Print Label</a></td>
                [% END %]
 
@@ -464,7 +464,7 @@ function verify_images() {
 <div id="editions"><h4>Editions</h4>
 <table>
 [% FOREACH XISBN IN XISBNS %]<tr>[% IF ( XISBN.AmazonEnabled ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img src="http://images.amazon.com/images/P/[% XISBN.normalized_isbn %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %]
-[% UNLESS ( XISBN.item_level_itypes ) %]<td>[% IF ( XISBN.noItemTypeImages ) %][% XISBN.description %][% ELSE %]<img src="[% XISBN.imageurl %]" alt="[% XISBN.description %]" title="[% XISBN.description %]">[% END %]</td>[% END %]
+[% UNLESS ( item_level_itypes ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description %][% ELSE %]<img src="[% XISBN.imageurl %]" alt="[% XISBN.description %]" title="[% XISBN.description %]">[% END %]</td>[% END %]
 <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber %]">[% XISBN.title |html %]</a> by [% XISBN.author %] &copy;[% XISBN.copyrightdate %]
   [% IF ( XISBN.publishercode ) %]
 [% XISBN.publishercode %] [% IF ( XISBN.place ) %]([% XISBN.place %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear %][% END %] [% IF ( XISBN.editionstatement ) %][% XISBN.editionstatement %][% END %] [% IF ( XISBN.editionresponsability ) %][% XISBN.editionresponsability %][% END %]

diff --git a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 58bc6ed..59c1500 100644 (file)
--- a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -430,7 +430,6 @@ YAHOO.util.Event.onContentReady("searchheader", function () {
                             </td>
                             <td>
                                 <p>[% SEARCH_RESULT.result_number %].
-                               [% biblionumber = SEARCH_RESULT.biblionumber %]
                                 [% INCLUDE 'biblio-default-view.inc' %]
                                             <b>[% IF ( SEARCH_RESULT.title ) %][% SEARCH_RESULT.title |html %][% ELSE %]No title[% END %]</b>
                                             </a>

diff --git a/koha-tt/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tt/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
index 4db3ccd..8d04cc4 100644 (file)
--- a/koha-tt/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt
@@ -63,7 +63,7 @@ Updated:<ul>
         [% END %]
         </select></li>
     [% END %]
-<!--
+
     [% IF ( printerloop ) %]
         <li><label for="printer">Choose a network printer:</label>
         <select name="printer" id="printer">
@@ -75,8 +75,7 @@ Updated:<ul>
                 [% END %]
             [% END %]
         </select></li>
-    [% END %] -->
-    </ol>
+    [% END %]</ol>
 </fieldset>
 <fieldset class="action"><input type="submit" value="Submit" /></fieldset>
 <div class="noshow">

diff --git a/koha-tt/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tt/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index ccf56f5..88cda68 100644 (file)
--- a/koha-tt/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -916,9 +916,9 @@
                        <ol class="radio">
                        [% FOREACH flagloo IN flagloop %]
                                <li><label class="radio" for="yes[% flagloo.name %]">
-                               [% IF ( flagloo.key == 'gonenoaddress' ) %]Gone no Address:[% END %]
-                               [% IF ( flagloo.key == 'debarred' ) %]Debarred:[% END %]
-                               [% IF ( flagloo.key == 'lost' ) %]Lost Card:[% END %]
+                               [% IF ( key == 'gonenoaddress' ) %]Gone no Address:[% END %]
+                               [% IF ( key == 'debarred' ) %]Debarred:[% END %]
+                               [% IF ( key == 'lost' ) %]Lost Card:[% END %]
                 </label>
                                <label for="yes[% flagloo.name %]">Yes </label>
                                [% IF ( flagloo.yes ) %]

diff --git a/koha-tt/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tt/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index e725ecb..8bcf5cb 100644 (file)
--- a/koha-tt/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tt/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -4,7 +4,7 @@
 [% INCLUDE 'calendar.inc' %]
 [% IF ( op_else ) %] <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
-<script type="text/JavaScript">
+<script type="text/javascript">
 // <![CDATA[
 
     function yuiToolbar() {
@@ -79,11 +79,16 @@ $(document).ready(function() {
 <style type="text/css">
 h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { display : none; }
 .overlay { top: 180px; left: 50%; position: absolute; margin-left: -100px; width: 200px; text-align: center; display: none; margin-top: -10px; background: #eeffd4; padding: .5em; color: #000; } .note { -moz-border-radius: 3px; border-radius:3px; background: transparent url("/intranet-tmpl/prog/img/famfamfam/silk/comment.png") top left no-repeat; padding : 1px 3px 1px 18px; font-size : 90%; }
-</style>
+</style>[% ELSE %]
+<script type="text/javascript">
+// <![CDATA[
+$(document).ready(function() { calcNewsuggTotal(); });
+// ]]>
+</script>
 [% END %]
 <script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
 </head>
-<body onload="calcNewsuggTotal();">
+<body>
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'cat-search.inc' %]
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; [% IF ( op_save ) %] <a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a> &rsaquo; [% IF ( suggestionid ) %]Suggestion edit #[% suggestionid %][% ELSE %]New purchase suggestion[% END %][% ELSE %]Suggestions Management[% END %] </div>

diff --git a/koha-tt/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tt/opac-tmpl/prog/en/includes/doc-head-close.inc
index 4e773de..1ace917 100644 (file)
--- a/koha-tt/opac-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tt/opac-tmpl/prog/en/includes/doc-head-close.inc
@@ -51,7 +51,7 @@
     var MSG_NO_RECORD_ADDED = _("No item was added to your cart");
     var MSG_CONFIRM_DEL_BASKET = _("Are you sure you want to empty your cart?");
     var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");
-       $("#cartDetails").ready(function(){ $("#cmspan").html("<a href=\"#\" id=\"cartmenulink\" class=\"\"><i><\/i><span><i><\/i><span><\/span><img src=\"/opac-tmpl/prog/images/cart.gif\" width=\"14\" height=\"14\" alt=\"\" border=\"0\" /> "+_("Cart")+"<span id=\"basketcount\"><\/span><\/span><\/a>"); }); [% ELSE %][% IF ( virtualshelves ) %]
+       $("#cartDetails").ready(function(){ $("#cmspan").html("<a href=\"#\" id=\"cartmenulink\" class=\"\"><i><\/i><span><i><\/i><span><\/span><span id=\"carticon\"></span> "+_("Cart")+"<span id=\"basketcount\"><\/span><\/span><\/a>"); }); [% ELSE %][% IF ( virtualshelves ) %]
     var MSG_NO_RECORD_SELECTED = _("No item was selected");[% END %][% END %]
     [% IF ( opacuserlogin ) %][% IF ( TagsEnabled ) %]var MSG_TAGS_DISABLED = _("Sorry, tags are not enabled on this system.");
     var MSG_TAG_ALL_BAD = _("Error! Your tag was entirely markup code.  It was NOT added.  Please try again with plain text.");

diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt
index db9a489..5e0f25e 100644 (file)
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt
@@ -400,15 +400,15 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
                <th>Date Due</th>
            </tr></thead>
            <tbody>[% FOREACH ITEM_RESULT IN ITEM_RESULTS %]
-           <tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( ITEM_RESULT.noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
+           <tr>[% IF ( item_level_itypes ) %]<td>[% UNLESS ( noItemTypeImages ) %][% IF ( ITEM_RESULT.imageurl ) %]<img src="[% ITEM_RESULT.imageurl %]" title="[% ITEM_RESULT.description %]" alt="[% ITEM_RESULT.description %]" />[% END %][% END %] [% ITEM_RESULT.description %]</td>[% END %]
                <td>[% UNLESS ( ITEM_RESULT.singleBranchMode ) %][% IF ( ITEM_RESULT.branchurl ) %]<a href="[% ITEM_RESULT.branchurl %]">[% ITEM_RESULT.branchname %]</a>[% ELSE %][% ITEM_RESULT.branchname %][% END %][% END %] <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span> </td>
-               [% IF ( itemdata_ccode ) %]<td>[% ITEM_RESULT.ccode %]</td>[% END %]
+               [% IF ( ITEM_RESULT.itemdata_ccode ) %]<td>[% ITEM_RESULT.ccode %]</td>[% END %]
                <td>[% IF ( ITEM_RESULT.itemcallnumber ) %] [% ITEM_RESULT.itemcallnumber %][% IF ( ITEM_RESULT.OPACShelfBrowser ) %] (<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ITEM_RESULT.biblionumber %]&amp;shelfbrowse_itemnumber=[% ITEM_RESULT.itemnumber %]#shelfbrowser">Browse Shelf</a>)[% END %][% END %]</td>
-               [% IF ( itemdata_enumchron ) %]<td>[% ITEM_RESULT.enumchron %]</td>[% END %]
-               [% IF ( itemdata_uri ) %]<td><a href="[% ITEM_RESULT.uri %]">[% ITEM_RESULT.uri %]</a></td>[% END %]
-               [% IF ( itemdata_copynumber ) %]<td>[% ITEM_RESULT.copynumber %]</td>[% END %]
+               [% IF ( ITEM_RESULT.itemdata_enumchron ) %]<td>[% ITEM_RESULT.enumchron %]</td>[% END %]
+               [% IF ( ITEM_RESULT.itemdata_uri ) %]<td><a href="[% ITEM_RESULT.uri %]">[% ITEM_RESULT.uri %]</a></td>[% END %]
+               [% IF ( ITEM_RESULT.itemdata_copynumber ) %]<td>[% ITEM_RESULT.copynumber %]</td>[% END %]
                <td>[% INCLUDE 'item-status.inc' %]</td>
-               [% IF ( itemdata_itemnotes ) %]<td>[% ITEM_RESULT.itemnotes %]</td>[% END %]
+               [% IF ( ITEM_RESULT.itemdata_itemnotes ) %]<td>[% ITEM_RESULT.itemnotes %]</td>[% END %]
                <td>[% ITEM_RESULT.datedue %]</td>
                [% IF ( ITEM_RESULT.type ) %]
                <td><a href="/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&amp;bi=[% ITEM_RESULT.biblioitemnumber %]&amp;item=[% ITEM_RESULT.itemtype %]">Fix Itemtype</a></td>
@@ -436,14 +436,14 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
         <td rowspan="2" style="width:20px;"><a style="height: 10em;" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% IF ( shelfbrowser_prev_biblionumber ) %][% shelfbrowser_prev_biblionumber %][% ELSE %][% biblionumber %][% END %]&amp;shelfbrowse_itemnumber=[% shelfbrowser_prev_itemnumber %]#shelfbrowser"><img src="/opac-tmpl/prog/images/browse-prev.gif" alt="Previous" border="0" /></a></td>
 [% FOREACH PREVIOUS_SHELF_BROWS IN PREVIOUS_SHELF_BROWSE %]
         <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% PREVIOUS_SHELF_BROWS.biblionumber %]&amp;shelfbrowse_itemnumber=[% PREVIOUS_SHELF_BROWS.itemnumber %]#shelfbrowser">
-    [% IF ( PREVIOUS_SHELF_BROWS.OPACAmazonEnabled ) %][% IF ( PREVIOUS_SHELF_BROWS.OPACAmazonCoverImages ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %]<img border="0" src="http://images.amazon.com/images/P/[% PREVIOUS_SHELF_BROWS.browser_normalized_isbn %].01._AA75_PU_PU-5_.jpg" alt="" />[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %][% END %]
-    [% IF ( PREVIOUS_SHELF_BROWS.SyndeticsEnabled ) %][% IF ( PREVIOUS_SHELF_BROWS.SyndeticsCoverImages ) %][% IF ( PREVIOUS_SHELF_BROWS.content_identifier_exists ) %]
+    [% IF ( PREVIOUS_SHELF_BROWS.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %]<img border="0" src="http://images.amazon.com/images/P/[% PREVIOUS_SHELF_BROWS.browser_normalized_isbn %].01._AA75_PU_PU-5_.jpg" alt="" />[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %][% END %]
+    [% IF ( SyndeticsEnabled ) %][% IF ( PREVIOUS_SHELF_BROWS.SyndeticsCoverImages ) %][% IF ( PREVIOUS_SHELF_BROWS.content_identifier_exists ) %]
     [% IF ( PREVIOUS_SHELF_BROWS.using_https ) %]
     <img border="0" src="https://secure.syndetics.com/index.aspx?isbn=[% PREVIOUS_SHELF_BROWS.browser_normalized_isbn %]/SC.GIF&amp;client=[% PREVIOUS_SHELF_BROWS.SyndeticsClientCode %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_upc ) %]&amp;upc=[% PREVIOUS_SHELF_BROWS.browser_normalized_upc %][% END %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_oclc ) %]&amp;oclc=[% PREVIOUS_SHELF_BROWS.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />
     [% ELSE %]<img border="0" src="http://www.syndetics.com/index.aspx?isbn=[% PREVIOUS_SHELF_BROWS.browser_normalized_isbn %]/SC.GIF&amp;client=[% PREVIOUS_SHELF_BROWS.SyndeticsClientCode %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_upc ) %]&amp;upc=[% PREVIOUS_SHELF_BROWS.browser_normalized_upc %][% END %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_oclc ) %]&amp;oclc=[% PREVIOUS_SHELF_BROWS.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />[% END %]
     [% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %][% END %]
-    [% IF ( PREVIOUS_SHELF_BROWS.GoogleJackets ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %]<div style="block" title="[% PREVIOUS_SHELF_BROWS.biblionumber |url %]" class="[% PREVIOUS_SHELF_BROWS.browser_normalized_isbn %]" id="gbs-thumbnail-preview[% loop.count %]"></div>[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
-    [% IF ( PREVIOUS_SHELF_BROWS.BakerTaylorEnabled ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %]
+    [% IF ( GoogleJackets ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %]<div style="block" title="[% PREVIOUS_SHELF_BROWS.biblionumber |url %]" class="[% PREVIOUS_SHELF_BROWS.browser_normalized_isbn %]" id="gbs-thumbnail-preview[% loop.count %]"></div>[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
+    [% IF ( BakerTaylorEnabled ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %]
     <img alt="See Baker &amp; Taylor" src="[% PREVIOUS_SHELF_BROWS.BakerTaylorImageurl |html %][% PREVIOUS_SHELF_BROWS.browser_normalized_isbn %]" />[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
 
 </a></td>
@@ -452,17 +452,17 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% FOREACH NEXT_SHELF_BROWS IN NEXT_SHELF_BROWSE %]
        <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% NEXT_SHELF_BROWS.biblionumber %]&amp;shelfbrowse_itemnumber=[% NEXT_SHELF_BROWS.itemnumber %]#shelfbrowser">
 
-    [% IF ( NEXT_SHELF_BROWS.OPACAmazonEnabled ) %][% IF ( NEXT_SHELF_BROWS.OPACAmazonCoverImages ) %][% IF ( NEXT_SHELF_BROWS.browser_normalized_isbn ) %]
+    [% IF ( NEXT_SHELF_BROWS.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( NEXT_SHELF_BROWS.browser_normalized_isbn ) %]
     <img border="0" src="http://images.amazon.com/images/P/[% NEXT_SHELF_BROWS.browser_normalized_isbn %].01._AA75_PU_PU-5_.jpg" alt="" />[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %][% END %]
 
-       [% IF ( NEXT_SHELF_BROWS.SyndeticsEnabled ) %][% IF ( NEXT_SHELF_BROWS.SyndeticsCoverImages ) %][% IF ( NEXT_SHELF_BROWS.content_identifier_exists ) %]
+       [% IF ( SyndeticsEnabled ) %][% IF ( NEXT_SHELF_BROWS.SyndeticsCoverImages ) %][% IF ( NEXT_SHELF_BROWS.content_identifier_exists ) %]
     [% IF ( NEXT_SHELF_BROWS.using_https ) %]
     <img border="0" src="https://secure.syndetics.com/index.aspx?isbn=[% NEXT_SHELF_BROWS.browser_normalized_isbn %]/SC.GIF&amp;client=[% NEXT_SHELF_BROWS.SyndeticsClientCode %][% IF ( NEXT_SHELF_BROWS.browser_normalized_upc ) %]&amp;upc=[% NEXT_SHELF_BROWS.browser_normalized_upc %][% END %][% IF ( NEXT_SHELF_BROWS.browser_normalized_oclc ) %]&amp;oclc=[% NEXT_SHELF_BROWS.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />
     [% ELSE %]<img border="0" src="http://www.syndetics.com/index.aspx?isbn=[% NEXT_SHELF_BROWS.browser_normalized_isbn %]/SC.GIF&amp;client=[% NEXT_SHELF_BROWS.SyndeticsClientCode %][% IF ( NEXT_SHELF_BROWS.browser_normalized_upc ) %]&amp;upc=[% NEXT_SHELF_BROWS.browser_normalized_upc %][% END %][% IF ( NEXT_SHELF_BROWS.browser_normalized_oclc ) %]&amp;oclc=[% NEXT_SHELF_BROWS.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />[% END %]
     [% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %][% END %]
 
-    [% IF ( NEXT_SHELF_BROWS.GoogleJackets ) %][% IF ( NEXT_SHELF_BROWS.browser_normalized_isbn ) %]<div style="block" title="[% NEXT_SHELF_BROWS.biblionumber |url %]" class="[% NEXT_SHELF_BROWS.browser_normalized_isbn %]" id="gbs-thumbnail-preview[% loop.count %]"></div>[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
-    [% IF ( NEXT_SHELF_BROWS.BakerTaylorEnabled ) %][% IF ( NEXT_SHELF_BROWS.browser_normalized_isbn ) %]
+    [% IF ( GoogleJackets ) %][% IF ( NEXT_SHELF_BROWS.browser_normalized_isbn ) %]<div style="block" title="[% NEXT_SHELF_BROWS.biblionumber |url %]" class="[% NEXT_SHELF_BROWS.browser_normalized_isbn %]" id="gbs-thumbnail-preview[% loop.count %]"></div>[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
+    [% IF ( BakerTaylorEnabled ) %][% IF ( NEXT_SHELF_BROWS.browser_normalized_isbn ) %]
     <img alt="See Baker &amp; Taylor" src="[% NEXT_SHELF_BROWS.BakerTaylorImageurl |html %][% NEXT_SHELF_BROWS.browser_normalized_isbn %]" />[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
 
 </a></td>
@@ -720,16 +720,16 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 [% FOREACH XISBN IN XISBNS %]
 <tr>
 <td>
-[% IF ( XISBN.OPACAmazonEnabled ) %][% IF ( XISBN.OPACAmazonCoverImages ) %]<img src="http://images.amazon.com/images/P/[% XISBN.normalized_isbn %].01._AA75_PU_PU-5_.jpg" alt="" />[% END %][% END %]
+[% IF ( XISBN.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %]<img src="http://images.amazon.com/images/P/[% XISBN.normalized_isbn %].01._AA75_PU_PU-5_.jpg" alt="" />[% END %][% END %]
 
-[% IF ( XISBN.SyndeticsEnabled ) %][% IF ( XISBN.SyndeticsCoverImages ) %][% IF ( XISBN.content_identifier_exists ) %]
+[% IF ( SyndeticsEnabled ) %][% IF ( XISBN.SyndeticsCoverImages ) %][% IF ( XISBN.content_identifier_exists ) %]
 [% IF ( XISBN.using_https ) %]
 <img border="0" src="https://secure.syndetics.com/index.aspx?isbn=[% XISBN.browser_normalized_isbn %]/SC.GIF&amp;client=[% XISBN.SyndeticsClientCode %][% IF ( XISBN.browser_normalized_upc ) %]&amp;upc=[% XISBN.browser_normalized_upc %][% END %][% IF ( XISBN.browser_normalized_oclc ) %]&amp;oclc=[% XISBN.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />
 [% ELSE %]<img border="0" src="http://www.syndetics.com/index.aspx?isbn=[% XISBN.browser_normalized_isbn %]/SC.GIF&amp;client=[% XISBN.SyndeticsClientCode %][% IF ( XISBN.browser_normalized_upc ) %]&amp;upc=[% XISBN.browser_normalized_upc %][% END %][% IF ( XISBN.browser_normalized_oclc ) %]&amp;oclc=[% XISBN.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />[% END %]
 [% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %][% END %]
 
 </td>
-[% UNLESS ( XISBN.item_level_itypes ) %]<td>[% XISBN.description %]</td>[% END %]<td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% XISBN.biblionumber %]">[% XISBN.title |html %]</a>[% IF ( XISBN.author ) %] by [% XISBN.author |html %][% END %][% IF ( XISBN.copyrightdate ) %] &copy;[% XISBN.copyrightdate %][% END %][% IF ( XISBN.publishercode ) %]
+[% UNLESS ( item_level_itypes ) %]<td>[% XISBN.description %]</td>[% END %]<td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% XISBN.biblionumber %]">[% XISBN.title |html %]</a>[% IF ( XISBN.author ) %] by [% XISBN.author |html %][% END %][% IF ( XISBN.copyrightdate ) %] &copy;[% XISBN.copyrightdate %][% END %][% IF ( XISBN.publishercode ) %]
     <p>[% XISBN.publishercode |html %] 
        [% IF ( XISBN.place ) %]([% XISBN.place %])[% END %] [% IF ( XISBN.publicationyear ) %], [% XISBN.publicationyear %][% END %]
         [% IF ( XISBN.pages ) %][% XISBN.pages %] [% XISBN.illus %] [% XISBN.size %]</p>[% END %]
@@ -746,8 +746,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <table><tr>
 [% FOREACH AMAZON_SIMILAR_PRODUCT IN AMAZON_SIMILAR_PRODUCTS %]
 [% FOREACH similar_biblionumber IN AMAZON_SIMILAR_PRODUCT.similar_biblionumbers %]
-<td>[% IF ( similar_biblionumber.OPACAmazonCoverImages ) %]<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% similar_biblionumber.biblionumber %]"><img alt="" src="http://images.amazon.com/images/P/[% similar_biblionumber.ASIN %].01._SS50_.jpg" />[% END %]
-    [% IF ( similar_biblionumber.SyndeticsEnabled ) %][% IF ( similar_biblionumber.SyndeticsCoverImages ) %][% IF ( similar_biblionumber.content_identifier_exists ) %]
+<td>[% IF ( OPACAmazonCoverImages ) %]<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% similar_biblionumber.biblionumber %]"><img alt="" src="http://images.amazon.com/images/P/[% similar_biblionumber.ASIN %].01._SS50_.jpg" />[% END %]
+    [% IF ( SyndeticsEnabled ) %][% IF ( similar_biblionumber.SyndeticsCoverImages ) %][% IF ( similar_biblionumber.content_identifier_exists ) %]
     [% IF ( similar_biblionumber.using_https ) %]
     <img border="0" src="https://secure.syndetics.com/index.aspx?isbn=[% similar_biblionumber.browser_normalized_isbn %]/SC.GIF&amp;client=[% similar_biblionumber.SyndeticsClientCode %][% IF ( similar_biblionumber.browser_normalized_upc ) %]&amp;upc=[% similar_biblionumber.browser_normalized_upc %][% END %][% IF ( similar_biblionumber.browser_normalized_oclc ) %]&amp;oclc=[% similar_biblionumber.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />
     [% ELSE %]<img border="0" src="http://www.syndetics.com/index.aspx?isbn=[% similar_biblionumber.browser_normalized_isbn %]/SC.GIF&amp;client=[% similar_biblionumber.SyndeticsClientCode %][% IF ( similar_biblionumber.browser_normalized_upc ) %]&amp;upc=[% similar_biblionumber.browser_normalized_upc %][% END %][% IF ( similar_biblionumber.browser_normalized_oclc ) %]&amp;oclc=[% similar_biblionumber.browser_normalized_oclc %][% END %]&amp;type=xw10" alt="" />[% END %]

diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt
index ac7b15d..c3463a8 100644 (file)
--- a/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt
@@ -119,17 +119,17 @@ $.tablesorter.addParser({
 <div id="opac-user-views" class="toptabs">
         <ul>
             <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts">Checked Out</a></li>
-            [% IF ( overdues_count ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">Overdue</a></li>[% END %]
-[% IF (OPACFinesTab ) %]
-            [% IF ( amountoverfive ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Fines</a></li>[% END %]
-            [% IF ( amountoverzero ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Fines</a></li>[% END %]
-            [% IF ( amountlessthanzero ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Credits</a></li>[% END %]
+            [% IF ( BORROWER_INF.overdues_count ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues">Overdue</a></li>[% END %]
+[% IF ( BORROWER_INF.OPACFinesTab ) %]
+            [% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Fines</a></li>[% END %]
+            [% IF ( BORROWER_INF.amountoverzero ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Fines</a></li>[% END %]
+            [% IF ( BORROWER_INF.amountlessthanzero ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-fines">Credits</a></li>[% END %]
 [% END %]
-            [% IF ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-waiting">Waiting</a></li>[% END %][% END %]
-            [% IF ( reserves_count ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">Holds</a></li>[% END %]
+            [% IF ( BORROWER_INF.waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-waiting">Waiting</a></li>[% END %][% END %]
+            [% IF ( BORROWER_INF.reserves_count ) %]<li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds">Holds</a></li>[% END %]
         </ul>
         
-[% IF ( OPACFinesTab ) %]
+[% IF ( BORROWER_INF.OPACFinesTab ) %]
         <!-- FINES BOX -->
         [% IF ( BORROWER_INF.amountoverfive ) %]
             <div id="opac-user-fines"> <h3>Fines and Charges</h3>
@@ -196,11 +196,12 @@ $.tablesorter.addParser({
        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]">
        <input type="hidden" name="from" value="opac_user" />
         <table id="checkoutst">
-        <caption>[% issues_count %] Items Checked Out</caption>
+        <caption>[% issues_count %] Item(s) Checked Out</caption>
        <thead><tr>
                [% IF ( JacketImages ) %]<th>&nbsp;</th>[% END %]
         <th>Title</th>
                [% UNLESS ( item_level_itypes ) %]<th>Item Type</th> [% END %]
+        [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
         <th>Call No.</th>
         <th>Due</th>
         [% IF ( OpacRenewalAllowed ) %]
@@ -240,7 +241,8 @@ $.tablesorter.addParser({
                 <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %]</a><span class="item-details">
                         [% ISSUE.author %]
                     </span></td>
-                [% UNLESS ( ISSUE.item_level_itypes ) %]<td>[% IF ( ISSUE.imageurl ) %]<img src="[% ISSUE.imageurl %]" title="[% ISSUE.description %]" alt="[% ISSUE.description %]" />[% END %] [% ISSUE.description %]</td>[% END %]
+                [% UNLESS ( item_level_itypes ) %]<td>[% IF ( ISSUE.imageurl ) %]<img src="[% ISSUE.imageurl %]" title="[% ISSUE.description %]" alt="[% ISSUE.description %]" />[% END %] [% ISSUE.description %]</td>[% END %]
+                [% IF ( ISSUE.show_barcode ) %]<td>[% ISSUE.barcode %]</td>[% END %]
                 <td>[% ISSUE.itemcallnumber %]</td>
                 [% IF ( ISSUE.overdue ) %]
                     <td class="overdue">[% ISSUE.date_due %]</td>
@@ -292,6 +294,7 @@ $.tablesorter.addParser({
 [% IF ( JacketImages ) %]<th>&nbsp;</th>[% END %]
 <th>Title</th>
 [% UNLESS ( item_level_itypes ) %]<th>Item Type</th> [% END %]
+[% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
 <th>Call No.</th>
 <th>Due</th>
 [% IF ( OpacRenewalAllowed ) %]
@@ -303,13 +306,13 @@ $.tablesorter.addParser({
 
 <tbody>[% FOREACH OVERDUE IN OVERDUES %]
 <tr>
-[% IF ( OVERDUE.JacketImages ) %]<td class="jacketcell">
+[% IF ( JacketImages ) %]<td class="jacketcell">
 
-[% IF ( OVERDUE.OPACAmazonCoverImages ) %][% IF ( OVERDUE.normalized_isbn ) %]<a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="http://images.amazon.com/images/P/[% OVERDUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="thumbnail" /></a>[% ELSE %]<a href="#"><span class="no-image">No cover image available</span></a>[% END %][% END %]
+[% IF ( OPACAmazonCoverImages ) %][% IF ( OVERDUE.normalized_isbn ) %]<a href="http://www.amazon.com/gp/reader/[% OVERDUE.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="http://images.amazon.com/images/P/[% OVERDUE.normalized_isbn %].01.THUMBZZZ.jpg" alt="" class="thumbnail" /></a>[% ELSE %]<a href="#"><span class="no-image">No cover image available</span></a>[% END %][% END %]
 
-[% IF ( OVERDUE.GoogleJackets ) %][% IF ( OVERDUE.normalized_isbn ) %]<div style="display:block;" title="Click to view in Google Books" class="[% OVERDUE.normalized_isbn %]" id="gbs-thumbnail[% loop.count %]"></div>[% ELSE %]<a href="http://books.google.com/books?q=[% OVERDUE.title |url %]"><span class="no-image">No cover image available</span></a>[% END %][% END %]
+[% IF ( GoogleJackets ) %][% IF ( OVERDUE.normalized_isbn ) %]<div style="display:block;" title="Click to view in Google Books" class="[% OVERDUE.normalized_isbn %]" id="gbs-thumbnail[% loop.count %]"></div>[% ELSE %]<a href="http://books.google.com/books?q=[% OVERDUE.title |url %]"><span class="no-image">No cover image available</span></a>[% END %][% END %]
 
-[% IF ( OVERDUE.BakerTaylorEnabled ) %][% IF ( OVERDUE.normalized_isbn ) %]<a href="https://[% OVERDUE.BakerTaylorBookstoreurl |html %][% OVERDUE.normalized_isbn %]"><img alt="See Baker &amp; Taylor" src="[% OVERDUE.BakerTaylorImageurl |html %][% OVERDUE.normalized_isbn %]" /></a>[% ELSE %]<!-- BakerTaylor needs normalized_isbn! --><span class="no-image">No cover image available</span>[% END %][% END %]
+[% IF ( BakerTaylorEnabled ) %][% IF ( OVERDUE.normalized_isbn ) %]<a href="https://[% OVERDUE.BakerTaylorBookstoreurl |html %][% OVERDUE.normalized_isbn %]"><img alt="See Baker &amp; Taylor" src="[% OVERDUE.BakerTaylorImageurl |html %][% OVERDUE.normalized_isbn %]" /></a>[% ELSE %]<!-- BakerTaylor needs normalized_isbn! --><span class="no-image">No cover image available</span>[% END %][% END %]
 
 [% IF ( OVERDUE.SyndeticsCoverImages ) %]
 [% IF ( OVERDUE.using_https ) %]
@@ -322,10 +325,11 @@ $.tablesorter.addParser({
 
 <td><a href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber %]">[% OVERDUE.title |html %]</a> <span class="item-details">[% OVERDUE.author %]</span></td>
 
-[% UNLESS ( OVERDUE.item_level_itypes ) %]<td>[% IF ( OVERDUE.imageurl ) %]<img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" />[% END %] [% OVERDUE.description %]</td>[% END %]
+[% UNLESS ( item_level_itypes ) %]<td>[% IF ( OVERDUE.imageurl ) %]<img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" />[% END %] [% OVERDUE.description %]</td>[% END %]
+[% IF ( OVERDUE.show_barcode ) %]<td>[% OVERDUE.barcode %]</td>[% END %]
 <td>[% OVERDUE.itemcallnumber %]</td>
 <td>[% OVERDUE.date_due %]</td>
-                [% IF ( OVERDUE.OpacRenewalAllowed ) %]
+                [% IF ( OpacRenewalAllowed ) %]
                     [% UNLESS ( OVERDUE.patron_flagged ) %]
 <td>
 [% IF ( OVERDUE.debarred ) %]Account Frozen