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 350-361 Link Here
350
                                </form>
324
                                </form>
351
                            [% END %]
325
                            [% END %]
352
326
353
                            [% IF ( RECALLED ) %]
354
                                <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
355
                                    <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>
356
                                </form>
357
                            [% END %]
358
359
                            <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
327
                            <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
360
                                [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
328
                                [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
361
                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
329
                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
Lines 373-381 Link Here
373
                                [% END %]
341
                                [% END %]
374
                            </form>
342
                            </form>
375
343
376
                            [% IF ( RESERVED || ISSUED_TO_ANOTHER || RECALLED ) && (CAN_user_reserveforothers_place_holds ) %]
344
                            [% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %]
377
                                [% UNLESS noissues %]
345
                                [% UNLESS noissues %]
378
                                    <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>
346
                                    <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>
379
                                [% END %]
347
                                [% END %]
380
                            [% END %]
348
                            [% END %]
381
                        </div> <!-- /#circ_needsconfirmation -->
349
                        </div> <!-- /#circ_needsconfirmation -->
Lines 414-420 Link Here
414
382
415
                                            [% IF ( fast_cataloging ) %]
383
                                            [% IF ( fast_cataloging ) %]
416
                                                [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
384
                                                [% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
417
                                                    <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>
385
                                                    <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>
418
                                                [% END %]
386
                                                [% END %]
419
                                            [% END %]
387
                                            [% END %]
420
                                        </div>
388
                                        </div>
Lines 495-504 Link Here
495
                                [% IF ( USERBLOCKEDOVERDUE ) %]
463
                                [% IF ( USERBLOCKEDOVERDUE ) %]
496
                                    <li>Checkouts are BLOCKED because patron has overdue items.</li>
464
                                    <li>Checkouts are BLOCKED because patron has overdue items.</li>
497
                                [% END %]
465
                                [% END %]
498
499
                                [% IF ( RECALLED_INTRANSIT ) %]
500
                                    <li>Item has been recalled and is in transit for pickup at [% Branches.GetName( RECALLED_INTRANSIT ) | html %].</li>
501
                                [% END %]
502
                                </ul>
466
                                </ul>
503
467
504
                                [% IF (forceallow) %]
468
                                [% IF (forceallow) %]
Lines 566-572 Link Here
566
                                                                    <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
530
                                                                    <input type="hidden" name="barcode" value="[% item.barcode | html %]" />
567
                                                                    <input type="hidden" name="onsite_checkout" value="[% onsite_checkout | html %]" />
531
                                                                    <input type="hidden" name="onsite_checkout" value="[% onsite_checkout | html %]" />
568
                                                                    <input type="hidden" name="auto_renew" value="[% auto_renew | html %]" />
532
                                                                    <input type="hidden" name="auto_renew" value="[% auto_renew | html %]" />
569
                                                                    <button class="btn btn-default btn-xs" type="submit" name="x"><i class="fa fa-check"></i> Check out</button>
533
                                                                    <button class="btn btn-default btn-xs" type="submit" id="lientype" name="x"><i class="fa fa-check"></i> Check out</button>
570
                                                                </form>
534
                                                                </form>
571
                                                            </td>
535
                                                            </td>
572
                                                        </tr>
536
                                                        </tr>
Lines 575-581 Link Here
575
                                                </table>
539
                                                </table>
576
                                            </div> <!-- /.modal-body -->
540
                                            </div> <!-- /.modal-body -->
577
                                            <div class="modal-footer">
541
                                            <div class="modal-footer">
578
                                                <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
542
                                                <button type="button" class="btn btn-default cancel" data-dismiss="modal">Cancel</button>
579
                                            </div>
543
                                            </div>
580
                                        </div> <!-- /.modal-content -->
544
                                        </div> <!-- /.modal-content -->
581
                                    </div> <!-- /.modal-dialog.modal-wide -->
545
                                    </div> <!-- /.modal-dialog.modal-wide -->
Lines 610-620 Link Here
610
                            </div>
574
                            </div>
611
                        [% END %]
575
                        [% END %]
612
576
613
                        <div>
577
                        <div class="row">
614
                            [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
578
                            [% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
615
                                <div class="col-sm-6">
579
                                <div class="col-sm-6">
616
                                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
580
                                    <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
617
                                        <input type="hidden" name="restoreduedatespec" />
581
                                        <input type="hidden" name="restoreduedatespec" />
582
                                        <div id="searchresults">
618
                                        [% IF ( issue ) %]
583
                                        [% IF ( issue ) %]
619
                                            <fieldset id="circ_circulation_issue" class="lastchecked">
584
                                            <fieldset id="circ_circulation_issue" class="lastchecked">
620
                                        [% ELSE %]
585
                                        [% ELSE %]
Lines 628-634 Link Here
628
593
629
                                        [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
594
                                        [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
630
595
631
                                        <label class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</label>
596
                                        <h3 class="circ_barcode" for="barcode">Checking out to [% INCLUDE 'patron-title.inc' %]</h3>
632
597
633
                                        [% IF Koha.Preference('itemBarcodeFallbackSearch') %]
598
                                        [% IF Koha.Preference('itemBarcodeFallbackSearch') %]
634
                                            <div class="hint">Enter item barcode or keyword:</div>
599
                                            <div class="hint">Enter item barcode or keyword:</div>
Lines 645-652 Link Here
645
                                        <div id="show-circ-settings">
610
                                        <div id="show-circ-settings">
646
                                            <a href="#"><i class="fa-sign-out"></i></a>
611
                                            <a href="#"><i class="fa-sign-out"></i></a>
647
                                        </div>
612
                                        </div>
648
                                        <button class="submit" id="principal" type="submit">Check out</button>
649
613
614
                                        <button type="submit" class="btn btn-default principal">Check out</button>
650
615
651
                                        <div class="circ-settings">
616
                                        <div class="circ-settings">
652
617
Lines 670-702 Link Here
670
                                                [% END %]
635
                                                [% END %]
671
636
672
                                                [% UNLESS ( noissues ) %]
637
                                                [% UNLESS ( noissues ) %]
673
                                                    [% IF Koha.Preference('AllowSetAutomaticRenewal') %]
638
                                                    <div id="set-automatic-renewal" class="circ-setting">
674
                                                        <div id="set-automatic-renewal" class="circ-setting">
639
                                                        [% IF NEEDSCONFIRMATION %]
675
                                                            [% IF NEEDSCONFIRMATION %]
640
                                                            [% IF auto_renew %]
676
                                                                [% IF auto_renew %]
641
                                                                [% IF patron.autorenew_checkouts %]
677
                                                                    [% IF patron.autorenew_checkouts %]
678
                                                                        <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
679
                                                                        title="Patron has opted out of auto-renewal"/>
680
                                                                    [% ELSE %]
681
                                                                        <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" checked="checked" />
682
                                                                    [% END %]
683
                                                                [% ELSE %]
684
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
685
                                                                [% END %]
686
                                                            [% ELSE %]
687
                                                                [% IF ( auto_renew && patron.autorenew_checkouts ) %]
688
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" checked="checked" />
689
                                                                [% ELSIF patron.autorenew_checkouts %]
690
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" />
691
                                                                [% ELSE %]
692
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
642
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
693
                                                                    title="Patron has opted out of auto-renewal"/>
643
                                                                    title="Patron has opted out of auto-renewal"/>
644
                                                                [% ELSE %]
645
                                                                    <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" checked="checked" />
694
                                                                [% END %]
646
                                                                [% END %]
647
                                                            [% ELSE %]
648
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled" />
649
                                                            [% END %]
650
                                                        [% ELSE %]
651
                                                            [% IF ( auto_renew && patron.autorenew_checkouts ) %]
652
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" checked="checked" />
653
                                                            [% ELSIF patron.autorenew_checkouts %]
654
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" class="circ_setting" />
655
                                                            [% ELSE %]
656
                                                                <input type="checkbox" name="auto_renew" id="auto_renew" value="auto_renew" disabled="disabled"
657
                                                                title="Patron has opted out of auto-renewal"/>
695
                                                            [% END %]
658
                                                            [% END %]
659
                                                        [% END %]
696
660
697
                                                            <label for="auto_renew">Automatic renewal</label>
661
                                                        <label for="auto_renew">Automatic renewal</label>
698
                                                        </div>
662
                                                    </div>
699
                                                    [% END %]
700
                                                    [% IF Koha.Preference('decreaseLoanHighHolds') %]
663
                                                    [% IF Koha.Preference('decreaseLoanHighHolds') %]
701
                                                        <div id="set_high_holds_overrride" class="circ-setting">
664
                                                        <div id="set_high_holds_overrride" class="circ-setting">
702
                                                            [% IF NEEDSCONFIRMATION %]
665
                                                            [% IF NEEDSCONFIRMATION %]
Lines 744-749 Link Here
744
                                                    <input type="hidden" name="charges" value="yes" />
707
                                                    <input type="hidden" name="charges" value="yes" />
745
                                            [% END %]
708
                                            [% END %]
746
                                        </fieldset> <!-- /#circ_circulation_issue -->
709
                                        </fieldset> <!-- /#circ_circulation_issue -->
710
                                        </div>
747
711
748
                                        [% IF ( issue ) %]
712
                                        [% IF ( issue ) %]
749
                                            <div class="lastchecked">
713
                                            <div class="lastchecked">
Lines 765-776 Link Here
765
                                <div class="col-sm-6">
729
                                <div class="col-sm-6">
766
                            [% END %]
730
                            [% END %]
767
731
732
                            <div id="searchresults">
768
                            [% IF ( noissues ) %]
733
                            [% IF ( noissues ) %]
769
                                [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
734
                                [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]
770
                                    <fieldset id="searchresults">
735
                                    <div id="circmessages" class="circmessage attention">
771
                                [% ELSE %]
736
                                [% ELSE %]
772
                                    <h2>Checking out to [% INCLUDE 'patron-title.inc' %]</h2>
737
                                    <h4>Checking out to [% INCLUDE 'patron-title.inc' %]</h4>
773
                                    <fieldset id="searchresults">
738
                                    <div id="circmessages" class="circmessage warning">
774
                                [% END %]
739
                                [% END %]
775
                                <h3>
740
                                <h3>
776
                                    Cannot check out!
741
                                    Cannot check out!
Lines 779-820 Link Here
779
                                    [% END %]
744
                                    [% END %]
780
                                </h3>
745
                                </h3>
781
                            [% ELSE %]
746
                            [% ELSE %]
782
                                <fieldset id="searchresults">
747
                                <div id="circmessages" class="circmessage attention">
783
                            [% END %]
748
                            [% END %]
749
                            </div>
784
750
785
                            [% INCLUDE 'patron_messages.inc' %]
751
                            [% INCLUDE 'patron_messages.inc' %]
786
752
787
753
                        </div> <!-- /#circmessages -->
788
                        </fieldset> <!-- /#circmessages -->
789
                    </div> <!-- /div or div.col-sm-6 -->
754
                    </div> <!-- /div or div.col-sm-6 -->
790
                </div> <!-- /.row -->
755
                </div> <!-- /.row -->
791
756
792
                <div id="patronlists" class="toptabs">
757
                <div id="patronlists" class="toptabs">
793
                    <ul>
758
                    <ul>
794
                        <li>
759
                        <li>
795
                            <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a>
760
                            [% IF ( issuecount ) %]
761
                                <a href="#checkouts">[% issuecount | html %] Checkout(s)</a>
762
                            [% ELSE %]
763
                                <a href="#checkouts">0 Checkouts</a>
764
                            [% END %]
796
                        </li>
765
                        </li>
797
766
798
                        [% IF relatives_issues_count %]
767
                        [% IF relatives_issues_count %]
799
                            <li>
768
                            <li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count | html %] Relatives' checkouts</a></li>
800
                                <a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts ([% relatives_issues_count | html %])</a>
801
                            </li>
802
                        [% END %]
769
                        [% END %]
803
770
804
                        <li>
771
                        <li>
805
                            <a href="#reserves" id="holds-tab">Holds ([% holds_count || 0 | html %])</a>
772
                            [% IF ( holds_count ) %]
773
                                <a href="#reserves" id="holds-tab">[% holds_count | html %] Hold(s)</a>
774
                            [% ELSE %]
775
                                <a href="#reserves" id="holds-tab">0 Holds</a>
776
                            [% END %]
806
                        </li>
777
                        </li>
807
778
808
                        [% IF Koha.Preference('UseRecalls') %]
809
                            <li>
810
                                <a href="#recalls" id="recalls-tab">Recalls ([% recalls.count || 0 | html %])</a>
811
                            </li>
812
                        [% END %]
813
814
                        [% IF Koha.Preference('ArticleRequests') %]
779
                        [% IF Koha.Preference('ArticleRequests') %]
815
                            [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
780
                            [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
816
                            <li>
781
                            <li>
817
                                <a href="#article-requests" id="article-requests-tab">Article requests ([% current_article_requests.count || 0 | html %])</a>
782
                                <a href="#article-requests" id="article-requests-tab"> [% current_article_requests.count | html %] Article requests</a>
818
                            </li>
783
                            </li>
819
                        [% END %]
784
                        [% END %]
820
785
Lines 822-829 Link Here
822
                            <li>
787
                            <li>
823
                                [% IF ( patron.return_claims.count ) %]
788
                                [% IF ( patron.return_claims.count ) %]
824
                                    <a href="#return-claims" id="return-claims-tab">
789
                                    <a href="#return-claims" id="return-claims-tab">
825
                                        Claims
790
                                        Claim(s)
826
                                        ([% IF patron.return_claims.resolved.count == 0 %]
791
                                        [% IF patron.return_claims.resolved.count == 0 %]
827
                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
792
                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
828
                                        [% ELSE %]
793
                                        [% ELSE %]
829
                                            <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
794
                                            <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
Lines 832-852 Link Here
832
                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
797
                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
833
                                        [% ELSE %]
798
                                        [% ELSE %]
834
                                            <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
799
                                            <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
835
                                        [% END %])
800
                                        [% END %]
836
                                    </a>
801
                                    </a>
837
                                [% ELSE %]
802
                                [% ELSE %]
838
                                    <a href="#return-claims" id="return-claims-tab">
803
                                    <a href="#return-claims" id="return-claims-tab">
839
                                        Claims
804
                                        Claim(s)
840
                                        (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
805
                                        <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
841
                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
806
                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>
842
                                    </a>
807
                                    </a>
843
                                [% END %]
808
                                [% END %]
844
                            </li>
809
                            </li>
845
                        [% END %]
810
                        [% END %]
846
811
847
                        <li>
812
                        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.count | html %] Restrictions</a></li>
848
                            <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.count || 0 | html %])</a>
849
                        </li>
850
813
851
                        [% SET enrollments = patron.get_club_enrollments(1) %]
814
                        [% SET enrollments = patron.get_club_enrollments(1) %]
852
                        [% SET enrollable  = patron.get_enrollable_clubs(0,1) %]
815
                        [% SET enrollable  = patron.get_enrollable_clubs(0,1) %]
Lines 898-904 Link Here
898
                                    <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
861
                                    <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
899
862
900
                                    [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
863
                                    [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
901
                                    [% IF hold_cancellation.count %]
864
                                    [% IF hold_cancellation %]
902
                                        <select name="cancellation-reason">
865
                                        <select name="cancellation-reason">
903
                                            <option value="">No reason given</option>
866
                                            <option value="">No reason given</option>
904
                                            [% FOREACH reason IN hold_cancellation %]
867
                                            [% FOREACH reason IN hold_cancellation %]
Lines 914-920 Link Here
914
                                    <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
877
                                    <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
915
                                        <input type="hidden" name="from" value="circ" />
878
                                        <input type="hidden" name="from" value="circ" />
916
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
879
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
917
                                        <input type="submit" value="Suspend all holds" />
880
                                        <input type="submit" class="principal" value="Suspend all holds" />
918
881
919
                                        [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
882
                                        [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
920
                                        <label for="suspend_until">until</label>
883
                                        <label for="suspend_until">until</label>
Lines 929-935 Link Here
929
                                        <input type="hidden" name="from" value="circ" />
892
                                        <input type="hidden" name="from" value="circ" />
930
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
893
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
931
                                        <input type="hidden" name="suspend" value="0" />
894
                                        <input type="hidden" name="suspend" value="0" />
932
                                        <input type="submit" value="Resume all suspended holds" />
895
                                        <input type="submit" class="principal" value="Resume all suspended holds" />
933
                                    </form>
896
                                    </form>
934
                                </fieldset>
897
                                </fieldset>
935
                            [% END # /IF SuspendHoldsIntranet %]
898
                            [% END # /IF SuspendHoldsIntranet %]
Lines 939-950 Link Here
939
                        [% END # /IF holds_count %]
902
                        [% END # /IF holds_count %]
940
                    </div> <!-- /#reserves -->
903
                    </div> <!-- /#reserves -->
941
904
942
                    [% IF Koha.Preference('UseRecalls') %]
943
                        <div id="recalls">
944
                            [% INCLUDE 'recalls.inc' %]
945
                        </div>
946
                    [% END %]
947
948
                    [% IF Koha.Preference('ClaimReturnedLostValue') %]
905
                    [% IF Koha.Preference('ClaimReturnedLostValue') %]
949
                        [% INCLUDE 'patron-return-claims.inc' %]
906
                        [% INCLUDE 'patron-return-claims.inc' %]
950
                    [% END %]
907
                    [% END %]
Lines 955-961 Link Here
955
912
956
                </div> <!-- /#patronlists -->
913
                </div> <!-- /#patronlists -->
957
                [% ELSIF borrowernumber # IF patron %]
914
                [% ELSIF borrowernumber # IF patron %]
958
                    <div class="dialog message">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
915
                    <div class="dialog message">Patron not found. <a id="lientype" href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
959
                [% END # /IF patron %]
916
                [% END # /IF patron %]
960
917
961
                </div> <!-- /.col-sm-10.col-sm-push-2 -->
918
                </div> <!-- /.col-sm-10.col-sm-push-2 -->
Lines 999-1004 Link Here
999
    [% INCLUDE 'calendar.inc' %]
956
    [% INCLUDE 'calendar.inc' %]
1000
    [% INCLUDE 'datatables.inc' %]
957
    [% INCLUDE 'datatables.inc' %]
1001
    [% INCLUDE 'columns_settings.inc' %]
958
    [% INCLUDE 'columns_settings.inc' %]
959
    [% Asset.js("lib/jquery/plugins/jquery-ui-timepicker-addon.min.js") | $raw %]
960
    [% INCLUDE 'timepicker.inc' %]
1002
    [% INCLUDE 'select2.inc' %]
961
    [% INCLUDE 'select2.inc' %]
1003
    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
962
    [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
1004
    [% INCLUDE 'js-date-format.inc' %]
963
    [% INCLUDE 'js-date-format.inc' %]
Lines 1028-1035 Link Here
1028
    [% Asset.js("js/checkouts.js") | $raw %]
987
    [% Asset.js("js/checkouts.js") | $raw %]
1029
    [% Asset.js("js/holds.js") | $raw %]
988
    [% Asset.js("js/holds.js") | $raw %]
1030
    <script>
989
    <script>
1031
        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
990
        columns_settings_issues_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
1032
        table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
991
        columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
1033
992
1034
        [% IF borrowernumber and patron %]
993
        [% IF borrowernumber and patron %]
1035
            if( Cookies.get("holdfor") != [% patron.borrowernumber | html %]){
994
            if( Cookies.get("holdfor") != [% patron.borrowernumber | html %]){
Lines 1104-1110 Link Here
1104
    </script>
1063
    </script>
1105
    [% INCLUDE 'str/members-menu.inc' %]
1064
    [% INCLUDE 'str/members-menu.inc' %]
1106
    [% Asset.js("js/members-menu.js") | $raw %]
1065
    [% Asset.js("js/members-menu.js") | $raw %]
1107
    [% Asset.js("js/recalls.js") | $raw %]
1108
[% END %]
1066
[% END %]
1109
1067
1110
[% INCLUDE 'intranet-bottom.inc' %]
1068
[% 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 93-98 Link Here
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>
111
                        <h1>
109
                            [% UNLESS ( I ) %]
112
                            [% UNLESS ( I ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-17 / +6 lines)
Lines 285-291 Link Here
285
                            [% END %]
285
                            [% END %]
286
                        [% UNLESS ( multi_hold ) %]
286
                        [% UNLESS ( multi_hold ) %]
287
                            <fieldset class="action">
287
                            <fieldset class="action">
288
                                <input type="submit" value="Place hold" />
288
                                <input type="submit" class="principal" value="Place hold" />
289
                            </fieldset>
289
                            </fieldset>
290
                        [% ELSE %]
290
                        [% ELSE %]
291
                            <table id="requesttitles">
291
                            <table id="requesttitles">
Lines 569-585 Link Here
569
                        </ol>
569
                        </ol>
570
570
571
                        [% UNLESS ( multi_hold ) %]
571
                        [% UNLESS ( multi_hold ) %]
572
                            <fieldset class="action">
572
573
                                [% IF ( patron.borrowernumber ) %]
574
                                    [% IF ( override_required ) %]
575
                                        <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place hold</button>
576
                                    [% ELSIF ( none_available ) %]
577
                                        <button type="submit" disabled="disabled" class="btn btn-default btn-disabled">Place hold</button>
578
                                    [% ELSE %]
579
                                        <button type="submit" class="btn btn-default">Place hold</button>
580
                                    [% END %]
581
                                [% END %]
582
                            </fieldset>
583
573
584
                            [% FOREACH bibitemloo IN bibitemloop %]
574
                            [% FOREACH bibitemloo IN bibitemloop %]
585
                                <ol>
575
                                <ol>
Lines 896-909 Link Here
896
                        <fieldset class="action">
886
                        <fieldset class="action">
897
                            [% IF ( patron AND patron.borrowernumber ) %]
887
                            [% IF ( patron AND patron.borrowernumber ) %]
898
                                [% IF ( override_required ) %]
888
                                [% IF ( override_required ) %]
899
                                    <button type="submit" class="btn btn-default warning"><i class="fa fa-exclamation-triangle "></i> Place holds</button>
889
                                    <button type="submit" class="btn btn-default principal warning"><i class="fa fa-exclamation-triangle "></i> Place holds</button>
900
                                [% ELSIF ( none_available ) %]
890
                                [% ELSIF ( none_available ) %]
901
                                    <button class="btn btn-default" type="submit">Place holds</button>
891
                                    <button class="btn btn-default" principal type="submit">Place holds</button>
902
                                [% ELSE %]
892
                                [% ELSE %]
903
                                    [% IF ( multi_hold ) %]
893
                                    [% IF ( multi_hold ) %]
904
                                        <button type="submit" class="btn btn-default" id="multi_hold_submit">Place holds</button>
894
                                        <button type="submit" class="btn btn-default principal" id="multi_hold_submit">Place holds</button>
905
                                    [% ELSE %]
895
                                    [% ELSE %]
906
                                        <button type="submit" class="btn btn-default">Place hold</button>
896
                                        <button type="submit" class="btn btn-default principal">Place hold</button>
907
                                    [% END %]
897
                                    [% END %]
908
                                [% END %]
898
                                [% END %]
909
                            [% END # /IF patron %]
899
                            [% END # /IF patron %]
910
- 

Return to bug 30952