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

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-15 / +14 lines)
Lines 2457-2463 td.bundle { Link Here
2457
    }
2457
    }
2458
}
2458
}
2459
2459
2460
2461
.field_hint {
2460
.field_hint {
2462
    color: #808080;
2461
    color: #808080;
2463
    font-style: italic;
2462
    font-style: italic;
Lines 2472-2494 td.bundle { Link Here
2472
    width: 50%;
2471
    width: 50%;
2473
}
2472
}
2474
2473
2475
.advsearch {
2474
#advsearches {
2476
    margin: 0 1em 1em 0;
2475
    margin-bottom: 1em;
2477
2476
2478
    table {
2477
    .tab-pane {
2479
        border-collapse: separate;
2478
        margin: 0 1em 1em 0;
2480
        border-spacing: 5px;
2481
        border-width: 0;
2482
    }
2483
2479
2484
    td {
2480
        table {
2485
        border: 1px solid #EEE;
2481
            border-collapse: separate;
2486
        padding: .3em .4em;
2482
            border-spacing: 5px;
2487
    }
2483
            border-width: 0;
2488
}
2484
        }
2489
2485
2490
#advsearches {
2486
        td {
2491
    margin-bottom: 1em;
2487
            border: 1px solid #EEE;
2488
            padding: .3em .4em;
2489
        }
2490
    }
2492
}
2491
}
2493
2492
2494
#circ_circulation_issue {
2493
#circ_circulation_issue {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt (-17 / +19 lines)
Lines 207-230 Link Here
207
                </div> <!-- /#advanced-search -->
207
                </div> <!-- /#advanced-search -->
208
208
209
                <!-- MC-TYPE LIMITS -->
209
                <!-- MC-TYPE LIMITS -->
210
                <div id="advsearches" class="toptabs">
210
                [% WRAPPER tabs id= "advsearches" %]
211
                    <ul class="nav nav-tabs" role="tablist">
211
                    [% WRAPPER tabs_nav %]
212
                        [% FOREACH advsearchloo IN advancedsearchesloop %]
212
                        [% FOREACH advsearchloo IN advancedsearchesloop %]
213
                            <li role="presentation" id="advsearch-tab-[% advsearchloo.advanced_search_type | html %]">
213
                            [% WRAPPER tab_item tabname= "advsearch-tab-${advsearchloo.advanced_search_type}" %]
214
                                <a href="#advsearch-[% advsearchloo.advanced_search_type | uri %]" aria-controls="advsearch-[% advsearchloo.advanced_search_type | uri %]" role="tab" data-toggle="tab">
214
                                [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]
215
                                    [% IF ( advsearchloo.advanced_search_type == 'itemtypes' ) %]<span>Item type</span>
215
                                    <span>Item type</span>
216
                                    [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]<span>Collection</span>
216
                                [% ELSIF ( advsearchloo.advanced_search_type == 'ccode' ) %]
217
                                    [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]<span>Shelving location</span>
217
                                    <span>Collection</span>
218
                                    [% ELSE %]<span>Something else</span>
218
                                [% ELSIF ( advsearchloo.advanced_search_type == 'loc' ) %]
219
                                    [% END %]
219
                                    <span>Shelving location</span>
220
                                </a>
220
                                [% ELSE %]
221
                            </li>
221
                                    <span>Something else</span>
222
                                [% END %]
223
                            [% END # /tab_item#advsearch-tab-... %]
222
                        [% END # /FOREACH advsearchloo %]
224
                        [% END # /FOREACH advsearchloo %]
223
                    </ul>
225
                    [% END # /WRAPPER tabs_nav %]
224
226
225
                    <div class="tab-content">
227
                    [% WRAPPER tab_panels %]
226
                        [% FOREACH advsearchloo IN advancedsearchesloop %]
228
                        [% FOREACH advsearchloo IN advancedsearchesloop %]
227
                            <div id="advsearch-[% advsearchloo.advanced_search_type | html %]"  role="tabpanel" class="tab-pane advsearch">
229
                            [% WRAPPER tab_panel tabname="advsearch-tab-${advsearchloo.advanced_search_type}" %]
228
                                <h4>Limit to any of the following:</h4>
230
                                <h4>Limit to any of the following:</h4>
229
                                <table>
231
                                <table>
230
                                    <tr>
232
                                    <tr>
Lines 257-266 Link Here
257
                                            [% END # /IF ( loop.last ) %]
259
                                            [% END # /IF ( loop.last ) %]
258
                                        [% END # /FOREACH itemtypeloo %]
260
                                        [% END # /FOREACH itemtypeloo %]
259
                                </table>
261
                                </table>
260
                            </div> <!-- /#advsearch-[% advsearchloo.advanced_search_type | html %] -->
262
                            [% END # tab_panel/#advsearch-... %]
261
                        [% END # /FOREACH advsearchloo %]
263
                        [% END # /FOREACH advsearchloo %]
262
                    </div> <!-- /.tab-content -->
264
                    [% END # /WRAPPER tab_panels %]
263
                </div> <!-- /#advsearches -->
265
                [% END # /WRAPPER tabs %]
264
                <!-- /MC-TYPE LIMIT -->
266
                <!-- /MC-TYPE LIMIT -->
265
267
266
                [% IF ( expanded_options ) %]
268
                [% IF ( expanded_options ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt (-161 / +163 lines)
Lines 37-217 Link Here
37
        <div class="col-sm-12 col-md-8 col-md-offset-2">
37
        <div class="col-sm-12 col-md-8 col-md-offset-2">
38
38
39
      <h1>Search history</h1>
39
      <h1>Search history</h1>
40
        <div id="tabs" class="toptabs">
40
41
            <ul class="nav nav-tabs" role="tablist">
41
            [% WRAPPER tabs id= "tabs" %]
42
                <li role="presentation" class="active"><a href="#biblio_tab" aria-controls="biblio_tab" role="tab" data-toggle="tab">Catalog</a></li>
42
                [% WRAPPER tabs_nav %]
43
                <li role="presentation"><a href="#authority_tab" aria-controls="authority_tab" role="tab" data-toggle="tab">Authority</a></li>
43
                    [% WRAPPER tab_item tabname= "biblio_tab" bt_active= 1 %] <span>Catalog</span> [% END %]
44
            </ul>
44
                    [% WRAPPER tab_item tabname= "authority_tab" %] <span>Authority</span> [% END %]
45
            <div class="tab-content">
45
                [% END # /WRAPPER tabs_nav %]
46
                <div role="tabpanel" class="tab-pane active" id="biblio_tab">
46
47
                    [% IF ( current_biblio_searches ) %]
47
                [% WRAPPER tab_panels %]
48
                        <h2>Current session</h2>
48
                    [% WRAPPER tab_panel tabname="biblio_tab" bt_active= 1 %]
49
                        <form id="current_cat" action="/cgi-bin/koha/catalogue/search-history.pl" method="post">
49
                        [% IF ( current_biblio_searches ) %]
50
                            <p class="selections-toolbar">
50
                            <h2>Current session</h2>
51
                                <a class="CheckAll" data-form="current_cat" href="#"><i class="fa fa-check"></i> Select all visible rows</a>
51
                            <form id="current_cat" action="/cgi-bin/koha/catalogue/search-history.pl" method="post">
52
                                <span class="sep">|</span>
52
                                <p class="selections-toolbar">
53
                                <a class="CheckNone" data-form="current_cat" href="#"><i class="fa fa-remove"></i> Clear selection on visible rows</a>
53
                                    <a class="CheckAll" data-form="current_cat" href="#"><i class="fa fa-check"></i> Select all visible rows</a>
54
                                <span class="sep">|</span>
54
                                    <span class="sep">|</span>
55
                                <span class="links">
55
                                    <a class="CheckNone" data-form="current_cat" href="#"><i class="fa fa-remove"></i> Clear selection on visible rows</a>
56
                                <span class="selections">Select searches to: </span>
56
                                    <span class="sep">|</span>
57
                                <a href="#" class="btn btn-default btn-xs action_delete disabled"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
57
                                    <span class="links">
58
                                </span>
58
                                    <span class="selections">Select searches to: </span>
59
                            </p>
59
                                    <a href="#" class="btn btn-default btn-xs action_delete disabled"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
60
                            <input type="hidden" name="action" value="delete" />
60
                                    </span>
61
                            <table class="historyt">
61
                                </p>
62
                                <thead>
62
                                <input type="hidden" name="action" value="delete" />
63
                                    <tr>
63
                                <table class="historyt">
64
                                        <th></th>
64
                                    <thead>
65
                                        <th>Date</th>
66
                                        <th>Search</th>
67
                                        <th>Results</th>
68
                                    </tr>
69
                                </thead>
70
                                <tbody>
71
                                    [% FOREACH s IN current_biblio_searches %]
72
                                        <tr>
65
                                        <tr>
73
                                            <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
66
                                            <th></th>
74
                                            <td data-order="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</td>
67
                                            <th>Date</th>
75
                                            <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
68
                                            <th>Search</th>
76
                                            <td>[% s.total | html %]</td>
69
                                            <th>Results</th>
77
                                        </tr>
70
                                        </tr>
78
                                    [% END %]
71
                                    </thead>
79
                                </tbody>
72
                                    <tbody>
80
                            </table>
73
                                        [% FOREACH s IN current_biblio_searches %]
81
                        </form>
74
                                            <tr>
82
                    [% END %]
75
                                                <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
76
                                                <td data-order="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</td>
77
                                                <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
78
                                                <td>[% s.total | html %]</td>
79
                                            </tr>
80
                                        [% END %]
81
                                    </tbody>
82
                                </table>
83
                            </form>
84
                        [% END %]
83
85
84
                    [% IF ( current_biblio_searches && previous_biblio_searches) %]
86
                        [% IF ( current_biblio_searches && previous_biblio_searches) %]
85
                        <hr />
87
                            <hr />
86
                    [% END %]
88
                        [% END %]
87
89
88
                    [% IF ( previous_biblio_searches ) %]
90
                        [% IF ( previous_biblio_searches ) %]
89
                        <h2>Previous sessions</h2>
91
                            <h2>Previous sessions</h2>
90
                        <form id="previous_cat" action="/cgi-bin/koha/catalogue/search-history.pl" method="post">
92
                            <form id="previous_cat" action="/cgi-bin/koha/catalogue/search-history.pl" method="post">
91
                            <p class="selections-toolbar">
93
                                <p class="selections-toolbar">
92
                                <a class="CheckAll" data-form="previous_cat" href="#"><i class="fa fa-check"></i> Select all visible rows</a>
94
                                    <a class="CheckAll" data-form="previous_cat" href="#"><i class="fa fa-check"></i> Select all visible rows</a>
93
                                <span class="sep">|</span>
95
                                    <span class="sep">|</span>
94
                                <a class="CheckNone" data-form="previous_cat" href="#"><i class="fa fa-remove"></i> Clear selection on visible rows</a>
96
                                    <a class="CheckNone" data-form="previous_cat" href="#"><i class="fa fa-remove"></i> Clear selection on visible rows</a>
95
                                <span class="sep">|</span>
97
                                    <span class="sep">|</span>
96
                                <span class="links">
98
                                    <span class="links">
97
                                <span class="selections">Select searches to: </span>
99
                                    <span class="selections">Select searches to: </span>
98
                                <a href="#" class="btn btn-default btn-xs action_delete disabled"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
100
                                    <a href="#" class="btn btn-default btn-xs action_delete disabled"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
99
                                </span>
101
                                    </span>
100
                            </p>
102
                                </p>
101
                            <input type="hidden" name="action" value="delete" />
103
                                <input type="hidden" name="action" value="delete" />
102
                            <table class="historyt">
104
                                <table class="historyt">
103
                                <thead>
105
                                    <thead>
104
                                    <tr>
105
                                        <th></th>
106
                                        <th>Date</th>
107
                                        <th>Search</th>
108
                                        <th>Results</th>
109
                                    </tr>
110
                                </thead>
111
                                <tbody>
112
                                    [% FOREACH s IN previous_biblio_searches %]
113
                                        <tr>
106
                                        <tr>
114
                                            <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
107
                                            <th></th>
115
                                            <td data-order="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</td>
108
                                            <th>Date</th>
116
                                            <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
109
                                            <th>Search</th>
117
                                            <td>[% s.total | html %]</td>
110
                                            <th>Results</th>
118
                                        </tr>
111
                                        </tr>
119
                                    [% END %]
112
                                    </thead>
120
                                </tbody>
113
                                    <tbody>
121
                            </table>
114
                                        [% FOREACH s IN previous_biblio_searches %]
122
                        </form>
115
                                            <tr>
123
                    [% END %]
116
                                                <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
117
                                                <td data-order="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</td>
118
                                                <td><a href="/cgi-bin/koha/catalogue/search.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
119
                                                <td>[% s.total | html %]</td>
120
                                            </tr>
121
                                        [% END %]
122
                                    </tbody>
123
                                </table>
124
                            </form>
125
                        [% END %]
124
126
125
                    [% IF !current_biblio_searches && !previous_biblio_searches %]
127
                        [% IF !current_biblio_searches && !previous_biblio_searches %]
126
                        <p>Your catalog search history is empty.</p>
128
                            <p>Your catalog search history is empty.</p>
127
                    [% END %]
129
                        [% END %]
128
                </div> <!-- /#biblio_tab -->
130
                    [% END # /tab_panel#biblio_tab %]
129
131
130
                <div id="authority_tab" role="tabpanel" class="tab-pane">
132
                    [% WRAPPER tab_panel tabname="authority_tab" %]
131
                    [% IF ( current_authority_searches ) %]
133
                        [% IF ( current_authority_searches ) %]
132
                        <h2>Current session</h2>
134
                            <h2>Current session</h2>
133
                        <form id="current_auth" action="/cgi-bin/koha/catalogue/search-history.pl" method="post">
135
                            <form id="current_auth" action="/cgi-bin/koha/catalogue/search-history.pl" method="post">
134
                            <p class="selections-toolbar">
136
                                <p class="selections-toolbar">
135
                                <a class="CheckAll" data-form="current_auth" href="#"><i class="fa fa-check"></i> Select all visible rows</a>
137
                                    <a class="CheckAll" data-form="current_auth" href="#"><i class="fa fa-check"></i> Select all visible rows</a>
136
                                <span class="sep">|</span>
138
                                    <span class="sep">|</span>
137
                                <a class="CheckNone" data-form="current_auth" href="#"><i class="fa fa-remove"></i> Clear selection on visible rows</a>
139
                                    <a class="CheckNone" data-form="current_auth" href="#"><i class="fa fa-remove"></i> Clear selection on visible rows</a>
138
                                <span class="sep">|</span>
140
                                    <span class="sep">|</span>
139
                                <span class="links">
141
                                    <span class="links">
140
                                <span class="selections">Select searches to: </span>
142
                                    <span class="selections">Select searches to: </span>
141
                                <a href="#" class="btn btn-default btn-xs action_delete disabled"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
143
                                    <a href="#" class="btn btn-default btn-xs action_delete disabled"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
142
                                </span>
144
                                    </span>
143
                            </p>
145
                                </p>
144
                            <input type="hidden" name="action" value="delete" />
146
                                <input type="hidden" name="action" value="delete" />
145
                            <table class="historyt">
147
                                <table class="historyt">
146
                                <thead>
148
                                    <thead>
147
                                    <tr>
148
                                        <th></th>
149
                                        <th>Date</th>
150
                                        <th>Search</th>
151
                                        <th>Results</th>
152
                                    </tr>
153
                                </thead>
154
                                <tbody>
155
                                    [% FOREACH s IN current_authority_searches %]
156
                                        <tr>
149
                                        <tr>
157
                                            <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
150
                                            <th></th>
158
                                            <td data-order="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</td>
151
                                            <th>Date</th>
159
                                            <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
152
                                            <th>Search</th>
160
                                            <td>[% s.total | html %]</td>
153
                                            <th>Results</th>
161
                                        </tr>
154
                                        </tr>
162
                                    [% END %]
155
                                    </thead>
163
                                </tbody>
156
                                    <tbody>
164
                            </table>
157
                                        [% FOREACH s IN current_authority_searches %]
165
                        </form>
158
                                            <tr>
166
                    [% END %]
159
                                                <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
160
                                                <td data-order="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</td>
161
                                                <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
162
                                                <td>[% s.total | html %]</td>
163
                                            </tr>
164
                                        [% END %]
165
                                    </tbody>
166
                                </table>
167
                            </form>
168
                        [% END %]
167
169
168
                    [% IF ( current_authority_searches && previous_authority_searches) %]
170
                        [% IF ( current_authority_searches && previous_authority_searches) %]
169
                        <hr />
171
                            <hr />
170
                    [% END %]
172
                        [% END %]
171
173
172
                    [% IF ( previous_authority_searches ) %]
174
                        [% IF ( previous_authority_searches ) %]
173
                        <h2>Previous sessions</h2>
175
                            <h2>Previous sessions</h2>
174
                        <form id="previous_auth" action="/cgi-bin/koha/catalogue/search-history.pl" method="post">
176
                            <form id="previous_auth" action="/cgi-bin/koha/catalogue/search-history.pl" method="post">
175
                            <p class="selections-toolbar">
177
                                <p class="selections-toolbar">
176
                                <a class="CheckAll" data-form="previous_auth" href="#"><i class="fa fa-check"></i> Select all visible rows</a>
178
                                    <a class="CheckAll" data-form="previous_auth" href="#"><i class="fa fa-check"></i> Select all visible rows</a>
177
                                <span class="sep">|</span>
179
                                    <span class="sep">|</span>
178
                                <a class="CheckNone" data-form="previous_auth" href="#"><i class="fa fa-remove"></i> Clear selection on visible rows</a>
180
                                    <a class="CheckNone" data-form="previous_auth" href="#"><i class="fa fa-remove"></i> Clear selection on visible rows</a>
179
                                <span class="sep">|</span>
181
                                    <span class="sep">|</span>
180
                                <span class="links">
182
                                    <span class="links">
181
                                <span class="selections">Select searches to: </span>
183
                                    <span class="selections">Select searches to: </span>
182
                                <a href="#" class="btn btn-default btn-xs action_delete disabled"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
184
                                    <a href="#" class="btn btn-default btn-xs action_delete disabled"><i class="fa fa-trash" aria-hidden="true"></i> Delete</a>
183
                                </span>
185
                                    </span>
184
                            </p>
186
                                </p>
185
                            <input type="hidden" name="action" value="delete" />
187
                                <input type="hidden" name="action" value="delete" />
186
                            <table class="historyt">
188
                                <table class="historyt">
187
                                <thead>
189
                                    <thead>
188
                                    <tr>
189
                                        <th></th>
190
                                        <th>Date</th>
191
                                        <th>Search</th>
192
                                        <th>Results</th>
193
                                    </tr>
194
                                </thead>
195
                                <tbody>
196
                                    [% FOREACH s IN previous_authority_searches %]
197
                                        <tr>
190
                                        <tr>
198
                                            <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
191
                                            <th></th>
199
                                            <td data-order="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</td>
192
                                            <th>Date</th>
200
                                            <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
193
                                            <th>Search</th>
201
                                            <td>[% s.total | html %]</td>
194
                                            <th>Results</th>
202
                                        </tr>
195
                                        </tr>
203
                                    [% END %]
196
                                    </thead>
204
                                </tbody>
197
                                    <tbody>
205
                            </table>
198
                                        [% FOREACH s IN previous_authority_searches %]
206
                        </form>
199
                                            <tr>
207
                    [% END %]
200
                                                <td><input type="checkbox" name="id" value="[% s.id | html %]" /></td>
201
                                                <td data-order="[% s.time | html %]">[% s.time |$KohaDates  with_hours => 1 %]</td>
202
                                                <td><a href="/cgi-bin/koha/authorities/authorities-home.pl?[% s.query_cgi | $raw %]">[% s.query_desc | html %]</a></td>
203
                                                <td>[% s.total | html %]</td>
204
                                            </tr>
205
                                        [% END %]
206
                                    </tbody>
207
                                </table>
208
                            </form>
209
                        [% END %]
210
211
                        [% IF !current_authority_searches && !previous_authority_searches %]
212
                            <p>Your authority search history is empty.</p>
213
                        [% END %]
214
                    [% END # /tab_panel#authority_tab %]
215
                [% END # /WRAPPER tab_panels %]
216
            [% END # /WRAPPER tabs %]
208
217
209
                    [% IF !current_authority_searches && !previous_authority_searches %]
210
                        <p>Your authority search history is empty.</p>
211
                    [% END %]
212
                </div> [% # /authority_tab %]
213
            </div> <!-- /.tab-content -->
214
        </div> [% # /tabs %]
215
    </div> [% # /div.col-md-8 %]
218
    </div> [% # /div.col-md-8 %]
216
  </div> [% # /div.row %]
219
  </div> [% # /div.row %]
217
220
218
- 

Return to bug 33186