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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc (+3 lines)
Lines 30-35 Link Here
30
  [% IF ( sort_by ) %]
30
  [% IF ( sort_by ) %]
31
    [% url = BLOCK %][% url | $raw %][% "&sort_by=" _ sort_by | url %][% END %]
31
    [% url = BLOCK %][% url | $raw %][% "&sort_by=" _ sort_by | url %][% END %]
32
  [% END %]
32
  [% END %]
33
  [% IF ( results_per_page ) %]
34
    [% url = BLOCK %][% url | $raw %][% "&count=" _ results_per_page | url %][% END %]
35
  [% END %]
33
  [% FOREACH facet IN facets_loo.facets %]
36
  [% FOREACH facet IN facets_loo.facets %]
34
  [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,0) || facet.facet_label_value %][% END %]
37
  [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,0) || facet.facet_label_value %][% END %]
35
  [% IF facets_loo.type_label_Language %][% SET facet.facet_label_value = Languages.GetByISOCode(lang,facet.facet_label_value) || facet.facet_label_value %][% END %]
38
  [% IF facets_loo.type_label_Language %][% SET facet.facet_label_value = Languages.GetByISOCode(lang,facet.facet_label_value) || facet.facet_label_value %][% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc (-5 / +6 lines)
Lines 1-19 Link Here
1
[% USE raw %]
1
[% IF ( PAGE_NUMBERS ) %]<nav><ul class="pagination">
2
[% IF ( PAGE_NUMBERS ) %]<nav><ul class="pagination">
2
 [% IF hits_to_paginate < total %]<h6>[% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records</h6>[% END %]
3
 [% IF hits_to_paginate < total %]<h6>[% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records</h6>[% END %]
3
    [% IF ( previous_page_offset.defined ) %]
4
    [% IF ( previous_page_offset.defined ) %]
4
        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page %][% END %]"><i class="fa fa-fw fa-angle-double-left"></i> First</a></li>
5
        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]"><i class="fa fa-fw fa-angle-double-left"></i> First</a></li>
5
        <!-- Row of numbers corresponding to search result pages -->
6
        <!-- Row of numbers corresponding to search result pages -->
6
        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% previous_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page %][% END %]"><i class="fa fa-fw fa-angle-left"></i> Previous</a></li>
7
        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% previous_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]"><i class="fa fa-fw fa-angle-left"></i> Previous</a></li>
7
    [% END %]
8
    [% END %]
8
    [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
9
    [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
9
        [% IF ( PAGE_NUMBER.highlight ) %]
10
        [% IF ( PAGE_NUMBER.highlight ) %]
10
            <li class="active"><span>[% PAGE_NUMBER.pg | html %]</span></li>
11
            <li class="active"><span>[% PAGE_NUMBER.pg | html %]</span></li>
11
        [% ELSE %]
12
        [% ELSE %]
12
            <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% PAGE_NUMBER.offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page %][% END %]">[% PAGE_NUMBER.pg | html %]</a></li>
13
            <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% PAGE_NUMBER.offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]">[% PAGE_NUMBER.pg | html %]</a></li>
13
        [% END %]
14
        [% END %]
14
    [% END %]
15
    [% END %]
15
    [% IF ( next_page_offset ) %]
16
    [% IF ( next_page_offset ) %]
16
        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% next_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page %][% END %]">Next <i class="fa fa-fw fa-angle-right"></i></a></li>
17
        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% next_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]">Next <i class="fa fa-fw fa-angle-right"></i></a></li>
17
        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% last_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page %][% END %]">Last <i class="fa fa-fw fa-angle-double-right"></i></a></li>
18
        <li><a class="nav" href="/cgi-bin/koha/catalogue/search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% last_page_offset | html %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by |url %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | html %][% END %]">Last <i class="fa fa-fw fa-angle-double-right"></i></a></li>
18
    [% END %]
19
    [% END %]
19
</ul></nav>[% END %]
20
</ul></nav>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-29 / +29 lines)
Lines 184-270 Link Here
184
                                </button>
184
                                </button>
185
                                <ul class="dropdown-menu">
185
                                <ul class="dropdown-menu">
186
                                    [% IF ( sort_by == "relevance_dsc" ) %]
186
                                    [% IF ( sort_by == "relevance_dsc" ) %]
187
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=relevance[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Relevance</a></li>
187
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=relevance[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Relevance</a></li>
188
                                    [% ELSE %]
188
                                    [% ELSE %]
189
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=relevance[% PROCESS sort_search_query %]">Relevance</a></li>
189
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=relevance[% PROCESS sort_search_query %]">Relevance</a></li>
190
                                    [% END %]
190
                                    [% END %]
191
                                    <li class="dropdown-header">Popularity</li>
191
                                    <li class="dropdown-header">Popularity</li>
192
                                    [% IF ( sort_by == "popularity_dsc" ) %]
192
                                    [% IF ( sort_by == "popularity_dsc" ) %]
193
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=popularity_dsc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Popularity (most to least)</a></li>
193
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=popularity_dsc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Popularity (most to least)</a></li>
194
                                    [% ELSE %]
194
                                    [% ELSE %]
195
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=popularity_dsc[% PROCESS sort_search_query %]">Popularity (most to least)</a></li>
195
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=popularity_dsc[% PROCESS sort_search_query %]">Popularity (most to least)</a></li>
196
                                    [% END %]
196
                                    [% END %]
197
197
198
                                    [% IF ( sort_by == "popularity_asc" ) %]
198
                                    [% IF ( sort_by == "popularity_asc" ) %]
199
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=popularity_asc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Popularity (least to most)</a></li>
199
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=popularity_asc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Popularity (least to most)</a></li>
200
                                    [% ELSE %]
200
                                    [% ELSE %]
201
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=popularity_asc[% PROCESS sort_search_query %]">Popularity (least to most)</a></li>
201
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=popularity_asc[% PROCESS sort_search_query %]">Popularity (least to most)</a></li>
202
                                    [% END %]
202
                                    [% END %]
203
203
204
                                    <li class="dropdown-header">Author</li>
204
                                    <li class="dropdown-header">Author</li>
205
205
206
                                    [% IF ( sort_by == "author_az" || sort_by == "author_asc" ) %]
206
                                    [% IF ( sort_by == "author_az" || sort_by == "author_asc" ) %]
207
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=author_a[% PROCESS sort_search_query %]z"><i class="fa fa-check"></i> Author (A-Z)</a></li>
207
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=author_a[% PROCESS sort_search_query %]z"><i class="fa fa-check"></i> Author (A-Z)</a></li>
208
                                    [% ELSE %]
208
                                    [% ELSE %]
209
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=author_az[% PROCESS sort_search_query %]">Author (A-Z)</a></li>
209
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=author_az[% PROCESS sort_search_query %]">Author (A-Z)</a></li>
210
                                    [% END %]
210
                                    [% END %]
211
211
212
                                    [% IF ( sort_by == "author_za" || sort_by == "author_dsc" ) %]
212
                                    [% IF ( sort_by == "author_za" || sort_by == "author_dsc" ) %]
213
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=author_za[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Author (Z-A)</a></li>
213
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=author_za[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Author (Z-A)</a></li>
214
                                    [% ELSE %]
214
                                    [% ELSE %]
215
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=author_za[% PROCESS sort_search_query %]">Author (Z-A)</a></li>
215
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=author_za[% PROCESS sort_search_query %]">Author (Z-A)</a></li>
216
                                    [% END %]
216
                                    [% END %]
217
217
218
                                    <li class="dropdown-header">Call number</li>
218
                                    <li class="dropdown-header">Call number</li>
219
219
220
                                    [% IF ( sort_by == "call_number_asc" ) %]
220
                                    [% IF ( sort_by == "call_number_asc" ) %]
221
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=call_number_asc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Call Number (0-9 to A-Z)</a></li>
221
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=call_number_asc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Call Number (0-9 to A-Z)</a></li>
222
                                    [% ELSE %]
222
                                    [% ELSE %]
223
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=call_number_asc[% PROCESS sort_search_query %]">Call Number (0-9 to A-Z)</a></li>
223
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=call_number_asc[% PROCESS sort_search_query %]">Call Number (0-9 to A-Z)</a></li>
224
                                    [% END %]
224
                                    [% END %]
225
225
226
                                    [% IF ( sort_by == "call_number_dsc" ) %]
226
                                    [% IF ( sort_by == "call_number_dsc" ) %]
227
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=call_number_dsc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Call number (Z-A to 9-0)</a></li>
227
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=call_number_dsc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Call number (Z-A to 9-0)</a></li>
228
                                    [% ELSE %]
228
                                    [% ELSE %]
229
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=call_number_dsc[% PROCESS sort_search_query %]">Call number (Z-A to 9-0)</a></li>
229
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=call_number_dsc[% PROCESS sort_search_query %]">Call number (Z-A to 9-0)</a></li>
230
                                    [% END %]
230
                                    [% END %]
231
231
232
                                    <li class="dropdown-header">Dates</li>
232
                                    <li class="dropdown-header">Dates</li>
233
                                    [% IF ( sort_by == "pubdate_dsc" ) %]
233
                                    [% IF ( sort_by == "pubdate_dsc" ) %]
234
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=pubdate_dsc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Publication/Copyright date: newest to oldest</a></li>
234
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=pubdate_dsc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Publication/Copyright date: newest to oldest</a></li>
235
                                    [% ELSE %]
235
                                    [% ELSE %]
236
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=pubdate_dsc[% PROCESS sort_search_query %]">Publication/Copyright date: newest to oldest</a></li>
236
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=pubdate_dsc[% PROCESS sort_search_query %]">Publication/Copyright date: newest to oldest</a></li>
237
                                    [% END %]
237
                                    [% END %]
238
238
239
                                    [% IF ( sort_by == "pubdate_asc" ) %]
239
                                    [% IF ( sort_by == "pubdate_asc" ) %]
240
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=pubdate_asc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Publication/Copyright date: oldest to newest</a></li>
240
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=pubdate_asc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Publication/Copyright date: oldest to newest</a></li>
241
                                    [% ELSE %]
241
                                    [% ELSE %]
242
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=pubdate_asc[% PROCESS sort_search_query %]">Publication/Copyright date: oldest to newest</a></li>
242
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=pubdate_asc[% PROCESS sort_search_query %]">Publication/Copyright date: oldest to newest</a></li>
243
                                    [% END %]
243
                                    [% END %]
244
244
245
                                    [% IF ( sort_by == "acqdate_dsc" ) %]
245
                                    [% IF ( sort_by == "acqdate_dsc" ) %]
246
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=acqdate_dsc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Acquisition date: newest to oldest</a></li>
246
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=acqdate_dsc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Acquisition date: newest to oldest</a></li>
247
                                    [% ELSE %]
247
                                    [% ELSE %]
248
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=acqdate_dsc[% PROCESS sort_search_query %]">Acquisition date: newest to oldest</a></li>
248
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=acqdate_dsc[% PROCESS sort_search_query %]">Acquisition date: newest to oldest</a></li>
249
                                    [% END %]
249
                                    [% END %]
250
250
251
                                    [% IF ( sort_by == "acqdate_asc" ) %]
251
                                    [% IF ( sort_by == "acqdate_asc" ) %]
252
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=acqdate_asc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Acquisition date: oldest to newest</a></li>
252
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=acqdate_asc[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Acquisition date: oldest to newest</a></li>
253
                                    [% ELSE %]
253
                                    [% ELSE %]
254
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=acqdate_asc[% PROCESS sort_search_query %]">Acquisition date: oldest to newest</a></li>
254
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=acqdate_asc[% PROCESS sort_search_query %]">Acquisition date: oldest to newest</a></li>
255
                                    [% END %]
255
                                    [% END %]
256
256
257
                                    <li class="dropdown-header">Title</li>
257
                                    <li class="dropdown-header">Title</li>
258
                                    [% IF ( sort_by == "title_az" || sort_by == "title_asc" ) %]
258
                                    [% IF ( sort_by == "title_az" || sort_by == "title_asc" ) %]
259
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=title_az[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Title (A-Z)</a></li>
259
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=title_az[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Title (A-Z)</a></li>
260
                                    [% ELSE %]
260
                                    [% ELSE %]
261
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=title_az[% PROCESS sort_search_query %]">Title (A-Z)</a></li>
261
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=title_az[% PROCESS sort_search_query %]">Title (A-Z)</a></li>
262
                                    [% END %]
262
                                    [% END %]
263
263
264
                                    [% IF ( sort_by == "title_za" || sort_by == "title_dsc" ) %]
264
                                    [% IF ( sort_by == "title_za" || sort_by == "title_dsc" ) %]
265
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=title_za[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Title (Z-A)</a></li>
265
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=title_za[% PROCESS sort_search_query %]"><i class="fa fa-check"></i> Title (Z-A)</a></li>
266
                                    [% ELSE %]
266
                                    [% ELSE %]
267
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?sort_by=title_za[% PROCESS sort_search_query %]">Title (Z-A)</a></li>
267
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% results_per_page | uri %]&sort_by=title_za[% PROCESS sort_search_query %]">Title (Z-A)</a></li>
268
                                    [% END %]
268
                                    [% END %]
269
                                </ul>
269
                                </ul>
270
                            </div> <!-- /.btn-group -->
270
                            </div> <!-- /.btn-group -->
Lines 272-285 Link Here
272
                            [% IF Koha.Preference('numSearchResultsDropdown') && Koha.Preference('SearchEngine') == "Zebra" %]
272
                            [% IF Koha.Preference('numSearchResultsDropdown') && Koha.Preference('SearchEngine') == "Zebra" %]
273
                                <div class="btn-group">
273
                                <div class="btn-group">
274
                                    <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
274
                                    <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
275
                                        Results per page: [% results_per_page %] <span class="caret"></span>
275
                                        Results per page: [% results_per_page | html %] <span class="caret"></span>
276
                                    </button>
276
                                    </button>
277
                                    <ul class="dropdown-menu">
277
                                    <ul class="dropdown-menu">
278
                                        [% IF Koha.Preference('numSearchResults') %]
278
                                        [% IF Koha.Preference('numSearchResults') %]
279
                                            <li><a href="#" id="resultsperpage-default">
279
                                            <li><a href="/cgi-bin/koha/catalogue/search.pl?count=[% Koha.Preference('numSearchResults')%][% PROCESS sort_search_query %]" id="resultsperpage-default">
280
                                                [% IF results_per_page == Koha.Preference('numSearchResults') %]
280
                                                [% IF results_per_page == Koha.Preference('numSearchResults') %]
281
                                                    <i class="fa fa-check"></i>
281
                                                    <i class="fa fa-check"></i>
282
                                                [% END %] Library default: [% Koha.Preference('numSearchResults') %]
282
                                                [% END %] Library default: [% Koha.Preference('numSearchResults') | html %]
283
                                            </a></li>
283
                                            </a></li>
284
                                        [% END %]
284
                                        [% END %]
285
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=20[% PROCESS sort_search_query %]">[% IF results_per_page == '20' %]<i class="fa fa-check"></i>[% END %] 20</a></li>
285
                                        <li><a href="/cgi-bin/koha/catalogue/search.pl?count=20[% PROCESS sort_search_query %]">[% IF results_per_page == '20' %]<i class="fa fa-check"></i>[% END %] 20</a></li>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc (+3 lines)
Lines 39-44 Link Here
39
                            [% IF ( sort_by ) %]
39
                            [% IF ( sort_by ) %]
40
                              [% url = BLOCK %][% url | $raw %][% "&amp;sort_by=" _ sort_by | url %][% END %]
40
                              [% url = BLOCK %][% url | $raw %][% "&amp;sort_by=" _ sort_by | url %][% END %]
41
                            [% END %]
41
                            [% END %]
42
                            [% IF ( results_per_page ) %]
43
                              [% url = BLOCK %][% url | $raw %][% "&amp;count=" _ results_per_page | url %][% END %]
44
                            [% END %]
42
                            [% FOREACH facet IN facets_loo.facets %]
45
                            [% FOREACH facet IN facets_loo.facets %]
43
                            [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,1) || facet.facet_label_value %][% END %]
46
                            [% IF facets_loo.type_label_CollectionCodes %][% SET facet.facet_label_value = AuthorisedValues.GetByCode('CCODE',facet.facet_label_value,1) || facet.facet_label_value %][% END %]
44
                            [% IF facets_loo.type_label_Language %][% SET facet.facet_label_value = Languages.GetByISOCode(lang,facet.facet_label_value) || facet.facet_label_value %][% END %]
47
                            [% IF facets_loo.type_label_Language %][% SET facet.facet_label_value = Languages.GetByISOCode(lang,facet.facet_label_value) || facet.facet_label_value %][% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc (-5 / +6 lines)
Lines 1-21 Link Here
1
[% USE raw %]
1
[% IF ( PAGE_NUMBERS ) %]
2
[% IF ( PAGE_NUMBERS ) %]
2
    <div class="pagination pagination-small noprint">
3
    <div class="pagination pagination-small noprint">
3
     [% IF hits_to_paginate < total %]<h6>[% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records</h6>[% END %]
4
     [% IF hits_to_paginate < total %]<h6>[% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records</h6>[% END %]
4
        <ul>
5
        <ul>
5
            [% IF ( previous_page_offset.defined ) %]
6
            [% IF ( previous_page_offset.defined ) %]
6
                <li class="page-first"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %][% IF results_per_page %]&amp;count=[% results_per_page %][% END %]"><i class="fa fa-fw fa-angle-double-left"></i>  First</a></li>
7
                <li class="page-first"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | uri %][% END %]"><i class="fa fa-fw fa-angle-double-left"></i>  First</a></li>
7
                <li class="page-prev"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% previous_page_offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %][% IF results_per_page %]&amp;count=[% results_per_page %][% END %]"> <i class="fa fa-fw fa-angle-left"></i>  Previous</a></li>
8
                <li class="page-prev"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% previous_page_offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | uri %][% END %]"> <i class="fa fa-fw fa-angle-left"></i>  Previous</a></li>
8
            [% END %]
9
            [% END %]
9
            [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
10
            [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
10
                [% IF ( PAGE_NUMBER.highlight ) %]
11
                [% IF ( PAGE_NUMBER.highlight ) %]
11
                    <li class="active"><a clas="page-num current" href="#">[% PAGE_NUMBER.pg | html %]</a></li>
12
                    <li class="active"><a clas="page-num current" href="#">[% PAGE_NUMBER.pg | html %]</a></li>
12
                [% ELSE %]
13
                [% ELSE %]
13
                    <li class="page-num"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% PAGE_NUMBER.offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %][% IF results_per_page %]&amp;count=[% results_per_page %][% END %]">[% PAGE_NUMBER.pg | html %]</a></li>
14
                    <li class="page-num"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% PAGE_NUMBER.offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | uri %][% END %]">[% PAGE_NUMBER.pg | html %]</a></li>
14
                [% END %]
15
                [% END %]
15
            [% END %]
16
            [% END %]
16
            [% IF ( next_page_offset ) %]
17
            [% IF ( next_page_offset ) %]
17
                <li class="page-next"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% next_page_offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %][% IF results_per_page %]&amp;count=[% results_per_page %][% END %]">Next <i class="fa fa-fw fa-angle-double-right"></i></a></li>
18
                <li class="page-next"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% next_page_offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | uri %][% END %]">Next <i class="fa fa-fw fa-angle-double-right"></i></a></li>
18
                <li class="page-last"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% last_page_offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %][% IF results_per_page %]&amp;count=[% results_per_page %][% END %]">Last <i class="fa fa-fw fa-angle-double-right"></i></a></li>
19
                <li class="page-last"><a href="/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;offset=[% last_page_offset | uri %][% IF ( sort_by ) %]&amp;sort_by=[% sort_by | uri %][% END %][% IF results_per_page %]&amp;count=[% results_per_page | uri %][% END %]">Last <i class="fa fa-fw fa-angle-double-right"></i></a></li>
19
            [% END %]
20
            [% END %]
20
        </ul>
21
        </ul>
21
    </div>
22
    </div>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-3 / +2 lines)
Lines 169-177 Link Here
169
                                                    <select id="results_per_page" name="count">
169
                                                    <select id="results_per_page" name="count">
170
                                                        [% IF Koha.Preference('OPACnumSearchResults') %]
170
                                                        [% IF Koha.Preference('OPACnumSearchResults') %]
171
                                                            [% IF results_per_page == Koha.Preference('OPACnumSearchResults') %]
171
                                                            [% IF results_per_page == Koha.Preference('OPACnumSearchResults') %]
172
                                                                <option value="[% Koha.Preference('OPACnumSearchResults') %]" selected="selected">Library default: [% Koha.Preference('OPACnumSearchResults') %]</option>
172
                                                                <option value="[% Koha.Preference('OPACnumSearchResults') | html %]" selected="selected">Library default: [% Koha.Preference('OPACnumSearchResults') | html %]</option>
173
                                                            [% ELSE %]
173
                                                            [% ELSE %]
174
                                                                <option value="[% Koha.Preference('OPACnumSearchResults') %]">Library default: [% Koha.Preference('OPACnumSearchResults') %]</option>
174
                                                                <option value="[% Koha.Preference('OPACnumSearchResults') | html %]">Library default: [% Koha.Preference('OPACnumSearchResults') | html %]</option>
175
                                                            [% END %]
175
                                                            [% END %]
176
                                                        [% END %]
176
                                                        [% END %]
177
                                                        [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %]
177
                                                        [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %]
178
- 

Return to bug 14715