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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/main-container.inc (+1 lines)
Lines 31-36 Link Here
31
                        [% CASE 'serials-advsearch_brief' %][% INCLUDE 'serials-advsearch.inc' brief=1 %]
31
                        [% CASE 'serials-advsearch_brief' %][% INCLUDE 'serials-advsearch.inc' brief=1 %]
32
                        [% CASE 'serials-menu' %][% INCLUDE 'serials-menu.inc' %]
32
                        [% CASE 'serials-menu' %][% INCLUDE 'serials-menu.inc' %]
33
                        [% CASE 'subscriptions-search' %][% INCLUDE 'subscriptions-search.inc' %]
33
                        [% CASE 'subscriptions-search' %][% INCLUDE 'subscriptions-search.inc' %]
34
                        [% CASE 'tags-filter' %][% INCLUDE 'tags-filter.inc' %]
34
                        [% CASE 'tools-menu' %][% INCLUDE 'tools-menu.inc' %]
35
                        [% CASE 'tools-menu' %][% INCLUDE 'tools-menu.inc' %]
35
                        [% END %]
36
                        [% END %]
36
                    [% END %]
37
                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/tags-filter.inc (+50 lines)
Line 0 Link Here
1
<form method="get" action="/cgi-bin/koha/tags/review.pl">
2
    <fieldset class="brief">
3
        <h4>Filters</h4>
4
        <ol>
5
            <li>
6
                <label for="tag">Term:</label> <input type="text" name="tag" id="tag" value="[% filter_tag | html %]" />
7
            </li>
8
            <li>
9
                <label for="approved">Status:</label>
10
                <select name="approved" id="approved">
11
                [% IF ( filter_approved_all ) %]
12
                    <option selected="selected" value="all">All</option>
13
                [% ELSE %]
14
                    <option value="all">all</option>
15
                [% END %]
16
                [% IF ( filter_approved_ok ) %]
17
                    <option selected="selected" value="1">Approved</option>
18
                [% ELSE %]
19
                    <option value="1">approved</option>
20
                [% END %]
21
                [% IF ( filter_approved_pending ) %]
22
                    <option selected="selected" value="0">Pending</option>
23
                [% ELSE %]
24
                    <option value="0">pending</option>
25
                [% END %]
26
                [% IF ( filter_approved_rej ) %]
27
                    <option selected="selected" value="-1">Rejected</option>
28
                [% ELSE %]
29
                    <option value="-1">Rejected</option>
30
                [% END %]
31
                </select>
32
            </li>
33
            <li>
34
                <label for="approver">Reviewer:</label> <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" />
35
            </li>
36
            <li>
37
                <label for="from">Date: from </label>
38
                <input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from | html %]" class="flatpickr" data-date_to="to" />
39
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
40
41
                <label for="to">...to </label>
42
                <input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to | html %]" class="flatpickr" />
43
                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
44
            </li>
45
        </ol>
46
    </fieldset>
47
    <fieldset class="action">
48
        <button type="submit" class="btn btn-primary"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button>
49
    </fieldset>
50
</form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt (-53 / +4 lines)
Lines 76-86 Link Here
76
        [% END #/ WRAPPER breadcrumbs %]
76
        [% END #/ WRAPPER breadcrumbs %]
77
    [% END #/ WRAPPER sub-header.inc %]
77
    [% END #/ WRAPPER sub-header.inc %]
78
78
79
    <div class="main container-fluid">
79
[% WRAPPER 'main-container.inc' asides=['tags-filter', 'tools-menu'] %]
80
        <div class="row">
80
81
            <div class="col-md-10 order-sm-1 order-md-2">
82
                <main>
83
                    [% INCLUDE 'messages.inc' %]
84
                    <h1>Tags</h1>
81
                    <h1>Tags</h1>
85
82
86
                    <div class="row">
83
                    <div class="row">
Lines 267-319 Link Here
267
                                </fieldset>
264
                                </fieldset>
268
                            </aside>
265
                            </aside>
269
                        </div> <!-- /.col-sm-12.col-md-4 -->
266
                        </div> <!-- /.col-sm-12.col-md-4 -->
270
                    </div> <!-- /.row -->
267
                    </div>
271
                </main>
268
[% END %]
272
            </div> <!-- /.col-sm-10 order-sm-1 order-md-2 -->
273
            <div class="col-md-2 order-sm-2 order-md-1">
274
                <aside>
275
                    <form method="get" action="/cgi-bin/koha/tags/review.pl">
276
                        <fieldset class="brief">
277
                            <h4>Filters</h4>
278
                            <ol>
279
                                <li><label for="tag">Term:</label> <input type="text" name="tag" id="tag" value="[% filter_tag | html %]" />
280
                                </li>
281
                                <li><label for="approved">Status:</label>
282
                                    <select name="approved" id="approved">
283
                                    [% IF ( filter_approved_all ) %]<option selected="selected" value="all">all</option>
284
                                    [% ELSE %]<option value="all">all</option>[% END %]
285
                                    [% IF ( filter_approved_ok ) %]<option selected="selected" value="1">approved</option>
286
                                    [% ELSE %]<option value="1">approved</option>[% END %]
287
                                    [% IF ( filter_approved_pending ) %]<option selected="selected" value="0">pending</option>
288
                                    [% ELSE %]<option value="0">pending</option>[% END %]
289
                                    [% IF ( filter_approved_rej ) %]<option selected="selected" value="-1">rejected</option>
290
                                    [% ELSE %]<option value="-1">rejected</option>[% END %]
291
                                    </select>
292
                                </li>
293
                                <li><label for="approver">Reviewer:</label> <input type="text" name="approver" id="approver" value="[% filter_approver | html %]" />
294
                                </li>
295
                                <li>
296
                                    <label for="from">Date: from </label>
297
                                    <input type="text" size="10" id="from" name="from" value="[% filter_date_approved_from | html %]" class="flatpickr" data-date_to="to" />
298
                                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
299
300
                                    <label for="to">...to </label>
301
                                    <input type="text" size="10" id="to" name="to" value="[% filter_date_approved_to | html %]" class="flatpickr" />
302
                                    <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
303
                                </li>
304
                            </ol>
305
                        </fieldset>
306
                        <fieldset class="action">
307
                            <button type="submit" class="btn btn-primary"><i class="fa fa-filter" aria-hidden="true"></i> Apply filter(s)</button>
308
                        </fieldset>
309
                    </form>
310
311
                    [% INCLUDE 'tools-menu.inc' %]
312
313
                </aside>
314
            </div> <!-- /.col-sm-2 order-sm-2 order-md-1 -->
315
        </div> <!-- /.row -->
316
    </div> <!-- /.main.container-fluid -->
317
269
318
[% MACRO jsinclude BLOCK %]
270
[% MACRO jsinclude BLOCK %]
319
    [% INCLUDE 'datatables.inc' %]
271
    [% INCLUDE 'datatables.inc' %]
320
- 

Return to bug 38718