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

(-)a/installer/data/mysql/atomicupdate/bug_14715_-_results_per_page_dropdown_sysprefs.sql (-1 / +1 lines)
Lines 1-3 Link Here
1
INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES
1
INSERT IGNORE INTO systempreferences (`variable`, `value`, `options`, `explanation`,`type`) VALUES
2
('OPACnumSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in OPAC search results','YesNo'),
2
('OPACnumSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in OPAC search results','YesNo'),
3
('numSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in staff client search results','YesNo');
3
('numSearchResultsDropdown', 0, NULL, 'Option list of number of results per page to show in staff client search results','YesNo')
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-3 / +3 lines)
Lines 78-87 Link Here
78
                    </select>
78
                    </select>
79
                <!-- RESORT END -->
79
                <!-- RESORT END -->
80
                <!-- RESULTS_PER_PAGE START -->
80
                <!-- RESULTS_PER_PAGE START -->
81
                [% IF Koha.Preference('SearchEngine') eq "Zebra" && Koha.Preference('numSearchResultsDropdown') %]
81
                [% IF Koha.Preference('SearchEngine') == "Zebra" && Koha.Preference('numSearchResultsDropdown') %]
82
                    <label for="results_per_page">Results per page: </label>
82
                    <label for="results_per_page">Results per page: </label>
83
                    <select id="results_per_page" name="results_per_page">
83
                    <select id="results_per_page" name="results_per_page">
84
                        [% IF Koha.Preference('numSearchResults') %]<option value="[% Koha.Preference('numSearchResults') %]" selected="selected">Library default: [% Koha.Preference('numSearchResults') %]</option>[% ELSE %]<option value="[% Koha.Preference('numSearchResults') %]">Library default: [% Koha.Preference('numSearchResults') %]</option>[% END %]
84
                        [% IF Koha.Preference('numSearchResults') %]<option value="[% Koha.Preference('numSearchResults') | html %]" selected="selected">Library default: [% Koha.Preference('numSearchResults') | html %]</option>[% ELSE %]<option value="[% Koha.Preference('numSearchResults') | html %]">Library default: [% Koha.Preference('numSearchResults') | html %]</option>[% END %]
85
                        [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %]
85
                        [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %]
86
                        [% IF results_per_page == '40' %]<option value="40" selected="selected">40</option>[% ELSE %]<option value="40">40</option>[% END %]
86
                        [% IF results_per_page == '40' %]<option value="40" selected="selected">40</option>[% ELSE %]<option value="40">40</option>[% END %]
87
                        [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
87
                        [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
Lines 93-99 Link Here
93
                    <input type="submit" value="Go" />
93
                    <input type="submit" value="Go" />
94
            </form>
94
            </form>
95
            <h3>
95
            <h3>
96
                [% total %] result(s) found [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc |html %]'</span>[% END %][% IF limit_desc  %]&nbsp;with limit(s): <span style="font-weight: bold;">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName %] Catalog[% END %].<br />&nbsp;
96
                [% total | html %] result(s) found [% IF ( query_desc ) %]for <span style="font-weight: bold;">'[% query_desc |html %]'</span>[% END %][% IF limit_desc  %]&nbsp;with limit(s): <span style="font-weight: bold;">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName | html %] Catalog[% END %].<br />&nbsp;
97
            </h3>
97
            </h3>
98
                <a href="#" id="select_all"><i class="fa fa-check"></i> Select all</a>
98
                <a href="#" id="select_all"><i class="fa fa-check"></i> Select all</a>
99
                |
99
                |
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt (-3 / +2 lines)
Lines 164-173 Link Here
164
                                    [% UNLESS tag %]
164
                                    [% UNLESS tag %]
165
                                        <div class="sort_by pull-right">
165
                                        <div class="sort_by pull-right">
166
                                            <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select>
166
                                            <select id="sort_by" class="resort" name="sort_by"> [% INCLUDE 'resort_form.inc' %] </select>
167
                                        [% IF Koha.Preference('SearchEngine') eq "Zebra" && Koha.Preference('OPACnumSearchResultsDropdown') %]
167
                                        [% IF Koha.Preference('SearchEngine') == "Zebra" && Koha.Preference('OPACnumSearchResultsDropdown') %]
168
                                            <label for="results_per_page">Results per page: </label>
168
                                            <label for="results_per_page">Results per page: </label>
169
                                            <select id="results_per_page" name="results_per_page">
169
                                            <select id="results_per_page" name="results_per_page">
170
                                                [% IF Koha.Preference('OPACnumSearchResults') %]<option value="[% Koha.Preference('OPACnumSearchResults') %]" selected="selected">Library default: [% Koha.Preference('OPACnumSearchResults') %]</option>[% ELSE %]<option value="[% Koha.Preference('OPACnumSearchResults') %]">Library default: [% Koha.Preference('OPACnumSearchResults') %]</option>[% END %]
170
                                                [% IF Koha.Preference('OPACnumSearchResults') %]<option value="[% Koha.Preference('OPACnumSearchResults') | html %]" selected="selected">Library default: [% Koha.Preference('OPACnumSearchResults') | html %]</option>[% ELSE %]<option value="[% Koha.Preference('OPACnumSearchResults') | html %]">Library default: [% Koha.Preference('OPACnumSearchResults') | html %]</option>[% END %]
171
                                                [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %]
171
                                                [% IF results_per_page == '20' %]<option value="20" selected="selected">20</option>[% ELSE %]<option value="20">20</option>[% END %]
172
                                                [% IF results_per_page == '40' %]<option value="40" selected="selected">40</option>[% ELSE %]<option value="40">40</option>[% END %]
172
                                                [% IF results_per_page == '40' %]<option value="40" selected="selected">40</option>[% ELSE %]<option value="40">40</option>[% END %]
173
                                                [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
173
                                                [% IF results_per_page == '60' %]<option value="60" selected="selected">60</option>[% ELSE %]<option value="60">60</option>[% END %]
174
- 

Return to bug 14715