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

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / reserve / request.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 0d16ce0..0ad5d23 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -1,3 +1,4 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 [% UNLESS ( multi_hold ) %]
     <title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Place a hold on [% title |html %]</title>
@@ -110,7 +111,7 @@ function checkMultiHold() {
        $("#requestany").click(function() {
                if(this.checked){
                $("input[name=checkitem]").each(function() {
-                       $(this).attr("checked","");
+            $(this).removeAttr("checked");
                });
                }
        });
@@ -122,7 +123,7 @@ function checkMultiHold() {
                        }
                });
                if(onechecked == 1){
-                       $("#requestany").attr("checked","");
+            $("#requestany").removeAttr("checked");
                } else {
                        $("#requestany").attr("checked","checked");
                }
@@ -287,65 +288,15 @@ function checkMultiHold() {
 
        [% IF ( reserve_in_future ) %]
        <li>
-           <label for="reserve_date">Hold starts on date:</label>
-           <input name="reserve_date" id="reserve_date" size="10" readonly="readonly">
-        <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="CalendarReserveDate" style="cursor: pointer;" />
-           <script language="JavaScript" type="text/javascript">
-               //<![CDATA[
-               function validate1(date) {
-                       var today = new Date();
-                       if ( (date > today) ||
-                    ( date.getDate() == today.getDate() &&
-                      date.getMonth() == today.getMonth() &&
-                      date.getFullYear() == today.getFullYear() ) ) {
-                               return false;
-                       } else {
-                               return true;
-                       }
-               };
-               Calendar.setup(
-                       {
-                               inputField : "reserve_date",
-                               ifFormat : "[% DHTMLcalendar_dateformat %]",
-                               button : "CalendarReserveDate",
-                               disableFunc : validate1,
-                               dateStatusFunc : validate1
-                       }
-               );
-               //]]>
-           </script>
+        <label for="from">Hold starts on date:</label>
+        <input name="reserve_date" id="from" size="10" readonly="readonly" class="datepickerfrom">
         <a href='#' onclick="document.getElementById('reserve_date').value='';">Clear Date</a>
        </li>
        [% END %]
 
        <li>
-           <label for="expiration_date">Hold expires on date:</label>
-           <input name="expiration_date" id="expiration_date" size="10" readonly="readonly" />
-        <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="CalendarExpirationDate" style="cursor: pointer;" />
-           <script language="JavaScript" type="text/javascript">
-               //<![CDATA[
-               function validate1(date) {
-                       var today = new Date();
-                       if ( (date > today) ||
-                    ( date.getDate() == today.getDate() &&
-                      date.getMonth() == today.getMonth() &&
-                      date.getFullYear() == today.getFullYear() ) ) {
-                               return false;
-                       } else {
-                               return true;
-                       }
-               };
-               Calendar.setup(
-                       {
-                               inputField : "expiration_date",
-                               ifFormat : "[% DHTMLcalendar_dateformat %]",
-                               button : "CalendarExpirationDate",
-                               disableFunc : validate1,
-                               dateStatusFunc : validate1
-                       }
-               );
-               //]]>
-           </script>
+        <label for="to">Hold expires on date:</label>
+        <input name="expiration_date" id="to" size="10" readonly="readonly" class="datepickerto" />
         <a href='#' onclick="document.getElementById('expiration_date').value='';">Clear date</a>
        </li>
 
@@ -597,7 +548,7 @@ function checkMultiHold() {
             <th><img src="/intranet-tmpl/[% theme %]/img/go-bottom.png" border="0" alt="Toggle set to lowest priority" /></th>
         [% END %]
        <th>&nbsp;</th>
-       <th>&nbsp;</th>
+    [% IF SuspendHoldsIntranet %]<th>&nbsp;</th><!-- Suspend Holds Column Header -->[% END %]
       </tr>
   [% FOREACH reserveloo IN biblioloo.reserveloop %]
   [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
@@ -729,44 +680,22 @@ function checkMultiHold() {
                 </a>
        </td>
 
+        [% IF SuspendHoldsIntranet %]
        <td>
        [% UNLESS ( reserveloo.wait ) %]
-            <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]'" />
+            <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]&amp;suspend_until=' + $('#suspend_until_[% reserveloo.borrowernumber %]').val()" />
 
             [% IF AutoResumeSuspendedHolds %]
            <label for="suspend_until_[% reserveloo.borrowernumber %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label>
-           <input name="suspend_until" id="suspend_until_[% reserveloo.borrowernumber %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until %]" />
-        <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="SuspendUntilDate_[% reserveloo.borrowernumber %]" style="cursor: pointer;" />
-           <script language="JavaScript" type="text/javascript">
-               //<![CDATA[
-               function validate1(date) {
-                       var today = new Date();
-                       if ( (date > today) ||
-                    ( date.getDate() == today.getDate() &&
-                      date.getMonth() == today.getMonth() &&
-                      date.getFullYear() == today.getFullYear() ) ) {
-                               return false;
-                       } else {
-                               return true;
-                       }
-               };
-               Calendar.setup(
-                       {
-                               inputField : "suspend_until_[% reserveloo.borrowernumber %]",
-                               ifFormat : "[% DHTMLcalendar_dateformat %]",
-                               button : "SuspendUntilDate_[% reserveloo.borrowernumber %]",
-                               disableFunc : validate1,
-                               dateStatusFunc : validate1
-                       }
-               );
-               //]]>
-           </script>
+        <input name="suspend_until" id="suspend_until_[% reserveloo.borrowernumber %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker" />
            <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.borrowernumber %]').value='';">Clear Date</a>
             [% END %]
        [% ELSE %]
                <input type="hidden" name="suspend_until" value="" />
        [% END %]
        </td>
+        [% END # IF SuspendHoldsIntranet %]
+
       </tr>
 
   [% END %] <!-- existing reserveloop -->