From 711f65a6894f8979734f2738ec3500dee4756826 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 Signed-off-by: Marcel de Rooy Signed-off-by: Nick Clemens (cherry picked from commit ad34ef74cdee0f204c03cdf88b1db775768a44fe) Signed-off-by: Martin Renvoize (cherry picked from commit 517827fb9c2e69d58d8e9345ba2d259de08efded) Signed-off-by: Fridolin Somers --- .../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 %] -
-

Refine your search

-
    - [% FOR facets IN facets_loop %] -
  • - [% facets.label %] -
      - [% FOR value IN facets.values %] -
    • - [% 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 _ ':"' _ f.val _ '"' %] - [% END %] - [% END %] - [x] - [% 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 _ ':"' _ f.val _ '"' %] - [% END %] - [% SET url = url _ '&filters=' _ facets.indexname _ ':"' _ value.value _ '"' %] - - [% value.lib %] ([% value.count %]) - [% END %] -
    • - [% END %] -
    -
  • - [% END %] -
-
-[% 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 ) %] -
- [% IF hits_to_paginate < total %]
[% hits_to_paginate %] of [% total %] results loaded, refine your search to view other records
[% END %] - [% IF ( previous_page ) %] - << Previous - [% END %] - [% FOREACH PAGE_NUMBER IN PAGE_NUMBERS %] - [% IF ( PAGE_NUMBER.current ) %] - [% PAGE_NUMBER.page %] - [% ELSE %] - [% PAGE_NUMBER.page %] - [% END %] - [% END %] - [% IF ( next_page ) %] - Next >> - [% END %] -
-[% 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" %] - -[% ELSE %] - -[% END %] -[% IF sort_by == "score desc" %] - -[% ELSE %] - -[% END %] - -[% FOREACH ind IN sortable_indexes %] - [% IF sort_by == "$ind.code asc" %] - - [% ELSE %] - - [% END %] - [% IF sort_by == "$ind.code desc" %] - - [% ELSE %] - - [% END %] -[% END %] -- 2.39.5