X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fopac-tmpl%2Fprog%2Fen%2Fmodules%2Fopac-user.tt;h=d7c691fbcd5c0c2a61d08cb5c708755933870ea9;hb=53fbfa2dde3fb1150be9e49a90d9974bd71368a0;hp=ffcd293f6e17dc0866976c0bb80092bdd5cc311a;hpb=803095a7989bd1cd4357ebe9736a19284d97b2db;p=koha_fer

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
index ffcd293f6e..d7c691fbcd 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -1,14 +1,17 @@
+[% USE Koha %]
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
-[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog › Library Home for
-[% FOREACH BORROWER_INF IN BORROWER_INFO %]
-    [% INCLUDE 'patron-title.inc' category_type = BORROWER_INF.category_type firstname = BORROWER_INF.firstname surname = BORROWER_INF.surname othernames = BORROWER_INF.othernames cardnumber = BORROWER_INF.cardnumber %]
-[% END %]
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your library home
 [% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'calendar.inc' %]
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.metadata.min.js"></script>
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <script type="text/JavaScript">
 //<![CDATA[
-var MSG_CONFIRM_DELETE_HOLD = _("Are you sure you want to cancel this hold?");
+var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
+var MSG_CONFIRM_SUSPEND_HOLDS = _("Are you sure you want to suspend all holds?");
+var MSG_CONFIRM_RESUME_HOLDS  = _("Are you sure you want to resume all suspended holds?");
+
 $.tablesorter.addParser({
     id: 'articles', 
     is: function(s) {return false;  }, 
@@ -16,7 +19,7 @@ $.tablesorter.addParser({
     type: 'text' 
 });
             $(function() {
-            $('#opac-user-views > ul').tabs();
+            $('#opac-user-views').tabs();
             $.tablesorter.defaults.widgets = ['zebra'];
             [% IF ( dateformat == 'metric' ) %]$.tablesorter.defaults.dateFormat = ['uk'];[% END %]
 			$("#holdst").tablesorter({
@@ -46,6 +49,7 @@ $.tablesorter.addParser({
             $("#renewall").submit();
         });
         $("#checkoutst caption").append("<div id=\"renewcontrols\"><a id=\"renewselected_link\" href=\"#\">"+_("Renew selected")+"</a> <a id=\"renewall_link\" href=\"#\">"+_("Renew all")+"</a></div>");[% END %]
+        $( "#suspend_until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
             });
 //]]>
 </script>
@@ -60,12 +64,12 @@ $.tablesorter.addParser({
 	<div id="userdetails" class="container">
 	[% IF ( bor_messages ) %]
 	       <div class="dialog message">
-	               <h3>Messages For You</h3>
+                   <h3>Messages for you</h3>
 	               <ul>
 	                       [% FOREACH bor_messages_loo IN bor_messages_loop %]
 					<li>
 						<strong>[% bor_messages_loo.message %]</strong><br>
-	                        		&nbsp;&nbsp;&nbsp;<i>Written on [% bor_messages_loo.message_date_formatted %] by [% bor_messages_loo.branchname %]</i>
+                            &nbsp;&nbsp;&nbsp;<i>Written on [% bor_messages_loo.message_date | $KohaDates %] by [% bor_messages_loo.branchname %]</i>
 					</li>
 	                        [% END %]
 
@@ -82,9 +86,15 @@ $.tablesorter.addParser({
 		[% IF ( 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>[% END %]
 		
         [% IF ( BORROWER_INF.warndeparture ) %]
-        <div class="dialog alert">
-                <strong>Please note:</strong><span> Your card will expire on [% BORROWER_INF.warndeparture %]. Please contact the library if you wish to renew your subscription.</span>
-                [% IF ( BORROWER_INF.returnbeforeexpiry ) %]<span> Also note that you must return all checked out items before your card expires.</span>[% END %]
+        <div class="dialog alert" id="warndeparture">
+                <strong>Please note:</strong><span> Your card will expire on <span id="warndeparture_date">[% BORROWER_INF.warndeparture | $KohaDates %]</span>. Please contact the library for more information.</span>
+                [% IF ( BORROWER_INF.returnbeforeexpiry ) %]<span id="warndeparture_returnbeforeexpiry"> Also note that you must return all checked out items before your card expires.</span>[% END %]
+        </div>
+        [% END %]
+
+        [% IF ( BORROWER_INF.warnexpired ) %]
+        <div class="dialog alert" id="warnexpired">
+            <strong>Please note:</strong><span> Your card has expired. Please contact the library for more information.</span>
         </div>
         [% END %]
 
@@ -92,106 +102,44 @@ $.tablesorter.addParser({
 		<div class="dialog alert">
         <ul>
             [% IF ( userdebarred ) %]
-                <li><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INF.userdebarreddate ) %] until [% BORROWER_INF.userdebarreddate %][% END %][% IF ( BORROWER_INF.debarredcomment ) %] with the comment "[% BORROWER_INF.debarredcomment %]"[% END %]. 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 contact the library.</li>
+                <span id="userdebarred"><li><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INF.userdebarreddate ) %] until <span id="userdebarred_date">[% BORROWER_INF.userdebarreddate | $KohaDates %]</span>[% END %][% IF ( BORROWER_INF.debarredcomment ) %] with the comment <span id="userdebarred_comment">"[% BORROWER_INF.debarredcomment %]"</span>[% END %]. 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 contact the library.</li></span>
             [% END %]
             [% IF ( BORROWER_INF.gonenoaddress ) %]
-                <li><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]<a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>
+                <span id="gonenoaddress"><li><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]<a href="/cgi-bin/koha/opac-memberentry.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the <a href="/cgi-bin/koha/opac-memberentry.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li></span>
             [% END %]
             [% IF ( BORROWER_INF.lost ) %]
-                <li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please contact the library.</li>
+                <span id="lost"><li><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please contact the library.</li></span>
             [% END %]
-            [% IF renewal_blocked_fines %]
-                <li><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">more than [% renewal_blocked_fines %]</a> in fines, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li>
+            [% IF ( renewal_blocked_fines ) && ( OpacRenewalAllowed ) %]
+                <span id="renewal_blocked_fines"><li><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">[% IF renewal_blocked_fines != "0.00" %] more than <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines %]</span> in [% END %] fines</a>, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li></span>
             [% END %]
         </ul></div>
         [% END %]
         
 <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 %]
+            <li><a href="#opac-user-checkouts">Checked out</a></li>
+            [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue</a></li>[% END %]
 [% IF ( 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 %]
+            [% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines</a></li>[% END %]
+            [% IF ( BORROWER_INF.amountoverzero ) %]<li><a href="#opac-user-fines">Fines</a></li>[% END %]
+            [% IF ( BORROWER_INF.amountlessthanzero ) %]<li><a href="#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 ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="#opac-user-waiting">Waiting</a></li>[% END %][% END %]
+            [% IF ( reserves_count ) %]<li><a href="#opac-user-holds">Holds</a></li>[% END %]
         </ul>
-        
-[% IF ( OPACFinesTab ) %]
-        <!-- FINES BOX -->
-        [% IF ( BORROWER_INF.amountoverfive ) %]
-            <div id="opac-user-fines"> <h3>Fines and Charges</h3>
-            <table>
-                <tr><th colspan="2">Amount</th></tr>
-                <tr>
-                    <td>You currently owe fines and charges amounting to:</td>
-                    <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td>
-                </tr>
-            </table></div>
-        [% END %]
-
-        [% IF ( BORROWER_INF.amountoverzero ) %]
-           <div id="opac-user-fines"> <h3>Fines and Charges</h3>
-            <table>
-                <tr><th colspan="2">Amount</th></tr>
-                <tr><td>You currently owe fines and charges amounting to:</td>
-                <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td></tr>
-            </table></div>
-        [% END %]
-
-        [% IF ( BORROWER_INF.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">[% BORROWER_INF.amountoutstanding %]</a></td></tr>
-            </table></div>
-        [% END %]
-[% END %]
-    
-    [% END %]
-
-    [% IF ( waiting_count ) %]
-    [% IF ( atdestination ) %]
-    <div id="opac-user-waiting">
-        <table id="waitingt">
-            <caption>Holds Waiting</caption>
-           <thead> <tr>
-                <th colspan="2" class="{sorter:'articles'}">Title</th>
-                <th>Hold date</th>
-                <th>Pick Up Library</th>
-            </tr></thead>
-            <tbody>[% FOREACH WAITIN IN WAITING %]
-                <tr>
-                    <td><img src="[% themelang %]/images/[% WAITIN.itemtype %].gif" alt="[% WAITIN.itemtype %]" title="[% WAITIN.itemtype %]" /></td>
-                    <td><a href="opac-detail.pl?biblionumber=[% WAITIN.biblionumber %]">
-                            [% WAITIN.waiting_title %]
-                        </a><span class="item-details">
-                            [% WAITIN.author %]
-                        </span></td>
-                    <td>[% WAITIN.reservedate %]</td>
-                    <td>[% IF ( WAITIN.atdestination ) %]<strong>Waiting</strong> at [% WAITIN.branch %]
-                        [% ELSE %]
-                        In transit from [% WAITIN.holdingbranch %] to [% WAITIN.branch %]
-                        [% END %]</td>
-                </tr>
-            [% END %]</tbody>
-        </table></div>
-        [% END %]
-    [% END %]
 
     <div id="opac-user-checkouts">[% IF ( issues_count ) %]
         <form id="renewselected" action="/cgi-bin/koha/opac-renew.pl" method="post">
-	<input type="hidden" name="borrowernumber" value="[% borrowernumber %]">
-	<input type="hidden" name="from" value="opac_user" />
+    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]">
+    <input type="hidden" name="from" value="opac_user" />
         <table id="checkoutst">
-        <caption>[% issues_count %] Item(s) Checked Out</caption>
+        <caption>[% issues_count %] Item(s) checked out</caption>
        <thead><tr>
-		[% IF ( JacketImages ) %]<th class="{sorter: false}">&nbsp;</th>[% END %]
+        [% IF ( JacketImages ) %]<th class="{sorter: false}">&nbsp;</th>[% END %]
         <th class="{sorter:'articles'}">Title</th>
         <th>Due</th>
-		[% UNLESS ( item_level_itypes ) %]<th>Item Type</th> [% END %]
+        [% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
         [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
         <th>Call No.</th>
         [% IF ( OpacRenewalAllowed ) %]
@@ -205,15 +153,15 @@ $.tablesorter.addParser({
         [% END %]
         </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:
+        <!-- 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:
         [% UNLESS ( __odd__ ) %]
            <tr[% IF ( overdue ) %] class="overdue"[% END %]>
         [% ELSE %]
            <tr class="[% IF ( overdue ) %]overdue [% END %]highlight">
         [% END %]
-		-->
-		[% FOREACH ISSUE IN ISSUES %]
+        -->
+        [% FOREACH ISSUE IN ISSUES %]
         [% IF ( ISSUE.overdue ) %]<tr class="overdue">[% ELSE %]<tr>[% END %]
 
 [% IF ( JacketImages ) %]<td class="jacketcell">
@@ -231,53 +179,114 @@ $.tablesorter.addParser({
 
 </td>[% END %]
 
-                <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %]</a><span class="item-details">
+                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %]</a><span class="item-details">
                         [% ISSUE.author %]
                     </span></td>
                 [% IF ( ISSUE.overdue ) %]
-                    <td class="overdue">[% ISSUE.date_due %]</td>
+                    <td class="date_due overdue">[% ISSUE.date_due | $KohaDates %]</td>
                 [% ELSE %]
-                    <td>[% ISSUE.date_due %]</td>
+                    <td class="date_due">[% ISSUE.date_due | $KohaDates %]</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 ( show_barcode ) %]<td>[% ISSUE.barcode %]</td>[% END %]
-                <td>[% ISSUE.itemcallnumber %]</td>
+                [% UNLESS ( item_level_itypes ) %]<td class="itype">[% IF ( ISSUE.imageurl ) %]<img src="[% ISSUE.imageurl %]" title="[% ISSUE.description %]" alt="[% ISSUE.description %]" />[% END %] [% ISSUE.description %]</td>[% END %]
+                [% IF ( show_barcode ) %]<td class="barcode">[% ISSUE.barcode %]</td>[% END %]
+                <td class="call_no">[% ISSUE.itemcallnumber %]</td>
                 [% IF ( OpacRenewalAllowed ) %]
-                    <td>[% IF ( ISSUE.status ) %][% IF ( canrenew ) %]<input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
+                    <td class="renew">[% IF ( ISSUE.status ) %][% IF ( canrenew ) %]<input type="checkbox" name="item" value="[% ISSUE.itemnumber %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber %]&amp;borrowernumber=[% ISSUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>
                         [% ELSE %]
                         Not renewable[% IF ( ISSUE.too_many ) %] <span class="renewals">([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining)</span>[% ELSE %][% IF ( ISSUE.on_reserve ) %] <span class="renewals">(On hold)</span>[% END %][% END %] 
                         [% END %]</td>
                 [% END %]
 [% IF ( OPACFinesTab ) %]
-                <td>[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]</td>
+                <td class="fines">[% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]</td>
 [% END %]
             [% IF ( OPACMySummaryHTML ) %]
-                <td>[% ISSUE.MySummaryHTML %]</td>
+                <td class="links">[% ISSUE.MySummaryHTML %]</td>
             [% END %]
             </tr>
         [% END %]</tbody>
         </table>
-	   [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
-		<input type="submit" value="Renew Selected" />
-		[% END %]
-		</form>
+       [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
+        <input type="submit" value="Renew Selected" />
+        [% END %]
+        </form>
         [% IF ( canrenew && !userdebarred && OpacRenewalAllowed ) %]
-		<form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
-			<input type="hidden" name="from" value="opac_user" />
-			<input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
-			[% FOREACH ISSUE IN ISSUES %]
-			<input type="hidden" name="item" value="[% ISSUE.itemnumber %]" />
-			[% END %]
-			<input type="submit" value="Renew All" />
-		</form>
-		[% END %]
+        <form id="renewall" action="/cgi-bin/koha/opac-renew.pl" method="post">
+            <input type="hidden" name="from" value="opac_user" />
+            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+            [% FOREACH ISSUE IN ISSUES %]
+            <input type="hidden" name="item" value="[% ISSUE.itemnumber %]" />
+            [% END %]
+            <input type="submit" value="Renew All" />
+        </form>
+        [% END %]
     [% ELSE %]
         <table>
             <tr><td>You have nothing checked out</td></tr>
         </table>
     [% END %]</div>
+
+[% IF ( OPACFinesTab ) %]
+        <!-- FINES BOX -->
+        [% IF ( BORROWER_INF.amountoverfive ) %]
+            <div id="opac-user-fines"> <h3>Fines and charges</h3>
+            <table>
+                <tr><th colspan="2">Amount</th></tr>
+                <tr>
+                    <td>You currently owe fines and charges amounting to:</td>
+                    <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td>
+                </tr>
+            </table></div>
+        [% END %]
+
+        [% IF ( BORROWER_INF.amountoverzero ) %]
+           <div id="opac-user-fines"> <h3>Fines and charges</h3>
+            <table>
+                <tr><th colspan="2">Amount</th></tr>
+                <tr><td>You currently owe fines and charges amounting to:</td>
+                <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td></tr>
+            </table></div>
+        [% END %]
+
+        [% IF ( BORROWER_INF.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">[% BORROWER_INF.amountoutstanding %]</a></td></tr>
+            </table></div>
+        [% END %]
+[% END %]
     
-    
+    [% END %]
+
+    [% IF ( waiting_count ) %]
+    [% IF ( atdestination ) %]
+    <div id="opac-user-waiting">
+        <table id="waitingt">
+            <caption>Holds waiting</caption>
+           <thead> <tr>
+                <th colspan="2" class="{sorter:'articles'}">Title</th>
+                <th>Hold date</th>
+                <th>Pick up library</th>
+            </tr></thead>
+            <tbody>[% FOREACH WAITIN IN WAITING %]
+                <tr>
+                    <td><img src="[% themelang %]/images/[% WAITIN.itemtype %].gif" alt="[% WAITIN.itemtype %]" title="[% WAITIN.itemtype %]" /></td>
+                    <td><a href="opac-detail.pl?biblionumber=[% WAITIN.biblionumber %]">
+                            [% WAITIN.waiting_title %]
+                        </a><span class="item-details">
+                            [% WAITIN.author %]
+                        </span></td>
+                    <td>[% WAITIN.reservedate | $KohaDates %]</td>
+                    <td>[% IF ( WAITIN.atdestination ) %]<strong>Waiting</strong> at [% WAITIN.branch %]
+                        [% ELSE %]
+                        In transit from [% WAITIN.holdingbranch %] to [% WAITIN.branch %]
+                        [% END %]</td>
+                </tr>
+            [% END %]</tbody>
+        </table></div>
+        [% END %]
+    [% END %]
+
 [% IF ( overdues_count ) %]
 <div id="opac-user-overdues"><table id="overduest">
 <caption>Overdues <span class="count">([% overdues_count %] total)</span></caption>
@@ -285,9 +294,9 @@ $.tablesorter.addParser({
 <thead><tr>
 [% IF ( JacketImages ) %]<th class="{sorter: false}">&nbsp;</th>[% END %]
 <th class="{sorter:'articles'}">Title</th>
-[% UNLESS ( item_level_itypes ) %]<th>Item Type</th> [% END %]
+[% UNLESS ( item_level_itypes ) %]<th>Item type</th> [% END %]
 [% IF ( show_barcode ) %]<th>Barcode</th>[% END %]
-<th>Call No.</th>
+<th>Call no.</th>
 <th>Due</th>
 [% IF ( OpacRenewalAllowed ) %]
                     <th class="{sorter: false}">Renew</th>
@@ -321,10 +330,10 @@ $.tablesorter.addParser({
 [% UNLESS ( item_level_itypes ) %]<td>[% IF ( OVERDUE.imageurl ) %]<img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" />[% END %] [% OVERDUE.description %]</td>[% END %]
 [% IF ( show_barcode ) %]<td>[% OVERDUE.barcode %]</td>[% END %]
 <td>[% OVERDUE.itemcallnumber %]</td>
-<td>[% OVERDUE.date_due %]</td>
+<td>[% OVERDUE.date_due | $KohaDates %]</td>
                 [% IF ( OpacRenewalAllowed ) %]
 <td>
-[% IF ( OVERDUE.debarred ) %]Account Frozen
+[% IF ( OVERDUE.debarred ) %]Account frozen
 [% ELSIF ( OVERDUE.status ) %]
 [% IF ( canrenew ) %]<a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% OVERDUE.itemnumber %]&amp;bornum=[% OVERDUE.borrowernumber %]">Renew</a>[% END %] <span class="renewals">([% OVERDUE.renewsleft %] of [% OVERDUE.renewsallowed %] renewals remaining)</span>
 [% ELSIF ( OVERDUE.onreserve ) %]On hold
@@ -347,9 +356,10 @@ $.tablesorter.addParser({
             <!-- RESERVES TABLE ROWS -->
             <thead><tr>
                 <th class="{sorter:'articles'}">Title</th>
-                <th>Placed On</th>
-		<th>Expires On</th>
-                <th>Pick Up Location</th>
+                <th>Placed on</th>
+                [% IF OpacHoldNotes %]<th>Notes</th>[% END %]
+        <th>Expires on</th>
+                <th>Pick up location</th>
 		[% IF ( showpriority ) %]
 			<th>Priority</th>
 		[% END %]
@@ -371,20 +381,21 @@ $.tablesorter.addParser({
                     [% ELSE %]
                             <tr>
                     [% END %]
-                <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %]</a>
+                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %]</a>
                     [% RESERVE.author %]
                 </td>
-                <td>[% RESERVE.reservedate %]</td>
-		<td>[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate %][% ELSE %]Never Expires[% END %]</td>
-                <td>[% RESERVE.branch %]</td>
+                <td class="reservedate">[% RESERVE.reservedate | $KohaDates %]</td>
+                [% IF OpacHoldNotes %]<td class="reservenotes">[% RESERVE.reservenotes %]</td>[% END %]
+        <td class="expirationdate">[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never expires[% END %]</td>
+                <td class="branch">[% RESERVE.branch %]</td>
 				[% IF ( showpriority ) %]
-				<td>[% RESERVE.priority %] </td>
+                             <td class="priority">[% RESERVE.priority %] </td>
 				[% END %]
-                <td>
+                <td class="status">
                     [% IF ( RESERVE.wait ) %]
                         [% IF ( RESERVE.atdestination ) %]
                             [% IF ( RESERVE.found ) %]
-                            Item waiting at <b> [% RESERVE.wbrname %]</b>[% IF ( RESERVE.formattedwaitingdate ) %] since [% RESERVE.formattedwaitingdate %][% END %]
+                            Item waiting at <b> [% RESERVE.wbrname %]</b>[% IF ( RESERVE.waitingdate ) %] since [% RESERVE.waitingdate | $KohaDates %][% END %]
                             <input type="hidden" name="pickup" value="[% RESERVE.wbrcd %]" />
                             [% ELSE %]
                             Item waiting to be pulled from <b> [% RESERVE.wbrname %]</b>
@@ -395,27 +406,50 @@ $.tablesorter.addParser({
                     [% ELSE %]
                             [% IF ( RESERVE.intransit ) %]
                                 Item in transit from <b> [% RESERVE.frombranch %]</b> since 
-                                [% RESERVE.datesent %]
+                                [% RESERVE.datesent | $KohaDates %]
+                            [% ELSIF ( RESERVE.suspend ) %]
+                                Suspended [% IF ( RESERVE.suspend_until ) %] until [% RESERVE.suspend_until %] [% END %]
                             [% ELSE %]
                                 Pending
                             [% END %]
                     [% END %]
                 </td>
-		<td>
+              <td class="modify">
 		[% IF ( RESERVE.cancelable ) %]
 			<form action="/cgi-bin/koha/opac-modrequest.pl" method="post">
 			<input type="hidden" name="biblionumber" value="[% RESERVE.biblionumber %]" />
-		<input type="hidden" name="reservenumber" value="[% RESERVE.reservenumber %]" />
-			<input type="submit" name="submit" class="icon delete cancel" value="Cancel" onclick="return confirmDelete('Are you sure you want to cancel this hold?');" /></form>
+          <input type="hidden" name="reserve_id" value="[% RESERVE.reserve_id %]" />
+			<input type="submit" name="submit" class="icon delete cancel" value="Cancel" onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);" /></form>
 		[% ELSE %]
-			&nbsp;
 		[% END %]
 		</td>
 
+
             </tr>
             [% END %]
 			</tbody>
         </table>
+
+        [% IF SuspendHoldsOpac %]
+	<div>
+            <form action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
+              <input type="submit" name="submit" class="icon delete cancel" value="Suspend all holds" onclick="return confirmDelete(MSG_CONFIRM_SUSPEND_HOLDS);" />
+              <input type="hidden" name="suspend" value="1" />
+
+	      [% IF AutoResumeSuspendedHolds %]
+	      <label for="suspend_until"> until </label>
+              <input name="suspend_until" id="suspend_until" readonly="readonly" size="10" />
+              <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('suspend_until').value='';return false;">Clear date</a></p>
+              [% END %]
+            </form>
+	</div>
+	<div>
+            <form action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
+              <input type="submit" name="submit" class="icon delete cancel" value="Resume all suspended holds" onclick="return confirmDelete(MSG_CONFIRM_RESUME_HOLDS);" />
+              <input type="hidden" name="suspend" value="0" />
+            </form>
+	</div>
+        [% END %]
     </div>
     [% END %]
     </div><!-- /opac-user views -->