fixing opac facets

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

koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc

@@ -1,18 +1,14 @@
-<div id="nav">
-
 <!-- TMPL_IF NAME="opacfacets" -->
-<h6>Refine Your Search</h6>
-<ul id="facets">
+<!-- TMPL_IF NAME="facets_loop" -->
+<ul id="search_facets">
+<li><h4>Refine your search</h4></li>
 <!-- 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="/search?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="/search?q=<!-- TMPL_VAR NAME="searchdesc" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
+        <!-- TMPL_LOOP NAME="facets" --><li><a href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&amp;limit=<!-- 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?<!-- TMPL_VAR NAME="query_cgi" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
 <!-- /TMPL_IF -->
 </ul></li>
 <!-- /TMPL_LOOP -->
 </ul>
 <!-- /TMPL_IF -->
-</div>
+<!-- /TMPL_IF -->

koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl

@@ -204,33 +204,7 @@
 <div class="yui-b">
         <!-- FACETS START -->
         <!-- TMPL_IF NAME="opacfacets" -->
-            <!-- TMPL_IF NAME="facets_loop" -->
-                <div id="facets" >
-                    <h4>Refine Your Search</h4>
-                    <ul>
-                        <!-- 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?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" --> 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?<!-- TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">
-                                        Show More
-                                    </a>
-                                </li>
-                                <!-- /TMPL_IF -->
-                            </ul>
-                        </li>
-                        <!-- /TMPL_LOOP -->
-                    </ul>
-                </div>
-            <!-- /TMPL_IF -->
+		<!-- TMPL_INCLUDE NAME="opac-facets.inc" -->
         <!-- /TMPL_IF -->
         <!-- FACETS END -->
 </div>