reintroducing facets and sorting on OPAC

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
index 54ce842..b4e7899 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/opac-results.tmpl
@@ -53,56 +53,56 @@ Error :
 <!-- Search Results Table -->
 <!-- TMPL_IF NAME="total" -->
 <!-- TMPL_IF NAME="scan" -->
-<h1>Scan Index:</h1>
-<form action="/cgi-bin/koha/opac-search.pl" method="post">
-    <table>
-        <tr>
-            <td>
-                Scan Index for: <input type="text" name="qf" id="scan-index" size="35" value="" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label for="scan-index">Indexed in:</label>
-                <select name="idx" id="scan-index">
-                    <option value="">Any Word</option>
-                    <option value="any/phr:">Any Phrase</option>
-                    <option value="ti:">Title</option>
-                    <option value="ti,phr:">Title Phrase</option>
-                    <option value="au,phr:">Author</option>
-                    <option value="su:">Subject</option>
-                    <option value="su,phr:">Subject Phrase</option>
-                    <option value="se:">Series</option>
-                    <option value="pb:">Publisher</option>
-                    <option value="nt:">Notes</option>
-                    <option value="se:">Series Title</option>
-                    <option value="sn:">ISBN</option>
-                    <option value="ss:">ISSN</option>
-                </select>
-                <input type="hidden" name="scan" value="1" />
-            </td>
-        </tr>
-    </table>
-</form>
-
-<form action="/cgi-bin/koha/opac-search.pl" method="post">
-    <table>
-        <tr>
-            <th>Term/Phrase</th>
-            <th>Count</th>
-        </tr>
-        <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-        <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
-            <td>
-                <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title" -->&quot;"><!-- TMPL_VAR NAME="title" --></a>
-            </td>
-            <td>
-                <!-- TMPL_VAR NAME="subtitle" -->
-            </td>
-        </tr>
-        <!-- /TMPL_LOOP -->
-    </table>
-</form>
+    <h1>Scan Index:</h1>
+    <form action="/cgi-bin/koha/opac-search.pl" method="post">
+        <table>
+            <tr>
+                <td>
+                    Scan Index for: <input type="text" name="qf" id="scan-index" size="35" value="" />
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <label for="scan-index">Indexed in:</label>
+                    <select name="idx" id="scan-index">
+                        <option value="">Any Word</option>
+                        <option value="any/phr:">Any Phrase</option>
+                        <option value="ti:">Title</option>
+                        <option value="ti,phr:">Title Phrase</option>
+                        <option value="au,phr:">Author</option>
+                        <option value="su:">Subject</option>
+                        <option value="su,phr:">Subject Phrase</option>
+                        <option value="se:">Series</option>
+                        <option value="pb:">Publisher</option>
+                        <option value="nt:">Notes</option>
+                        <option value="se:">Series Title</option>
+                        <option value="sn:">ISBN</option>
+                        <option value="ss:">ISSN</option>
+                    </select>
+                    <input type="hidden" name="scan" value="1" />
+                </td>
+            </tr>
+        </table>
+    </form>
+    
+    <form action="/cgi-bin/koha/opac-search.pl" method="post">
+        <table>
+            <tr>
+                <th>Term/Phrase</th>
+                <th>Count</th>
+            </tr>
+            <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
+            <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
+                <td>
+                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title" -->&quot;"><!-- TMPL_VAR NAME="title" --></a>
+                </td>
+                <td>
+                    <!-- TMPL_VAR NAME="subtitle" -->
+                </td>
+            </tr>
+            <!-- /TMPL_LOOP -->
+        </table>
+    </form>
 <!-- TMPL_ELSE -->
 
 <form action="/cgi-bin/koha/opac-search.pl" method="post" name="myform" id="mainform">
@@ -114,7 +114,6 @@ Error :
     <div class="searchresults">
         
         <!-- RE-SORT START -->
-        <!-- TMPL_IF NAME="sort_by" -->
         <p>
             Re-sort results
             <select id="sort_by" name="sort_by" onChange="javascript:document.myform.submit();">
@@ -186,41 +185,40 @@ Error :
         <!--/TMPL_IF-->
             </select>
         </p>
-        <!-- /TMPL_IF -->
         <!-- RESORT END -->
 </form>
         <!-- ######### -->
         <!-- FACETS START -->
         <!-- TMPL_IF NAME="opacfacets" -->
-        <!-- TMPL_IF NAME="NoZebra" -->
-        <div id="facets" >
-            <dl>
-            <dt onclick="var Elt=document.getElementById('facets_list');if (Elt.style.display!='block'){Elt.style.display='block';} else {Elt.style.display='none';}">Refine Your Search</dt>
-            <dd id="facets_list" style="display:none">
-                <!-- TMPL_LOOP NAME="facets_loop" -->
-                <li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label" -->
-                    <ul>
-                        <!-- TMPL_LOOP NAME="facets" -->
-                        <li>
-                            <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="searchdesc" --> and <!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->">
-                                <!-- TMPL_VAR NAME="facet_label_value" -->
-                            </a> (<!-- TMPL_VAR NAME="facet_count" -->)
+            <!-- TMPL_UNLESS NAME="NoZebra" -->
+                <div id="facets" >
+                    <dl>
+                    <dt onclick="var Elt=document.getElementById('facets_list');if (Elt.style.display!='block'){Elt.style.display='block';} else {Elt.style.display='none';}">Refine Your Search</dt>
+                    <dd id="facets_list" style="display:none">
+                        <!-- TMPL_LOOP NAME="facets_loop" -->
+                        <li id="<!-- TMPL_VAR NAME="type_id" -->"><!-- TMPL_VAR NAME="type_label" -->
+                            <ul>
+                                <!-- TMPL_LOOP NAME="facets" -->
+                                <li>
+                                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="searchdesc" --> and <!-- TMPL_VAR NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->" title="<!-- TMPL_VAR NAME="facet_title_value" -->">
+                                        <!-- TMPL_VAR NAME="facet_label_value" -->
+                                    </a> (<!-- TMPL_VAR NAME="facet_count" -->)
+                                </li>
+                                <!-- /TMPL_LOOP -->
+                                <!-- TMPL_IF NAME="expandable" -->
+                                <li class="showmore">
+                                    <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="searchdesc" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">
+                                        Show More
+                                    </a>
+                                </li>
+                                <!-- /TMPL_IF -->
+                            </ul>
                         </li>
                         <!-- /TMPL_LOOP -->
-                        <!-- TMPL_IF NAME="expandable" -->
-                        <li class="showmore">
-                            <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="searchdesc" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">
-                                Show More
-                            </a>
-                        </li>
-                        <!-- /TMPL_IF -->
                     </ul>
-                </li>
-                <!-- /TMPL_LOOP -->
-            </ul>
-            </dd>
-        </div>
-        <!-- /TMPL_IF -->
+                    </dd>
+                </div>
+            <!-- /TMPL_UNLESS -->
         <!-- /TMPL_IF -->
         <!-- FACETS END -->