projects / koha_ffzg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b22ef3e)
BUG FIX OPAC sort results was broken
authorHenri-Damien LAURENT <henridamien@koha-fr.org>
Thu, 15 Nov 2007 18:54:08 +0000 (12:54 -0600)
committerJoshua Ferraro <jmf@liblime.com>
Fri, 16 Nov 2007 13:34:59 +0000 (07:34 -0600)
Adapting sort to what has been designed for intranet.
Copying resort_form.inc to opac includes.
Using resort_form in the templates.

I hope this will not be too much of a burden. this should come before all owen's redesign. Unless it has already been done.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc [new file with mode: 0644] patch | blob
koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl patch | blob | history
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl patch | blob | history

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc b/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
new file mode 100644 (file)
index 0000000..4a9b8e8
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/resort_form.inc
@@ -0,0 +1,14 @@
+                        <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>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
index df5dd8d..e4ff34c 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tmpl
@@ -434,75 +434,8 @@
 <!-- RANK LIMITS -->
     <fieldset><legend>Sort by: </legend>
         <p><select id="sort_by" name="sort_by">
-            <option value="">Field-weighted, Relevance Ranked</option>
-        <!--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>
-    </fieldset>
+<!--TMPL_INCLUDE Name=resort_form.inc-->
+</select></p></fieldset>
 <!-- RANK LIMITS -->
 <!-- SEARCH BUTTONS -->
 <p>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index c4eaa9f..6238926 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -121,73 +121,8 @@
         <!-- RE-SORT START -->
         <p style="float: right;">
             Re-sort results
-            <select id="sort_by" name="sort_by" onchange="javascript:document.myform.submit();">
-                <option value="">Field-weighted, Relevance Ranked</option>
-        <!--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 id="sort_by" name="sort_by" onChange="javascript:document.myform.submit();">
+<!--TMPL_INCLUDE Name="resort_form.inc"-->
             </select>
         </p>
         <!-- RESORT END -->
Unnamed repository; edit this file 'description' to name the repository.