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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/article-requests.tt (-30 / +22 lines)
Lines 172-199 Link Here
172
                    </button>
172
                    </button>
173
                </form>
173
                </form>
174
174
175
                <div id="article-request-tabs" class="toptabs">
175
                [% WRAPPER tabs id= "article-request-tabs" %]
176
                    <ul class="nav nav-tabs" role="tablist">
176
                    [% WRAPPER tabs_nav %]
177
                        <li role="presentation" class="active">
177
                        [% WRAPPER tab_item tabname= "article-requests-requested" bt_active= 1 %]
178
                            <a href="#article-requests-requested" aria-controls="article-requests-requested" role="tab" data-toggle="tab">
178
                            <span>New</span> (<span id="ar_requested_count">[% article_requests_requested.count | html %]</span>)
179
                                New (<span id="ar_requested_count">[% article_requests_requested.count | html %]</span>)
179
                        [% END %]
180
                            </a>
180
                        [% WRAPPER tab_item tabname= "article-requests-pending" %]
181
                        </li>
181
                            <span>Pending</span> (<span id="ar_pending_count">[% article_requests_pending.count | html %]</span>)
182
182
                        [% END %]
183
                        <li role="presentation">
183
                        [% WRAPPER tab_item tabname= "article-requests-processing" %]
184
                            <a href="#article-requests-pending" aria-controls="article-requests-pending" role="tab" data-toggle="tab">
184
                            <span>Processing</span> (<span id="ar_processing_count">[% article_requests_processing.count | html %]</span>)
185
                                Pending (<span id="ar_pending_count">[% article_requests_pending.count | html %]</span>)
185
                        [% END %]
186
                            </a>
186
                    [% END # /WRAPPER tabs_nav %]
187
                        </li role="presentation">
187
188
188
                    [% WRAPPER tab_panels %]
189
                        <li>
189
                        [% WRAPPER tab_panel tabname="article-requests-requested" bt_active= 1 %]
190
                            <a href="#article-requests-processing" aria-controls="article-requests-processing" role="tab" data-toggle="tab">
191
                                Processing (<span id="ar_processing_count">[% article_requests_processing.count | html %]</span>)
192
                            </a>
193
                        </li>
194
                    </ul>
195
                    <div class="tab-content">
196
                        <div id="article-requests-requested" role="tabpanel" class="tab-pane active">
197
                            <div class="article-requests-requested_table_controls">
190
                            <div class="article-requests-requested_table_controls">
198
                                <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a>
191
                                <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a>
199
                                [% PROCESS actions menuid='article-menu-requested' id_arg=0 pull_right='' aria_menu='table_controls' %]
192
                                [% PROCESS actions menuid='article-menu-requested' id_arg=0 pull_right='' aria_menu='table_controls' %]
Lines 298-306 Link Here
298
                                    [% END %]
291
                                    [% END %]
299
                                </tbody>
292
                                </tbody>
300
                            </table>
293
                            </table>
301
                        </div>
294
                        [% END # /tab_panel#article-requests-requested %]
302
295
303
                        <div id="article-requests-pending" role="tabpanel" class="tab-pane">
296
                        [% WRAPPER tab_panel tabname="article-requests-pending" %]
304
                            <div class="article-requests-pending_table_controls">
297
                            <div class="article-requests-pending_table_controls">
305
                                <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a>
298
                                <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a>
306
                                [% PROCESS actions menuid='article-menu-pending' id_arg=0 pull_right='' aria_menu='table_controls' %]
299
                                [% PROCESS actions menuid='article-menu-pending' id_arg=0 pull_right='' aria_menu='table_controls' %]
Lines 405-413 Link Here
405
                                    [% END %]
398
                                    [% END %]
406
                                </tbody>
399
                                </tbody>
407
                            </table>
400
                            </table>
408
                        </div>
401
                        [% END # /tab_panel#article-requests-pending %]
409
402
410
                        <div id="article-requests-processing" role="tabpanel" class="tab-pane">
403
                        [% WRAPPER tab_panel tabname="article-requests-processing" %]
411
                            <div class="article-requests-processing_table_controls">
404
                            <div class="article-requests-processing_table_controls">
412
                                <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a>
405
                                <a href="#" class="SelectAll"><i class="fa fa-check"></i> Select all</a> | <a href="#" class="ClearAll"><i class="fa fa-remove"></i> Clear all</a>
413
                                [% PROCESS actions menuid='article-menu-processing' id_arg=0 pull_right='' aria_menu='table_controls' %]
406
                                [% PROCESS actions menuid='article-menu-processing' id_arg=0 pull_right='' aria_menu='table_controls' %]
Lines 509-518 Link Here
509
                                    [% END %]
502
                                    [% END %]
510
                                </tbody>
503
                                </tbody>
511
                            </table>
504
                            </table>
512
                        </div>
505
                        [% END # /tab_panel#article-requests-processing %]
513
                    </div> <!-- /.tab-content -->
506
                    [% END # /WRAPPER tab_panels %]
514
                    <br/>
507
                [% END # /WRAPPER tabs %]
515
                </div>
516
            </div>
508
            </div>
517
509
518
            [% IF Koha.Preference('CircSidebar') %]
510
            [% IF Koha.Preference('CircSidebar') %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-24 / +27 lines)
Lines 5-10 Link Here
5
[% USE Branches %]
5
[% USE Branches %]
6
[% USE TablesSettings %]
6
[% USE TablesSettings %]
7
[% USE AuthorisedValues %]
7
[% USE AuthorisedValues %]
8
[% PROCESS 'i18n.inc' %]
8
[% SET footerjs = 1 %]
9
[% SET footerjs = 1 %]
9
[% INCLUDE 'doc-head-open.inc' %]
10
[% INCLUDE 'doc-head-open.inc' %]
10
<title>Holds awaiting pickup &rsaquo; Circulation &rsaquo; Koha</title>
11
<title>Holds awaiting pickup &rsaquo; Circulation &rsaquo; Koha</title>
Lines 92-113 Link Here
92
                                    <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a></p>
93
                                    <p><a href="/cgi-bin/koha/admin/background_jobs.pl?op=view&id=[% job_id | uri %]" title="View detail of the enqueued job">View detail of the enqueued job</a></p>
93
                                </div>
94
                                </div>
94
                            [% END %]
95
                            [% END %]
95
                            <div id="resultlist" class="toptabs">
96
96
                                <ul class="nav nav-tabs" role="tablist">
97
                            [% WRAPPER tabs id= "resultlist" %]
97
                                    <li role="presentation" class="active"><a href="#holdswaiting" aria-controls="holdswaiting" role="tab" data-toggle="tab">Holds waiting: [% reservecount | html %]</a></li>
98
                                [% WRAPPER tabs_nav %]
98
                                    <li role="presentation">
99
                                    [% WRAPPER tab_item tabname= "holdswaiting" bt_active= 1 %]
99
                                        <a href="#holdsover" aria-controls="holdsover" role="tab" data-toggle="tab">
100
                                        <span>Holds waiting:</span> [% reservecount | html %]
100
                                            Holds waiting over [% Koha.Preference('ReservesMaxPickUpDelay') | html %] days: [% overcount | html %]
101
                                    [% END %]
101
                                        </a>
102
                                    [% WRAPPER tab_item tabname= "holdsover" %]
102
                                    </li>
103
                                        [% tx("Holds waiting over {count} days:", { count = Koha.Preference('ReservesMaxPickUpDelay') }) %] [% overcount | html %]
103
                                    <li role="presentation">
104
                                    [% END %]
104
                                        <a href="#holdscancelled" aria-controls="holdscancelled" role="tab" data-toggle="tab">
105
                                    [% WRAPPER tab_item tabname= "holdscancelled" %]
105
                                            Holds with cancellation requests: [% cancel_reqs_count | html %]
106
                                        <span>Holds with cancellation requests:</span> [% cancel_reqs_count | html %]
106
                                        </a>
107
                                    [% END %]
107
                                    </li>
108
                                [% END # /WRAPPER tabs_nav %]
108
                                </ul> <!-- /.nav.nav-tabs -->
109
109
                                <div class="tab-content">
110
                                [% WRAPPER tab_panels %]
110
                                    <div role="tabpanel" class="tab-pane active" id="holdswaiting">
111
                                    [% WRAPPER tab_panel tabname="holdswaiting" bt_active= 1 %]
111
                                        [% IF ( reserveloop ) %]
112
                                        [% IF ( reserveloop ) %]
112
                                            <div id="toolbar" class="btn-toolbar">
113
                                            <div id="toolbar" class="btn-toolbar">
113
                                                <button class="btn btn-default cancel_selected_holds" data-bulk="true"></button>
114
                                                <button class="btn btn-default cancel_selected_holds" data-bulk="true"></button>
Lines 116-123 Link Here
116
                                        [% ELSE %]
117
                                        [% ELSE %]
117
                                            <div class="dialog message">No holds found.</div>
118
                                            <div class="dialog message">No holds found.</div>
118
                                        [% END %]
119
                                        [% END %]
119
                                    </div> <!-- /#holdswaiting -->
120
                                    [% END # /tab_panel#holdswaiting %]
120
                                    <div role="tabpanel" class="tab-pane" id="holdsover">
121
122
                                    [% WRAPPER tab_panel tabname="holdsover" %]
121
                                        [% IF ( ReservesMaxPickUpDelay ) %]
123
                                        [% IF ( ReservesMaxPickUpDelay ) %]
122
                                            <p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.</p>
124
                                            <p>Holds listed here have been awaiting pickup for more than [% ReservesMaxPickUpDelay | html %] days.</p>
123
                                        [% END %]
125
                                        [% END %]
Lines 142-157 Link Here
142
                                        [% ELSE %]
144
                                        [% ELSE %]
143
                                            <div class="dialog message">No holds found.</div>
145
                                            <div class="dialog message">No holds found.</div>
144
                                        [% END # /IF( overloop ) %]
146
                                        [% END # /IF( overloop ) %]
145
                                    </div> <!-- /#holdsover -->
147
                                    [% END # /tab_panel#holdsover %]
146
                                    <div role="tabpanel" class="tab-pane" id="holdscancelled">
148
149
                                    [% WRAPPER tab_panel tabname="holdscancelled" %]
147
                                        [% IF cancel_reqs_count %]
150
                                        [% IF cancel_reqs_count %]
148
                                            [% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %]
151
                                            [% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %]
149
                                        [% ELSE %]
152
                                        [% ELSE %]
150
                                            <div class="dialog message">No holds found.</div>
153
                                            <div class="dialog message">No holds found.</div>
151
                                        [% END %]
154
                                        [% END %]
152
                                    </div> <!-- /#holdscancelled -->
155
                                    [% END # /tab_panel#holdscancelled %]
153
                                </div> <!-- /.tab-content -->
156
                                [% END # /WRAPPER tab_panels %]
154
                            </div> <!-- /#resultlist.toptabs -->
157
                            [% END # /WRAPPER tabs %]
158
155
                        [% END # /IF ( cancel_result ) %]
159
                        [% END # /IF ( cancel_result ) %]
156
                    </div> <!-- /.col-sm-10.col-sm-push-2 -->
160
                    </div> <!-- /.col-sm-10.col-sm-push-2 -->
157
161
158
- 

Return to bug 33187