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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc (-214 / +210 lines)
Lines 3-234 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
        </tr>
32
    </thead>
33
    <tbody>
34
        [% SET all_holds_waiting = 1 %]
35
        [% FOREACH HOLD IN HOLDS %]
36
            [% UNLESS ( HOLD.is_waiting || HOLD.is_in_transit || HOLD.is_in_processing) %]
37
                [% SET all_holds_waiting = 0 %]
38
            [% END %]
39
            [% IF ( HOLD.is_at_destination ) %]
40
                <tr class="reserved">
41
            [% ELSIF HOLD.is_in_transit %]
42
                <tr class="transfered">
43
            [% ELSE %]
12
                <tr>
44
                <tr>
13
                    <th class="anti-the">Title</th>
45
            [% END %]
14
                    [% IF ( showpriority ) %]
46
                <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 %]
47
                    [% IF ! onlyinfo %]
31
                        <th class="nosort">Modify</th>
48
                        [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio link=> 1 %]
49
                        [% HOLD.item.enumchron | html %]
50
                    [% ELSE %]
51
                        <strong>
52
                            [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]
53
                            [% HOLD.item.enumchron | html %]
54
                        </strong>
32
                    [% END %]
55
                    [% END %]
33
                </tr>
56
                    [% HOLD.biblio.author | html %]
34
            </thead>
57
                    [% IF HOLD.item_group_id %]
35
            <tbody>
58
                        <p>Next available item from item group: <strong>[% HOLD.item_group.description | html %]</strong></p>
36
                [% SET all_holds_waiting = 1 %]
37
                [% FOREACH HOLD IN HOLDS %]
38
                    [% UNLESS ( HOLD.is_waiting || HOLD.is_in_transit || HOLD.is_in_processing) %]
39
                        [% SET all_holds_waiting = 0 %]
40
                    [% END %]
59
                    [% END %]
41
                    [% IF ( HOLD.is_at_destination ) %]
60
                    [% IF HOLD.item_level_hold %]
42
                        <tr class="reserved">
61
                        <p class="hint">Item on hold: [% HOLD.item.barcode | html %]</p>
43
                    [% ELSIF HOLD.is_in_transit %]
44
                        <tr class="transfered">
45
                    [% ELSE %]
46
                        <tr>
47
                    [% END %]
62
                    [% END %]
48
                        <td class="title">
63
                </td>
49
                            [% IF ! onlyinfo %]
64
                <td class="reservedate" data-order="[% HOLD.reservedate | html %]">
50
                                [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio link=> 1 %]
65
                    <span class="tdlabel">Hold date:</span>
51
                                [% HOLD.item.enumchron | html %]
66
                        [% HOLD.reservedate | $KohaDates %]
52
                            [% ELSE %]
67
                    </span>
53
                                <strong>
68
                </td>
54
                                    [% INCLUDE 'biblio-title.inc' biblio=HOLD.biblio %]
69
                [% IF ! HOLD.found %]
55
                                    [% HOLD.item.enumchron | html %]
70
                    <td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
56
                                </strong>
71
                        [% IF ( HOLD.expirationdate ) %]
57
                            [% END %]
72
                            <span class="tdlabel">Expiration:</span>
58
                            [% HOLD.biblio.author | html %]
73
                            [% HOLD.expirationdate | $KohaDates %]
59
                            [% IF HOLD.item_group_id %]
60
                               <p>Next available item from item group: <strong>[% HOLD.item_group.description | html %]</strong></p>
61
                            [% END %]
62
                            [% IF HOLD.item_level_hold %]
63
                                <p class="hint">Item on hold: [% HOLD.item.barcode | html %]</p>
64
                            [% END %]
65
                        </td>
66
                        <td class="reservedate" data-order="[% HOLD.reservedate | html %]">
67
                            <span class="tdlabel">Hold date:</span>
68
                                [% HOLD.reservedate | $KohaDates %]
69
                            </span>
70
                        </td>
71
                        [% IF ! HOLD.found %]
72
                            <td class="expirationdate" data-order="[% HOLD.expirationdate | html %]">
73
                                [% IF ( HOLD.expirationdate ) %]
74
                                    <span class="tdlabel">Expiration:</span>
75
                                    [% HOLD.expirationdate | $KohaDates %]
76
                                [% ELSE %]
77
                                    <span class="tdlabel">Expiration:</span>
78
                                    Never expires
79
                                [% END %]
80
                        [% ELSE %]
74
                        [% ELSE %]
81
                            <td class="expirationdate" data-order="0000-00-00">
75
                            <span class="tdlabel">Expiration:</span>
82
                                -
76
                            Never expires
83
                        [% END %]
77
                        [% END %]
84
                        </td>
78
                [% ELSE %]
85
                        [% UNLESS( singleBranchMode) %]
79
                    <td class="expirationdate" data-order="0000-00-00">
86
                            <td class="branch">
80
                        -
87
                                <span class="tdlabel">Pickup location:</span>
81
                [% END %]
88
                                [% HOLD.branch.branchname | html %]
82
                </td>
89
                                [% IF ( HOLD.can_update_pickup_location_opac ) %]
83
                [% UNLESS( singleBranchMode) %]
90
                                    <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">
84
                    <td class="branch">
91
                                        <i class="fa fa-pencil" aria-hidden="true"></i> Change
85
                        <span class="tdlabel">Pickup location:</span>
92
                                    </button>
86
                        [% HOLD.branch.branchname | html %]
93
                                    <!-- Change pickup location modal -->
87
                        [% IF ( HOLD.can_update_pickup_location_opac ) %]
94
                                    <div class="modal" id="changePickup[% HOLD.reserve_id | html %]" tabindex="-1" aria-labelledby="changePickup[% HOLD.reserve_id | html %]Label" aria-hidden="true">
88
                            <button type="button" class="btn btn-sm btn-link" data-toggle="modal" data-target="#changePickup[% HOLD.reserve_id | html %]">
95
                                        <div class="modal-dialog">
89
                                <i class="fa fa-pencil" aria-hidden="true"></i> Change
96
                                            <form id="change_branch_form[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
90
                            </button>
97
                                                <div class="modal-content">
91
                            <!-- Change pickup location modal -->
98
                                                    <div class="modal-header">
92
                            <div class="modal" id="changePickup[% HOLD.reserve_id | html %]" tabindex="-1" aria-labelledby="changePickup[% HOLD.reserve_id | html %]Label" aria-hidden="true">
99
                                                        <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>
93
                                <div class="modal-dialog">
100
                                                        <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
94
                                    <form id="change_branch_form[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
101
                                                            <span aria-hidden="true">&times;</span>
95
                                        <div class="modal-content">
102
                                                        </button>
96
                                            <div class="modal-header">
103
                                                    </div>
97
                                                <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>
104
                                                    <div class="modal-body">
98
                                                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close">
105
                                                        <div class="form-group">
99
                                                    <span aria-hidden="true">&times;</span>
106
                                                        <label for="new_branch[% HOLD.reserve_id | html %]">New pickup location:</label>
100
                                                </button>
107
                                                        <select name="new_pickup_location" id="new_branch[% HOLD.reserve_id | html %]" class="form-control">
101
                                            </div>
108
                                                            [% PROCESS options_for_libraries libraries = Branches.pickup_locations({ search_params => { biblio => HOLD.biblionumber, patron => HOLD.borrower }, selected => HOLD.branchcode }) %]
102
                                            <div class="modal-body">
109
                                                        </select>
103
                                                <div class="form-group">
110
                                                        </div>
104
                                                <label for="new_branch[% HOLD.reserve_id | html %]">New pickup location:</label>
111
                                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
105
                                                <select name="new_pickup_location" id="new_branch[% HOLD.reserve_id | html %]" class="form-control">
112
                                                    </div>
106
                                                    [% PROCESS options_for_libraries libraries = Branches.pickup_locations({ search_params => { biblio => HOLD.biblionumber, patron => HOLD.borrower }, selected => HOLD.branchcode }) %]
113
                                                    <div class="modal-footer">
107
                                                </select>
114
                                                        <button type="submit" name="change_branch" value="1" class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Save</button>
108
                                                </div>
115
                                                        <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-remove" aria-hidden="true"></i> Cancel</button>
109
                                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
116
                                                    </div>
110
                                            </div>
117
                                                </div> <!-- /.modal-content -->
111
                                            <div class="modal-footer">
118
                                            </form>
112
                                                <button type="submit" name="change_branch" value="1" class="btn btn-primary"><i class="fa fa-check" aria-hidden="true"></i> Save</button>
119
                                        </div> <!-- /.modal-dialog -->
113
                                                <button type="button" class="btn btn-secondary" data-dismiss="modal"><i class="fa fa-remove" aria-hidden="true"></i> Cancel</button>
120
                                    </div> <!-- /.modal -->
114
                                            </div>
121
                                [% END  %]
115
                                        </div> <!-- /.modal-content -->
122
                            </td>
116
                                    </form>
117
                                </div> <!-- /.modal-dialog -->
118
                            </div> <!-- /.modal -->
119
                        [% END  %]
120
                    </td>
121
                [% END %]
122
                [% IF ( showpriority ) %]
123
                        <td data-order="[% HOLD.priority | html %]" class="priority">
124
                        <span class="tdlabel">Priority:</span>
125
                        [% HOLD.priority | html %]
126
                    </td>
127
                [% END %]
128
                <td class="status">
129
                    <span class="tdlabel">Status:</span>
130
                    [% IF ( HOLD.is_waiting ) %]
131
                        <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
132
                        [% IF ( HOLD.is_at_destination ) %]
133
                            Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
134
                            [% IF ( HOLD.desk_id ) %], [% HOLD.desk.desk_name | html %],[% END %]
135
                            [% IF ( HOLD.waitingdate ) %]
136
                                since [% HOLD.waitingdate | $KohaDates %]
137
                                [% IF HOLD.expirationdate %]
138
                                    until [% HOLD.expirationdate | $KohaDates %]
139
                                [% END %]
140
                            [% END %]
141
                            <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
142
                        [% ELSE %]
143
                            Item in transit to <strong> [% Branches.GetName( HOLD.branchcode ) | html %]</strong> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
123
                        [% END %]
144
                        [% END %]
124
                        [% IF ( showpriority ) %]
145
                    [% ELSE %]
125
                                <td data-order="[% HOLD.priority | html %]" class="priority">
146
                        [% IF ( HOLD.is_in_transit ) %]
126
                                <span class="tdlabel">Priority:</span>
147
                            [% SET transfer = HOLD.item.get_transfer %]
127
                                [% HOLD.priority | html %]
148
                            [% branch_name = BLOCK %]<strong>[% Branches.GetName( transfer.frombranch ) | html %]</strong>[% END %]
128
                            </td>
149
                            <span>Item in transit from [% branch_name| $raw %] since</span>
150
                            [% transfer.datesent | $KohaDates %]
151
                        [% ELSIF ( HOLD.is_in_processing ) %]
152
                            <span>Item in processing</span>
153
                        [% ELSIF ( HOLD.suspend ) %]
154
                            <span>Suspended</span>[% IF ( HOLD.suspend_until ) %] <span>until</span> [% HOLD.suspend_until | $KohaDates %][% END %]
155
                        [% ELSE %]
156
                            [% IF HOLD.itemtype %]
157
                                <span>Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'</span>
158
                            [% ELSE %]
159
                                <span>Pending</span>
160
                            [% END %]
129
                        [% END %]
161
                        [% END %]
130
                        <td class="status">
162
                    [% END %]
131
                            <span class="tdlabel">Status:</span>
163
                </td>
132
                            [% IF ( HOLD.is_waiting ) %]
164
                [% IF SuspendHoldsOpac and ! onlyinfo %]
133
                                <i class="fa fa-exclamation-circle text-warning" aria-hidden="true"></i>
165
                    <td>
134
                                [% IF ( HOLD.is_at_destination ) %]
166
                        [% IF ( HOLD.is_cancelable_from_opac ) %]
135
                                    Item waiting at <strong> [% HOLD.branch.branchname | html %]</strong>
167
                            [% IF HOLD.suspend %]
136
                                    [% IF ( HOLD.desk_id ) %], [% HOLD.desk.desk_name | html %],[% END %]
168
                                <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
137
                                    [% IF ( HOLD.waitingdate ) %]
169
                                    <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
138
                                        since [% HOLD.waitingdate | $KohaDates %]
170
                                    <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-play" aria-hidden="true"></i> Resume</button>
139
                                        [% IF HOLD.expirationdate %]
171
                                </form>
140
                                            until [% HOLD.expirationdate | $KohaDates %]
141
                                        [% END %]
142
                                    [% END %]
143
                                    <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
144
                                [% ELSE %]
145
                                    Item in transit to <strong> [% Branches.GetName( HOLD.branchcode ) | html %]</strong> <input type="hidden" name="pickup" value="[% HOLD.branchcode | html %]" />
146
                                [% END %]
147
                            [% ELSE %]
172
                            [% ELSE %]
148
                                [% IF ( HOLD.is_in_transit ) %]
173
                                [% IF AutoResumeSuspendedHolds %]
149
                                    [% SET transfer = HOLD.item.get_transfer %]
174
                                    <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>
150
                                    [% branch_name = BLOCK %]<strong>[% Branches.GetName( transfer.frombranch ) | html %]</strong>[% END %]
151
                                    <span>Item in transit from [% branch_name| $raw %] since</span>
152
                                    [% transfer.datesent | $KohaDates %]
153
                                [% ELSIF ( HOLD.is_in_processing ) %]
154
                                    <span>Item in processing</span>
155
                                [% ELSIF ( HOLD.suspend ) %]
156
                                    <span>Suspended</span>[% IF ( HOLD.suspend_until ) %] <span>until</span> [% HOLD.suspend_until | $KohaDates %][% END %]
157
                                [% ELSE %]
175
                                [% ELSE %]
158
                                    [% IF HOLD.itemtype %]
176
                                    <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
159
                                        <span>Pending for next available item of item type '[% ItemTypes.GetDescription( HOLD.itemtype ) | html %]'</span>
160
                                    [% ELSE %]
161
                                        <span>Pending</span>
162
                                    [% END %]
163
                                [% END %]
164
                            [% END %]
165
                        </td>
166
                        [% IF SuspendHoldsOpac and ! onlyinfo %]
167
                            <td>
168
                                [% IF ( HOLD.is_cancelable_from_opac ) %]
169
                                    [% IF HOLD.suspend %]
170
                                        <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
171
                                            <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
172
                                            <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-play" aria-hidden="true"></i> Resume</button>
173
                                        </form>
174
                                    [% ELSE %]
175
                                        [% IF AutoResumeSuspendedHolds %]
176
                                            <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>
177
                                        [% ELSE %]
178
                                            <form class="form-inline" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
179
                                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
180
                                                <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-pause" aria-hidden="true"></i> Suspend</button>
181
                                            </form>
182
                                        [% END # / IF AutoResumeSuspendedHolds %]
183
                                    [% END # / IF HOLD.suspend %]
184
                                [% END # / IF ( HOLD.is_cancelable_from_opac )%]
185
                            </td>
186
                        [% END # / IF SuspendHoldsOpac %]
187
                        [% IF ! onlyinfo %]
188
                            <td class="modify">
189
                                [% IF ( HOLD.is_cancelable_from_opac ) %]
190
                                    <form id="delete_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
191
                                        <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
192
                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
193
                                        <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-remove" aria-hidden="true"></i> [% tp('Cancel hold button', 'Cancel') | html %]</button>
194
                                    </form>
195
                                [% ELSIF HOLD.is_waiting && HOLD.cancellation_requestable_from_opac %]
196
                                    <form id="req_cancel_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
197
                                        <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
198
                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
177
                                        <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
199
                                        <input type="hidden" name="cancellation_request" value="1" />
178
                                        <button class="btn btn-link" type="submit" name="submit"><i class="fa fa-pause" aria-hidden="true"></i> Suspend</button>
200
                                        <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-remove" aria-hidden="true"></i> [% tp('Cancel hold button', 'Cancel') | html %]</button>
201
                                    </form>
179
                                    </form>
202
                                [% END %]
180
                                [% END # / IF AutoResumeSuspendedHolds %]
203
                            </td>
181
                            [% END # / IF HOLD.suspend %]
204
                        [% END # / IF onlyinfo %]
182
                        [% END # / IF ( HOLD.is_cancelable_from_opac )%]
205
                    </tr>
183
                    </td>
206
                [% END # /FOREACH HOLDS %]
184
                [% END # / IF SuspendHoldsOpac %]
207
            </tbody>
185
                [% IF ! onlyinfo %]
208
        </table>
186
                    <td class="modify">
187
                        [% IF ( HOLD.is_cancelable_from_opac ) %]
188
                            <form id="delete_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
189
                                <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
190
                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
191
                                <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-remove" aria-hidden="true"></i> [% tp('Cancel hold button', 'Cancel') | html %]</button>
192
                            </form>
193
                        [% ELSIF HOLD.is_waiting && HOLD.cancellation_requestable_from_opac %]
194
                            <form id="req_cancel_hold_[% HOLD.reserve_id | html %]" action="/cgi-bin/koha/opac-modrequest.pl" method="post">
195
                                <input type="hidden" name="biblionumber" value="[% HOLD.biblionumber | html %]" />
196
                                <input type="hidden" name="reserve_id" value="[% HOLD.reserve_id | html %]" />
197
                                <input type="hidden" name="cancellation_request" value="1" />
198
                                <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-remove" aria-hidden="true"></i> [% tp('Cancel hold button', 'Cancel') | html %]</button>
199
                            </form>
200
                        [% END %]
201
                    </td>
202
                [% END # / IF onlyinfo %]
203
            </tr>
204
        [% END # /FOREACH HOLDS %]
205
    </tbody>
206
</table>
209
207
210
        [% IF SuspendHoldsOpac and ! onlyinfo %]
208
[% IF SuspendHoldsOpac and ! onlyinfo %]
211
            [% UNLESS ( all_holds_waiting ) %]
209
    [% UNLESS ( all_holds_waiting ) %]
212
                <div>
210
        <div>
213
                    <form class="form-inline" id="suspend_all_holds" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
211
            <form class="form-inline" id="suspend_all_holds" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
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>
212
                <button type="submit" id="suspend_all_submit" class="btn btn-primary"><i class="fa fa-pause" aria-hidden="true"></i> Suspend all holds</button>
215
                        <input type="hidden" name="suspend" value="1" />
213
                <input type="hidden" name="suspend" value="1" />
216
214
217
                        [% IF AutoResumeSuspendedHolds %]
215
                [% IF AutoResumeSuspendedHolds %]
218
                            <label for="suspend_until"> until </label>
216
                    <label for="suspend_until"> until </label>
219
                            <input type="text" name="suspend_until" id="suspend_until" class="flatpickr futuredate" size="10" />
217
                    <input type="text" name="suspend_until" id="suspend_until" class="flatpickr futuredate" size="10" />
220
                            <p><a href="#" class="clear-flatpickr" data-fp="suspend_until">Clear date to suspend indefinitely</a></p>
218
                    <p><a href="#" class="clear-flatpickr" data-fp="suspend_until">Clear date to suspend indefinitely</a></p>
221
                        [% END %]
219
                [% END %]
222
                    </form>
220
            </form>
223
                </div>
221
        </div>
224
                <br/>
222
        <br/>
225
                <div>
223
        <div>
226
                    <form id="resume_all_holds" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
224
            <form id="resume_all_holds" action="/cgi-bin/koha/opac-modrequest-suspend.pl" method="post">
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>
225
                <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>
228
                        <input type="hidden" name="suspend" value="0" />
226
                <input type="hidden" name="suspend" value="0" />
229
                    </form>
227
            </form>
230
                </div>
228
        </div>
231
            [% END %]
229
    [% END %]
232
        [% END %]
230
[% END %]
233
    </div> <!-- / #opac-user-holds -->
234
[% END # / #HOLDS.count %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt (-2 / +2 lines)
Lines 72-78 Link Here
72
<script>
72
<script>
73
function loadEnrollmentForm( id ) {
73
function loadEnrollmentForm( id ) {
74
    $("body").css("cursor", "progress");
74
    $("body").css("cursor", "progress");
75
    $('#opac-user-clubs').load('/cgi-bin/koha/clubs/enroll.pl?borrowernumber=[% borrower.borrowernumber | html %]&id=' + id, function() {
75
    $('#opac-user-clubs_panel').load('/cgi-bin/koha/clubs/enroll.pl?borrowernumber=[% borrower.borrowernumber | html %]&id=' + id, function() {
76
        $("body").css("cursor", "default");
76
        $("body").css("cursor", "default");
77
    });
77
    });
78
78
Lines 87-93 function cancelEnrollment( id ) { Link Here
87
        data: { id: id },
87
        data: { id: id },
88
        success: function( data ) {
88
        success: function( data ) {
89
            if ( data.success ) {
89
            if ( data.success ) {
90
                $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrower.borrowernumber | html %]', function() {
90
                $('#opac-user-clubs_panel').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrower.borrowernumber | html %]', function() {
91
                    $("body").css("cursor", "default");
91
                    $("body").css("cursor", "default");
92
                });
92
                });
93
            } else {
93
            } 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 600-618 Link Here
600
                                        </form>
599
                                        </form>
601
                                    </div>
600
                                    </div>
602
                                </div>
601
                                </div>
603
602
                            [% END # /tab_panel#opac-user-checkouts %]
604
                            </div> <!-- / .opac-user-checkouts -->
605
603
606
                            [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]
604
                            [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]
607
                                <div id="opac-user-clubs" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-clubs-tab-link">
605
                                [% WRAPPER tab_panel tabname="opac-user-clubs" %]
608
                                    Loading...
606
                                    Loading...
609
                                </div>
607
                                [% END # /tab_panel#opac-user-clubs %]
610
                            [% END %]
608
                            [% END %]
611
609
612
                            [% IF ( OPACFinesTab ) %]
610
                            [% IF ( OPACFinesTab ) %]
613
                                <!-- FINES BOX -->
611
                                <!-- FINES BOX -->
614
                                [% IF ( amountoutstanding > 0 ) %]
612
                                [% IF ( amountoutstanding > 0 ) %]
615
                                    <div id="opac-user-fines" class="tab-pane" id="home" role="tabpanel" aria-labelledby="opac-user-fines-tab">
613
                                    [% WRAPPER tab_panel tabname="opac-user-fines" %]
616
                                        <table class="table table-bordered table-striped">
614
                                        <table class="table table-bordered table-striped">
617
                                            <caption>Charges</caption>
615
                                            <caption>Charges</caption>
618
                                            <thead><tr><th colspan="2">Amount</th></tr></thead>
616
                                            <thead><tr><th colspan="2">Amount</th></tr></thead>
Lines 623-633 Link Here
623
                                                </tr>
621
                                                </tr>
624
                                            </tbody>
622
                                            </tbody>
625
                                        </table>
623
                                        </table>
626
                                    </div>
624
                                    [% END # /tab_panel#opac-user-fines %]
627
                                [% END %]
625
                                [% END %]
628
626
629
                                [% IF ( amountoutstanding < 0 ) %]
627
                                [% IF ( amountoutstanding < 0 ) %]
630
                                    <div id="opac-user-fines" class="tab-pane" id="home" role="tabpanel" aria-labelledby="opac-user-fines-tab">
628
                                    [% WRAPPER tab_panel tabname="opac-user-fines" %]
631
                                        <table class="table table-bordered table-striped">
629
                                        <table class="table table-bordered table-striped">
632
                                            <caption>Credits</caption>
630
                                            <caption>Credits</caption>
633
                                            <thead><tr><th colspan="2">Amount</th></tr></thead>
631
                                            <thead><tr><th colspan="2">Amount</th></tr></thead>
Lines 637-647 Link Here
637
                                                </tr>
635
                                                </tr>
638
                                            </tbody>
636
                                            </tbody>
639
                                        </table>
637
                                        </table>
640
                                    </div>
638
                                    [% END # /tab_panel#opac-user-fines %]
641
                                [% END %]
639
                                [% END %]
642
640
643
                                [% IF relatives_with_fines %]
641
                                [% IF relatives_with_fines %]
644
                                    <div id="opac-user-relative-fines" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-relative-fines-tab">
642
                                    [% WRAPPER tab_panel tabname="opac-user-relative-fines" %]
645
                                        <table class="table table-bordered table-striped">
643
                                        <table class="table table-bordered table-striped">
646
                                            <caption>Fines and charges</caption>
644
                                            <caption>Fines and charges</caption>
647
                                            <thead>
645
                                            <thead>
Lines 658-669 Link Here
658
                                                [% END %]
656
                                                [% END %]
659
                                            </tbody>
657
                                            </tbody>
660
                                        </table>
658
                                        </table>
661
                                    </div>
659
                                    [% END # /tab_panel#opac-user-relative-fines %]
662
                                [% END %]
660
                                [% END %]
663
                            [% END # / OPACFinesTab %]
661
                            [% END # / OPACFinesTab %]
664
662
665
                            [% IF relatives %]
663
                            [% IF relatives %]
666
                                <div id="opac-user-relative-issues" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-relative-issues-tab">
664
                                [% WRAPPER tab_panel tabname="opac-user-relative-issues" %]
667
                                    <table id="opac-user-relative-issues-table" class="table table-bordered table-striped">
665
                                    <table id="opac-user-relative-issues-table" class="table table-bordered table-striped">
668
                                        <caption class="sr-only">Relative issues</caption>
666
                                        <caption class="sr-only">Relative issues</caption>
669
                                        <thead>
667
                                        <thead>
Lines 706-716 Link Here
706
                                            [% END %]
704
                                            [% END %]
707
                                        </tbody>
705
                                        </tbody>
708
                                    </table>
706
                                    </table>
709
                                </div>
707
                                [% END # /tab_panel#opac-user-relative-issues %]
710
                            [% END %]
708
                            [% END %]
711
709
712
                            [% IF ( overdues_count ) %]
710
                            [% IF ( overdues_count ) %]
713
                                <div id="opac-user-overdues" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-overdues-tab">
711
                                [% WRAPPER tab_panel tabname="opac-user-overdues" %]
714
                                    <table id="overduest" class="table table-bordered table-striped">
712
                                    <table id="overduest" class="table table-bordered table-striped">
715
                                        <caption>Overdues <span class="count">([% overdues_count | html %] total)</span></caption>
713
                                        <caption>Overdues <span class="count">([% overdues_count | html %] total)</span></caption>
716
                                        <!-- OVERDUES TABLE ROWS -->
714
                                        <!-- OVERDUES TABLE ROWS -->
Lines 829-841 Link Here
829
                                            [% END %]
827
                                            [% END %]
830
                                        </tbody>
828
                                        </tbody>
831
                                    </table>
829
                                    </table>
832
                                </div> <!-- / #opac-user-overdues -->
830
                                [% END # /tab_panel#opac-user-overdues %]
833
                            [% END # /overdues_count %]
831
                            [% END # /overdues_count %]
834
832
835
                            [% PROCESS 'holds-table.inc' HOLDS = RESERVES, SuspendHoldsOpac = SuspendHoldsOpac, showpriority = showpriority, AutoResumeSuspendedHolds = AutoResumeSuspendedHolds %]
833
                            [% IF ( RESERVES.count ) %]
834
                                [% WRAPPER tab_panel tabname="opac-user-holds" %]
835
                                    [% PROCESS 'holds-table.inc' HOLDS = RESERVES, SuspendHoldsOpac = SuspendHoldsOpac, showpriority = showpriority, AutoResumeSuspendedHolds = AutoResumeSuspendedHolds %]
836
                                [% END # /tab_panel#opac-user-holds %]
837
                            [% END # / #RESERVES.count %]
836
838
837
                            [% IF Koha.Preference('UseRecalls') && RECALLS.count %]
839
                            [% IF Koha.Preference('UseRecalls') && RECALLS.count %]
838
                                <div id="opac-user-recalls" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-recalls-tab">
840
                                [% WRAPPER tab_panel tabname="opac-user-recalls" %]
839
                                    <table id="recalls-table" class="table table-bordered table-striped">
841
                                    <table id="recalls-table" class="table table-bordered table-striped">
840
                                        <caption>Recalls <span class="count">([% RECALLS.count | html %])</span></caption>
842
                                        <caption>Recalls <span class="count">([% RECALLS.count | html %])</span></caption>
841
                                        <thead>
843
                                        <thead>
Lines 904-914 Link Here
904
                                            </tr>
906
                                            </tr>
905
                                        </tbody>
907
                                        </tbody>
906
                                    </table>
908
                                    </table>
907
                                </div>
909
                                [% END # /tab_panel#opac-user-recalls %]
908
                            [% END # / # RECALLS.count %]
910
                            [% END # / # RECALLS.count %]
909
911
910
                            [% IF Koha.Preference('ArticleRequests') %]
912
                            [% IF Koha.Preference('ArticleRequests') %]
911
                                <div id="opac-user-article-requests" class="tab-pane" role="tabpanel" aria-labelledby="opac-user-article-requests-tab">
913
                                [% WRAPPER tab_panel tabname="opac-user-article-requests" %]
912
                                    [% IF current_article_requests.size %]
914
                                    [% IF current_article_requests.size %]
913
                                        <table id="article-requests-table" class="table table-bordered table-striped">
915
                                        <table id="article-requests-table" class="table table-bordered table-striped">
914
                                            <caption>Article requests <span class="count"></span></caption>
916
                                            <caption>Article requests <span class="count"></span></caption>
Lines 1015-1024 Link Here
1015
                                            <tr><td>You have no article requests currently.</td></tr>
1017
                                            <tr><td>You have no article requests currently.</td></tr>
1016
                                        </table>
1018
                                        </table>
1017
                                    [% END # IF current_article_requests.size %]
1019
                                    [% END # IF current_article_requests.size %]
1018
                                </div> <!-- / #opac-user-article-requests -->
1020
                                [% END # /tab_panel#opac-user-article-requests %]
1019
                            [% END %]
1021
                            [% END %]
1020
                        </div> <!-- /.tab-content -->
1022
                        [% END # /WRAPPER tab_panels %]
1021
                    </div> <!-- /#opac-user-views -->
1023
                    [% END # /WRAPPER tabs#opac-user-views %]
1022
                </div> <!-- /#userdetails -->
1024
                </div> <!-- /#userdetails -->
1023
            </div> <!-- /.col-10 -->
1025
            </div> <!-- /.col-10 -->
1024
        </div> <!-- /.row -->
1026
        </div> <!-- /.row -->
Lines 1293-1302 Link Here
1293
                $("#change-pickup-location" + hold_id ).show();
1295
                $("#change-pickup-location" + hold_id ).show();
1294
            });
1296
            });
1295
1297
1296
            if ( $('#opac-user-clubs').length ) {
1298
            if ( $('#opac-user-clubs_panel').length ) {
1297
                $('#opac-user-clubs-tab-link').on('click', function() {
1299
                $('#opac-user-clubs-tab').on('click', function() {
1298
                    $('#opac-user-clubs').text(_("Loading..."));
1300
                    $('#opac-user-clubs_panel').text(_("Loading..."));
1299
                    $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber | html %]');
1301
                    $('#opac-user-clubs_panel').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber | html %]');
1300
                });
1302
                });
1301
            }
1303
            }
1302
1304
Lines 1332-1337 Link Here
1332
            $(".dismiss-message-button").click(function(e){
1334
            $(".dismiss-message-button").click(function(e){
1333
                return confirmDelete(_("Are you sure you want to dismiss this message?"));
1335
                return confirmDelete(_("Are you sure you want to dismiss this message?"));
1334
            });
1336
            });
1337
1338
            if( $("#opac-user-views .tab-pane.active").length < 1 ){
1339
                $("#opac-user-views a:first").tab("show");
1340
            }
1335
        });
1341
        });
1336
1342
1337
        function submitNote( title, issue_id, note ){
1343
        function submitNote( title, issue_id, note ){
Lines 1414-1427 Link Here
1414
    [%- END -%]
1420
    [%- END -%]
1415
    $(document).ready(function() {
1421
    $(document).ready(function() {
1416
        [% IF ( overdrive_error ) %]
1422
        [% IF ( overdrive_error ) %]
1417
            KOHA.OverDriveCirculation.display_error("#opac-user-overdrive", "[% overdrive_error.dquote | html %]");
1423
            KOHA.OverDriveCirculation.display_error("#opac-user-overdrive_panel", "[% overdrive_error.dquote | html %]");
1418
        [% END %]
1424
        [% END %]
1419
1425
1420
        [% IF ( overdrive_tab ) %]
1426
        [% IF ( overdrive_tab ) %]
1421
            $("#opac-user-views a[href='#opac-user-overdrive']").tab("show");
1427
            $("#opac-user-views a[href='#opac-user-overdrive_panel']").tab("show");
1422
        [% END %]
1428
        [% END %]
1423
1429
1424
        $("#opac-user-overdrive").each( function() {
1430
        $("#opac-user-overdrive_panel").each( function() {
1425
            KOHA.OverDriveCirculation.display_account_details(this);
1431
            KOHA.OverDriveCirculation.display_account_details(this);
1426
        } );
1432
        } );
1427
    });
1433
    });
(-)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