Bug 11596: report warnings on the about patch if indexing options in koha-conf.xml...

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / includes / resort_form.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
index 87b763a..4326bea 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/resort_form.inc
@@ -2,27 +2,27 @@
 
 <optgroup label="Popularity">
        
-       [% IF ( popularity_dsc ) %]
-<option value="popularity_dsc" selected="selected">Popularity (Most to Least)</option>
+       [% 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>
+    <option value="popularity_dsc">Popularity (most to least)</option>
  [% END %]
-[% IF ( popularity_asc ) %]
-<option value="popularity_asc" selected="selected">Popularity (Least to Most)</option>
+[% 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>
+    <option value="popularity_asc">Popularity (least to most)</option>
  [% END %]
 
 </optgroup>
 
 <optgroup label="Author">
        
-       [% IF ( author_az ) %]
+       [% 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 ( author_za ) %]
+[% 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>
@@ -32,53 +32,53 @@
 
 <optgroup label="Call Number">
        
-       [% IF ( call_number_asc ) %]
-<option value="call_number_asc" selected="selected">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+       [% 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 (Non-fiction 0-9 to Fiction A-Z)</option>
+    <option value="call_number_asc">Call number (0-9 to A-Z)</option>
 [% END %]
 
-[% IF ( call_number_dsc ) %]
-<option value="call_number_dsc" selected="selected">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+[% 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 (Fiction Z-A to Non-fiction 9-0)</option>
+    <option value="call_number_dsc">Call number (Z-A to 9-0)</option>
 [% END %]
 
 </optgroup>
 
 <optgroup label="Dates">
-       [% IF ( pubdate_dsc ) %]
-<option value="pubdate_dsc" selected="selected" >Publication/Copyright Date: Newest to Oldest</option>
+       [% 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>
+<option value="pubdate_dsc">Publication/Copyright date: newest to oldest</option>
 [% END %]
 
-[% IF ( pubdate_asc ) %]
-<option value="pubdate_asc" selected="selected" >Publication/Copyright Date: Oldest to Newest</option>
+[% 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>
+<option value="pubdate_asc">Publication/Copyright date: oldest to newest</option>
 [% END %]
 
-[% IF ( acqdate_dsc ) %]
-<option value="acqdate_dsc" selected="selected">Acquisition Date: Newest to Oldest</option>
+[% 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>
+<option value="acqdate_dsc">Acquisition date: newest to oldest</option>
  [% END %]
 
- [% IF ( acqdate_asc ) %]
-<option value="acqdate_asc" selected="selected">Acquisition Date: Oldest to Newest</option>
+ [% 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>
+<option value="acqdate_asc">Acquisition date: oldest to newest</option>
  [% END %]
 </optgroup>
 
 <optgroup label="Title">
-       [% IF ( title_az ) %]
+       [% 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 ( title_za ) %]
+       [% 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>