From 517827fb9c2e69d58d8e9345ba2d259de08efded Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 21 Jun 2018 13:37:35 +0000
Subject: [PATCH] Bug 20974: Remove files left behind after removing Solr

Some files were left behind when Bug 12538 removed support for Solr.
This patch removes them.

To test, apply the patch and fail to observe the existence of these
files:

koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc

Perform a search in the OPAC to confirm that nothing broke.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit ad34ef74cdee0f204c03cdf88b1db775768a44fe)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../bootstrap/en/includes/search/facets.inc   | 56 -------------------
 .../en/includes/search/page-numbers.inc       | 18 ------
 .../en/includes/search/resort_form.inc        | 23 --------
 3 files changed, 97 deletions(-)
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
 delete mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
deleted file mode 100644
index 93c8b0f591..0000000000
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/facets.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-[% IF facets_loop %]
-  <div id="search-facets">
-    <h4>Refine your search</h4>
-    <ul>
-      [% FOR facets IN facets_loop %]
-        <li>
-          [% facets.label %]
-          <ul class="facets_list">
-            [% FOR value IN facets.values %]
-              <li>
-                [% IF ( value.active ) %]
-                  [% value.lib %] ([% value.count %])
-                  [% SET url = "/cgi-bin/koha/opac-search.pl?" %]
-                  [% SET first = 1 %]
-                  [% FOR p IN follower_params %]
-                    [% IF p.var != 'filters' %]
-                      [% UNLESS first %]
-                        [% SET url = url _ '&' %]
-                      [% END %]
-                      [% SET first = 0 %]
-                      [% SET url = url _ p.var _ '=' _ p.val %]
-                    [% END %]
-                  [% END %]
-                  [% FOR f IN filters %]
-                    [% UNLESS f.var == facets.indexname && f.val == value.value %]
-                      [% SET url = url _ '&filters=' _ f.var _ ':&quot;' _ f.val _ '&quot;' %]
-                    [% END %]
-                  [% END %]
-                  [<a href="[% url |url %]">x</a>]
-                [% ELSE %]
-                  [% SET url = "/cgi-bin/koha/opac-search.pl?" %]
-                  [% SET first = 1 %]
-                  [% FOR p IN follower_params %]
-                    [% IF p.var != 'filters' %]
-                      [% UNLESS first %]
-                        [% SET url = url _ '&' %]
-                      [% END %]
-                      [% SET first = 0 %]
-                      [% SET url = url _ p.var _ '=' _ p.val %]
-                    [% END %]
-                  [% END %]
-                  [% FOR f IN filters %]
-                    [% SET url = url _ '&filters=' _ f.var _ ':&quot;' _ f.val _ '&quot;' %]
-                  [% END %]
-                  [% SET url = url _ '&filters=' _ facets.indexname _ ':&quot;' _ value.value _ '&quot;' %]
-
-                  <a href="[% url |url %]">[% value.lib %]</a> ([% value.count %])
-                [% END %]
-              </li>
-            [% END %]
-          </ul>
-        </li>
-      [% END %]
-    </ul>
-</div>
-[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
deleted file mode 100644
index 59d84e00eb..0000000000
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/page-numbers.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-[% IF ( PAGE_NUMBERS ) %]
-  <div class="pages">
-   [% IF hits_to_paginate < total %]<h6>[% hits_to_paginate %] of [% total %] results loaded, refine your search to view other records</h6>[% END %]
-    [% IF ( previous_page ) %]
-      <a class="nav" href="?[% FOREACH fp IN follower_params %][% fp.var |url %]=[% fp.val |url %]&amp;[% END %]page=[% previous_page |url %]">&lt;&lt; Previous</a>
-    [% END %]
-    [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %]
-      [% IF ( PAGE_NUMBER.current ) %]
-        <span class="current">[% PAGE_NUMBER.page %]</span>
-      [% ELSE %]
-        <a class="nav" href="?[% FOREACH fp IN follower_params %][% fp.var |url %]=[% fp.val |url %]&amp;[% END %]page=[% PAGE_NUMBER.page |url %]">[% PAGE_NUMBER.page %]</a>
-      [% END %]
-    [% END %]
-    [% IF ( next_page ) %]
-      <a class="nav" href="?[% FOREACH fp IN follower_params %][% fp.var |url %]=[% fp.val |url %]&amp;[% END %]page=[% next_page |url %]">Next &gt;&gt;</a>
-    [% END %]
-  </div>
-[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc
deleted file mode 100644
index 88c9f66c06..0000000000
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/search/resort_form.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-[% IF sort_by == "score asc" %]
-  <option value="score asc" selected="selected">Relevance asc</option>
-[% ELSE %]
-  <option value="score asc">Relevance asc</option>
-[% END %]
-[% IF sort_by == "score desc" %]
-  <option value="score desc" selected="selected">Relevance desc</option>
-[% ELSE %]
-  <option value="score desc">Relevance desc</option>
-[% END %]
-
-[% FOREACH ind IN sortable_indexes %]
-  [% IF sort_by == "$ind.code asc" %]
-    <option value="[% ind.code %] asc" selected="selected">[% ind.label %] asc</option>
-  [% ELSE %]
-    <option value="[% ind.code %] asc">[% ind.label %] asc</option>
-  [% END %]
-  [% IF sort_by == "$ind.code desc" %]
-    <option value="[% ind.code %] desc" selected="selected">[% ind.label %] desc</option>
-  [% ELSE %]
-    <option value="[% ind.code %] desc">[% ind.label %] desc</option>
-  [% END %]
-[% END %]
-- 
2.39.5