From 57cdaee5de4cfc9878d75d74be6cf395749608e7 Mon Sep 17 00:00:00 2001
From: hdl <hdl>
Date: Fri, 20 Jul 2007 07:49:06 +0000
Subject: [PATCH] Putting order list into Template rather than setting this in
 a script. For translations.

---
 koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl | 70 +++++++++++++++++--
 opac/opac-search.pl                           | 10 ++-
 2 files changed, 70 insertions(+), 10 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
index f1ebd5026c..1e9f93e8c9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
@@ -114,14 +114,76 @@ Error :
     <div class="searchresults">
         
         <!-- RE-SORT START -->
-        <!-- TMPL_IF NAME="sort_by_loop" -->
+        <!-- TMPL_IF NAME="sort_by" -->
         <p>
             Re-sort results
             <select id="sort_by" name="sort_by" onChange="javascript:document.myform.submit();">
                 <option value="">Field-weighted, Relevance Ranked</option>
-                <!-- TMPL_LOOP NAME="sort_by_loop" -->
-                <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
-                <!-- /TMPL_LOOP -->
+        <!--TMPL_IF Name="9523a"-->
+          <option value="1=9523 &gt;i" selected>Popularity (Most to Least)</option>
+        <!--TMPL_ELSE -->
+          <option value="1=9523 &gt;i">Popularity (Most to Least)</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="9523d"-->
+          <option value="1=9523 &lt;i" selected>Popularity (Least to Most)</option>
+        <!--TMPL_ELSE -->
+          <option value="1=9523 &lt;i">Popularity (Least to Most)</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="1003d"-->
+          <option value="1=1003 &lt;i" selected>Author (A-Z)</option>
+        <!--TMPL_ELSE -->
+          <option value="1=1003 &lt;i">Author (A-Z)</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="1003a"-->
+         <option value="1=1003 &gt;i" selected>Author (Z-A)</option>
+        <!--TMPL_ELSE -->
+         <option value="1=1003 &gt;i">Author (Z-A)</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="20d"-->
+          <option value="1=20 &lt;i" selected>Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+        <!--TMPL_ELSE -->
+          <option value="1=20 &lt;i">Call Number (Non-fiction 0-9 to Fiction A-Z)</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="20a"-->
+          <option value="1=20 &gt;i" selected>Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+        <!--TMPL_ELSE -->
+          <option value="1=20 &gt;i">Call Number (Fiction Z-A to Non-fiction 9-0)</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="31a"-->
+          <option value="1=31 &gt;i" selected>Dates</option>
+        <!--TMPL_ELSE -->
+          <option value="1=31 &gt;i">Dates</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="31a"-->
+          <option value="1=31 &gt;i" selected>&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
+        <!--TMPL_ELSE -->
+          <option value="1=31 &gt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Newest to Oldest</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="31d"-->
+          <option value="1=31 &lt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest</option>
+        <!--TMPL_ELSE -->
+          <option value="1=31 &lt;i">&nbsp;&nbsp;&nbsp;Publication/Copyright Date: Oldest to Newest</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="32a"-->
+          <option value="1=32 &gt;i" selected>&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
+        <!--TMPL_ELSE -->
+          <option value="1=32 &gt;i">&nbsp;&nbsp;&nbsp;Acquisition Date: Newest to Oldest</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="32d"-->
+          <option value="1=32 &lt;i" selected>&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
+        <!--TMPL_ELSE -->
+          <option value="1=32 &lt;i">&nbsp;&nbsp;&nbsp;Acquisition Date: Oldest to Newest</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="4d"-->
+          <option value="1=4 &lt;i" selected>Title (A-Z)</option>
+        <!--TMPL_ELSE -->
+          <option value="1=4 &lt;i">Title (A-Z)</option>
+        <!--/TMPL_IF-->
+        <!--TMPL_IF Name="4a"-->
+          <option value="1=4 &gt;i" selected>Title (Z-A)</option>
+        <!--TMPL_ELSE -->
+          <option value="1=4 &gt;i">Title (Z-A)</option>
+        <!--/TMPL_IF-->
             </select>
         </p>
         <!-- /TMPL_IF -->
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 2146854c6c..aa0287c5dd 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -342,10 +342,8 @@ if ( $template_name eq "opac-advsearch.tmpl" ) {
 
     # load the sort_by options for the template
     my $sort_by      = $cgi->param('sort_by');
-    my $sort_by_loop = displaySortby($sort_by);
-    $template->param(
-        sort_by_loop => $sort_by_loop,
-     );
+    $sort_by=$1.($2 eq "lt"?'d':'a') if ($sort_by=~/1=(\d+) \&([a-z]+)\;/);
+    $template->param( sort_by => $sort_by);
 
     output_html_with_http_headers $cgi, $cookie, $template->output;
     exit;
@@ -366,8 +364,8 @@ my @sort_by;
 
 # load the sort_by options for the template
 my $sort_by      = $params->{'sort_by'};
-my $sort_by_loop = displaySortby($sort_by);
-$template->param( sort_by_loop => $sort_by_loop );
+$sort_by=~$1.($2 eq "lt"?'d':'a') if ($sort_by=~/1=(\d+) \&([a-z]+)\;/);
+$template->param( sort_by => $sort_by);
 
 #
 # Use the servers defined, or just search our local catalog(default)
-- 
2.39.2