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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-5 lines)
Lines 1246-1256 div { Link Here
1246
    }
1246
    }
1247
}
1247
}
1248
1248
1249
#reserves,
1250
#checkouts {
1251
    padding: 1em;
1252
}
1253
1254
#sales {
1249
#sales {
1255
    display: none;
1250
    display: none;
1256
}
1251
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc (-1 / +1 lines)
Lines 9-15 Link Here
9
        [% END %]
9
        [% END %]
10
        [% IF CAN_user_updatecharges_remaining_permissions %]
10
        [% IF CAN_user_updatecharges_remaining_permissions %]
11
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a>
11
            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Make payment</a>
12
            <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all charges</a></li>
12
            <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% patron.borrowernumber | uri %]" class="btn btn-default btn-xs" >Pay all charges</a>
13
        [% END %]
13
        [% END %]
14
    </li>
14
    </li>
15
[% END %]
15
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-1 / +1 lines)
Lines 1-7 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Koha %]
2
[% USE Koha %]
3
[% PROCESS 'patron_restrictions.inc' %]
3
[% PROCESS 'patron_restrictions.inc' %]
4
<div id="reldebarments">
4
<div id="reldebarments" role="tabpanel" class="tab-pane">
5
    [% IF ( not debarments.defined || debarments.size < 1 ) %]
5
    [% IF ( not debarments.defined || debarments.size < 1 ) %]
6
        <p>Patron is currently unrestricted.</p>
6
        <p>Patron is currently unrestricted.</p>
7
    [% ELSE %]
7
    [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc (-1 / +1 lines)
Lines 1-7 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% PROCESS 'modal-claims.inc' %]
2
[% PROCESS 'modal-claims.inc' %]
3
[% INCLUDE 'format_price.inc' %]
3
[% INCLUDE 'format_price.inc' %]
4
<div id="checkouts">
4
<div id="checkouts" role="tabpanel" class="tab-pane active">
5
    [% IF ( issuecount ) %]
5
    [% IF ( issuecount ) %]
6
        <div id="issues-table-loading-message">
6
        <div id="issues-table-loading-message">
7
            <p>
7
            <p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-article-requests.inc (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Context %]
1
[% USE Context %]
2
[% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
2
[% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
3
<div id="article-requests">
3
<div id="article-requests" role="tabpanel" class="tab-pane">
4
[% IF current_article_requests.count > 0 %]
4
[% IF current_article_requests.count > 0 %]
5
    <table id="article-requests-table" class="table table-bordered table-striped">
5
    <table id="article-requests-table" class="table table-bordered table-striped">
6
        <thead>
6
        <thead>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-return-claims.inc (-1 / +1 lines)
Lines 1-4 Link Here
1
<div id="return-claims">
1
<div id="return-claims" role="tabpanel" class="tab-pane">
2
    <p id="return-claims-controls">
2
    <p id="return-claims-controls">
3
        [% IF ( patron.return_claims.resolved.count > 0 || patron.return_claims.unresolved.count > 0 ) %]
3
        [% IF ( patron.return_claims.resolved.count > 0 || patron.return_claims.unresolved.count > 0 ) %]
4
            <a id="show_all_claims" class="ctrl_link" href="#">Show all [% patron.return_claims.count | html %] claim(s)</a>
4
            <a id="show_all_claims" class="ctrl_link" href="#">Show all [% patron.return_claims.count | html %] claim(s)</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/relatives-issues-table.inc (-1 / +1 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% IF ( relatives_issues_count ) %]
2
[% IF ( relatives_issues_count ) %]
3
    <div id="relatives-issues">
3
    <div id="relatives-issues" role="tabpanel" class="tab-pane">
4
        <table id="relatives-issues-table" style="width: 100% !Important;">
4
        <table id="relatives-issues-table" style="width: 100% !Important;">
5
            <thead>
5
            <thead>
6
                <tr>
6
                <tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-105 / +106 lines)
Lines 815-852 Link Here
815
                </div> <!-- /.row -->
815
                </div> <!-- /.row -->
816
816
817
                <div id="patronlists" class="toptabs">
817
                <div id="patronlists" class="toptabs">
818
                    <ul>
818
                    <ul class="nav nav-tabs" role="tablist">
819
                        <li>
819
                        <li role="presentation" class="active">
820
                            <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a>
820
                            <a href="#checkouts" aria-controls="checkouts" role="tab" data-toggle="tab">Checkouts ([% issuecount || 0 | html %])</a>
821
                        </li>
821
                        </li>
822
822
823
                        [% IF relatives_issues_count %]
823
                        [% IF relatives_issues_count %]
824
                            <li>
824
                            <li role="presentation">
825
                                <a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts ([% relatives_issues_count | html %])</a>
825
                                <a id="relatives-issues-tab" href="#relatives-issues" aria-controls="relatives-issues" role="tab" data-toggle="tab">Relatives' checkouts ([% relatives_issues_count | html %])</a>
826
                            </li>
826
                            </li>
827
                        [% END %]
827
                        [% END %]
828
828
829
                        <li>
829
                        <li role="presentation">
830
                            <a href="#reserves" id="holds-tab">Holds ([% holds_count || 0 | html %])</a>
830
                            <a href="#reserves" id="holds-tab" aria-controls="reserves" role="tab" data-toggle="tab">Holds ([% holds_count || 0 | html %])</a>
831
                        </li>
831
                        </li>
832
832
833
                        [% IF Koha.Preference('UseRecalls') %]
833
                        [% IF Koha.Preference('UseRecalls') %]
834
                            <li>
834
                            <li role="presentation">
835
                                <a href="#recalls" id="recalls-tab">Recalls ([% recalls.count || 0 | html %])</a>
835
                                <a href="#recalls" id="recalls-tab" aria-controls="recalls" role="tab" data-toggle="tab">Recalls ([% recalls.count || 0 | html %])</a>
836
                            </li>
836
                            </li>
837
                        [% END %]
837
                        [% END %]
838
838
839
                        [% IF Koha.Preference('ArticleRequests') %]
839
                        [% IF Koha.Preference('ArticleRequests') %]
840
                            [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
840
                            [% SET current_article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current' ) %]
841
                            <li>
841
                            <li role="presentation">
842
                                <a href="#article-requests" id="article-requests-tab">Article requests ([% current_article_requests.count || 0 | html %])</a>
842
                                <a href="#article-requests" id="article-requests-tab" aria-controls="article-requests" role="tab" data-toggle="tab">Article requests ([% current_article_requests.count || 0 | html %])</a>
843
                            </li>
843
                            </li>
844
                        [% END %]
844
                        [% END %]
845
845
846
                        [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
846
                        [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
847
                            <li>
847
                            <li role="presentation">
848
                                [% IF ( patron.return_claims.count ) %]
848
                                [% IF ( patron.return_claims.count ) %]
849
                                    <a href="#return-claims" id="return-claims-tab">
849
                                    <a href="#return-claims" id="return-claims-tab" aria-controls="return-claims" role="tab" data-toggle="tab">
850
                                        Claims
850
                                        Claims
851
                                        ([% IF patron.return_claims.resolved.count == 0 %]
851
                                        ([% IF patron.return_claims.resolved.count == 0 %]
852
                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
852
                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
Lines 860-866 Link Here
860
                                        [% END %])
860
                                        [% END %])
861
                                    </a>
861
                                    </a>
862
                                [% ELSE %]
862
                                [% ELSE %]
863
                                    <a href="#return-claims" id="return-claims-tab">
863
                                    <a href="#return-claims" id="return-claims-tab" aria-controls="return-claims" role="tab" data-toggle="tab">
864
                                        Claims
864
                                        Claims
865
                                        (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
865
                                        (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
866
                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
866
                                        <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
Lines 869-984 Link Here
869
                            </li>
869
                            </li>
870
                        [% END %]
870
                        [% END %]
871
871
872
                        <li>
872
                        <li role="presentation">
873
                            <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.size || 0 | html %])</a>
873
                            <a id="debarments-tab-link" href="#reldebarments" aria-controls="reldebarments" role="tab" data-toggle="tab">Restrictions ([% debarments.size || 0 | html %])</a>
874
                        </li>
874
                        </li>
875
875
876
                        [% SET enrollments = patron.get_club_enrollments %]
876
                        [% SET enrollments = patron.get_club_enrollments %]
877
                        [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
877
                        [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
878
                        [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
878
                        [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
879
                            <li>
879
                            <li role="presentation">
880
                                <a id="clubs-tab-link" href="#clubs-tab">
880
                                <a id="clubs-tab-link" href="#clubs-tab" aria-controls="clubs-tab" role="tab" data-toggle="tab">
881
                                    Clubs ([% enrollments.count | html %]/[% enrollable.count | html %])
881
                                    Clubs ([% enrollments.count | html %]/[% enrollable.count | html %])
882
                                </a>
882
                                </a>
883
                            </li>
883
                            </li>
884
                        [% END %]
884
                        [% END %]
885
                    </ul>
885
                    </ul>
886
886
887
                    <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
887
                    <div class="tab-content">
888
                        <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
888
889
889
                    [% INCLUDE "checkouts-table.inc" %]
890
                        [% INCLUDE "checkouts-table.inc" %]
890
891
891
                    [% INCLUDE "relatives-issues-table.inc" %]
892
                        [% INCLUDE "relatives-issues-table.inc" %]
892
893
893
                    [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
894
                        [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
894
                        <div id="clubs-tab">
895
                            <div id="clubs-tab" role="tabpanel" class="tab-pane">
895
                            Loading...
896
                                Loading...
896
                        </div> <!-- /#clubs-tab -->
897
                            </div> <!-- /#clubs-tab -->
897
                    [% END %]
898
                        [% END %]
898
899
899
                    [% INCLUDE borrower_debarments.inc %]
900
                        [% INCLUDE borrower_debarments.inc %]
900
901
901
                    <div id="reserves">
902
                        <div id="reserves" role="tabpanel" class="tab-pane">
902
                        [% IF ( holds_count ) %]
903
                            [% IF ( holds_count ) %]
903
                            <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
904
                                <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
904
                                <input type="hidden" name="from" value="circ" />
905
                                    <input type="hidden" name="from" value="circ" />
905
                                <table id="holds-table" style="width: 100% !Important;">
906
                                    <table id="holds-table" style="width: 100% !Important;">
906
                                    <thead>
907
                                        <thead>
907
                                        <tr>
908
                                            <tr>
908
                                            <th>Hold date</th>
909
                                                <th>Hold date</th>
909
                                            <th>Title</th>
910
                                                <th>Title</th>
910
                                            <th>Call number</th>
911
                                                <th>Call number</th>
911
                                            <th>Item type</th>
912
                                                <th>Item type</th>
912
                                            <th>Barcode</th>
913
                                                <th>Barcode</th>
913
                                            <th>Pickup at</th>
914
                                                <th>Pickup at</th>
914
                                            <th>Expiration</th>
915
                                                <th>Expiration</th>
915
                                            <th>Priority</th>
916
                                                <th>Priority</th>
916
                                            <th>Cancel?</th>
917
                                                <th>Cancel?</th>
917
                                            <th>Suspend?</th>
918
                                                <th>Suspend?</th>
918
                                            <th>Status</th>
919
                                                <th>Status</th>
919
                                        </tr>
920
                                            </tr>
920
                                    </thead>
921
                                        </thead>
921
                                </table>
922
                                    </table>
922
923
923
                                <fieldset class="action">
924
                                    <fieldset class="action">
924
                                    <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
925
                                        <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
925
926
926
                                    [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
927
                                        [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
927
                                    [% IF hold_cancellation.count %]
928
                                        [% IF hold_cancellation.count %]
928
                                        <select name="cancellation-reason">
929
                                            <select name="cancellation-reason">
929
                                            <option value="">No reason given</option>
930
                                                <option value="">No reason given</option>
930
                                            [% FOREACH reason IN hold_cancellation %]
931
                                                [% FOREACH reason IN hold_cancellation %]
931
                                                <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
932
                                                    <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
932
                                            [% END %]
933
                                                [% END %]
933
                                        </select>
934
                                            </select>
934
                                    [% END %]
935
                                        [% END %]
935
                                </fieldset>
936
                                    </fieldset>
936
                            </form>
937
                                </form>
937
938
938
                            [% IF Koha.Preference('SuspendHoldsIntranet') %]
939
                                [% IF Koha.Preference('SuspendHoldsIntranet') %]
939
                                <fieldset class="action">
940
                                    <fieldset class="action">
940
                                    <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
941
                                        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
941
                                        <input type="hidden" name="from" value="circ" />
942
                                            <input type="hidden" name="from" value="circ" />
942
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
943
                                            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
943
                                        <input type="submit" value="Suspend all holds" />
944
                                            <input type="submit" value="Suspend all holds" />
944
945
945
                                        [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
946
                                            [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
946
                                        <label for="suspend_until">until</label>
947
                                            <label for="suspend_until">until</label>
947
                                        <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr" data-flatpickr-futuredate="true" />
948
                                            <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr" data-flatpickr-futuredate="true" />
948
                                        <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
949
                                            <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
949
                                         [% END %]
950
                                            [% END %]
950
                                    </form>
951
                                        </form>
951
                                </fieldset>
952
                                    </fieldset>
952
953
953
                                <fieldset class="action">
954
                                    <fieldset class="action">
954
                                    <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
955
                                        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
955
                                        <input type="hidden" name="from" value="circ" />
956
                                            <input type="hidden" name="from" value="circ" />
956
                                        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
957
                                            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
957
                                        <input type="hidden" name="suspend" value="0" />
958
                                            <input type="hidden" name="suspend" value="0" />
958
                                        <input type="submit" value="Resume all suspended holds" />
959
                                            <input type="submit" value="Resume all suspended holds" />
959
                                    </form>
960
                                        </form>
960
                                </fieldset>
961
                                    </fieldset>
961
                            [% END # /IF SuspendHoldsIntranet %]
962
                                [% END # /IF SuspendHoldsIntranet %]
962
963
963
                        [% ELSE # IF holds_count %]
964
                            [% ELSE # IF holds_count %]
964
                            <p>Patron has nothing on hold.</p>
965
                                <p>Patron has nothing on hold.</p>
965
                        [% END # /IF holds_count %]
966
                            [% END # /IF holds_count %]
966
                    </div> <!-- /#reserves -->
967
                        </div> <!-- /#reserves -->
967
968
                    [% IF Koha.Preference('UseRecalls') %]
969
                        <div id="recalls">
970
                            [% INCLUDE 'recalls.inc' %]
971
                        </div>
972
                    [% END %]
973
968
974
                    [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
969
                        [% IF Koha.Preference('UseRecalls') %]
975
                        [% INCLUDE 'patron-return-claims.inc' %]
970
                            <div id="recalls" role="tabpanel" class="tab-pane">
976
                    [% END %]
971
                                [% INCLUDE 'recalls.inc' %]
972
                            </div>
973
                        [% END %]
977
974
978
                    [% IF Koha.Preference('ArticleRequests') %]
975
                        [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
979
                        [% INCLUDE 'patron-article-requests.inc' %]
976
                            [% INCLUDE 'patron-return-claims.inc' %]
980
                    [% END %]
977
                        [% END %]
981
978
979
                        [% IF Koha.Preference('ArticleRequests') %]
980
                            [% INCLUDE 'patron-article-requests.inc' %]
981
                        [% END %]
982
                    </div> <!-- /.tab-content -->
982
                </div> <!-- /#patronlists -->
983
                </div> <!-- /#patronlists -->
983
                [% ELSIF borrowernumber # IF patron %]
984
                [% ELSIF borrowernumber # IF patron %]
984
                    <div class="dialog message">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
985
                    <div class="dialog message">Patron not found. <a href="/cgi-bin/koha/members/members-home.pl">Return to search</a></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-124 / +118 lines)
Lines 653-695 Link Here
653
                    </div> <!-- /div.row -->
653
                    </div> <!-- /div.row -->
654
654
655
                    <div id="finesholdsissues" class="toptabs">
655
                    <div id="finesholdsissues" class="toptabs">
656
                        <ul>
656
                        <ul class="nav nav-tabs" role="tablist">
657
                            <li>
657
                            <li role="presentation" class="active">
658
                                <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a>
658
                                <a href="#checkouts" aria-controls="checkouts" role="tab" data-toggle="tab">Checkouts ([% issuecount || 0 | html %])</a>
659
                            </li>
659
                            </li>
660
                            [% IF relatives_issues_count %]
660
                            [% IF relatives_issues_count %]
661
                                <li>
661
                                <li role="presentation">
662
                                    <a href="#relatives-issues" id="relatives-issues-tab">Relatives' checkouts ([% relatives_issues_count | html %])</a>
662
                                    <a href="#relatives-issues" id="relatives-issues-tab" aria-controls="relatives-issues" role="tab" data-toggle="tab">Relatives' checkouts ([% relatives_issues_count | html %])</a>
663
                                </li>
663
                                </li>
664
                            [% END %]
664
                            [% END %]
665
                            [% IF ( fines ) %]
665
                            [% IF ( fines ) %]
666
                                <li id="finestab">
666
                                <li role="presentation" id="finestab">
667
                                    <a href="#finesandcharges">Charges ([% fines | $Price %])</a>
667
                                    <a href="#finesandcharges" aria-controls="finesandcharges" role="tab" data-toggle="tab">Charges ([% fines | $Price %])</a>
668
                                </li>
668
                                </li>
669
                            [% END %]
669
                            [% END %]
670
                            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
670
                            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
671
                                <li>
671
                                <li role="presentation">
672
                                        <a href="#reserves" id="holds-tab">Holds ([% holds_count || 0 | html %])</a>
672
                                        <a href="#reserves" id="holds-tab" aria-controls="reserves" role="tab" data-toggle="tab">Holds ([% holds_count || 0 | html %])</a>
673
                                </li>
673
                                </li>
674
                            [% END %]
674
                            [% END %]
675
675
676
                            [% IF Koha.Preference('UseRecalls') %]
676
                            [% IF Koha.Preference('UseRecalls') %]
677
                                <li>
677
                                <li role="presentation">
678
                                    <a href="#recalls" id="recalls-tab">Recalls ([% recalls.count || 0 | html %])</a>
678
                                    <a href="#recalls" id="recalls-tab" aria-controls="recalls" role="tab" data-toggle="tab">Recalls ([% recalls.count || 0 | html %])</a>
679
                                </li>
679
                                </li>
680
                            [% END %]
680
                            [% END %]
681
681
682
                            [% IF Koha.Preference('ArticleRequests') %]
682
                            [% IF Koha.Preference('ArticleRequests') %]
683
                                [% SET article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current') %]
683
                                [% SET article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current') %]
684
                                <li>
684
                                <li role="presentation">
685
                                    <a href="#article-requests" id="article-requests-tab">Article requests ([% article_requests.count || 0 | html %])</a>
685
                                    <a href="#article-requests" id="article-requests-tab" aria-controls="article-requests" role="tab" data-toggle="tab">Article requests ([% article_requests.count || 0 | html %])</a>
686
                                </li>
686
                                </li>
687
                            [% END %]
687
                            [% END %]
688
688
689
                            [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
689
                            [% IF Koha.Preference('ClaimReturnedLostValue') || Koha.Preference('BundleLostValue') %]
690
                                <li>
690
                                <li role="presentation">
691
                                    [% IF ( patron.return_claims.count ) %]
691
                                    [% IF ( patron.return_claims.count ) %]
692
                                        <a href="#return-claims" id="return-claims-tab">
692
                                        <a href="#return-claims" id="return-claims-tab" aria-controls="return-claims" role="tab" data-toggle="tab">
693
                                            Claims
693
                                            Claims
694
                                            ([% IF patron.return_claims.resolved.count == 0 %]
694
                                            ([% IF patron.return_claims.resolved.count == 0 %]
695
                                                <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
695
                                                <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
Lines 703-709 Link Here
703
                                            [% END %])
703
                                            [% END %])
704
                                        </a>
704
                                        </a>
705
                                    [% ELSE %]
705
                                    [% ELSE %]
706
                                        <a href="#return-claims" id="return-claims-tab">
706
                                        <a href="#return-claims" id="return-claims-tab" aria-controls="return-claims" role="tab" data-toggle="tab">
707
                                            Claims
707
                                            Claims
708
                                            (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
708
                                            (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
709
                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
709
                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
Lines 712-838 Link Here
712
                                </li>
712
                                </li>
713
                            [% END %]
713
                            [% END %]
714
714
715
                            <li>
715
                            <li role="presentation">
716
                                <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.size || 0 | html %])</a>
716
                                <a id="debarments-tab-link" href="#reldebarments" aria-controls="reldebarments" role="tab" data-toggle="tab">Restrictions ([% debarments.size || 0 | html %])</a>
717
                            </li>
717
                            </li>
718
718
719
                            [% SET enrollments = patron.get_club_enrollments %]
719
                            [% SET enrollments = patron.get_club_enrollments %]
720
                            [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
720
                            [% SET enrollable  = patron.get_enrollable_clubs(0) %] <!-- 0 => not OPAC -->
721
                            [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
721
                            [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
722
                                <li>
722
                                <li role="presentation">
723
                                    <a id="clubs-tab-link" href="#clubs-tab">
723
                                    <a id="clubs-tab-link" href="#clubs-tab" aria-controls="checkouts" role="tab" data-toggle="tab">
724
                                        Clubs ([% enrollments.count | html %]/[% enrollable.count | html %])
724
                                        Clubs ([% enrollments.count | html %]/[% enrollable.count | html %])
725
                                    </a>
725
                                    </a>
726
                                </li>
726
                                </li>
727
                            [% END %]
727
                            [% END %]
728
                        </ul>
728
                        </ul>
729
729
730
                        [% INCLUDE "checkouts-table.inc" %]
730
                        <div class="tab-content">
731
                            [% INCLUDE "checkouts-table.inc" %]
731
732
732
                        [% INCLUDE "relatives-issues-table.inc" %]
733
                            [% INCLUDE "relatives-issues-table.inc" %]
733
734
734
                        [% IF ( fines ) %]
735
                            [% IF ( fines ) %]
735
                            <div id="finesandcharges">
736
                                <div id="finesandcharges" role="tabpanel" class="tab-pane">
736
                                [% IF ( fines ) %]
737
                                    [% IF ( fines ) %]
737
                                    <p>Total due: [% fines | $Price %]</p>
738
                                        <p>Total due: [% fines | $Price %]</p>
738
                                [% ELSE %]
739
                                    [% ELSE %]
739
                                    <p>No outstanding charges</p>
740
                                        <p>No outstanding charges</p>
740
                                [% END %]
741
                                    [% END %]
741
                            </div>
742
                                </div>
742
                        [% END %]
743
                            [% END %]
743
744
744
                        [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %]
745
                            [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %]
745
                            <div id="clubs-tab">
746
                                <div id="clubs-tab" role="tabpanel" class="tab-pane">
746
                                Loading...
747
                                    Loading...
747
                            </div>
748
                                </div>
748
                        [% END %]
749
                            [% END %]
749
750
750
                        [% INCLUDE borrower_debarments.inc %]
751
                            [% INCLUDE borrower_debarments.inc %]
751
752
                        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
753
                            <div id="reserves">
754
                                [% IF ( holds_count ) %]
755
                                    <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
756
                                        <input type="hidden" name="from" value="circ" />
757
                                        <table id="holds-table" style="width: 100% !Important;">
758
                                            <thead>
759
                                                <tr>
760
                                                    <th>Hold date</th>
761
                                                    <th>Title</th>
762
                                                    <th>Call number</th>
763
                                                    <th>Item type</th>
764
                                                    <th>Barcode</th>
765
                                                    <th>Pickup at</th>
766
                                                    <th>Expiration</th>
767
                                                    <th>Priority</th>
768
                                                    <th>Delete?</th>
769
                                                    <th>Suspend?</th>
770
                                                    <th>Status</th>
771
                                                </tr>
772
                                            </thead>
773
                                        </table>
774
775
                                        <fieldset class="action">
776
                                            <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
777
778
                                            [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
779
                                            [% IF hold_cancellation.count %]
780
                                                <label for="cancellation-reason">Cancellation reason:</label>
781
                                                <select name="cancellation-reason">
782
                                                    <option value="">No reason given</option>
783
                                                    [% FOREACH reason IN hold_cancellation %]
784
                                                        <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
785
                                                    [% END %]
786
                                                </select>
787
                                            [% END %]
788
                                        </fieldset>
789
                                    </form>
790
752
791
                                    [% IF Koha.Preference('SuspendHoldsIntranet') %]
753
                            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
792
                                        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
754
                                <div id="reserves" role="tabpanel" class="tab-pane">
793
                                            <fieldset class="action">
755
                                    [% IF ( holds_count ) %]
794
                                                <input type="hidden" name="from" value="borrower" />
756
                                        <form action="/cgi-bin/koha/reserve/modrequest.pl" method="post">
795
                                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
757
                                            <input type="hidden" name="from" value="circ" />
796
                                                <input type="submit" value="Suspend all holds" />
758
                                            <table id="holds-table" style="width: 100% !Important;">
797
759
                                                <thead>
798
                                                [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
760
                                                    <tr>
799
                                                    <label for="suspend_until">until</label>
761
                                                        <th>Hold date</th>
800
                                                    <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr" data-flatpickr-futuredate="true"/>
762
                                                        <th>Title</th>
801
                                                    <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
763
                                                        <th>Call number</th>
802
                                                [% END %]
764
                                                        <th>Item type</th>
803
                                            </fieldset>
765
                                                        <th>Barcode</th>
804
                                        </form>
766
                                                        <th>Pickup at</th>
767
                                                        <th>Expiration</th>
768
                                                        <th>Priority</th>
769
                                                        <th>Delete?</th>
770
                                                        <th>Suspend?</th>
771
                                                        <th>Status</th>
772
                                                    </tr>
773
                                                </thead>
774
                                            </table>
805
775
806
                                        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
807
                                            <fieldset class="action">
776
                                            <fieldset class="action">
808
                                                <input type="hidden" name="from" value="borrower" />
777
                                                <input type="submit" class="cancel" name="submit" value="Cancel marked holds" />
809
                                                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
778
810
                                                <input type="hidden" name="suspend" value="0" />
779
                                                [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
811
                                                <input type="submit" value="Resume all suspended holds" />
780
                                                [% IF hold_cancellation.count %]
781
                                                    <label for="cancellation-reason">Cancellation reason:</label>
782
                                                    <select name="cancellation-reason">
783
                                                        <option value="">No reason given</option>
784
                                                        [% FOREACH reason IN hold_cancellation %]
785
                                                            <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
786
                                                        [% END %]
787
                                                    </select>
788
                                                [% END %]
812
                                            </fieldset>
789
                                            </fieldset>
813
                                        </form>
790
                                        </form>
814
                                    [% END # IF SuspendHoldsIntranet %]
815
791
816
                                [% ELSE %]
792
                                        [% IF Koha.Preference('SuspendHoldsIntranet') %]
817
                                    <p>Patron has nothing on hold.</p>
793
                                            <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
818
                                [% END %]
794
                                                <fieldset class="action">
819
                            </div> [% # /div#reserves %]
795
                                                    <input type="hidden" name="from" value="borrower" />
820
                        [% END %]
796
                                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
797
                                                    <input type="submit" value="Suspend all holds" />
798
799
                                                    [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
800
                                                        <label for="suspend_until">until</label>
801
                                                        <input type="text" size="10" id="suspend_until" name="suspend_until" class="flatpickr" data-flatpickr-futuredate="true"/>
802
                                                        <span class="hint">Specify date on which to resume [% INCLUDE 'date-format.inc' %]: </span>
803
                                                    [% END %]
804
                                                </fieldset>
805
                                            </form>
806
807
                                            <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
808
                                                <fieldset class="action">
809
                                                    <input type="hidden" name="from" value="borrower" />
810
                                                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | html %]" />
811
                                                    <input type="hidden" name="suspend" value="0" />
812
                                                    <input type="submit" value="Resume all suspended holds" />
813
                                                </fieldset>
814
                                            </form>
815
                                        [% END # IF SuspendHoldsIntranet %]
821
816
822
                        [% IF Koha.Preference('UseRecalls') %]
817
                                    [% ELSE %]
823
                            <div id="recalls">
818
                                        <p>Patron has nothing on hold.</p>
824
                                [% INCLUDE 'recalls.inc' %]
819
                                    [% END %]
825
                            </div>
820
                                </div> [% # /div#reserves %]
826
                        [% END %]
821
                            [% END %]
827
822
828
                        [% IF Koha.Preference('ClaimReturnedLostValue') %]
823
                            [% IF Koha.Preference('UseRecalls') %]
829
                            [% INCLUDE 'patron-return-claims.inc' %]
824
                                <div id="recalls" role="tabpanel" class="tab-pane">
830
                        [% END %]
825
                                    [% INCLUDE 'recalls.inc' %]
826
                                </div>
827
                            [% END %]
831
828
832
                        [% IF Koha.Preference('ArticleRequests') %]
829
                            [% IF Koha.Preference('ClaimReturnedLostValue') %]
833
                            [% INCLUDE 'patron-article-requests.inc' %]
830
                                [% INCLUDE 'patron-return-claims.inc' %]
834
                        [% END %]
831
                            [% END %]
835
832
833
                            [% IF Koha.Preference('ArticleRequests') %]
834
                                [% INCLUDE 'patron-article-requests.inc' %]
835
                            [% END %]
836
                        </div> <!-- /.tab-content -->
836
                    </div> <!-- /div#finesholdsissues -->
837
                    </div> <!-- /div#finesholdsissues -->
837
                </main>
838
                </main>
838
            </div> <!-- /.col-sm-10.col-sm-push-2 -->
839
            </div> <!-- /.col-sm-10.col-sm-push-2 -->
Lines 901-919 Link Here
901
                });
902
                });
902
            }
903
            }
903
904
904
            $('#finesholdsissues').tabs({
905
            $("#finesholdsissues a[data-toggle='tab']").on("shown.bs.tab", function(e){
905
                // Correct table sizing for tables hidden in tabs
906
                var oTable = $('div.dataTables_wrapper > table', $(e.target.hash) ).dataTable();
906
                // http://www.datatables.net/examples/api/tabs_and_scrolling.html
907
                if ( oTable.length > 0 ) {
907
                "show": function(event, ui) {
908
                    oTable.fnAdjustColumnSizing();
908
                    var oTable = $('div.dataTables_wrapper>table', ui.panel).dataTable();
909
                    if ( oTable.length > 0 ) {
910
                        oTable.fnAdjustColumnSizing();
911
                    }
912
                },
913
                "activate": function( event, ui ) {
914
                    $("a", ui.newTab ).click();
915
                }
909
                }
916
            } );
910
            });
917
911
918
            $("#view_restrictions").on("click",function(){
912
            $("#view_restrictions").on("click",function(){
919
                $('#debarments-tab-link').click();
913
                $('#debarments-tab-link').click();
(-)a/koha-tmpl/intranet-tmpl/prog/js/holds.js (-1 / +1 lines)
Lines 120-126 $(document).ready(function() { Link Here
120
    $("#holds-tab").on( "click", function(){ load_holds_table() } );
120
    $("#holds-tab").on( "click", function(){ load_holds_table() } );
121
121
122
    // If the holds tab is preselected on load, we need to load the table
122
    // If the holds tab is preselected on load, we need to load the table
123
    if ( $("#holds-tab").parent().hasClass('ui-state-active') ) { load_holds_table() }
123
    if ( $("#holds-tab").parent().hasClass('active') ) { load_holds_table() }
124
124
125
    function load_holds_table() {
125
    function load_holds_table() {
126
        var holds = new Array();
126
        var holds = new Array();
(-)a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js (-5 / +8 lines)
Lines 8-17 $(document).ready(function() { Link Here
8
        return false;
8
        return false;
9
    });
9
    });
10
10
11
    $('#patronlists').tabs({
11
    $("#patronlists a[data-toggle='tab']").on("shown.bs.tab", function(e){
12
        activate: function( event, ui ) {
12
        $(this).click();
13
            $("a", ui.newTab ).click();
14
        }
15
    });
13
    });
16
14
17
    $("#borrower_messages .cancel").on("click",function(){
15
    $("#borrower_messages .cancel").on("click",function(){
Lines 91-96 $(document).ready(function() { Link Here
91
        $("#" + fieldID).val("");
89
        $("#" + fieldID).val("");
92
    });
90
    });
93
91
92
    /* Preselect Bootstrap tab based on location hash */
93
    var hash = window.location.hash.substring(1);
94
    if( hash ){
95
        var activeTab = $('a[href="#' + hash + '"]');
96
        activeTab && activeTab.tab('show');
97
    }
94
98
95
});
99
});
96
100
97
- 

Return to bug 30487