From 8792d7e0b45de125973fbfbc49af52431e3a1174 Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 11 Oct 2016 11:36:42 -0400
Subject: [PATCH] LP#1005040: show number of filters applied

If at least advanced search filter is applied, the number
of them in force is displayed just below the search bar
next to the refine search link.

This patch also renames "opac-auto-102" CSS class to "refine_search"
and tweaks its left padding.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 Open-ILS/src/templates/opac/css/style.css.tt2   |  5 +++++
 Open-ILS/src/templates/opac/parts/searchbar.tt2 | 25 +++++++++++++++++++++++--
 Open-ILS/web/css/skin/default/opac/semiauto.css |  1 -
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index a6ba64e383..77b3b628f9 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -51,6 +51,11 @@ a {
     margin-left: 1em;
 }
 
+.refine_search {
+    padding-bottom: 7px;
+    margin-left: 1em;
+}
+
 /*
 #search-wrapper select {
     border:0px solid [% css_colors.border_dark %];
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 2c162fe6ea..fd867581e7 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -1,5 +1,18 @@
 <h3 class="sr-only">[% l('Catalog Search') %]</h3>
-[% PROCESS "opac/parts/org_selector.tt2" %]
+[% PROCESS "opac/parts/org_selector.tt2";
+
+# We need to ignore some filters in our count
+
+fignore = ['core_limit','limit','badge_orgs','badges','estimation_strategy','depth'];
+fcount = 0;
+FOR f IN ctx.query_struct.filters;
+    IF fignore.grep('^' _ f.name _ '$').size;
+        NEXT;
+    END;
+    fcount = fcount + 1;
+END;
+
+ %]
 <div id="search-wrapper">
     [% UNLESS took_care_of_form -%]
     <form action="[% ctx.opac_root %]/results" method="get">
@@ -113,12 +126,20 @@
         </form>
     [% END %]
     [% IF (is_advanced AND NOT is_special) AND CGI.param('qtype') %]
-    <div class="opac-auto-102">
+    <div class="refine_search">
+        [% IF fcount > 0 %]
+        [ [% l('[quant,_1,filter,filters] applied', fcount) %] ]
+        [% END %]
         [ <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[%
             l('Refine My Original Search')
         %]</a> ]
     </div>
     [% END %]
+    <!-- Canonicalized query:
+
+    [% ctx.canonicalized_query | html %]
+
+    -->
     <!--
     <div id="breadcrumb">
         <a href="[% ctx.opac_root %]/home">[% l('Catalog Home') %]</a> &gt;
diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css
index 07705990cd..5ce8dade3b 100644
--- a/Open-ILS/web/css/skin/default/opac/semiauto.css
+++ b/Open-ILS/web/css/skin/default/opac/semiauto.css
@@ -12,7 +12,6 @@
 }
 .pad-bottom-five { padding: 5px; }
 .item_list_padding { padding: 8px 0px 6px 0px; border: 0; }
-.opac-auto-102 { padding-bottom: 7px; }
 .opac-auto-108 { padding-left: 5px; }
 .pad-top-ten { padding-top: 10px; }
 .opac-auto-121 { padding-top: 6px; }
-- 
2.11.0