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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-216 / +212 lines)
Lines 3-236 Link Here
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% PROCESS 'i18n.inc' %]
4
[% PROCESS 'i18n.inc' %]
5
5
6
[% IF ( HOLDS.count ) %]
6
<table id="holdst" class="table table-bordered table-striped">
7
    <div id="opac-user-holds" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-holds-tab">
7
    <caption>Holds <span class="count">([% HOLDS.count | html %] total)</span></caption>
8
        <table id="holdst" class="table table-bordered table-striped">
8
    <!-- HOLDS TABLE ROWS -->
9
            <caption>Holds <span class="count">([% HOLDS.count | html %] total)</span></caption>
9
    <thead>
10
            <!-- HOLDS TABLE ROWS -->
10
        <tr>
11
            <thead>
11
            <th class="anti-the">Title</th>
12
            [% IF ( showpriority ) %]
13
                <th>Placed on</th>
14
            [% ELSE %]
15
                <th class="psort">Placed on</th>
16
            [% END %]
17
            <th>Expires on</th>
18
            [% UNLESS( singleBranchMode) %]
19
                <th>Pickup location</th>
20
            [% END %]
21
            [% IF ( showpriority ) %]
22
                <th class="psort">Priority</th>
23
            [% END %]
24
            <th>Status</th>
25
            [% IF SuspendHoldsOpac and ! onlyinfo %]
26
                    <th class="nosort" >Suspend</th>
27
            [% END %]
28
            [% IF ! onlyinfo %]
29
                <th class="nosort">Modify</th>
30
            [% END %]
31
            <th></th>
32
        </tr>
33
    </thead>
34
    <tbody>
35
        [% SET all_holds_waiting = 1 %]
36
        [% FOREACH HOLD IN HOLDS %]
37
            [% UNLESS ( HOLD.is_waiting || HOLD.is_in_transit || HOLD.is_in_processing) %]
38
                [% SET all_holds_waiting = 0 %]
39
            [% END %]
40
            [% IF ( HOLD.is_at_destination ) %]
41
                <tr class="reserved">
42
            [% ELSIF HOLD.is_in_transit %]
43
                <tr class="transfered">
44
            [% ELSE %]
12
                <tr>
45
                <tr>
13
                    <th class="anti-the">Title</th>
46
            [% END %]
14
                    [% IF ( showpriority ) %]
47
                <td class="title">
15
                        <th>Placed on</th>
16
                    [% ELSE %]
17
                        <th class="psort">Placed on</th>
18
                    [% END %]
19
                    <th>Expires on</th>
20
                    [% UNLESS( singleBranchMode) %]
21
                        <th>Pickup location</th>
22
                    [% END %]
23
                    [% IF ( showpriority ) %]
24
                        <th class="psort">Priority</th>
25
                    [% END %]
26
                    <th>Status</th>
27
                    [% IF SuspendHoldsOpac and ! onlyinfo %]
28
                            <th class="nosort" >Suspend</th>
29
                    [% END %]
30
                    [% IF ! onlyinfo %]
48
                    [% IF ! onlyinfo %]
31
                        <th class="nosort">Modify</th>
49
                        [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio link=> 1 %]
50
                        [% HOLD.item.enumchron | html %]
51
                    [% ELSE %]
52
                        <strong>
53
                            [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]
54
                            [% HOLD.item.enumchron | html %]
55
                        </strong>
32
                    [% END %]
56
                    [% END %]
33
                    <th></th>
57
                    [% HOLD.biblio.author | html %]
34
                </tr>
58
                    [% IF HOLD.item_group_id %]
35
            </thead>
59
                        <p>Next available item from item group: <strong>[% HOLD.item_group.description | html %]</strong></p>
36
            <tbody>
37
                [% SET all_holds_waiting = 1 %]
38
                [% FOREACH HOLD IN HOLDS %]
39
                    [% UNLESS ( HOLD.is_waiting || HOLD.is_in_transit || HOLD.is_in_processing) %]
40
                        [% SET all_holds_waiting = 0 %]
41
                    [% END %]
60
                    [% END %]
42
                    [% IF ( HOLD.is_at_destination ) %]
61
                    [% IF HOLD.item_level_hold %]
43
                        <tr class="reserved">
62
                        <p class="hint">Item on hold: [% HOLD.item.barcode | html %]</p>
44
                    [% ELSIF HOLD.is_in_transit %]
45
                        <tr class="transfered">
46
                    [% ELSE %]
47
                        <tr>
48
                    [% END %]
63
                    [% END %]
49
                        <td class="title">
64
                </td>
50
                            [% IF ! onlyinfo %]
65
                <td class="reservedate" data-order="[% HOLD.reservedate | html %]">
51
                                [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio link=> 1 %]
66
                    <span class="tdlabel">Hold date:</span>
52
                                [% HOLD.item.enumchron | html %]
67
                        [% HOLD.reservedate | $KohaDates %]
53
                            [% ELSE %]
68
                    </span>
54
                                <strong>
69
                </td>
55
                                    [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]
70
                [% IF ! HOLD.found %]
56
                                    [% HOLD.item.enumchron | html %]
71
                    <td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
57
                                </strong>
72
                        [% IF ( HOLD.expirationdate ) %]
58
                            [% END %]
73
                            <span class="tdlabel">Expiration:</span>
59
                            [% HOLD.biblio.author | html %]
74
                            [% HOLD.expirationdate | $KohaDates %]
60
                            [% IF HOLD.item_group_id %]
61
                               <p>Next available item from item group: <strong>[% HOLD.item_group.description | html %]</strong></p>
62
                            [% END %]
63
                            [% IF HOLD.item_level_hold %]
64
                                <p class="hint">Item on hold: [% HOLD.item.barcode | html %]</p>
65
                            [% END %]
66
                        </td>
67
                        <td class="reservedate" data-order="[% HOLD.reservedate | html %]">
68
                            <span class="tdlabel">Hold date:</span>
69
                                [% HOLD.reservedate | $KohaDates %]
70
                            </span>
71
                        </td>
72
                        [% IF ! HOLD.found %]
73
                            <td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
74
                                [% IF ( HOLD.expirationdate ) %]
75
                                    <span class="tdlabel">Expiration:</span>
76
                                    [% HOLD.expirationdate | $KohaDates %]
77
                                [% ELSE %]
78
                                    <span class="tdlabel">Expiration:</span>
79
                                    Never expires
80
                                [% END %]
81
                        [% ELSE %]
75
                        [% ELSE %]
82
                            <td class="expirationdate" data-order="0000-00-00">
76
                            <span class="tdlabel">Expiration:</span>
83
                                -
77
                            Never expires
84
                        [% END %]
78
                        [% END %]
85
                        </td>
79
                [% ELSE %]
86
                        [% UNLESS( singleBranchMode) %]
80
                    <td class="expirationdate" data-order="0000-00-00">
87
                            <td class="branch">
81
                        -
88
                                <span class="tdlabel">Pickup location:</span>
82
                [% END %]
89
                                [% HOLD.branch.branchname | html %]
83
                </td>
90
                                [% IF ( HOLD.can_update_pickup_location_opac ) %]
84
                [% UNLESS( singleBranchMode) %]
91
                                    <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">
85
                    <td class="branch">
92
                                        <i class="fa fa-pencil-alt" aria-hidden="true"></i> Change
86
                        <span class="tdlabel">Pickup location:</span>
93
                                    </button>
87
                        [% HOLD.branch.branchname | html %]
94
                                    <!-- Change pickup location modal -->
88
                        [% IF ( HOLD.can_update_pickup_location_opac ) %]
95
                                    <div class="modal" id="changePickup[% HOLD.reserve_id | html %]" tabindex="-1" aria-labelledby="changePickup[% HOLD.reserve_id | html %]Label" aria-hidden="true">
89
                            <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">
96
                                        <div class="modal-dialog">
90
                                <i class="fa fa-pencil-alt" aria-hidden="true"></i> Change
97
                                            <form id="change_branch_form[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
91
                            </button>
98
                                                <div class="modal-content">
92
                            <!-- Change pickup location modal -->
99
                                                    <div class="modal-header">
93
                            <div class="modal" id="changePickup[% HOLD.reserve_id | html %]" tabindex="-1" aria-labelledby="changePickup[% HOLD.reserve_id | html %]Label" aria-hidden="true">
100
                                                        <h5 class="modal-title" id="changePickup[% HOLD.reserve_id | html %]Label">Change pickup location for <em>[% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]</em></h5>
94
                                <div class="modal-dialog">
101
                                                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
95
                                    <form id="change_branch_form[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
102
                                                            <span aria-hidden="true">&times;</span>
96
                                        <div class="modal-content">
103
                                                        </button>
97
                                            <div class="modal-header">
104
                                                    </div>
98
                                                <h5 class="modal-title" id="changePickup[% HOLD.reserve_id | html %]Label">Change pickup location for <em>[% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]</em></h5>
105
                                                    <div class="modal-body">
99
                                                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
106
                                                        <div class="form-group">
100
                                                    <span aria-hidden="true">&times;</span>
107
                                                        <label for="new_branch[% HOLD.reserve_id | html %]">New pickup location:</label>
101
                                                </button>
108
                                                        <select name="new_pickup_location" id="new_branch[% HOLD.reserve_id | html %]" class="form-control">
102
                                            </div>
109
                                                            [% PROCESS options_for_libraries libraries = Branches.pickup_locations({ search_params => { biblio => HOLD.biblionumber, patron => HOLD.borrower }, selected => HOLD.branchcode }) %]
103
                                            <div class="modal-body">
110
                                                        </select>
104
                                                <div class="form-group">
111
                                                        </div>
105
                                                <label for="new_branch[% HOLD.reserve_id | html %]">New pickup location:</label>
112
                                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
106
                                                <select name="new_pickup_location" id="new_branch[% HOLD.reserve_id | html %]" class="form-control">
113
                                                    </div>
107
                                                    [% PROCESS options_for_libraries libraries = Branches.pickup_locations({ search_params => { biblio => HOLD.biblionumber, patron => HOLD.borrower }, selected => HOLD.branchcode }) %]
114
                                                    <div class="modal-footer">
108
                                                </select>
115
                                                        <button type="submit" name="change_branch" value="1" class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Save</button>
109
                                                </div>
116
                                                        <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-times" aria-hidden="true"></i> Cancel</button>
110
                                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
117
                                                    </div>
111
                                            </div>
118
                                                </div> <!-- /.modal-content -->
112
                                            <div class="modal-footer">
119
                                            </form>
113
                                                <button type="submit" name="change_branch" value="1" class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Save</button>
120
                                        </div> <!-- /.modal-dialog -->
114
                                                <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-times" aria-hidden="true"></i> Cancel</button>
121
                                    </div> <!-- /.modal -->
115
                                            </div>
122
                                [% END  %]
116
                                        </div> <!-- /.modal-content -->
123
                            </td>
117
                                    </form>
118
                                </div> <!-- /.modal-dialog -->
119
                            </div> <!-- /.modal -->
120
                        [% END  %]
121
                    </td>
122
                [% END %]
123
                [% IF ( showpriority ) %]
124
                        <td data-order="[% HOLD.priority | html %]" class="priority">
125
                        <span class="tdlabel">Priority:</span>
126
                        [% HOLD.priority | html %]
127
                    </td>
128
                [% END %]
129
                <td class="status">
130
                    <span class="tdlabel">Status:</span>
131
                    [% IF ( HOLD.is_waiting ) %]
132
                        <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
133
                        [% IF ( HOLD.is_at_destination ) %]
134
                            Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
135
                            [% IF ( HOLD.desk_id ) %], [% HOLD.desk.desk_name | html %],[% END %]
136
                            [% IF ( HOLD.waitingdate ) %]
137
                                since [% HOLD.waitingdate | $KohaDates %]
138
                                [% IF HOLD.expirationdate %]
139
                                    until [% HOLD.expirationdate | $KohaDates %]
140
                                [% END %]
141
                            [% END %]
142
                            <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
143
                        [% ELSE %]
144
                            Item in transit to <strong> [% Branches.GetName( HOLD.branchcode ) | html %]</strong> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
124
                        [% END %]
145
                        [% END %]
125
                        [% IF ( showpriority ) %]
146
                    [% ELSE %]
126
                                <td data-order="[% HOLD.priority | html %]" class="priority">
147
                        [% IF ( HOLD.is_in_transit ) %]
127
                                <span class="tdlabel">Priority:</span>
148
                            [% SET transfer = HOLD.item.get_transfer %]
128
                                [% HOLD.priority | html %]
149
                            [% branch_name = BLOCK %]<strong>[% Branches.GetName( transfer.frombranch ) | html %]</strong>[% END %]
129
                            </td>
150
                            <span>Item in transit from [% branch_name| $raw %] since</span>
151
                            [% transfer.datesent | $KohaDates %]
152
                        [% ELSIF ( HOLD.is_in_processing ) %]
153
                            <span>Item in processing</span>
154
                        [% ELSIF ( HOLD.suspend ) %]
155
                            <span>Suspended</span>[% IF ( HOLD.suspend_until ) %] <span>until</span> [% HOLD.suspend_until | $KohaDates %][% END %]
156
                        [% ELSE %]
157
                            [% IF HOLD.itemtype %]
158
                                <span>Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'</span>
159
                            [% ELSE %]
160
                                <span>Pending</span>
161
                            [% END %]
130
                        [% END %]
162
                        [% END %]
131
                        <td class="status">
163
                    [% END %]
132
                            <span class="tdlabel">Status:</span>
164
                </td>
133
                            [% IF ( HOLD.is_waiting ) %]
165
                [% IF SuspendHoldsOpac and ! onlyinfo %]
134
                                <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
166
                    <td>
135
                                [% IF ( HOLD.is_at_destination ) %]
167
                        [% IF ( HOLD.is_cancelable_from_opac ) %]
136
                                    Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
168
                            [% IF HOLD.suspend %]
137
                                    [% IF ( HOLD.desk_id ) %], [% HOLD.desk.desk_name | html %],[% END %]
169
                                <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
138
                                    [% IF ( HOLD.waitingdate ) %]
170
                                    <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
139
                                        since [% HOLD.waitingdate | $KohaDates %]
171
                                    <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-play" aria-hidden="true"></i> Resume</button>
140
                                        [% IF HOLD.expirationdate %]
172
                                </form>
141
                                            until [% HOLD.expirationdate | $KohaDates %]
142
                                        [% END %]
143
                                    [% END %]
144
                                    <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
145
                                [% ELSE %]
146
                                    Item in transit to <strong> [% Branches.GetName( HOLD.branchcode ) | html %]</strong> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
147
                                [% END %]
148
                            [% ELSE %]
173
                            [% ELSE %]
149
                                [% IF ( HOLD.is_in_transit ) %]
174
                                [% IF AutoResumeSuspendedHolds %]
150
                                    [% SET transfer = HOLD.item.get_transfer %]
175
                                    <a class="btn btn-link suspend_hold js-show" href="#" role="button" data-title="[% HOLD.biblio.title | html %] [% FOREACH subtitle IN HOLD.biblio.subtitle.split(' \| ') %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %][% subtitle | html %][% END %]" data-reserve_id="[% HOLD.reserve_id | html %]"><i class="fa fa-pause" aria-hidden="true"></i> Suspend</a>
151
                                    [% branch_name = BLOCK %]<strong>[% Branches.GetName( transfer.frombranch ) | html %]</strong>[% END %]
152
                                    <span>Item in transit from [% branch_name| $raw %] since</span>
153
                                    [% transfer.datesent | $KohaDates %]
154
                                [% ELSIF ( HOLD.is_in_processing ) %]
155
                                    <span>Item in processing</span>
156
                                [% ELSIF ( HOLD.suspend ) %]
157
                                    <span>Suspended</span>[% IF ( HOLD.suspend_until ) %] <span>until</span> [% HOLD.suspend_until | $KohaDates %][% END %]
158
                                [% ELSE %]
176
                                [% ELSE %]
159
                                    [% IF HOLD.itemtype %]
177
                                    <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
160
                                        <span>Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'</span>
161
                                    [% ELSE %]
162
                                        <span>Pending</span>
163
                                    [% END %]
164
                                [% END %]
165
                            [% END %]
166
                        </td>
167
                        [% IF SuspendHoldsOpac and ! onlyinfo %]
168
                            <td>
169
                                [% IF ( HOLD.is_cancelable_from_opac ) %]
170
                                    [% IF HOLD.suspend %]
171
                                        <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
172
                                            <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
173
                                            <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-play" aria-hidden="true"></i> Resume</button>
174
                                        </form>
175
                                    [% ELSE %]
176
                                        [% IF AutoResumeSuspendedHolds %]
177
                                            <a class="btn btn-link suspend_hold js-show" href="#" role="button" data-title="[% HOLD.biblio.title | html %] [% FOREACH subtitle IN HOLD.biblio.subtitle.split(' \| ') %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %][% subtitle | html %][% END %]" data-reserve_id="[% HOLD.reserve_id | html %]"><i class="fa fa-pause" aria-hidden="true"></i> Suspend</a>
178
                                        [% ELSE %]
179
                                            <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
180
                                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
181
                                                <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-pause" aria-hidden="true"></i> Suspend</button>
182
                                            </form>
183
                                        [% END # / IF AutoResumeSuspendedHolds %]
184
                                    [% END # / IF HOLD.suspend %]
185
                                [% END # / IF ( HOLD.is_cancelable_from_opac )%]
186
                            </td>
187
                        [% END # / IF SuspendHoldsOpac %]
188
                        [% IF ! onlyinfo %]
189
                            <td class="modify">
190
                                [% IF ( HOLD.is_cancelable_from_opac ) %]
191
                                    <form id="delete_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
192
                                        <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
193
                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
194
                                        <button data-title="[% INCLUDE 'biblio-title-head.inc' biblio=HOLD.biblio %]" data-reserve_id="[% HOLD.reserve_id | html %]" type="submit" class="btn btn-sm btn-danger btn-delete-hold"><i class="fa fa-times" aria-hidden="true"></i> [% tp('Cancel hold button', 'Cancel') | html %]</button>
195
                                    </form>
196
                                [% ELSIF HOLD.is_waiting && HOLD.cancellation_requestable_from_opac %]
197
                                    <form id="req_cancel_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
198
                                        <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
199
                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
178
                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
200
                                        <input type="hidden" name="cancellation_request" value="1" />
179
                                        <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-pause" aria-hidden="true"></i> Suspend</button>
201
                                        <button data-title="[% INCLUDE 'biblio-title-head.inc' biblio=HOLD.biblio %]" data-reserve_id="[% HOLD.reserve_id | html %]" type="submit" class="btn btn-sm btn-danger btn-req-delete-hold"><i class="fa fa-times" aria-hidden="true"></i> [% tp('Cancel hold button', 'Cancel') | html %]</button>
202
                                    </form>
180
                                    </form>
203
                                [% END %]
181
                                [% END # / IF AutoResumeSuspendedHolds %]
204
                            </td>
182
                            [% END # / IF HOLD.suspend %]
205
                            <td></td>
183
                        [% END # / IF ( HOLD.is_cancelable_from_opac )%]
206
                        [% END # / IF onlyinfo %]
184
                    </td>
207
                    </tr>
185
                [% END # / IF SuspendHoldsOpac %]
208
                [% END # /FOREACH HOLDS %]
186
                [% IF ! onlyinfo %]
209
            </tbody>
187
                    <td class="modify">
210
        </table>
188
                        [% IF ( HOLD.is_cancelable_from_opac ) %]
189
                            <form id="delete_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
190
                                <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
191
                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
192
                                <button data-title="[% INCLUDE 'biblio-title-head.inc' biblio=HOLD.biblio %]" data-reserve_id="[% HOLD.reserve_id | html %]" type="submit" class="btn btn-sm btn-danger btn-delete-hold"><i class="fa fa-times" aria-hidden="true"></i> [% tp('Cancel hold button', 'Cancel') | html %]</button>
193
                            </form>
194
                        [% ELSIF HOLD.is_waiting && HOLD.cancellation_requestable_from_opac %]
195
                            <form id="req_cancel_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
196
                                <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
197
                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
198
                                <input type="hidden" name="cancellation_request" value="1" />
199
                                <button data-title="[% INCLUDE 'biblio-title-head.inc' biblio=HOLD.biblio %]" data-reserve_id="[% HOLD.reserve_id | html %]" type="submit" class="btn btn-sm btn-danger btn-req-delete-hold"><i class="fa fa-times" aria-hidden="true"></i> [% tp('Cancel hold button', 'Cancel') | html %]</button>
200
                            </form>
201
                        [% END %]
202
                    </td>
203
                    <td></td>
204
                [% END # / IF onlyinfo %]
205
            </tr>
206
        [% END # /FOREACH HOLDS %]
207
    </tbody>
208
</table>
211
209
212
        [% IF SuspendHoldsOpac and ! onlyinfo %]
210
[% IF SuspendHoldsOpac and ! onlyinfo %]
213
            [% UNLESS ( all_holds_waiting ) %]
211
    [% UNLESS ( all_holds_waiting ) %]
214
                <div>
212
        <div>
215
                    <form class="form-inline" id="suspend_all_holds" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
213
            <form class="form-inline" id="suspend_all_holds" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
216
                        <button type="submit" id="suspend_all_submit" class="btn btn-primary"><i class="fa fa-pause" aria-hidden="true"></i> Suspend all holds</button>
214
                <button type="submit" id="suspend_all_submit" class="btn btn-primary"><i class="fa fa-pause" aria-hidden="true"></i> Suspend all holds</button>
217
                        <input type="hidden" name="suspend" value="1" />
215
                <input type="hidden" name="suspend" value="1" />
218
216
219
                        [% IF AutoResumeSuspendedHolds %]
217
                [% IF AutoResumeSuspendedHolds %]
220
                            <label for="suspend_until"> until </label>
218
                    <label for="suspend_until"> until </label>
221
                            <input type="text" name="suspend_until" id="suspend_until" class="flatpickr futuredate" size="10" />
219
                    <input type="text" name="suspend_until" id="suspend_until" class="flatpickr futuredate" size="10" />
222
                            <p><a href="#" class="clear-flatpickr" data-fp="suspend_until">Clear date to suspend indefinitely</a></p>
220
                    <p><a href="#" class="clear-flatpickr" data-fp="suspend_until">Clear date to suspend indefinitely</a></p>
223
                        [% END %]
221
                [% END %]
224
                    </form>
222
            </form>
225
                </div>
223
        </div>
226
                <br/>
224
        <br/>
227
                <div>
225
        <div>
228
                    <form id="resume_all_holds" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
226
            <form id="resume_all_holds" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
229
                        <button type="submit" id="resume_all_submit" class="btn btn-primary"><i class="fa fa-play" aria-hidden="true"></i> Resume all suspended holds</button>
227
                <button type="submit" id="resume_all_submit" class="btn btn-primary"><i class="fa fa-play" aria-hidden="true"></i> Resume all suspended holds</button>
230
                        <input type="hidden" name="suspend" value="0" />
228
                <input type="hidden" name="suspend" value="0" />
231
                    </form>
229
            </form>
232
                </div>
230
        </div>
233
            [% END %]
231
    [% END %]
234
        [% END %]
232
[% END %]
235
    </div> <!-- / #opac-user-holds -->
236
[% END # / #HOLDS.count %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt (-2 / +2 lines)
Lines 76-82 Link Here
76
<script>
76
<script>
77
function loadEnrollmentForm( id ) {
77
function loadEnrollmentForm( id ) {
78
    $("body").css("cursor", "progress");
78
    $("body").css("cursor", "progress");
79
    $('#opac-user-clubs').load('/cgi-bin/koha/clubs/enroll.pl?borrowernumber=[% borrower.borrowernumber | html %]&id=' + id, function() {
79
    $('#opac-user-clubs_panel').load('/cgi-bin/koha/clubs/enroll.pl?borrowernumber=[% borrower.borrowernumber | html %]&id=' + id, function() {
80
        $("body").css("cursor", "default");
80
        $("body").css("cursor", "default");
81
    });
81
    });
82
82
Lines 91-97 function cancelEnrollment( id ) { Link Here
91
        data: { id: id },
91
        data: { id: id },
92
        success: function( data ) {
92
        success: function( data ) {
93
            if ( data.success ) {
93
            if ( data.success ) {
94
                $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrower.borrowernumber | html %]', function() {
94
                $('#opac-user-clubs_panel').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrower.borrowernumber | html %]', function() {
95
                    $("body").css("cursor", "default");
95
                    $("body").css("cursor", "default");
96
                });
96
                });
97
            } else {
97
            } else {
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt (-2 / +2 lines)
Lines 44-50 function addEnrollment() { Link Here
44
        data: $( "#patron-enrollment-form" ).serialize(),
44
        data: $( "#patron-enrollment-form" ).serialize(),
45
        success: function( data ) {
45
        success: function( data ) {
46
            if ( data.success ) {
46
            if ( data.success ) {
47
                $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber | html %]&id=[% club.id | html %]', function() {
47
                $('#opac-user-clubs_panel').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber | html %]&id=[% club.id | html %]', function() {
48
                    $("body").css("cursor", "default");
48
                    $("body").css("cursor", "default");
49
                });
49
                });
50
            } else {
50
            } else {
Lines 58-64 function addEnrollment() { Link Here
58
58
59
function showClubs() {
59
function showClubs() {
60
    $("body").css("cursor", "progress");
60
    $("body").css("cursor", "progress");
61
    $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber | html %]&id=[% club.id | html %]', function() {
61
    $('#opac-user-clubs_panel').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber | html %]&id=[% club.id | html %]', function() {
62
        $("body").css("cursor", "default");
62
        $("body").css("cursor", "default");
63
    });
63
    });
64
}
64
}
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-70 / +76 lines)
Lines 251-323 Link Here
251
                    </form>
251
                    </form>
252
                    [% END %]
252
                    [% END %]
253
253
254
                    <div id="opac-user-views" class="toptabs">
254
                    [% WRAPPER tabs id= "opac-user-views" %]
255
                        <ul class="nav nav-tabs" role="tablist">
255
                        [% WRAPPER tabs_nav %]
256
                            <li class="nav-item" role="presentation">
256
                            [% WRAPPER tab_item tabname= "opac-user-checkouts" %]
257
                                <a class="nav-link active" id="opac-user-checkouts-tab" data-toggle="tab" role="tab" aria-controls="opac-user-checkouts" aria-selected="true"  href="#opac-user-checkouts">Checked out ([% issues_count | html %])</a>
257
                                <span>Checked out ([% issues_count | html %])</span>
258
                            </li>
258
                            [% END %]
259
                            [% IF relatives %]
259
                            [% IF relatives %]
260
                                <li class="nav-item" role="presentation">
260
                                [% WRAPPER tab_item tabname= "opac-user-relative-issues" %]
261
                                    <a class="nav-link" id="opac-user-relative-issues-tab" data-toggle="tab" role="tab" aria-controls="opac-user-relative-issues" aria-selected="false" href="#opac-user-relative-issues">Relatives' checkouts</a>
261
                                    <span>Relatives' checkouts</span>
262
                                </li>
262
                                [% END %]
263
                            [% END %]
263
                            [% END %]
264
                            [% IF ( overdues_count ) %]
264
                            [% IF ( overdues_count ) %]
265
                                <li class="nav-item" role="presentation">
265
                                [% WRAPPER tab_item tabname= "opac-user-overdues" %]
266
                                    <a class="nav-link" id="opac-user-overdues-tab" data-toggle="tab" role="tab" aria-controls="opac-user-overdues" aria-selected="false" href="#opac-user-overdues">Overdue ([% overdues_count | html %])</a>
266
                                    <span>Overdue ([% overdues_count | html %])</span>
267
                                </li>
267
                                [% END %]
268
                            [% END %]
268
                            [% END %]
269
                            [% IF ( OPACFinesTab ) %]
269
                            [% IF ( OPACFinesTab ) %]
270
                                [% IF ( amountoutstanding > 0 ) %]
270
                                [% IF ( amountoutstanding > 0 ) %]
271
                                    <li class="nav-item" role="presentation">
271
                                    [% WRAPPER tab_item tabname= "opac-user-fines" %]
272
                                        <a class="nav-link" id="opac-user-fines-tab" data-toggle="tab" role="tab" aria-controls="opac-user-fines" aria-selected="false" href="#opac-user-fines">Charges ([% amountoutstanding | $Price %])</a>
272
                                        <span>Charges ([% amountoutstanding | $Price %])</span>
273
                                    </li>
273
                                    [% END %]
274
                                [% END %]
274
                                [% END %]
275
                                [% IF ( amountoutstanding < 0 ) %]
275
                                [% IF ( amountoutstanding < 0 ) %]
276
                                    <li class="nav-item" role="presentation">
276
                                    [% WRAPPER tab_item tabname= "opac-user-fines" %]
277
                                        <a class="nav-link" id="opac-user-fines-tab" data-toggle="tab" role="tab" aria-controls="opac-user-fines" aria-selected="false" href="#opac-user-fines">Credits ([% amountoutstanding * -1 | $Price %])</a>
277
                                        <span>Credits ([% amountoutstanding * -1 | $Price %])</span>
278
                                    </li>
278
                                    [% END %]
279
                                [% END %]
279
                                [% END %]
280
                                [% IF relatives_with_fines %]
280
                                [% IF relatives_with_fines %]
281
                                    <li class="nav-item" role="presentation">
281
                                    [% WRAPPER tab_item tabname= "opac-user-relative-fines" %]
282
                                        <a class="nav-link" id="opac-user-relative-fines-tab" data-toggle="tab" role="tab" aria-controls="opac-user-relative-fines" aria-selected="false" href="#opac-user-relative-fines">Relatives' charges</a>
282
                                        <span>Relatives' charges</span>
283
                                    </li>
283
                                    [% END %]
284
                                [% END %]
284
                                [% END %]
285
                            [% END %]
285
                            [% END %]
286
286
287
                            [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]
287
                            [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]
288
                                <li class="nav-item" role="presentation">
288
                                [% WRAPPER tab_item tabname= "opac-user-clubs" %]
289
                                    <a class="nav-link" data-toggle="tab" role="tab" aria-controls="opac-user-clubs" aria-selected="false" id="opac-user-clubs-tab-link" href="#opac-user-clubs">
289
                                    <span>Clubs ([% borrower_club_enrollments.count || 0 | html %]/[% borrower_enrollable_clubs.count || 0 | html %])</span>
290
                                        Clubs ([% borrower_club_enrollments.count || 0 | html %]/[% borrower_enrollable_clubs.count || 0 | html %])
290
                                [% END %]
291
                                    </a>
292
                                </li>
293
                            [% END %]
291
                            [% END %]
294
292
295
                            [% IF ( RESERVES.count ) %]
293
                            [% IF ( RESERVES.count ) %]
296
                                <li class="nav-item" role="presentation">
294
                                [% WRAPPER tab_item tabname= "opac-user-holds" %]
297
                                    <a class="nav-link" id="opac-user-holds-tab" data-toggle="tab" role="tab" aria-controls="opac-user-holds" aria-selected="false" href="#opac-user-holds">Holds ([% RESERVES.count | html %])</a>
295
                                    <span>Holds ([% RESERVES.count | html %])</span>
298
                                </li>
296
                                [% END %]
299
                            [% END %]
297
                            [% END %]
300
                            [% IF Koha.Preference('UseRecalls') && RECALLS.count %]
298
                            [% IF Koha.Preference('UseRecalls') && RECALLS.count %]
301
                                <li class="nav-item" role="presentation">
299
                                [% WRAPPER tab_item tabname= "opac-user-recalls" %]
302
                                    <a class="nav-link" id="opac-user-recalls-tab" data-toggle="tab" role="tab" aria-controls="opac-user-recalls" aria-selected="false" href="#opac-user-recalls">Recalls ([% RECALLS.count | html %])</a>
300
                                    <span>Recalls ([% RECALLS.count | html %])</span>
303
                                </li>
301
                                [% END %]
304
                            [% END %]
302
                            [% END %]
305
                            [% IF Koha.Preference('ArticleRequests') %]
303
                            [% IF Koha.Preference('ArticleRequests') %]
306
                                <li class="nav-item" role="presentation">
304
                                [% WRAPPER tab_item tabname= "opac-user-article-requests" %]
307
                                    <a class="nav-link" id="opac-user-article-requests-tab" data-toggle="tab" role="tab" aria-controls="opac-user-article-requests" aria-selected="false" href="#opac-user-article-requests">Article requests ([% current_article_requests.size || 0 | html %])</a>
305
                                    <span>Article requests ([% current_article_requests.size || 0 | html %])</span>
308
                                </li>
306
                                [% END %]
309
                            [% END %]
307
                            [% END %]
310
                            [% IF ( OverDriveCirculation ) %]
308
                            [% IF ( OverDriveCirculation ) %]
311
                                <li class="nav-item" role="presentation">
309
                                [% WRAPPER tab_item tabname= "opac-user-overdrive" %]
312
                                    <a class="nav-link" id="opac-user-overdrive-tab" data-toggle="tab" role="tab" aria-controls="opac-user-overdrive" aria-selected="false" href="#opac-user-overdrive">OverDrive account</a>
310
                                    <span>OverDrive account</span>
313
                                </li>
311
                                [% END %]
314
                            [% END %]
312
                            [% END %]
315
                        </ul>
313
                        [% END # /WRAPPER tabs_nav %]
316
                        <div class="tab-content">
314
315
                        [% WRAPPER tab_panels %]
316
                            [% WRAPPER tab_panel tabname="opac-user-overdrive" %]
317
                            [% END # /tab_panel#opac-user-overdrive %]
317
318
318
                            <div id="opac-user-overdrive" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-overdrive-tab">
319
                            [% WRAPPER tab_panel tabname="opac-user-checkouts" %]
319
                            </div>
320
                            <div id="opac-user-checkouts" class="tab-pane active" role="tabpanel" aria-labelledby="opac-user-checkouts-tab">
321
                                [% IF ( issues_count ) %]
320
                                [% IF ( issues_count ) %]
322
                                    <form id="renewselected" action="/cgi-bin/koha/opac-renew.pl" method="post">
321
                                    <form id="renewselected" action="/cgi-bin/koha/opac-renew.pl" method="post">
323
                                        <legend class="sr-only">Renew selected</legend>
322
                                        <legend class="sr-only">Renew selected</legend>
Lines 602-620 Link Here
602
                                        </form>
601
                                        </form>
603
                                    </div>
602
                                    </div>
604
                                </div>
603
                                </div>
605
604
                            [% END # /tab_panel#opac-user-checkouts %]
606
                            </div> <!-- / .opac-user-checkouts -->
607
605
608
                            [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]
606
                            [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]
609
                                <div id="opac-user-clubs" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-clubs-tab-link">
607
                                [% WRAPPER tab_panel tabname="opac-user-clubs" %]
610
                                    Loading...
608
                                    Loading...
611
                                </div>
609
                                [% END # /tab_panel#opac-user-clubs %]
612
                            [% END %]
610
                            [% END %]
613
611
614
                            [% IF ( OPACFinesTab ) %]
612
                            [% IF ( OPACFinesTab ) %]
615
                                <!-- FINES BOX -->
613
                                <!-- FINES BOX -->
616
                                [% IF ( amountoutstanding > 0 ) %]
614
                                [% IF ( amountoutstanding > 0 ) %]
617
                                    <div id="opac-user-fines" class="tab-pane" id="home" role="tabpanel" aria-labelledby="opac-user-fines-tab">
615
                                    [% WRAPPER tab_panel tabname="opac-user-fines" %]
618
                                        <table class="table table-bordered table-striped">
616
                                        <table class="table table-bordered table-striped">
619
                                            <caption>Charges</caption>
617
                                            <caption>Charges</caption>
620
                                            <thead><tr><th colspan="2">Amount</th></tr></thead>
618
                                            <thead><tr><th colspan="2">Amount</th></tr></thead>
Lines 625-635 Link Here
625
                                                </tr>
623
                                                </tr>
626
                                            </tbody>
624
                                            </tbody>
627
                                        </table>
625
                                        </table>
628
                                    </div>
626
                                    [% END # /tab_panel#opac-user-fines %]
629
                                [% END %]
627
                                [% END %]
630
628
631
                                [% IF ( amountoutstanding < 0 ) %]
629
                                [% IF ( amountoutstanding < 0 ) %]
632
                                    <div id="opac-user-fines" class="tab-pane" id="home" role="tabpanel" aria-labelledby="opac-user-fines-tab">
630
                                    [% WRAPPER tab_panel tabname="opac-user-fines" %]
633
                                        <table class="table table-bordered table-striped">
631
                                        <table class="table table-bordered table-striped">
634
                                            <caption>Credits</caption>
632
                                            <caption>Credits</caption>
635
                                            <thead><tr><th colspan="2">Amount</th></tr></thead>
633
                                            <thead><tr><th colspan="2">Amount</th></tr></thead>
Lines 639-649 Link Here
639
                                                </tr>
637
                                                </tr>
640
                                            </tbody>
638
                                            </tbody>
641
                                        </table>
639
                                        </table>
642
                                    </div>
640
                                    [% END # /tab_panel#opac-user-fines %]
643
                                [% END %]
641
                                [% END %]
644
642
645
                                [% IF relatives_with_fines %]
643
                                [% IF relatives_with_fines %]
646
                                    <div id="opac-user-relative-fines" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-relative-fines-tab">
644
                                    [% WRAPPER tab_panel tabname="opac-user-relative-fines" %]
647
                                        <table class="table table-bordered table-striped">
645
                                        <table class="table table-bordered table-striped">
648
                                            <caption>Fines and charges</caption>
646
                                            <caption>Fines and charges</caption>
649
                                            <thead>
647
                                            <thead>
Lines 660-671 Link Here
660
                                                [% END %]
658
                                                [% END %]
661
                                            </tbody>
659
                                            </tbody>
662
                                        </table>
660
                                        </table>
663
                                    </div>
661
                                    [% END # /tab_panel#opac-user-relative-fines %]
664
                                [% END %]
662
                                [% END %]
665
                            [% END # / OPACFinesTab %]
663
                            [% END # / OPACFinesTab %]
666
664
667
                            [% IF relatives %]
665
                            [% IF relatives %]
668
                                <div id="opac-user-relative-issues" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-relative-issues-tab">
666
                                [% WRAPPER tab_panel tabname="opac-user-relative-issues" %]
669
                                    <table id="opac-user-relative-issues-table" class="table table-bordered table-striped">
667
                                    <table id="opac-user-relative-issues-table" class="table table-bordered table-striped">
670
                                        <caption class="sr-only">Relative issues</caption>
668
                                        <caption class="sr-only">Relative issues</caption>
671
                                        <thead>
669
                                        <thead>
Lines 710-720 Link Here
710
                                            [% END %]
708
                                            [% END %]
711
                                        </tbody>
709
                                        </tbody>
712
                                    </table>
710
                                    </table>
713
                                </div>
711
                                [% END # /tab_panel#opac-user-relative-issues %]
714
                            [% END %]
712
                            [% END %]
715
713
716
                            [% IF ( overdues_count ) %]
714
                            [% IF ( overdues_count ) %]
717
                                <div id="opac-user-overdues" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-overdues-tab">
715
                                [% WRAPPER tab_panel tabname="opac-user-overdues" %]
718
                                    <table id="overduest" class="table table-bordered table-striped">
716
                                    <table id="overduest" class="table table-bordered table-striped">
719
                                        <caption>Overdues <span class="count">([% overdues_count | html %] total)</span></caption>
717
                                        <caption>Overdues <span class="count">([% overdues_count | html %] total)</span></caption>
720
                                        <!-- OVERDUES TABLE ROWS -->
718
                                        <!-- OVERDUES TABLE ROWS -->
Lines 835-847 Link Here
835
                                            [% END %]
833
                                            [% END %]
836
                                        </tbody>
834
                                        </tbody>
837
                                    </table>
835
                                    </table>
838
                                </div> <!-- / #opac-user-overdues -->
836
                                [% END # /tab_panel#opac-user-overdues %]
839
                            [% END # /overdues_count %]
837
                            [% END # /overdues_count %]
840
838
841
                            [% PROCESS 'holds-table.inc' HOLDS = RESERVES, SuspendHoldsOpac = SuspendHoldsOpac, showpriority = showpriority, AutoResumeSuspendedHolds = AutoResumeSuspendedHolds %]
839
                            [% IF ( RESERVES.count ) %]
840
                                [% WRAPPER tab_panel tabname="opac-user-holds" %]
841
                                    [% PROCESS 'holds-table.inc' HOLDS = RESERVES, SuspendHoldsOpac = SuspendHoldsOpac, showpriority = showpriority, AutoResumeSuspendedHolds = AutoResumeSuspendedHolds %]
842
                                [% END # /tab_panel#opac-user-holds %]
843
                            [% END # / #RESERVES.count %]
842
844
843
                            [% IF Koha.Preference('UseRecalls') && RECALLS.count %]
845
                            [% IF Koha.Preference('UseRecalls') && RECALLS.count %]
844
                                <div id="opac-user-recalls" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-recalls-tab">
846
                                [% WRAPPER tab_panel tabname="opac-user-recalls" %]
845
                                    <table id="recalls-table" class="table table-bordered table-striped">
847
                                    <table id="recalls-table" class="table table-bordered table-striped">
846
                                        <caption>Recalls <span class="count">([% RECALLS.count | html %])</span></caption>
848
                                        <caption>Recalls <span class="count">([% RECALLS.count | html %])</span></caption>
847
                                        <thead>
849
                                        <thead>
Lines 912-922 Link Here
912
                                            </tr>
914
                                            </tr>
913
                                        </tbody>
915
                                        </tbody>
914
                                    </table>
916
                                    </table>
915
                                </div>
917
                                [% END # /tab_panel#opac-user-recalls %]
916
                            [% END # / # RECALLS.count %]
918
                            [% END # / # RECALLS.count %]
917
919
918
                            [% IF Koha.Preference('ArticleRequests') %]
920
                            [% IF Koha.Preference('ArticleRequests') %]
919
                                <div id="opac-user-article-requests" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-article-requests-tab">
921
                                [% WRAPPER tab_panel tabname="opac-user-article-requests" %]
920
                                    [% IF current_article_requests.size %]
922
                                    [% IF current_article_requests.size %]
921
                                        <table id="article-requests-table" class="table table-bordered table-striped">
923
                                        <table id="article-requests-table" class="table table-bordered table-striped">
922
                                            <caption>Article requests <span class="count"></span></caption>
924
                                            <caption>Article requests <span class="count"></span></caption>
Lines 1025-1034 Link Here
1025
                                            <tr><td>You have no article requests currently.</td></tr>
1027
                                            <tr><td>You have no article requests currently.</td></tr>
1026
                                        </table>
1028
                                        </table>
1027
                                    [% END # IF current_article_requests.size %]
1029
                                    [% END # IF current_article_requests.size %]
1028
                                </div> <!-- / #opac-user-article-requests -->
1030
                                [% END # /tab_panel#opac-user-article-requests %]
1029
                            [% END %]
1031
                            [% END %]
1030
                        </div> <!-- /.tab-content -->
1032
                        [% END # /WRAPPER tab_panels %]
1031
                    </div> <!-- /#opac-user-views -->
1033
                    [% END # /WRAPPER tabs#opac-user-views %]
1032
                </div> <!-- /#userdetails -->
1034
                </div> <!-- /#userdetails -->
1033
            </div> <!-- /.col-10 -->
1035
            </div> <!-- /.col-10 -->
1034
        </div> <!-- /.row -->
1036
        </div> <!-- /.row -->
Lines 1330-1339 Link Here
1330
                $("#change-pickup-location" + hold_id ).show();
1332
                $("#change-pickup-location" + hold_id ).show();
1331
            });
1333
            });
1332
1334
1333
            if ( $('#opac-user-clubs').length ) {
1335
            if ( $('#opac-user-clubs_panel').length ) {
1334
                $('#opac-user-clubs-tab-link').on('click', function() {
1336
                $('#opac-user-clubs-tab').on('click', function() {
1335
                    $('#opac-user-clubs').text(_("Loading..."));
1337
                    $('#opac-user-clubs_panel').text(_("Loading..."));
1336
                    $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber | html %]');
1338
                    $('#opac-user-clubs_panel').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber | html %]');
1337
                });
1339
                });
1338
            }
1340
            }
1339
1341
Lines 1369-1374 Link Here
1369
            $(".dismiss-message-button").click(function(e){
1371
            $(".dismiss-message-button").click(function(e){
1370
                return confirmDelete(_("Are you sure you want to dismiss this message?"));
1372
                return confirmDelete(_("Are you sure you want to dismiss this message?"));
1371
            });
1373
            });
1374
1375
            if( $("#opac-user-views .tab-pane.active").length < 1 ){
1376
                $("#opac-user-views a:first").tab("show");
1377
            }
1372
        });
1378
        });
1373
1379
1374
        function submitNote( title, issue_id, note ){
1380
        function submitNote( title, issue_id, note ){
Lines 1451-1464 Link Here
1451
    [%- END -%]
1457
    [%- END -%]
1452
    $(document).ready(function() {
1458
    $(document).ready(function() {
1453
        [% IF ( overdrive_error ) %]
1459
        [% IF ( overdrive_error ) %]
1454
            KOHA.OverDriveCirculation.display_error("#opac-user-overdrive", "[% overdrive_error.dquote | html %]");
1460
            KOHA.OverDriveCirculation.display_error("#opac-user-overdrive_panel", "[% overdrive_error.dquote | html %]");
1455
        [% END %]
1461
        [% END %]
1456
1462
1457
        [% IF ( overdrive_tab ) %]
1463
        [% IF ( overdrive_tab ) %]
1458
            $("#opac-user-views a[href='#opac-user-overdrive']").tab("show");
1464
            $("#opac-user-views a[href='#opac-user-overdrive_panel']").tab("show");
1459
        [% END %]
1465
        [% END %]
1460
1466
1461
        $("#opac-user-overdrive").each( function() {
1467
        $("#opac-user-overdrive_panel").each( function() {
1462
            KOHA.OverDriveCirculation.display_account_details(this);
1468
            KOHA.OverDriveCirculation.display_account_details(this);
1463
        } );
1469
        } );
1464
    });
1470
    });
(-)a/koha-tmpl/opac-tmpl/bootstrap/js/overdrive.js (-2 / +1 lines)
Lines 225-231 KOHA.OverDriveCirculation = new function() { Link Here
225
                if( $("#overdrive-results-page").length > 0 ){
225
                if( $("#overdrive-results-page").length > 0 ){
226
                    location.reload();
226
                    location.reload();
227
                } else {
227
                } else {
228
                    KOHA.OverDriveCirculation.display_account_details( $("#opac-user-overdrive") );
228
                    KOHA.OverDriveCirculation.display_account_details( $("#opac-user-overdrive_panel") );
229
                }
229
                }
230
            }
230
            }
231
        });
231
        });
232
- 

Return to bug 33895