Merge remote-tracking branch 'origin/new/bug_2780'

[koha_gimpoz] / koha-tmpl / opac-tmpl / prog / en / includes / resort_form.inc

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
index 4a9b8e8..45215f3 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
@@ -1,14 +1,70 @@
-                        <option value="">Field-weighted, Relevance Ranked</option>
-                        <option value="popularity_dsc" <!-- TMPL_IF NAME="popularity_dsc" -->selected="selected" <!-- /TMPL_IF -->>Popularity (Most to Least)</option>
-                        <option value="popularity_asc" <!-- TMPL_IF NAME="popularity_asc" -->selected="selected" <!-- /TMPL_IF -->>Popularity (Least to Most)</option>
-                        <option value="author_az" <!-- TMPL_IF NAME="author_az" -->selected="selected" <!-- /TMPL_IF -->>Author (A-Z)</option>
-                        <option value="author_za" <!-- TMPL_IF NAME="author_za" -->selected="selected" <!-- /TMPL_IF -->>Author (Z-A)</option>
-                        <option value="call_number_asc" <!-- TMPL_IF NAME="call_number_asc" -->selected="selected" <!-- /TMPL_IF -->>Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
-                        <option value="call_number_dsc" <!-- TMPL_IF NAME="call_number_dsc" -->selected="selected" <!-- /TMPL_IF -->>Call Number (Fiction Z-A to Non-fiction 9-0)</option>
-                        <option value="pubdate_asc" <!-- TMPL_IF NAME="pubdate_asc" -->selected="selected" <!-- /TMPL_IF -->>Dates</option>
-                        <option value="pubdate_dsc" <!-- TMPL_IF NAME="pubdate_asc" -->selected="selected" <!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
-                        <option value="pubdate_asc" <!-- TMPL_IF NAME="pubdate_dsc" -->selected="selected" <!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest</option>
-                        <option value="acqdate_dsc" <!-- TMPL_IF NAME="acqdate_asc" -->selected="selected" <!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
-                        <option value="acqdate_asc" <!-- TMPL_IF NAME="acqdate_dsc" -->selected="selected" <!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
-                        <option value="title_az" <!-- TMPL_IF NAME="title_az" -->selected="selected" <!-- /TMPL_IF -->>Title (A-Z)</option>
-                        <option value="title_za" <!-- TMPL_IF NAME="title_za" -->selected="selected" <!-- /TMPL_IF -->>Title (Z-A)</option>
+<option value="relevance">Relevance</option>
+<optgroup label="Popularity">
+[% IF ( sort_by == "popularity_dsc" ) %]
+<option value="popularity_dsc" selected="selected">Popularity (most to least)</option>[% ELSE %]
+<option value="popularity_dsc">Popularity (most to least)</option>
+[% END %]
+[% IF ( sort_by == "popularity_asc" ) %]
+<option value="popularity_asc" selected="selected">Popularity (least to most)</option>[% ELSE %]
+<option value="popularity_asc">Popularity (least to most)</option>
+[% END %]
+</optgroup>
+<optgroup label="Author">
+[% IF ( sort_by == "author_az" || sort_by == "author_asc" ) %]
+<option value="author_az" selected="selected">Author (A-Z)</option>
+[% ELSE %]
+<option value="author_az">Author (A-Z)</option>
+[% END %]
+[% IF ( sort_by == "author_za" || sort_by == "author_dsc" ) %]
+<option value="author_za" selected="selected">Author (Z-A)</option>
+[% ELSE %]
+<option value="author_za">Author (Z-A)</option>
+[% END %]
+</optgroup>
+<optgroup label="Call Number">
+[% IF ( sort_by == "call_number_asc" ) %]
+<option value="call_number_asc" selected="selected">Call number (0-9 to A-Z)</option>
+[% ELSE %]
+<option value="call_number_asc">Call number (0-9 to A-Z)</option>
+[% END %]
+[% IF ( sort_by == "call_number_dsc" ) %]
+<option value="call_number_dsc" selected="selected">Call number (Z-A to 9-0)</option>
+[% ELSE %]
+<option value="call_number_dsc">Call number (Z-A to 9-0)</option>
+[% END %]
+</optgroup>
+<optgroup label="Dates">
+[% IF ( sort_by == "pubdate_dsc" ) %]
+<option value="pubdate_dsc" selected="selected">Publication/Copyright date: Newest to oldest</option>
+[% ELSE %]
+<option value="pubdate_dsc">Publication/Copyright date: Newest to oldest</option>
+[% END %]
+[% IF ( sort_by == "pubdate_asc" ) %]
+<option value="pubdate_asc" selected="selected">Publication/Copyright date: Oldest to newest</option>
+[% ELSE %]
+<option value="pubdate_asc">Publication/Copyright date: Oldest to newest</option>
+[% END %]
+[% IF ( sort_by == "acqdate_dsc" ) %]
+<option value="acqdate_dsc" selected="selected">Acquisition date: Newest to oldest</option>
+[% ELSE %]
+<option value="acqdate_dsc">Acquisition date: Newest to oldest</option>
+[% END %]
+[% IF ( sort_by == "acqdate_asc" ) %]
+<option value="acqdate_asc" selected="selected">Acquisition date: Oldest to newest</option>
+[% ELSE %]
+<option value="acqdate_asc">Acquisition date: Oldest to newest</option>
+[% END %]
+</optgroup>
+<optgroup label="Title">
+[% IF ( sort_by == "title_az" || sort_by == "title_asc" ) %]
+<option value="title_az" selected="selected">Title (A-Z)</option>
+[% ELSE %]
+<option value="title_az">Title (A-Z)</option>
+[% END %]
+[% IF ( sort_by == "title_za" || sort_by == "title_dsc" ) %]
+<option value="title_za" selected="selected">Title (Z-A)</option>
+[% ELSE %]
+<option value="title_za">Title (Z-A)</option>
+[% END %]
+</optgroup>
+