Merge remote-tracking branch 'origin/new/bug_6634'

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / members / moremember.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 326de06..351e162 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -1,3 +1,4 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Patrons &rsaquo;
 [% IF ( unknowuser ) %]
@@ -19,7 +20,7 @@ $.tablesorter.addParser({
     type: 'text' 
 });
 $(document).ready(function() {
-       $('#finesholdsissues > ul').tabs();
+    $('#finesholdsissues').tabs();
        $.tablesorter.defaults.widgets = ['zebra'];
        $("#issuest").tablesorter({[% IF ( dateformat_metric ) %]
                dateFormat: 'uk',[% END %]
@@ -288,7 +289,7 @@ function validate1(date) {
 [% FOREACH attribute IN attributes_loop %]
     [% IF attribute.class %]
         <h4>[% attribute.lib %]</h4>
-        <table id=aai_[% attribute.class %]>
+        <table id="aai_[% attribute.class %]">
     [% ELSE %]
         <table id="aai">
     [% END %]
@@ -408,35 +409,26 @@ function validate1(date) {
 </div>
 
 <div id="finesholdsissues" class="toptabs">
-       <ul>
-               <li><a href="/cgi-bin/koha/members/moremember.pl#checkedout">[% issueloop.size %] Checkout(s)</a></li>
+    <ul>
+        <li><a href="#checkedout">[% issueloop.size %] Checkout(s)</a></li>
     [% IF relissueloop.size %]
-        <li><a href="/cgi-bin/koha/members/moremember.pl#relissues">Relatives' Checkouts</a></li>
+        <li><a href="#relissues">Relatives' Checkouts</a></li>
     [% END %]
-               <li><a href="/cgi-bin/koha/members/moremember.pl#finesandcharges">Fines &amp; Charges</a></li>
-               <li>[% IF ( countreserv ) %]
-            <a href="/cgi-bin/koha/members/moremember.pl#onhold">[% countreserv %] Hold(s)</a>
-    [% ELSE %]
-            <a href="/cgi-bin/koha/members/moremember.pl#onhold">0 Holds</a>
+        <li><a href="#finesandcharges">Fines &amp; Charges</a></li>
+        <li>[% IF ( countreserv ) %]
+            <a href="#onhold">[% countreserv %] Hold(s)</a>    [% ELSE %]
+            <a href="#onhold">0 Holds</a>
     [% END %]</li>
-       </ul>
-       
-<div id="finesandcharges">
-    [% IF ( totaldue_raw ) %]
-        <p>Total due: [% totaldue %]</p>
-    [% ELSE %]
-        <p>No outstanding charges</p>
-    [% END %]
-</div>
+    </ul>
 
     <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post" class="checkboxed">
     <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
-       <input type="hidden" name="branch" value="[% branch %]" />
+    <input type="hidden" name="branch" value="[% branch %]" />
 <div id="checkedout">
     [% IF ( issueloop ) %]
     <table id="issuest">
     <thead>
-               <tr>
+        <tr>
             <th scope="col">Due date</th>
             <th scope="col">Title</th>
             <th scope="col">Item type</th>
@@ -458,7 +450,7 @@ function validate1(date) {
           <tr>
           [% END %]
           [% IF ( issueloo.red ) %]
-                     <td class="od">
+              <td class="od">
           [% ELSE %]
             <td>
           [% END %]
@@ -474,7 +466,7 @@ function validate1(date) {
 <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
             <td>[% issueloo.issuedate %]</td>
             <td>[% issueloo.issuingbranchname %]</td>
-               <td>[% issueloo.itemcallnumber %]</td>
+            <td>[% issueloo.itemcallnumber %]</td>
             <td>[% issueloo.charge %]</td>
             <td>[% issueloo.replacementprice %]</td>
       [% IF ( issueloo.renew_failed ) %]
@@ -495,9 +487,9 @@ function validate1(date) {
                 [% IF ( issueloo.norenew_reason_on_reserve ) %]
                 <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On Hold</a>
                 [% END %]
-                                   [% IF ( issueloo.norenew_reason_too_many ) %]
+                    [% IF ( issueloo.norenew_reason_too_many ) %]
                         Not renewable
-                                   [% END %]
+                    [% END %]
                 [% IF ( issueloo.can_confirm ) %]
                     </span>
                 [% END %]
@@ -545,7 +537,7 @@ function validate1(date) {
 <div id="relissues">
  <table id="relissuest">
     <thead>
-       <tr>
+    <tr>
             <th scope="col">Due date</th>
             <th scope="col">Title</th>
             <th scope="col">Item type</th>
@@ -585,15 +577,23 @@ function validate1(date) {
         <td>[% relissueloo.itemcallnumber %]</td>
         <td>[% relissueloo.charge %]</td>
         <td>[% relissueloo.replacementprice %]</td>
-           <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])</a></td>
+        <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.firstname %] [% relissueloo.surname %] ([% relissueloo.cardnumber %])</a></td>
         </tr>
   [% END %]
         </tbody>
        </table>
-       </div>
+    </div>
 [% END %]
     </form>
-       
+
+<div id="finesandcharges">
+    [% IF ( totaldue_raw ) %]
+        <p>Total due: [% totaldue %]</p>
+    [% ELSE %]
+        <p>No outstanding charges</p>
+    [% END %]
+</div>
+
 <div id="onhold">
 [% IF ( reservloop ) %]
 <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
@@ -645,6 +645,8 @@ function validate1(date) {
 
         <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
     </form>
+
+    [% IF SuspendHoldsIntranet %]
     <fieldset class="action">
         <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
             <input type="hidden" name="from" value="borrower" />
@@ -696,6 +698,7 @@ function validate1(date) {
             <input type="submit" value="Resume all suspended holds" />
        </form>
     </fieldset>
+    [% END # IF SuspendHoldsIntranet %]
 
     [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
        </div>