Bug 15758: Koha::Libraries - Remove GetBranches
[srvgit] / koha-tmpl / intranet-tmpl / prog / en / modules / circ / returns.tt
index 7a66a5c..8e1849a 100644 (file)
@@ -6,9 +6,24 @@
 [% USE AuthorisedValues %]
 [% USE ColumnsSettings %]
 
+[% BLOCK display_bormessagepref %]
+    [% IF ( bormessagepref ) %]
+        <li>Patron notification:
+            [% FOREACH mtt IN bormessagepref.keys %]
+                [%~ IF ( mtt == 'email' ) %] Email[% END ~%]
+                [%~ IF ( mtt == 'phone' ) %] Phone[% END ~%]
+                [%~ IF ( mtt == 'sms' ) %] SMS[% END ~%]
+                [%~ UNLESS loop.last %], [% ELSE %].[% END ~%]
+            [% END %]
+        </li>
+           [% ELSE %]
+        <li>Patron is not notified.</li>
+    [% END %]
+[% END %]
+
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Circulation &rsaquo; Check in [% title |html %]</title>
-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'datatables.inc' %]
 [% INCLUDE 'columns_settings.inc' %]
@@ -23,6 +38,11 @@ function Dopop(link) {
     $("#barcode").focus();
 }
 $(document).ready(function () {
+    $(".modal").modal({ backdrop: 'static' }).on('shown', function() {
+        $("#barcode").prop("disabled", true);
+    }).on('hidden', function() {
+        $("#barcode").prop("disabled", false).focus();
+    });
 
     [% IF print_slip %]
         Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% biblionumber %]');
@@ -38,11 +58,17 @@ $(document).ready(function () {
             }, columns_settings);
 
     $("#return_date_override").datetimepicker({
-        onClose: function(dateText, inst) { $("#barcode").focus(); },
+        onClose: function(dateText, inst) {
+            if (validate_date(dateText, inst) ) {
+                $("#barcode").focus();
+            }
+        },
         defaultDate: -1,
         hour: 23,
         minute: 59,
         maxDate: 0
+    }).on("change", function(e, value) {
+        if ( ! is_valid_date( $(this).val() ) ) {$(this).val("");}
     });
     $("#return_date_override").on("blur", function() {
             check_valid_return_date();
@@ -81,13 +107,13 @@ $(document).ready(function () {
             $("#barcode").addClass("alert");
             $("#dropboxmode").show();
 
-            $("#return_date_override_fields :input").attr("disabled", true);
+            $("#return_date_override_fields :input").prop('disabled', true);
             $("#return_date_override").datetimepicker("disable");
         } else {
             $("#barcode").removeClass("alert");
             $("#dropboxmode").hide();
 
-            $("#return_date_override_fields :input").attr("disabled", false);
+            $("#return_date_override_fields :input").prop('disabled', false);
             $("#return_date_override").datetimepicker("enable");
         }
         $("#barcode").focus();
@@ -103,7 +129,7 @@ $(document).ready(function () {
         $("#barcode").focus();
     });
     [% IF(overduecharges) %] $("#barcode").focus(function () {
-        if (($("#exemptcheck").attr("checked") == true) || ($("#dropboxcheck").attr("checked") == true)) {
+        if (($("#exemptcheck").prop("checked") == true) || ($("#dropboxcheck").prop("checked") == true)) {
             $("#barcode").addClass("alert");
         } else {
             $("#barcode").removeClass("alert");
@@ -113,6 +139,10 @@ $(document).ready(function () {
         $("#barcode").removeClass("alert");
     });
     [% END %]
+    $('.openWin').on("click",function(e){
+        e.preventDefault();
+        Dopop( $(this).data("url") );
+    });
 });
 //]]>
 </script>
@@ -146,9 +176,10 @@ $(document).ready(function () {
 
 [% IF ( collectionItemNeedsTransferred ) %]
  <div id="rotating-collection" class="dialog message">
-        <h3>Please transfer item to: [% collectionBranch %]</h3>
+        <h3>Please transfer item to: [% Branches.GetName( collectionBranch ) %]</h3>
             <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
             <p>This item is part of a rotating collection.</p>
+            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% collectionBranch %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
 </div>
 [% END %]
 
@@ -193,7 +224,8 @@ $(document).ready(function () {
         <!-- WrongTransfer -->
         <h3>Please return item to: [% Branches.GetName( TransferWaitingAt ) %]</h3>
             <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
-        <button type="submit" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip'); return true;"><i class="fa fa-print"></i> Print transfer slip</button><button type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
+        <button type="submit" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% homebranch %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
+        <button class="deny" type="submit" onclick="window.location.href='/cgi-bin/koha/circ/returns.pl?itemnumber=[% itemnumber %]&amp;canceltransfer=1'"><i class="fa fa-times"></i> Cancel transfer</button>
 [% IF ( wborcnum ) %]<h5>Hold for:</h5>
         <ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
             [% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
@@ -220,56 +252,97 @@ $(document).ready(function () {
 [% END %]
 
 [% IF ( found ) %]
-<!-- found -->
-<!-- case of a reservation found, and display info -->
     [% IF ( waiting ) %]
-       <!-- waiting -->
+        <div id="hold-found1" class="modal fade audio-alert-action">
+            <form method="post" action="returns.pl" class="confirm">
+                <div class="modal-header">
+                    <h3>
+                        Hold found (item is already waiting):
+                        <br/>
+                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">
+                            [% itembarcode |html %]: [% title |html %]
+                        </a>
+                    </h3>
+                </div>
+
+                <div class="modal-body">
+                    [% IF ( reservenotes ) %]
+                        <h4>Notes: [% reservenotes %]</h4>
+                    [% END %]
 
-    <div id="hold-found1" class="dialog message audio-alert-action">
-        <h3>Hold found (item is already waiting)</h3>
-        <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
-        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
-        <h4>Hold for:</h4>
-                       <ul>
-            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])</li>
-            <li>[% borstnum %] [% boraddress %]<br />
-                       [% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
-            [% borcity %] [% borzip %]</li>
-           [% IF ( borphone ) %]<li> [% borphone %]</li>[% END %]
-                  [% IF ( boremail ) %]<li><a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a></li>[% END %]
-[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
-[% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]</ul>
-               [% IF ( transfertodo ) %]
-            <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
-               [% ELSE %]
-               <h4><strong>Hold at</strong> [% destbranchname %]</h4>
-        [% END %]
-        <form method="post" action="returns.pl" class="confirm">
-            <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm</button>
+                    <h4>Hold for:</h4>
 
-            <input type="hidden" name="cancel_reserve" value="0" />
-            <button type="submit" class="deny" onclick="this.form.cancel_reserve.value = 1; this.form.submit();"><i class="fa fa-times"></i> Cancel</button>
+                    <li>
+                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borsurname %], [% borfirstname %]</a> ([% borcnum %])
+                    </li>
 
-            <input type="hidden" name="print_slip" value="0" />
-            <input type="submit" value="Print and confirm" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();" />
-            [% FOREACH inputloo IN inputloop %]
-                <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
-                <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
-                <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
-            [% END %]
-                <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
-                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
-                <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
-                <input type="hidden" name="resbarcode" value="[% barcode %]" />
-                <input type="hidden" name="diffBranch" value="[% destbranch %]" />
-                <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
-                <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
-                <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
-
-                <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
-                <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
-                </form>
-       </div>
+                    <li>
+                        [% borstnum %] [% boraddress %]<br />
+                        [% IF ( boraddress2 ) %]
+                            [% boraddress2 %]<br />
+                        [% END %]
+                        [% borcity %] [% borzip %]
+                    </li>
+
+                    [% IF ( borphone ) %]
+                        <li> [% borphone %]</li>
+                    [% END %]
+
+                    [% IF ( boremail ) %]
+                        <li><a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a></li>
+                    [% END %]
+
+                    [% IF ( debarred ) %]
+                        <li class="error">Patron is RESTRICTED</li>
+                    [% END %]
+
+                    [% IF ( gonenoaddress ) %]
+                        <li class="error">Patron's address is in doubt</li>
+                    [% END %]
+
+                    [% IF ( transfertodo ) %]
+                        <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) %]</h4>
+                    [% ELSE %]
+                        <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) %]</h4>
+                    [% END %]
+
+                    [% FOREACH inputloo IN inputloop %]
+                        <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
+                        <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
+                        <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
+                    [% END %]
+
+                    <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
+                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
+                    <input type="hidden" name="reserve_id" value="[% reserve_id %]" />
+                    <input type="hidden" name="diffBranch" value="[% destbranch %]" />
+                    <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
+                    <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
+                    <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
+
+                    <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
+                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
+                </div>
+
+                <div class="modal-footer">
+                    <input type="hidden" name="cancel_reserve" value="0" />
+
+                    <button type="submit" class="btn approve">
+                        <i class="fa fa-check"></i> Confirm
+                    </button>
+
+                    <input type="hidden" name="print_slip" value="0" />
+                    <button type="submit" class="btn print" onclick="this.form.print_slip.value = 1; this.form.submit();">
+                        <i class="fa fa-print"></i> Print and confirm
+                    </button>
+
+                    <button type="submit" class="btn deny" onclick="this.form.cancel_reserve.value = 1; this.form.submit();">
+                        <i class="fa fa-times"></i> Cancel hold
+                    </button>
+                </div>
+            </form>
+        </div>
     [% END %]
 
     [% IF ( diffbranch ) %]
@@ -288,10 +361,10 @@ $(document).ready(function () {
 [% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
 [% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]
                     </ul>
-               [% IF ( transfertodo ) %]
-            <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
-               [% ELSE %]
-               <h4><strong>Hold at</strong> [% destbranchname %]</h4>
+        [% IF ( transfertodo ) %]
+            <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) %]</h4>
+        [% ELSE %]
+            <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) %]</h4>
         [% END %]
 
         <form method="post" action="returns.pl" class="confirm">
@@ -322,7 +395,7 @@ $(document).ready(function () {
         <div id="return1" class="dialog message audio-alert-action">
             <h3>Please return item to: [% Branches.GetName( returnbranch ) %]</h3>
             <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
-            <ul><li><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% returnbranch %]&amp;op=slip'); return true;">Print slip</a></li></ul>
+            <p><button type="button" class="openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;branchcode=[% returnbranch %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button></p>
         </div>
     [% END %]
 
@@ -332,7 +405,7 @@ $(document).ready(function () {
     Transfer now?<br />
     <form method="post" action="returns.pl" name="mainform" id="mainform">
     [% IF itemnumber %]
-        <button type="submit" name="dotransfer" class="print" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% returnbranch %]&amp;op=slip'); return true;"><i class="fa fa-print"></i> Yes, print slip</button>
+        <button type="submit" name="dotransfer" class="print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber %]&amp;&amp;branchcode=[% returnbranch %]&amp;op=slip"><i class="fa fa-print"></i> Yes, print slip</button>
     [% END %]
        <button type="submit" name="dotransfer" class="submit"><i class="fa fa-check"></i> Yes</button>
        <button type="submit" name="notransfer" class="submit"><i class="fa fa-times"></i> No</button>
@@ -382,55 +455,114 @@ $(document).ready(function () {
     <!-- case of simple return no issue or transfer but with a reservation  -->
     [% IF ( reserved ) %]
        <!--  reserved  -->
+        <div id="hold-found2" class="modal fade audio-alert-action">
+            <form method="post" action="returns.pl" class="confirm">
+                <div class="modal-header">
+                    <h3>
+                        Hold found:
+                        <br/>
+                        <a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">
+                            [% itembarcode |html %]: [% title |html %]
+                        </a>
+                </div>
+
+                <div class="modal-body">
+                    [% IF ( reservenotes ) %]
+                        <h4>Notes: [% reservenotes %]</h4>
+                    [% END %]
+                    <h5>Hold for:</h5>
+
+                        <li>
+                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
+                                [% borsurname %], [% borfirstname %]
+                            </a>
+                            ([% borcnum %])
+                        </li>
+
+                        <li>
+                            [% borstnum %] [% boraddress %]<br />
+                            [% IF ( boraddress2 ) %]
+                                [% boraddress2 %]<br />
+                            [% END %]
+                            [% borcity %] [% borzip %]
+                        </li>
 
-    <div id="hold-found2" class="dialog message audio-alert-action">
-      <h3>Hold found</h3>
-          <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% itembarcode |html %]: [% title |html %]</a></p>
-        [% IF ( reservenotes ) %]<h4>Notes: [% reservenotes %]</h4>[% END %]
-        <h5>Hold for:</h5>
-               <ul>
-            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
-                [% borsurname %], [% borfirstname %]
-            </a> ([% borcnum %])</li>
-            <li>[% borstnum %] [% boraddress %]<br />
-                       [% IF ( boraddress2 ) %][% boraddress2 %]<br />[% END %]
-                       [% borcity %] [% borzip %]</li>
-            [% IF ( borphone ) %]<li>[% borphone %]</li>[% END %]
-            [% IF ( boremail ) %]<li>[% IF ( transfertodo ) %][% boremail %][% ELSE %]<a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a>[% END %]</li>[% END %]
-[% IF ( debarred ) %]<li class="error">Patron is RESTRICTED</li>[% END %]
-[% IF ( gonenoaddress ) %]<li class="error">Patron's address is in doubt</li>[% END %]
-        </ul>
-        [% IF ( transfertodo ) %]
-            <h4><strong>Transfer to:</strong> [% destbranchname %]</h4>
-               [% ELSE %]
-               <h4><strong>Hold at</strong> [% destbranchname %]</h4>
-        [% END %]
-        <form method="post" action="returns.pl" class="confirm">
-            <input type="hidden" name="print_slip" value="0" />
-            [% IF ( transfertodo ) %]
-                <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm hold and transfer</button>
-                <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit()"><i class="fa fa-print"></i> Print slip, transfer, and confirm</button>
-            [% ELSE %]
-                <button type="submit" class="approve"><i class="fa fa-check"></i> Confirm hold</button>
-                <button type="submit" class="print" onclick="this.form.print_slip.value = 1; this.form.submit();"><i class="fa fa-print"></i> Print slip and confirm</button>
-            [% END %]
-                <button type="submit" class="deny" onclick="$('.dialog:visible').hide('slow'); $('#barcode').focus(); return false;"><i class="fa fa-times"></i> Ignore</button>
-            [% FOREACH inputloo IN inputloop %]
-       <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
-       <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
-       <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />[% END %]
-            <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
-            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
-            <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
-            <input type="hidden" name="resbarcode" value="[% barcode %]" />
-            <input type="hidden" name="diffBranch" value="[% destbranch %]" />
-            <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
-            <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
-            <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
-            <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
-            <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
-        </form>
-       </div>
+                        [% IF ( borphone ) %]
+                            <li>[% borphone %]</li>
+                        [% END %]
+
+                        [% IF ( boremail ) %]
+                            <li>
+                                [% IF ( transfertodo ) %]
+                                    [% boremail %]
+                                [% ELSE %]
+                                    <a id="boremail" href="mailto:[% boremail %]">[% boremail %]</a>
+                                [% END %]
+                            </li>
+                        [% END %]
+
+                        [% UNLESS ( transfertodo) %]
+                            [% INCLUDE display_bormessagepref %]
+                        [% END %]
+
+                        [% IF ( debarred ) %]
+                            <li class="error">Patron is RESTRICTED</li>
+                        [% END %]
+
+                        [% IF ( gonenoaddress ) %]
+                            <li class="error">Patron's address is in doubt</li>
+                        [% END %]
+
+                    [% IF ( transfertodo ) %]
+                        <h4><strong>Transfer to:</strong> [% Branches.GetName( destbranch ) %]</h4>
+                    [% ELSE %]
+                        <h4><strong>Hold at</strong> [% Branches.GetName( destbranch ) %]</h4>
+                    [% END %]
+
+                    <input type="hidden" name="print_slip" value="0" />
+
+
+                    [% FOREACH inputloo IN inputloop %]
+                        <input type="hidden" name="ri-[% inputloo.counter %]" value="[% inputloo.barcode %]" />
+                        <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
+                        <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
+                    [% END %]
+
+                    <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
+                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+                    <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
+                    <input type="hidden" name="reserve_id" value="[% reserve_id %]" />
+                    <input type="hidden" name="diffBranch" value="[% destbranch %]" />
+                    <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
+                    <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
+                    <input type="hidden" name="forgivemanualholdsexpire" value="[% forgivemanualholdsexpire %]" />
+                    <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
+                    <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
+                </div>
+
+                <div class="modal-footer">
+                    [% IF ( transfertodo ) %]
+                        <button type="submit" class="btn approve">
+                            <i class="fa fa-check"></i> Confirm hold and transfer
+                        </button>
+                        <button type="submit" class="btn print" onclick="this.form.print_slip.value = 1; this.form.submit()">
+                            <i class="fa fa-print"></i> Print slip, transfer, and confirm
+                        </button>
+                    [% ELSE %]
+                        <button type="submit" class="btn approve">
+                            <i class="fa fa-check"></i> Confirm hold
+                        </button>
+                        <button type="submit" class="btn print" onclick="this.form.print_slip.value = 1; this.form.submit();">
+                            <i class="fa fa-print"></i> Print slip and confirm
+                        </button>
+                    [% END %]
+
+                    <button data-dismiss="modal" aria-hidden="true" type="submit" class="btn btn-danger deny" onclick="$('#barcode').focus(); return false;">
+                        <i class="fa fa-times"></i> Ignore
+                    </button>
+                </div>
+            </form>
+        </div>
     [% END %]
 [% END %]
 
@@ -459,10 +591,10 @@ $(document).ready(function () {
                         </p>
                     [% END %]
                     [% IF ( errmsgloo.badbarcode ) %]
-                        <p class="problem">No item with barcode: [% errmsgloo.msg %]</p>
+                        <p class="problem">No item with barcode: [% errmsgloo.msg | html %]</p>
                     [% END %]
                     [% IF ( errmsgloo.ispermanent ) %]
-                        <p class="problem">Please return item to: [% errmsgloo.msg %]</p>
+                        <p class="problem">Please return item to: [% Branches.GetName( errmsgloo.msg ) %]</p>
                     [% END %]
                     [% IF ( errmsgloo.notissued ) %]
                         <p class="problem">Not checked out.</p>
@@ -614,7 +746,13 @@ $(document).ready(function () {
                 [% END %]
             </td>
             <td class="ci-title"><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% riloo.itembiblionumber %]">
-                    [% riloo.itemtitle |html %]</a></td>
+                    [% riloo.itemtitle |html %]
+                </a>
+                [% IF ( riloo.enumchron ) %]
+                    <br/>
+                    <span class="item_enumeration" style="white-space: nowrap;">[% riloo.enumchron %]</span>
+                [% END %]
+            </td>
             <td class="ci-author">[% riloo.itemauthor %]</td>
             <td class="ci-barcode"><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% riloo.itembiblionumber %]&amp;itemnumber=[% riloo.itemnumber %]#item[% riloo.itemnumber %]">[% riloo.barcode %]</a></td>
             <td class="ci-homelibrary">[% Branches.GetName( riloo.homebranch ) %]</td>
@@ -629,9 +767,9 @@ $(document).ready(function () {
                 </a>
             [% ELSE %]Not checked out[% END %]</td>
             <td class="ci-note">
-                [% IF ( riloo.bornote ) %]<p><span class="circ-hlt">[% riloo.bornote %]</p></span>[% END %]
-                [% IF ( riloo.itemnote ) %]<p><span class="circ-hlt">[% riloo.itemnote %]</p></span>[% END %]
-                [% IF ( riloo.itemnotes_nonpublic ) %]<p><span class="circ-hlt">[% riloo.itemnotes_nonpublic %]</p></span>[% END %]
+                [% IF ( riloo.bornote ) %]<p><span class="circ-hlt patron-note">[% riloo.bornote %]</p></span>[% END %]
+                [% IF ( riloo.itemnote ) %]<p><span class="circ-hlt item-note-public">[% riloo.itemnote %]</p></span>[% END %]
+                [% IF ( riloo.itemnotes_nonpublic ) %]<p><span class="circ-hlt item-note-nonpublic">[% riloo.itemnotes_nonpublic %]</p></span>[% END %]
             </td>
            </tr>
         [% END %]