projects / koha.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote-tracking branch 'origin/new/bug_2780'
[koha.git] / 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 7a62b00..27c7a2f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -3,7 +3,7 @@
 [% IF ( unknowuser ) %]
     Patron does not exist
 [% ELSE %]
-    Patron Details for [% INCLUDE 'patron-title.inc' %]
+    Patron details for [% INCLUDE 'patron-title.inc' %]
 [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -125,7 +125,7 @@ function validate1(date) {
 <div id="breadcrumbs">
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
-&rsaquo; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron Details for [% INCLUDE 'patron-title.inc' %][% END %]
+&rsaquo; [% IF ( unknowuser ) %]Patron does not exist[% ELSE %]Patron details for [% INCLUDE 'patron-title.inc' %][% END %]
 </div>
 
 <div id="doc3" class="yui-t1">
@@ -168,7 +168,7 @@ function validate1(date) {
             <li>Patron is restricted[% IF ( userdebarreddate ) %] until [% userdebarreddate%] [% IF (debarredcomment ) %]([% debarredcomment %])[% END %][% END %]
             <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post">
                 <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
-                <input type="submit" value="Lift Restriction" />
+                <input type="submit" value="Lift restriction" />
             </form>
             </li>
         [% END %]
@@ -376,12 +376,12 @@ function validate1(date) {
  
     [% UNLESS ( I ) %]
  <div id="patron-alternate-address" style="padding-top: 1em;">
-    <h3>Alternate Address</h3>
+    <h3>Alternate address</h3>
     <div class="rows">  <ol><li><span class="label">Address: </span>[% B_address %]</li>
       <li><span class="label">Address 2: </span>[% B_address2 %]</li>
       <li><span class="label">City: </span>[% B_city %]</li>
       [% IF ( B_state ) %]<li><span class="label">State: </span>[% B_state %]</li>[% END %]
-      <li><span class="label">Zip/Postal Code: </span>[% B_zipcode %]</li>
+      <li><span class="label">Zip/Postal code: </span>[% B_zipcode %]</li>
       [% IF ( B_country ) %]<li><span class="label">Country: </span>[% B_country %]</li>[% END %]
       [% IF ( B_phone ) %]<li><span class="label">Phone: </span>[% B_phone %]</li>[% END %]
       [% IF ( B_email ) %]<li><span class="label">Email: </span><a href="mailto:[% B_email %]">[% email %]</a></li>[% END %]</ol></div>
@@ -390,14 +390,14 @@ function validate1(date) {
     [% END %]
 
  <div id="patron-alternative-contact" style="padding-top: 1em;">
- <h3>Alternative Contact</h3>  
+ <h3>Alternative contact</h3>
    <div class="rows"> <ol><li><span class="label">Surname: </span>[% altcontactsurname %]</li>
     <li><span class="label">First name: </span>[% altcontactfirstname %]</li>    
     <li><span class="label">Address: </span>[% altcontactaddress1 %]</li>
     <li><span class="label">Address 2: </span>[% altcontactaddress2 %]</li>
        <li><span class="label">City: </span>[% altcontactaddress3 %]</li>
     [% IF ( altcontactstate ) %]<li><span class="label">State: </span>[% altcontactstate %]</li>[% END %]
-       <li><span class="label">Zip/Postal Code: </span>[% altcontactzipcode %]</li>
+    <li><span class="label">Zip/Postal code: </span>[% altcontactzipcode %]</li>
        [% IF ( altcontactcountry ) %]<li><span class="label">Country: </span>[% altcontactcountry %]</li>[% END %]
     [% IF ( altcontactphone ) %]<li><span class="label">Phone: </span>[% altcontactphone %]</li>[% END %]
     </ol></div>
@@ -439,10 +439,10 @@ function validate1(date) {
                <tr>
             <th scope="col">Due date</th>
             <th scope="col">Title</th>
-            <th scope="col">Item Type</th>
+            <th scope="col">Item type</th>
             <th scope="col">Checked out on</th> 
             <th scope="col">Checked out from</th> 
-            <th scope="col">Call no</th>
+            <th scope="col">Call no.</th>
             <th scope="col">Charge</th>
             <th scope="col">Price</th>
             <th scope="col">Renew <p class="column-tool"><a href="#" id="CheckAllitems">select all</a> | <a href="#" id="CheckNoitems">none</a></p></th>
@@ -496,7 +496,7 @@ function validate1(date) {
                 <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On Hold</a>
                 [% END %]
                                    [% IF ( issueloo.norenew_reason_too_many ) %]
-                                       Not Renewable
+                        Not renewable
                                    [% END %]
                 [% IF ( issueloo.can_confirm ) %]
                     </span>
@@ -512,10 +512,10 @@ function validate1(date) {
             </td>
       [% END %]
       [% IF ( issueloo.return_failed ) %]
-            <td class="problem">Checkin Failed</td>
+            <td class="problem">Checkin failed</td>
       [% ELSE %]
         [% IF ( issueloo.norenew_reason_on_reserve ) %]
-            <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On Hold</a></td>
+            <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% issueloo.biblionumber %]">On hold</a></td>
         [% ELSE %]
             <td><input type="checkbox" name="barcodes[]"  value="[% issueloo.barcode %]" onclick="uncheck_sibling(this);" />
                 <input type="checkbox" name="all_barcodes[]" value="[% issueloo.barcode %]" checked="checked" style="display: none;" />
@@ -529,11 +529,11 @@ function validate1(date) {
         <fieldset class="action">
         [% IF ( CAN_user_circulate_override_renewals ) %]
         [% IF ( AllowRenewalLimitOverride ) %]
-        <label for="override_limit">Override Renewal Limit:</label>
+        <label for="override_limit">Override renewal limit:</label>
         <input type="checkbox" name="override_limit" id="override_limit" value="1" />
         [% END %]
         [% END %]
-        <input type="submit" name="renew_checked" value="Renew or Return checked items" />
+        <input type="submit" name="renew_checked" value="Renew or return checked items" />
         <input type="submit" id="renew_all" name="renew_all" value="Renew all" />
         </fieldset>
     [% ELSE %]<p>Patron has nothing checked out.</p>
@@ -548,10 +548,10 @@ function validate1(date) {
        <tr>
             <th scope="col">Due date</th>
             <th scope="col">Title</th>
-            <th scope="col">Item Type</th>
+            <th scope="col">Item type</th>
             <th scope="col">Checked out on</th> 
             <th scope="col">Checked out from</th>
-            <th scope="col">Call no</th>
+            <th scope="col">Call no.</th>
             <th scope="col">Charge</th>
             <th scope="col">Price</th>
             <th scope="col">Patron</th>
@@ -602,10 +602,11 @@ function validate1(date) {
                <thead><tr>
                        <th>Hold date</th>
                        <th>Title</th>
-                       <th>Call Number</th>
+            <th>Call number</th>
                        <th>Barcode</th>
                        <th>Priority</th>
                        <th>Delete?</th>
+                       <th>&nbsp;</th>
                </tr></thead>
                <tbody>[% FOREACH reservloo IN reservloop %]
                <tr class="[% reservloo.color %]">
@@ -637,12 +638,65 @@ function validate1(date) {
                 <input type="hidden" name="biblionumber" value="[% reservloo.biblionumber %]" />
                 <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
             </td>
+            <td>[% IF ( reservloo.suspend ) %]Suspended [% IF ( reservloo.suspend_until ) %] until [% reservloo.suspend_until | $KohaDates %][% END %][% END %]</td>
         </tr>
                [% END %]</tbody>
     </table>
 
-        <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" /></fieldset>
+        <fieldset class="action"><input type="submit" class="cancel" name="submit" value="Cancel marked holds" /></fieldset>
     </form>
+    <fieldset class="action">
+        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
+            <input type="hidden" name="from" value="borrower" />
+            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+            <input type="submit" value="Suspend all holds" />
+
+            [% IF AutoResumeSuspendedHolds %]
+            <label for="suspend_until">until</label>
+            <input type="text" size="10" id="suspend_until" name="suspend_until"/>
+            <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show Calendar"  border="0" id="CalendarSuspendUntil" style="cursor: pointer;" />
+            <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
+
+             <script language="JavaScript" type="text/javascript">
+                        //<![CDATA[
+                   function validate1(date) {
+                         var today = new Date();
+                         if ( date < today ) {
+                             return true;
+                          } else {
+                             return false;
+                          }
+                     };
+                     function refocus(calendar) {
+                        $('#barcode').focus();
+                        calendar.hide();
+                     };
+                               //#TODO - ADD syspref (AllowPostDatedCheckouts).
+                     Calendar.setup(
+                          {
+                             inputField : "suspend_until",
+                             ifFormat : "[% DHTMLcalendar_dateformat %]",
+                             button : "CalendarSuspendUntil",
+//                           disableFunc : validate1,
+//                           dateStatusFunc : validate1,
+                             onClose : refocus
+                           }
+                        );
+                               //]]>
+             </script>
+            [% END %]
+        </form>
+    </fieldset>
+
+    <fieldset class="action">
+        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
+            <input type="hidden" name="from" value="borrower" />
+            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+            <input type="hidden" name="suspend" value="0" />
+            <input type="submit" value="Resume all suspended holds" />
+       </form>
+    </fieldset>
+
     [% ELSE %]<p>Patron has nothing on hold.</p>[% END %]
        </div>
 
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git