From f5c6bffd3645e538d6908d5967004b5648b5478f Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 10 Jan 2018 14:44:48 -0500
Subject: [PATCH] LP#1744385: Allow highlight disabling globally via config.tt2

Also, add CC0 highlighter icon from https://pixabay.com/en/highlight-highlighter-highlighting-2022407/
and provide highlight en/dis-able.

Signed-off-by: Mike Rylander <miker@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
---
 Open-ILS/src/templates/opac/parts/config.tt2         |   3 +++
 Open-ILS/src/templates/opac/parts/misc_util.tt2      |   2 +-
 Open-ILS/src/templates/opac/parts/record/summary.tt2 |  12 ++++++++++++
 Open-ILS/src/templates/opac/parts/searchbar.tt2      |  12 ++++++++++--
 Open-ILS/web/images/highlight.png                    | Bin 0 -> 928 bytes
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 Open-ILS/web/images/highlight.png

diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index 28f730cdeb..ac731cd28b 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -181,6 +181,9 @@ search.basic_config = {
 # Make metarecord search the default.
 #search.metarecord_default = 1;
 
+# Disable search term highlighting
+#search.no_highlight = 1;
+
 ##############################################################################
 # Show Google Book Previews
 # Set to 1 or 'true' to enable
diff --git a/Open-ILS/src/templates/opac/parts/misc_util.tt2 b/Open-ILS/src/templates/opac/parts/misc_util.tt2
index 2d48ccc53f..ba507bd6eb 100644
--- a/Open-ILS/src/templates/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates/opac/parts/misc_util.tt2
@@ -108,7 +108,7 @@
 
         args.display_fields = {};
         args.hl = {};
-        IF !CGI.param('no_highlight');
+        IF !CGI.param('no_highlight') && !search.no_highlight;
             args.display_field_list = ctx.fetch_display_fields(args.df_bib_list.list);
 
             FOR df IN args.display_field_list;
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 20b7d368a3..15d2a37fb0 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -138,6 +138,18 @@
                     </a>
                 </div>
             [% END %]
+            [% IF !search.no_highlight %]
+            <div class="rdetail_aux_utils highlighting">
+              [% IF CGI.param('no_highlight') %]
+                <a href="[% mkurl('', {}, ['no_highlight']) %]" class="no-dec">
+              [% ELSE %]
+                <a href="[% mkurl('', {no_highlight => '1'}) %]" class="no-dec">
+              [% END %]
+                     <img src="[% ctx.media_prefix %]/images/highlight.png[% ctx.cache_key %]" alt="[% l('Toggle highlighting') %]" />
+                     [% CGI.param('no_highlight') ?  l('Enable Highlighting') : l('Disable Highlighting') %]
+                </a>
+            </div>
+            [% END %]
             [%- IF ctx.is_staff %]
             <div class="rdetail_aux_utils clear_addedcontent_cache">
                 <a href="[% ctx.media_prefix %]/opac/extras/ac/clearcache/all/r/[% ctx.bre_id | uri %]" class="no-dec" target="_blank">
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index c33a897cf3..0a5f62f44c 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -94,7 +94,7 @@ END;
               id='search_org_selector' show_loc_groups=1
         -%]
         </label>
-    <span>
+      <span>
         <input id="detail" type="hidden" name="detail_record_view" value="[% show_detail_view %]"/>
         <input id='search-submit-go' type="submit" value="[% l('Search') %]" class="opac-button"
             onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden";[% IF ctx.depth_sel_button AND NOT took_care_of_form %] $("search-submit-go-depth").className="hidden";[% END %]}, 2000)'/>
@@ -103,7 +103,15 @@ END;
             onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"; $("search-submit-go-depth").className="hidden";}, 2000)' title="[% ctx.depth_sel_tooltip | html %]">[% ctx.depth_sel_button_label | html %]</button>
         [%- END %]
         <img id='search-submit-spinner' src='[% ctx.media_prefix %]/opac/images/progressbar_green.gif[% ctx.cache_key %]' style='height:16px;width:16px;' class='hidden' alt='[% l("Search In Progress") %]'/>
-    </span>
+        [%- IF took_care_of_form && !search.no_highlight %]
+        <label for="no_highlight">
+          <input type="checkbox" id="no_highlight" name="no_highlight" value="1"
+              onchange="search_modifier_onchange('no_highlight', this, true)"
+              [% CGI.param('no_highlight').size ? ' checked="checked"' : '' %] />
+          [% l('Disable Highlighting') %]
+        </label>
+        [%- END %]
+      </span>
     </div>
     [% IF ctx.bookbag %]
     <div id="search-only-bookbag-container">
diff --git a/Open-ILS/web/images/highlight.png b/Open-ILS/web/images/highlight.png
new file mode 100644
index 0000000000000000000000000000000000000000..d550b46c8dc0846809d321309feced6621172e08
GIT binary patch
literal 928
zcmV;R17G}!P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00009a7bBm000ie
z000ie0hKEb8vp<UQb|NXR5*>Dluu|JRUF4ZZ<9^Z>`=mNi;dfYITS4(a%iB0^ss^i
zA_>*dg%J}=S_*0pg&uk-l~Rir6{(;Y6t5yG9z>4;Ew-iBlO7_?WwT`MY_fl{vpa9*
z&7app63xclw9OB`%w^tZK78lBC)ndmOic8q)9JIvkN<P})T!m+g9qg&hT(n(l_eoi
zU3&$Ojg4JMCX*j6F2+Z1-;Vps<wjO(^-?CI&1=`fve*kWm&=_tO>@3bD46wn9VsPB
zxg0o9<HU(ZaPFLQ>uJGaW@hG<R4VmNKA%rD8Vy|6ZHec(M3MKP`)R0_Wt~i=QlA%#
z#Z<G|L`vBb&-0MduSQY)ZsJLylarH2)9LiQZQF<I^*WyCwM!I5(N*BvCo;Ay>p9aj
ze<&7<FI1~lT-W`dt&~!RVR#*w2cpM<r>Cb6o2L0yrBZpZR;&GMw*wl5VfY#F0T2P~
zTE*1VRDULu`M6fAWlN<}J4>XL1VQjM@ZJ^_pri5l_;@Ol$$YxLzW%Ch+hXV6-%PBO
z`Wd(Y)VHs13mzRE-8VEebX_U+=E};7=+LQFO8o+y-3jej#qjX(#VCs2DHIA~Ya8v1
zQtD6OZD6$>qs2Iv%XJxsF_%art`rJ|zW?@StEuOC%UbI<fWJFc*#aII7|8YX^xRxp
zTIz2$o9#M9O1Z4HejWI$6SSoY%d$p#dwW03=kxs?I>q<>n%4RvaA!AYi?QQ4P0#ZN
z9mi=4)!Nf%&O|@nxWVB5{k#u68^<J~2%$9qS}ATFI>Z+(U?IdaVHk>JGKo^E<#d4;
zU%nhA=H{3U0%ptQjWtT4U6;68B_TGhv)5o7IGfEHz!g9QL4cH!N~J;=hJF}^m64I~
zcgteRFc1KnhJ+y^kwC;TvFEWGMJxaU(A@xrVaxzo&+}MYTVr)~HFg~5zSjCGu#(B(
z#4*3wHiJPxpAhtDO)`!N7Z+K+caOa9v!WCaw!i{lcJ}38OQpoghYxL0EEXH(a{2o>
zj^6_O%@=px+j?8tPM6j^f8<ExQlsJOyLX%SYqi>!K@i+z<J|89`hXrF33P4y$gbdS
zDLH@aSgE+MP`+c^-9P!h|Hr0j45-cLRvv4*HID#o+;HvN)H8qp0000<MNUMnLSTYm
C)xVDb

literal 0
HcmV?d00001

-- 
2.11.0