View | Details | Raw Unified | Return to bug 16421
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css (+7 lines)
Lines 2322-2327 a.disabled { Link Here
2322
    color : #999999;
2322
    color : #999999;
2323
}
2323
}
2324
2324
2325
fieldset.rows li.divider {
2326
    clear: none;
2327
    float: none;
2328
    padding-bottom: 0;
2329
    width: auto;
2330
}
2331
2325
.navbar {
2332
.navbar {
2326
    color: #333;
2333
    color: #333;
2327
}
2334
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-66 / +137 lines)
Lines 13-19 Link Here
13
[% INCLUDE 'calendar.inc' %]
13
[% INCLUDE 'calendar.inc' %]
14
<script type="text/javascript">
14
<script type="text/javascript">
15
    // <![CDATA[
15
    // <![CDATA[
16
var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
17
var patron_homebranch = "[% borrower_branchname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
16
var patron_homebranch = "[% borrower_branchname |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
18
var override_items = {[% FOREACH bibitemloo IN bibitemloop %][% FOREACH itemloo IN bibitemloo.itemloop %][% IF ( itemloo.override ) %]
17
var override_items = {[% FOREACH bibitemloo IN bibitemloop %][% FOREACH itemloo IN bibitemloo.itemloop %][% IF ( itemloo.override ) %]
19
    [% itemloo.itemnumber %]: {
18
    [% itemloo.itemnumber %]: {
Lines 58-64 $(document).ready(function() { Link Here
58
        "width":"auto",
57
        "width":"auto",
59
        "margin-right":"0em"
58
        "margin-right":"0em"
60
    });
59
    });
61
60
    $(".cancel_hold").on("click", function(){
61
        return confirmDelete( _("Are you sure you want to cancel this hold?") );
62
    });
63
    $(".toggle_suspend").on("click",function(e){
64
        e.preventDefault();
65
        var row = $(this).closest("tr");
66
        var biblionumber = row.find("input[name='biblionumber']").val();
67
        var borrowernumber = row.find("input[name='borrowernumber']").val();
68
        var reserve_id = row.find("input[name='reserve_id']").val();
69
        var reserve_date = row.find("input[name='reserve_date']").val();
70
        var suspend_until = row.find("input[name='suspend_until']").val();
71
        var redirect = "request.pl?action=toggleSuspend&reserve_id=" + reserve_id + "&borrowernumber=" + borrowernumber + "&biblionumber=" + biblionumber + "&date=" + reserve_date + "&suspend_until=" + suspend_until;
72
        window.location.href = redirect;
73
    });
62
});
74
});
63
75
64
function check() {
76
function check() {
Lines 206-211 function checkMultiHold() { Link Here
206
218
207
// ]]>
219
// ]]>
208
</script>
220
</script>
221
<style>
222
    .arrow-top { border-top: 2px solid black; }
223
    .arrow-bottom { border-bottom: 2px solid black; }
224
    .dropdown-menu li > a:hover .arrow-top,
225
    .dropdown-menu li > a:focus .arrow-top,
226
    .dropdown-menu li > a:hover .arrow-bottom,
227
    .dropdown-menu li > a:focus .arrow-bottom {
228
        border-color: #ffffff;
229
    }
230
</style>
209
</head>
231
</head>
210
<body id="circ_request" class="catalog">
232
<body id="circ_request" class="catalog">
211
[% INCLUDE 'header.inc' %]
233
[% INCLUDE 'header.inc' %]
Lines 559-565 function checkMultiHold() { Link Here
559
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
581
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
560
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">[% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %]
582
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">[% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% itemloo.ExpectedAtLibrary %]
561
                    since
583
                    since
562
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]"  onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a>
584
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="cancel_hold" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]">Cancel hold</a>
563
585
564
                    [% END %]
586
                    [% END %]
565
                 [% ELSE %]
587
                 [% ELSE %]
Lines 681-687 function checkMultiHold() { Link Here
681
      <tr>
703
      <tr>
682
        [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
704
        [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
683
            <th>Priority</th>
705
            <th>Priority</th>
684
	        <th>&nbsp;</th>
685
        [% ELSE %]
706
        [% ELSE %]
686
            <th>Delete?</th>
707
            <th>Delete?</th>
687
        [% END %]
708
        [% END %]
Lines 691-701 function checkMultiHold() { Link Here
691
	<th>Expiration</th>
712
	<th>Expiration</th>
692
        <th>Pickup library</th>
713
        <th>Pickup library</th>
693
        <th>Details</th>
714
        <th>Details</th>
694
        [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
715
        <th>&nbsp;</th>
695
            <th><img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Toggle set to lowest priority" /></th>
696
        [% END %]
697
	<th>&nbsp;</th>
698
    [% IF SuspendHoldsIntranet %]<th>&nbsp;</th><!-- Suspend Holds Column Header -->[% END %]
699
      </tr>
716
      </tr>
700
  [% FOREACH reserveloo IN biblioloo.reserveloop %]
717
  [% FOREACH reserveloo IN biblioloo.reserveloop %]
701
        <tr>
718
        <tr>
Lines 703-708 function checkMultiHold() { Link Here
703
          <input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id %]" />
720
          <input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id %]" />
704
          <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernumber %]" />
721
          <input type="hidden" name="borrowernumber" value="[% reserveloo.borrowernumber %]" />
705
          <input type="hidden" name="biblionumber" value="[% reserveloo.biblionumber %]" />
722
          <input type="hidden" name="biblionumber" value="[% reserveloo.biblionumber %]" />
723
          <input type="hidden" name="reserve_date" value="[% reserveloo.date %]" />
706
          <select name="rank-request">
724
          <select name="rank-request">
707
              [% IF ( reserveloo.found ) %]
725
              [% IF ( reserveloo.found ) %]
708
                  [% IF ( reserveloo.intransit ) %]
726
                  [% IF ( reserveloo.intransit ) %]
Lines 726-752 function checkMultiHold() { Link Here
726
              <option value="del">del</option>
744
              <option value="del">del</option>
727
          </select>
745
          </select>
728
        </td>
746
        </td>
729
730
     [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
731
        <td style="white-space:nowrap;">
732
            <a title="Move hold up" href="request.pl?action=move&amp;where=up&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
733
            <img src="[% interface %]/[% theme %]/img/go-up.png" alt="Go up" />
734
                </a>
735
736
                <a title="Move hold to top" href="request.pl?action=move&amp;where=top&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
737
                    <img src="[% interface %]/[% theme %]/img/go-top.png" alt="Go top" />
738
                </a>
739
740
                <a title="Move hold to bottom" href="request.pl?action=move&amp;where=bottom&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
741
                    <img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Go bottom" />
742
                </a>
743
744
                <a title="Move hold down" href="request.pl?action=move&amp;where=down&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
745
                    <img src="[% interface %]/[% theme %]/img/go-down.png" alt="Go down" />
746
                </a>
747
        </td>
748
    [% END %]
749
750
        <td>
747
        <td>
751
          <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber %]" >
748
          <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernumber %]" >
752
	  [% IF ( reserveloo.hidename ) %]
749
	  [% IF ( reserveloo.hidename ) %]
Lines 790-807 function checkMultiHold() { Link Here
790
          </select>
787
          </select>
791
    [% END %]
788
    [% END %]
792
        </td>
789
        </td>
793
        <td>
790
        <td class="circmessage">
791
            <ul>
794
    [% IF ( reserveloo.found ) %]
792
    [% IF ( reserveloo.found ) %]
795
          <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% reserveloo.biblionumber %]">
793
        <li>
794
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% reserveloo.biblionumber %]">
796
                [% IF ( reserveloo.barcodenumber ) %]
795
                [% IF ( reserveloo.barcodenumber ) %]
797
                    [% reserveloo.barcodenumber %]
796
                    [% reserveloo.barcodenumber %]
798
                    <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" />
797
                    <input type="hidden" name="itemnumber" value="[% reserveloo.itemnumber %]" />
799
                [% ELSE %]
798
                [% ELSE %]
800
                    No barcode
799
                    No barcode
801
                [% END %]
800
                [% END %]
802
          </a>
801
            </a>
802
        </li>
803
    [% ELSE %]
803
    [% ELSE %]
804
            [% IF ( reserveloo.item_level_hold ) %]
804
            [% IF ( reserveloo.item_level_hold ) %]
805
                <li>
805
                <i>Only item
806
                <i>Only item
806
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% reserveloo.biblionumber %]">
807
                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% reserveloo.biblionumber %]">
807
                     [% IF ( reserveloo.barcodenumber ) %]
808
                     [% IF ( reserveloo.barcodenumber ) %]
Lines 812-861 function checkMultiHold() { Link Here
812
                    [% END %]
813
                    [% END %]
813
                </a>
814
                </a>
814
                </i>
815
                </i>
816
                </li>
815
            [% ELSE %]
817
            [% ELSE %]
816
                [% IF reserveloo.itemtype %]
818
                [% IF reserveloo.itemtype %]
817
                    <i>Next available [% ItemTypes.GetDescription( reserveloo.itemtype ) %] item</i>
819
                    <li>
820
                        <i>Next available [% ItemTypes.GetDescription( reserveloo.itemtype ) %] item</i>
821
                    </li>
818
                [% ELSE %]
822
                [% ELSE %]
819
                    <i>Next available</i>
823
                    <li>
824
                        <i>Next available</i>
825
                    </li>
820
                [% END %]
826
                [% END %]
821
                 <input type="hidden" name="itemnumber" value="" />
822
            [% END %]
827
            [% END %]
823
    [% END %]
828
    [% END %]
829
                [% IF ( reserveloo.suspend ) %]
830
                    [% IF ( reserveloo.suspend_until ) %]
831
                        <li>Suspended until [% reserveloo.suspend_until|$KohaDates %]</li>
832
                    [% ELSE %]
833
                        <li>Suspended</li>
834
                    [% END %]
835
                [% END %]
836
                [% IF ( reserveloo.lowestPriority ) %]
837
                    <li>Hold is set to lowest priority.</li>
838
                [% END %]
839
            </ul>
840
            [% UNLESS ( reserveloo.item_level_hold ) %]<input type="hidden" name="itemnumber" value="" />[% END %]
824
        </td>
841
        </td>
825
842
826
    [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
827
	<td>
843
	<td>
828
                <a title="Toggle lowest priority" href="request.pl?action=setLowestPriority&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
844
            <div class="dropup">
829
			[% IF ( reserveloo.lowestPriority ) %]
845
                <a class="btn btn-mini dropdown-toggle" id="holdactions[% reserveloo.reserve_id %]" role="button" data-toggle="dropdown" href="#">
830
                        <img src="[% interface %]/[% theme %]/img/go-bottom.png" alt="Unset lowest priority" />
846
                   Actions <b class="caret"></b>
831
		        [% ELSE %]
832
                        <img src="[% interface %]/[% theme %]/img/go-down.png" alt="Set to lowest priority" />
833
		        [% END %]
834
		</a>
835
	</td>
836
    [% END %]
837
838
	<td>
839
           <a title="Cancel hold" href="request.pl?action=cancel&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
840
                    <img src="[% interface %]/[% theme %]/img/x.png" alt="Cancel" />
841
                </a>
847
                </a>
842
	</td>
848
                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="holdactions[% reserveloo.reserve_id %]">
849
850
                    [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
851
                        <li>
852
                            <a href="request.pl?action=move&amp;where=up&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
853
                                <i class="fa fa-fw fa-arrow-up"></i> Move hold up
854
                            </a>
855
                        </li>
856
                        <li>
857
                            <a href="request.pl?action=move&amp;where=top&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
858
                                <i class="fa fa-fw fa-arrow-up arrow-top"></i> Move hold to top
859
                            </a>
860
                        </li>
861
                        <li>
862
                            <a href="request.pl?action=move&amp;where=bottom&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
863
                                <i class="fa fa-fw fa-arrow-down arrow-bottom"></i> Move hold to bottom
864
                            </a>
865
                        </li>
866
                        <li>
867
                            <a href="request.pl?action=move&amp;where=down&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
868
                                <i class="fa fa-fw fa-arrow-down"></i> Move hold down
869
                            </a>
870
                        </li>
871
                        <li class="divider"></li>
872
                    [% END %]
843
873
844
        [% IF SuspendHoldsIntranet %]
874
                    [% IF ( CAN_user_reserveforothers_modify_holds_priority ) %]
845
	<td>
875
                        <li>
846
        [% UNLESS ( reserveloo.found ) %]
876
                            <a href="request.pl?action=setLowestPriority&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]">
847
            <input type="button" value="[% IF ( reserveloo.suspend ) %]Unsuspend[% ELSE %]Suspend[% END %]" onclick="window.location.href='request.pl?action=toggleSuspend&amp;reserve_id=[% reserveloo.reserve_id %]&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]&amp;suspend_until=' + $('#suspend_until_[% reserveloo.reserve_id %]').val()" />
877
                                [% IF ( reserveloo.lowestPriority ) %]
878
                                    <i class="fa fa-fw fa-times-circle"></i> Unset lowest priority
879
                                [% ELSE %]
880
                                    <i class="fa fa-fw fa-thumb-tack"></i> Set to lowest priority
881
                                [% END %]
882
                            </a>
883
                        </li>
884
                    [% END %]
885
886
                    [% IF SuspendHoldsIntranet %]
887
                        [% IF reserveloo.suspend %]
888
                            <li>
889
                                <a href="request.pl?action=toggleSuspend&amp;reserve_id=[% reserveloo.reserve_id %]&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]"><i class="fa fa-fw fa-play"></i> Resume</a>
890
                            </li>
891
                        [% ELSE %]
892
                            [% IF AutoResumeSuspendedHolds %]
893
                                <li>
894
                                    <a href="#suspendModal[% reserveloo.reserve_id %]" role="button" data-toggle="modal"><i class="fa fa-fw fa-pause"></i> Suspend</a>
895
                                </li>
896
                            [% ELSE %]
897
                                <li>
898
                                   <a href="request.pl?action=toggleSuspend&amp;reserve_id=[% reserveloo.reserve_id %]&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;date=[% reserveloo.date %]"><i class="fa fa-fw fa-pause"></i> Suspend</a>
899
                                </li>
900
                            [% END # / IF AutoResumeSuspendedHolds %]
901
                        [% END %]
902
                    [% END # IF SuspendHoldsIntranet %]
903
904
                    <li><a class="cancel_hold" href="request.pl?action=cancel&amp;borrowernumber=[% reserveloo.borrowernumber %]&amp;biblionumber=[% reserveloo.biblionumber %]&amp;reserve_id=[% reserveloo.reserve_id %]&amp;date=[% reserveloo.date %]"><i class="fa fa-fw fa-trash"></i> Cancel hold</a></li>
905
                </ul>
906
            </div>
907
            [% # hold suspend modal form %]
908
            <div id="suspendModal[% reserveloo.reserve_id %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="suspendModal[% reserveloo.reserve_id %]Label" aria-hidden="true">
909
                <div class="modal-header">
910
                    <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">×</button>
911
                    [% IF reserveloo.suspend %]
912
                        <h3 id="suspendModal[% reserveloo.reserve_id %]Label">Resume this hold on <i>[% biblioloo.title %]</i></h3>
913
                    [% ELSE %]
914
                        <h3 id="suspendModal[% reserveloo.reserve_id %]Label">Suspend this hold on <i>[% biblioloo.title %]</i></h3>
915
                    [% END %]
916
                </div>
917
                <div class="modal-body">
918
                    <input type="hidden" name="reserve_id" value="[% reserveloo.reserve_id %]" />
919
                    <label for="suspend_until_[% reserveloo.reserve_id %]">Suspend until:</label>
920
                    <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" />
921
                    <span class="hint">[% INCLUDE "date-format.inc" %]</span>
922
                    <p><a href="#" class="clear-date" id="clear-date-suspend_until_[% reserveloo.reserve_id %]"><i class="fa fa-remove"></i> Clear date to suspend indefinitely</a></p>
923
                </div>
924
                <div class="modal-footer">
925
                    <button class="btn btn-primary toggle_suspend" type="button">Suspend</button>
926
                    <a href="#" data-dismiss="modal" aria-hidden="true" class="cancel">Cancel</a>
927
                </div>
928
            </div>  <!-- /#suspendModal[% reserveloo.reserve_id %] -->
929
    </td>
848
930
849
            [% IF AutoResumeSuspendedHolds %]
850
        <label for="suspend_until_[% reserveloo.reserve_id %]">[% IF ( reserveloo.suspend ) %] on [% ELSE %] until [% END %]</label>
851
            <input name="suspend_until" id="suspend_until_[% reserveloo.reserve_id %]" size="10" readonly="readonly" value="[% reserveloo.suspend_until | $KohaDates %]" class="datepicker suspend_until_datepicker" />
852
            <a href='#' onclick="document.getElementById('suspend_until_[% reserveloo.reserve_id %]').value='';">Clear date</a>
853
            [% END %]
854
	[% ELSE %]
855
		<input type="hidden" name="suspend_until" value="" />
856
	[% END %]
857
	</td>
858
        [% END # IF SuspendHoldsIntranet %]
859
931
860
      </tr>
932
      </tr>
861
933
862
- 

Return to bug 16421