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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (-2 / +2 lines)
Lines 53-60 Link Here
53
                            <label id="renew_as_unseen_label" for="override_limit">Renew as &quot;unseen&quot; if appropriate:</label>
53
                            <label id="renew_as_unseen_label" for="override_limit">Renew as &quot;unseen&quot; if appropriate:</label>
54
                            <input type="checkbox" name="renew_as_unseen" id="renew_as_unseen_checkbox" value="1" />
54
                            <input type="checkbox" name="renew_as_unseen" id="renew_as_unseen_checkbox" value="1" />
55
                        [% END %]
55
                        [% END %]
56
                        <button class="btn btn-default" id="RenewCheckinChecked" id="lientype"><i class="fa fa-check"></i> Renew or check in selected items</button>
56
                        <button class="btn btn-default principal" id="RenewCheckinChecked"><i class="fa fa-check"></i> Renew or check in selected items</button>
57
                        <button class="btn btn-default" id="RenewAll" id="lientype"><i class="fa fa-book"></i> Renew all</button>
57
                        <button class="btn btn-default principal" id="RenewAll"><i class="fa fa-book"></i> Renew all</button>
58
                    [% END %]
58
                    [% END %]
59
                </fieldset>
59
                </fieldset>
60
60
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-106 / +64 lines)
Lines 66-73 Link Here
66
                        [% INCLUDE 'members-toolbar.inc' %]
66
                        [% INCLUDE 'members-toolbar.inc' %]
67
                    [% END %]
67
                    [% END %]
68
68
69
                    <h1>Checkouts</h1>
70
71
                    <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
69
                    <!--  INITIAL BLOC : PARAMETERS & BORROWER INFO -->
72
                    [% IF ( was_renewed ) %]
70
                    [% IF ( was_renewed ) %]
73
                        <div class="dialog message">Patron's account has been renewed until [% expiry | $KohaDates %]</div>
71
                        <div class="dialog message">Patron's account has been renewed until [% expiry | $KohaDates %]</div>
Lines 237-251 Link Here
237
                                        Please confirm that the accompanying materials are present: [% ADDITIONAL_MATERIALS | html %]
235
                                        Please confirm that the accompanying materials are present: [% ADDITIONAL_MATERIALS | html %]
238
                                    </li>
236
                                    </li>
239
                                [% END %]
237
                                [% END %]
240
241
                                [% IF RECALLED %]
242
                                    [% IF RECALLED.waiting %]
243
                                        <li>Item <i>[% RECALLED.biblio.title | html %]</i> ([% RECALLED.item.barcode | html %]) has been waiting for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% RECALLED.patron_id | uri %]">[% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %]</a> ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.waiting_date | $KohaDates %]</li>
244
                                    [% ELSIF RECALLED.requested or RECALLED.overdue %]
245
                                        <li>Item <i>[% RECALLED.biblio.title | html %]</i> [% IF RECALLED.item %]([% RECALLED.item.barcode | html %])[% END %] has been recalled by <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% RECALLED.patron_id | uri %]">[% RECALLED.patron.firstname | html %] [% RECALLED.patron.surname | html %]</a> ([% RECALLED.patron.cardnumber | html %]) at [% Branches.GetName( RECALLED.pickup_library_id ) | html %] since [% RECALLED.created_date | $KohaDates %]</li>
246
                                    [% END %]
247
                                [% END %]
248
249
                            </ul>
238
                            </ul>
250
239
251
                            [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
240
                            [% IF CAN_user_circulate_force_checkout or HIGHHOLDS %]
Lines 295-315 Link Here
295
                                        </p>
284
                                        </p>
296
                                    [% END %]
285
                                    [% END %]
297
286
298
                                    [% IF ( RECALLED ) %]
299
                                        <p>
300
                                            <label for="cancelrecall">Cancel recall</label>
301
                                            <input type="radio" value="cancel" name="cancel_recall" id="cancelrecall" />
302
                                            <input type="hidden" value="[% RECALLED.id | html %]" name="recall_id" />
303
                                        </p>
304
                                        [% IF RECALLED.waiting %]
305
                                            <p>
306
                                                <label for="revertrecall">Revert waiting status</label>
307
                                                <input type="radio" value="revert" name="cancel_recall" id="revertrecall" checked="checked"/>
308
                                                <input type="hidden" value="[% RECALLED.id | html %]" name="recall_id" />
309
                                            </p>
310
                                        [% END %]
311
                                    [% END %]
312
313
                                    <input type="hidden" name="barcode" value="[% barcode | html %]" />
287
                                    <input type="hidden" name="barcode" value="[% barcode | html %]" />
314
                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
288
                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
315
                                    <input type="hidden" name="issueconfirmed" value="1" />
289
                                    <input type="hidden" name="issueconfirmed" value="1" />
Lines 374-385 Link Here
374
                                </form>
348
                                </form>
375
                            [% END %]
349
                            [% END %]
376
350
377
                            [% IF ( RECALLED ) %]
378
                                <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
379
                                    <button class="print" type="submit" onclick="Dopop('/cgi-bin/koha/recalls/recall_pickup_slip.pl?recall_id=[% RECALLED.id | html %]');this.form.submit();"><i class="fa fa-print"></i> Don't check out and print slip (P)</button>
380
                                </form>
381
                            [% END %]
382
383
                            <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
351
                            <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
384
                                [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
352
                                [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
385
                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
353
                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
Lines 397-405 Link Here
397
                                [% END %]
365
                                [% END %]
398
                            </form>
366
                            </form>
399
367
400
                            [% IF ( RESERVED || ISSUED_TO_ANOTHER || RECALLED ) && (CAN_user_reserveforothers_place_holds ) %]
368
                            [% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
401
                                [% UNLESS noissues %]
369
                                [% UNLESS noissues %]
402
                                    <button type="submit" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber | html %]&borrowernumber=[% patron.borrowernumber | html %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>
370
                                    <button type="submit" id="lientype" onclick="window.location.href='/cgi-bin/koha/reserve/request.pl?biblionumber=[% itembiblionumber | html %]&borrowernumber=[% patron.borrowernumber | html %]'"><i class="fa fa-sticky-note-o"></i> Cancel checkout and place a hold for [% INCLUDE 'patron-title.inc' %]</button>
403
                                [% END %]
371
                                [% END %]
404
                            [% END %]
372
                            [% END %]
405
                        </div> <!-- /#circ_needsconfirmation -->
373
                        </div> <!-- /#circ_needsconfirmation -->
Lines 438-444 Link Here
438
406
439
                                            [% IF ( fast_cataloging ) %]
407
                                            [% IF ( fast_cataloging ) %]
440
                                                [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
408
                                                [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
441
                                                    <a class="approve" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&amp;barcode=[% barcode |uri %]&amp;circborrowernumber=[% patron.borrowernumber | html %]&amp;branch=[% branch | html %]&amp;duedatespec=[% duedatespec | html %]&amp;stickyduedate=[% stickyduedate | html %]"><i class="fa fa-plus"></i> Add record using fast cataloging</a>
409
                                                    <a class="approve" id="lientype" href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA&amp;barcode=[% barcode |uri %]&amp;circborrowernumber=[% patron.borrowernumber | html %]&amp;branch=[% branch | html %]&amp;duedatespec=[% duedatespec | html %]&amp;stickyduedate=[% stickyduedate | html %]"><i class="fa fa-plus"></i> Add record using fast cataloging</a>
442
                                                [% END %]
410
                                                [% END %]
443
                                            [% END %]
411
                                            [% END %]
444
                                        </div>
412
                                        </div>
Lines 519-528 Link Here
519
                                [% IF ( USERBLOCKEDOVERDUE ) %]
487
                                [% IF ( USERBLOCKEDOVERDUE ) %]
520
                                    <li>Checkouts are BLOCKED because patron has overdue items.</li>
488
                                    <li>Checkouts are BLOCKED because patron has overdue items.</li>
521
                                [% END %]
489
                                [% END %]
522
523
                                [% IF ( RECALLED_INTRANSIT ) %]
524
                                    <li>Item has been recalled and is in transit for pickup at [% Branches.GetName( RECALLED_INTRANSIT ) | html %].</li>
525
                                [% END %]
526
                                </ul>
490
                                </ul>
527
491
528
                                [% IF (forceallow) %]
492
                                [% IF (forceallow) %]
Lines 590-596 Link Here
590
                                                                    <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
554
                                                                    <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
591
                                                                    <input type="hidden" name="onsite_checkout" value="[% onsite_checkout | html %]" />
555
                                                                    <input type="hidden" name="onsite_checkout" value="[% onsite_checkout | html %]" />
592
                                                                    <input type="hidden" name="auto_renew" value="[% auto_renew | html %]" />
556
                                                                    <input type="hidden" name="auto_renew" value="[% auto_renew | html %]" />
593
                                                                    <button class="btn btn-default btn-xs" type="submit" name="x"><i class="fa fa-check"></i> Check out</button>
557
                                                                    <button class="btn btn-default btn-xs" type="submit" id="lientype" name="x"><i class="fa fa-check"></i> Check out</button>
594
                                                                </form>
558
                                                                </form>
595
                                                            </td>
559
                                                            </td>
596
                                                        </tr>
560
                                                        </tr>
Lines 599-605 Link Here
599
                                                </table>
563
                                                </table>
600
                                            </div> <!-- /.modal-body -->
564
                                            </div> <!-- /.modal-body -->
601
                                            <div class="modal-footer">
565
                                            <div class="modal-footer">
602
                                                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
566
                                                <button type="button" class="btn btn-default cancel" data-dismiss="modal">Cancel</button>
603
                                            </div>
567
                                            </div>
604
                                        </div> <!-- /.modal-content -->
568
                                        </div> <!-- /.modal-content -->
605
                                    </div> <!-- /.modal-dialog.modal-wide -->
569
                                    </div> <!-- /.modal-dialog.modal-wide -->
Lines 634-644 Link Here
634
                            </div>
598
                            </div>
635
                        [% END %]
599
                        [% END %]
636
600
637
                        <div>
601
                        <div class="row">
638
                            [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
602
                            [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
639
                                <div class="col-sm-6">
603
                                <div class="col-sm-6">
640
                                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
604
                                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
641
                                        <input type="hidden" name="restoreduedatespec" />
605
                                        <input type="hidden" name="restoreduedatespec" />
606
                                        <div id="searchresults">
642
                                        [% IF ( issue ) %]
607
                                        [% IF ( issue ) %]
643
                                            <fieldset id="circ_circulation_issue" class="lastchecked">
608
                                            <fieldset id="circ_circulation_issue" class="lastchecked">
644
                                        [% ELSE %]
609
                                        [% ELSE %]
Lines 655-661 Link Here
655
620
656
                                        [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
621
                                        [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
657
622
658
                                        <label class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
623
                                        <h3 class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</h3>
659
624
660
                                        [% IF Koha.Preference('itemBarcodeFallbackSearch') %]
625
                                        [% IF Koha.Preference('itemBarcodeFallbackSearch') %]
661
                                            <div class="hint">Enter item barcode or keyword:</div>
626
                                            <div class="hint">Enter item barcode or keyword:</div>
Lines 672-679 Link Here
672
                                        <div id="show-circ-settings">
637
                                        <div id="show-circ-settings">
673
                                            <a href="#"><i class="fa-sign-out"></i></a>
638
                                            <a href="#"><i class="fa-sign-out"></i></a>
674
                                        </div>
639
                                        </div>
675
                                        <button class="submit" id="principal" type="submit">Check out</button>
676
640
641
                                        <button type="submit" class="btn btn-default principal">Check out</button>
677
642
678
                                        <div class="circ-settings">
643
                                        <div class="circ-settings">
679
644
Lines 697-729 Link Here
697
                                                [% END %]
662
                                                [% END %]
698
663
699
                                                [% UNLESS ( noissues ) %]
664
                                                [% UNLESS ( noissues ) %]
700
                                                    [% IF Koha.Preference('AllowSetAutomaticRenewal') %]
665
                                                    <div id="set-automatic-renewal" class="circ-setting">
701
                                                        <div id="set-automatic-renewal" class="circ-setting">
666
                                                        [% IF NEEDSCONFIRMATION %]
702
                                                            [% IF NEEDSCONFIRMATION %]
667
                                                            [% IF auto_renew %]
703
                                                                [% IF auto_renew %]
668
                                                                [% IF patron.autorenew_checkouts %]
704
                                                                    [% IF patron.autorenew_checkouts %]
705
                                                                        <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
706
                                                                        title="Patron has opted out of auto-renewal"/>
707
                                                                    [% ELSE %]
708
                                                                        <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" checked="checked" />
709
                                                                    [% END %]
710
                                                                [% ELSE %]
711
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
712
                                                                [% END %]
713
                                                            [% ELSE %]
714
                                                                [% IF ( auto_renew && patron.autorenew_checkouts ) %]
715
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" checked="checked" />
716
                                                                [% ELSIF patron.autorenew_checkouts %]
717
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" />
718
                                                                [% ELSE %]
719
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
669
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
720
                                                                    title="Patron has opted out of auto-renewal"/>
670
                                                                    title="Patron has opted out of auto-renewal"/>
671
                                                                [% ELSE %]
672
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" checked="checked" />
721
                                                                [% END %]
673
                                                                [% END %]
674
                                                            [% ELSE %]
675
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
676
                                                            [% END %]
677
                                                        [% ELSE %]
678
                                                            [% IF ( auto_renew && patron.autorenew_checkouts ) %]
679
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" checked="checked" />
680
                                                            [% ELSIF patron.autorenew_checkouts %]
681
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" />
682
                                                            [% ELSE %]
683
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
684
                                                                title="Patron has opted out of auto-renewal"/>
722
                                                            [% END %]
685
                                                            [% END %]
686
                                                        [% END %]
723
687
724
                                                            <label for="auto_renew">Automatic renewal</label>
688
                                                        <label for="auto_renew">Automatic renewal</label>
725
                                                        </div>
689
                                                    </div>
726
                                                    [% END %]
727
                                                    [% IF Koha.Preference('decreaseLoanHighHolds') %]
690
                                                    [% IF Koha.Preference('decreaseLoanHighHolds') %]
728
                                                        <div id="set_high_holds_overrride" class="circ-setting">
691
                                                        <div id="set_high_holds_overrride" class="circ-setting">
729
                                                            [% IF NEEDSCONFIRMATION %]
692
                                                            [% IF NEEDSCONFIRMATION %]
Lines 771-776 Link Here
771
                                                    <input type="hidden" name="charges" value="yes" />
734
                                                    <input type="hidden" name="charges" value="yes" />
772
                                            [% END %]
735
                                            [% END %]
773
                                        </fieldset> <!-- /#circ_circulation_issue -->
736
                                        </fieldset> <!-- /#circ_circulation_issue -->
737
                                        </div>
774
738
775
                                        [% IF ( issue ) %]
739
                                        [% IF ( issue ) %]
776
                                            <div class="lastchecked">
740
                                            <div class="lastchecked">
Lines 792-803 Link Here
792
                                <div class="col-sm-6">
756
                                <div class="col-sm-6">
793
                            [% END %]
757
                            [% END %]
794
758
759
                            <div id="searchresults">
795
                            [% IF ( noissues ) %]
760
                            [% IF ( noissues ) %]
796
                                [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
761
                                [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
797
                                    <fieldset id="searchresults">
762
                                    <div id="circmessages" class="circmessage attention">
798
                                [% ELSE %]
763
                                [% ELSE %]
799
                                    <h2>Checking out to [% INCLUDE 'patron-title.inc' %]</h2>
764
                                    <h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
800
                                    <fieldset id="searchresults">
765
                                    <div id="circmessages" class="circmessage warning">
801
                                [% END %]
766
                                [% END %]
802
                                <h3>
767
                                <h3>
803
                                    Cannot check out!
768
                                    Cannot check out!
Lines 806-847 Link Here
806
                                    [% END %]
771
                                    [% END %]
807
                                </h3>
772
                                </h3>
808
                            [% ELSE %]
773
                            [% ELSE %]
809
                                <fieldset id="searchresults">
774
                                <div id="circmessages" class="circmessage attention">
810
                            [% END %]
775
                            [% END %]
776
                            </div>
811
777
812
                            [% INCLUDE 'patron_messages.inc' %]
778
                            [% INCLUDE 'patron_messages.inc' %]
813
779
814
780
                        </div> <!-- /#circmessages -->
815
                        </fieldset> <!-- /#circmessages -->
816
                    </div> <!-- /div or div.col-sm-6 -->
781
                    </div> <!-- /div or div.col-sm-6 -->
817
                </div> <!-- /.row -->
782
                </div> <!-- /.row -->
818
783
819
                <div id="patronlists" class="toptabs">
784
                <div id="patronlists" class="toptabs">
820
                    <ul>
785
                    <ul>
821
                        <li>
786
                        <li>
822
                            <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a>
787
                            [% IF ( issuecount ) %]
788
                                <a href="#checkouts">[% issuecount | html %] Checkout(s)</a>
789
                            [% ELSE %]
790
                                <a href="#checkouts">0 Checkouts</a>
791
                            [% END %]
823
                        </li>
792
                        </li>
824
793
825
                        [% IF relatives_issues_count %]
794
                        [% IF relatives_issues_count %]
826
                            <li>
795
                            <li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count | html %] Relatives' checkouts</a></li>
827
                                <a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts ([% relatives_issues_count | html %])</a>
828
                            </li>
829
                        [% END %]
796
                        [% END %]
830
797
831
                        <li>
798
                        <li>
832
                            <a href="#reserves" id="holds-tab">Holds ([% holds_count || 0 | html %])</a>
799
                            [% IF ( holds_count ) %]
800
                                <a href="#reserves" id="holds-tab">[% holds_count | html %] Hold(s)</a>
801
                            [% ELSE %]
802
                                <a href="#reserves" id="holds-tab">0 Holds</a>
803
                            [% END %]
833
                        </li>
804
                        </li>
834
805
835
                        [% IF Koha.Preference('UseRecalls') %]
836
                            <li>
837
                                <a href="#recalls" id="recalls-tab">Recalls ([% recalls.count || 0 | html %])</a>
838
                            </li>
839
                        [% END %]
840
841
                        [% IF Koha.Preference('ArticleRequests') %]
806
                        [% IF Koha.Preference('ArticleRequests') %]
842
                            [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
807
                            [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
843
                            <li>
808
                            <li>
844
                                <a href="#article-requests" id="article-requests-tab">Article requests ([% current_article_requests.count || 0 | html %])</a>
809
                                <a href="#article-requests" id="article-requests-tab"> [% current_article_requests.count | html %] Article requests</a>
845
                            </li>
810
                            </li>
846
                        [% END %]
811
                        [% END %]
847
812
Lines 849-856 Link Here
849
                            <li>
814
                            <li>
850
                                [% IF ( patron.return_claims.count ) %]
815
                                [% IF ( patron.return_claims.count ) %]
851
                                    <a href="#return-claims" id="return-claims-tab">
816
                                    <a href="#return-claims" id="return-claims-tab">
852
                                        Claims
817
                                        Claim(s)
853
                                        ([% IF patron.return_claims.resolved.count == 0 %]
818
                                        [% IF patron.return_claims.resolved.count == 0 %]
854
                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
819
                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
855
                                        [% ELSE %]
820
                                        [% ELSE %]
856
                                            <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
821
                                            <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
Lines 859-879 Link Here
859
                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
824
                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
860
                                        [% ELSE %]
825
                                        [% ELSE %]
861
                                            <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
826
                                            <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
862
                                        [% END %])
827
                                        [% END %]
863
                                    </a>
828
                                    </a>
864
                                [% ELSE %]
829
                                [% ELSE %]
865
                                    <a href="#return-claims" id="return-claims-tab">
830
                                    <a href="#return-claims" id="return-claims-tab">
866
                                        Claims
831
                                        Claim(s)
867
                                        (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
832
                                        <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
868
                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
833
                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>
869
                                    </a>
834
                                    </a>
870
                                [% END %]
835
                                [% END %]
871
                            </li>
836
                            </li>
872
                        [% END %]
837
                        [% END %]
873
838
874
                        <li>
839
                        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.count | html %] Restrictions</a></li>
875
                            <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.count || 0 | html %])</a>
876
                        </li>
877
840
878
                        [% SET enrollments = patron.get_club_enrollments(1) %]
841
                        [% SET enrollments = patron.get_club_enrollments(1) %]
879
                        [% SET enrollable  = patron.get_enrollable_clubs(0,1) %]
842
                        [% SET enrollable  = patron.get_enrollable_clubs(0,1) %]
Lines 925-931 Link Here
925
                                    <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
888
                                    <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
926
889
927
                                    [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
890
                                    [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
928
                                    [% IF hold_cancellation.count %]
891
                                    [% IF hold_cancellation %]
929
                                        <select name="cancellation-reason">
892
                                        <select name="cancellation-reason">
930
                                            <option value="">No reason given</option>
893
                                            <option value="">No reason given</option>
931
                                            [% FOREACH reason IN hold_cancellation %]
894
                                            [% FOREACH reason IN hold_cancellation %]
Lines 941-947 Link Here
941
                                    <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
904
                                    <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
942
                                        <input type="hidden" name="from" value="circ" />
905
                                        <input type="hidden" name="from" value="circ" />
943
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
906
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
944
                                        <input type="submit" value="Suspend all holds" />
907
                                        <input type="submit" class="principal" value="Suspend all holds" />
945
908
946
                                        [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
909
                                        [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
947
                                        <label for="suspend_until">until</label>
910
                                        <label for="suspend_until">until</label>
Lines 956-962 Link Here
956
                                        <input type="hidden" name="from" value="circ" />
919
                                        <input type="hidden" name="from" value="circ" />
957
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
920
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
958
                                        <input type="hidden" name="suspend" value="0" />
921
                                        <input type="hidden" name="suspend" value="0" />
959
                                        <input type="submit" value="Resume all suspended holds" />
922
                                        <input type="submit" class="principal" value="Resume all suspended holds" />
960
                                    </form>
923
                                    </form>
961
                                </fieldset>
924
                                </fieldset>
962
                            [% END # /IF SuspendHoldsIntranet %]
925
                            [% END # /IF SuspendHoldsIntranet %]
Lines 966-977 Link Here
966
                        [% END # /IF holds_count %]
929
                        [% END # /IF holds_count %]
967
                    </div> <!-- /#reserves -->
930
                    </div> <!-- /#reserves -->
968
931
969
                    [% IF Koha.Preference('UseRecalls') %]
970
                        <div id="recalls">
971
                            [% INCLUDE 'recalls.inc' %]
972
                        </div>
973
                    [% END %]
974
975
                    [% IF Koha.Preference('ClaimReturnedLostValue') %]
932
                    [% IF Koha.Preference('ClaimReturnedLostValue') %]
976
                        [% INCLUDE 'patron-return-claims.inc' %]
933
                        [% INCLUDE 'patron-return-claims.inc' %]
977
                    [% END %]
934
                    [% END %]
Lines 982-988 Link Here
982
939
983
                </div> <!-- /#patronlists -->
940
                </div> <!-- /#patronlists -->
984
                [% ELSIF borrowernumber # IF patron %]
941
                [% ELSIF borrowernumber # IF patron %]
985
                    <div class="dialog message">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
942
                    <div class="dialog message">Patron not found. <a id="lientype" href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
986
                [% END # /IF patron %]
943
                [% END # /IF patron %]
987
944
988
                </div> <!-- /.col-sm-10.col-sm-push-2 -->
945
                </div> <!-- /.col-sm-10.col-sm-push-2 -->
Lines 1026-1031 Link Here
1026
    [% INCLUDE 'calendar.inc' %]
983
    [% INCLUDE 'calendar.inc' %]
1027
    [% INCLUDE 'datatables.inc' %]
984
    [% INCLUDE 'datatables.inc' %]
1028
    [% INCLUDE 'columns_settings.inc' %]
985
    [% INCLUDE 'columns_settings.inc' %]
986
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
987
    [% INCLUDE 'timepicker.inc' %]
1029
    [% INCLUDE 'select2.inc' %]
988
    [% INCLUDE 'select2.inc' %]
1030
    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
989
    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
1031
    [% INCLUDE 'js-date-format.inc' %]
990
    [% INCLUDE 'js-date-format.inc' %]
Lines 1055-1062 Link Here
1055
    [% Asset.js("js/checkouts.js") | $raw %]
1014
    [% Asset.js("js/checkouts.js") | $raw %]
1056
    [% Asset.js("js/holds.js") | $raw %]
1015
    [% Asset.js("js/holds.js") | $raw %]
1057
    <script>
1016
    <script>
1058
        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
1017
        columns_settings_issues_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
1059
        table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
1018
        columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
1060
1019
1061
        [% IF borrowernumber and patron %]
1020
        [% IF borrowernumber and patron %]
1062
            if( Cookies.get("holdfor") != [% patron.borrowernumber | html %]){
1021
            if( Cookies.get("holdfor") != [% patron.borrowernumber | html %]){
Lines 1131-1137 Link Here
1131
    </script>
1090
    </script>
1132
    [% INCLUDE 'str/members-menu.inc' %]
1091
    [% INCLUDE 'str/members-menu.inc' %]
1133
    [% Asset.js("js/members-menu.js") | $raw %]
1092
    [% Asset.js("js/members-menu.js") | $raw %]
1134
    [% Asset.js("js/recalls.js") | $raw %]
1135
[% END %]
1093
[% END %]
1136
1094
1137
[% INCLUDE 'intranet-bottom.inc' %]
1095
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-2 / +4 lines)
Lines 1060-1066 Link Here
1060
                        </form> <!-- /#checkin-form -->
1060
                        </form> <!-- /#checkin-form -->
1061
1061
1062
                        [% IF ( riloop ) %]
1062
                        [% IF ( riloop ) %]
1063
                            <h2>Checked-in items</h2>
1063
                        <fieldset id="searchresults">
1064
                            <h3>Checked-in items</h3>
1064
                            <table id="checkedintable">
1065
                            <table id="checkedintable">
1065
                                <thead>
1066
                                <thead>
1066
                                    <tr>
1067
                                    <tr>
Lines 1148-1154 Link Here
1148
                                                        </span>
1149
                                                        </span>
1149
                                                    </span>
1150
                                                    </span>
1150
                                                [% END %]
1151
                                                [% END %]
1151
                                                <a class="btn btn-default btn-xs printcheckinslip" href="#" data-borrowernumber="[% riloo.patron.borrowernumber | html %]"><i class="fa fa-print"></i> Print checkin slip</a>
1152
                                                <a class="btn btn-default btn-xs printcheckinslip" id="lientype" href="#" data-borrowernumber="[% riloo.patron.borrowernumber | html %]"><i class="fa fa-print"></i> Print checkin slip</a>
1152
                                            [% ELSE %]
1153
                                            [% ELSE %]
1153
                                                Not checked out
1154
                                                Not checked out
1154
                                            [% END %]
1155
                                            [% END %]
Lines 1167-1172 Link Here
1167
                                    </tr>
1168
                                    </tr>
1168
                                [% END # /FOREACH riloo %]
1169
                                [% END # /FOREACH riloo %]
1169
                            </table> <!-- /#checkedintable -->
1170
                            </table> <!-- /#checkedintable -->
1171
                            </fieldset>
1170
                        [% END # /IF riloop %]
1172
                        [% END # /IF riloop %]
1171
                    [% IF Koha.Preference('CircSidebar') %]
1173
                    [% IF Koha.Preference('CircSidebar') %]
1172
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
1174
                            </div> <!-- /.col-sm-10.col-sm-push-2 -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+3 lines)
Lines 92-98 Link Here
92
                    [% END %]
92
                    [% END %]
93
93
94
                    <div>
94
                    <div>
95
                        
95
96
97
                        <div id="searchresults">
96
                            [% IF ( was_renewed ) %]
98
                            [% IF ( was_renewed ) %]
97
                            <fieldset id="searchresults">
99
                            <fieldset id="searchresults">
98
                            <div class="dialog message">
100
                            <div class="dialog message">
Lines 104-109 Link Here
104
                            <div id="patron_messages" class="circmessage attention">
106
                            <div id="patron_messages" class="circmessage attention">
105
                                [% INCLUDE 'patron_messages.inc' %]
107
                                [% INCLUDE 'patron_messages.inc' %]
106
                            </div>
108
                            </div>
109
                        </div>
107
110
108
                        <h1>[% INCLUDE 'patron-title.inc' no_html = 1 %]</h1>
111
                        <h1>[% INCLUDE 'patron-title.inc' no_html = 1 %]</h1>
109
                        <div class="col-sm-6">
112
                        <div class="col-sm-6">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-17 / +6 lines)
Lines 349-355 Link Here
349
                            [% END %]
349
                            [% END %]
350
                        [% UNLESS ( multi_hold ) %]
350
                        [% UNLESS ( multi_hold ) %]
351
                            <fieldset class="action">
351
                            <fieldset class="action">
352
                                <input type="submit" value="Place hold" />
352
                                <input type="submit" class="principal" value="Place hold" />
353
                            </fieldset>
353
                            </fieldset>
354
                        [% ELSE %]
354
                        [% ELSE %]
355
                            <table id="requesttitles">
355
                            <table id="requesttitles">
Lines 634-650 Link Here
634
                        </ol>
634
                        </ol>
635
635
636
                        [% UNLESS ( multi_hold ) %]
636
                        [% UNLESS ( multi_hold ) %]
637
                            <fieldset class="action">
637
638
                                [% IF ( patron.borrowernumber ) %]
639
                                    [% IF ( override_required ) %]
640
                                        <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button>
641
                                    [% ELSIF ( none_available ) %]
642
                                        <button type="submit" disabled="disabled" class="btn btn-default btn-disabled">Place hold</button>
643
                                    [% ELSE %]
644
                                        <button type="submit" class="btn btn-default">Place hold</button>
645
                                    [% END %]
646
                                [% END %]
647
                            </fieldset>
648
638
649
                            [% FOREACH bibitemloo IN bibitemloop %]
639
                            [% FOREACH bibitemloo IN bibitemloop %]
650
                                <ol>
640
                                <ol>
Lines 954-967 Link Here
954
                        <fieldset class="action">
944
                        <fieldset class="action">
955
                            [% IF ( patron AND patron.borrowernumber ) %]
945
                            [% IF ( patron AND patron.borrowernumber ) %]
956
                                [% IF ( override_required ) %]
946
                                [% IF ( override_required ) %]
957
                                    <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place holds</button>
947
                                    <button type="submit" class="btn btn-default principal warning"><i class="fa fa-exclamation-triangle "></i> Place holds</button>
958
                                [% ELSIF ( none_available ) %]
948
                                [% ELSIF ( none_available ) %]
959
                                    <button class="btn btn-default" type="submit">Place holds</button>
949
                                    <button class="btn btn-default" principal type="submit">Place holds</button>
960
                                [% ELSE %]
950
                                [% ELSE %]
961
                                    [% IF ( multi_hold ) %]
951
                                    [% IF ( multi_hold ) %]
962
                                        <button type="submit" class="btn btn-default" id="multi_hold_submit">Place holds</button>
952
                                        <button type="submit" class="btn btn-default principal" id="multi_hold_submit">Place holds</button>
963
                                    [% ELSE %]
953
                                    [% ELSE %]
964
                                        <button type="submit" class="btn btn-default">Place hold</button>
954
                                        <button type="submit" class="btn btn-default principal">Place hold</button>
965
                                    [% END %]
955
                                    [% END %]
966
                                [% END %]
956
                                [% END %]
967
                            [% END # /IF patron %]
957
                            [% END # /IF patron %]
968
- 

Return to bug 30952