From: Dan Pearl <dpearl@cwmars.org>
Date: Tue, 26 Aug 2014 20:07:41 +0000 (-0400)
Subject: LP#1190508: Rename certain image files to avoid Ad Block Plus's blacklist
X-Git-Tag: sprint4-merge-nov22~1907
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=346709cece7e3056a7d59c41b4aea564c6a76125;p=working%2FEvergreen.git

LP#1190508: Rename certain image files to avoid Ad Block Plus's blacklist

Ad Block Plus was blocking images with /images/adv_ in their pathname. It is
presumed that "adv" was short for "advertisement".  I have renamed the files
and the references to avoid the ABP blacklist.

Signed-off-by: Dan Pearl <dpearl@cwmars.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>
---

diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 8b8849d177..85e2ca2c29 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -22,7 +22,7 @@
                     <a href="javascript:;" class="row-remover"
                         title="[% l('Remove row') %]" alt="[% l('Remove row') %]"
                         onclick='return killRowIfAtLeast(1, this);'>
-                        <img src="[% ctx.media_prefix %]/images/adv_row_close_btn.png" 
+                        <img src="[% ctx.media_prefix %]/images/expert_row_close_btn.png" 
                             alt="[% l('Remove Search Row') %]"/>
                     </a>
                 </td>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2 b/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2
index 6302a297e6..37430472c5 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2
@@ -50,7 +50,7 @@
         <a href="javascript:;" class="row-remover"
             title="[% l('Remove row') %]" alt="[% l('Remove row') %]"
             onclick='return killRowIfAtLeast(2, this);'>
-                <img src="[% ctx.media_prefix %]/images/adv_row_close_btn.png" 
+                <img src="[% ctx.media_prefix %]/images/expert_row_close_btn.png" 
                     alt="[% l('Remove row') %]"/>
             </a>
     </td>
diff --git a/Open-ILS/src/templates/opac/parts/staff_saved_searches.tt2 b/Open-ILS/src/templates/opac/parts/staff_saved_searches.tt2
index 0250651caa..ade1290293 100644
--- a/Open-ILS/src/templates/opac/parts/staff_saved_searches.tt2
+++ b/Open-ILS/src/templates/opac/parts/staff_saved_searches.tt2
@@ -6,9 +6,9 @@
         </div>
         <div class="button">
             [% IF ctx.saved_searches_expanded %]
-            <a href="[% mkurl('', {'sss_expand' => 0}) %]" title="[% l('Collapse') %]"><img src="[% ctx.media_prefix %]/images/adv_search_minus_btn.png" alt="[% l('Collapse') %]" /></a>
+            <a href="[% mkurl('', {'sss_expand' => 0}) %]" title="[% l('Collapse') %]"><img src="[% ctx.media_prefix %]/images/staff_search_minus_btn.png" alt="[% l('Collapse') %]" /></a>
             [% ELSE %]
-            <a href="[% mkurl('', {'sss_expand' => 1}) %]" title="[% l('Expand') %]"><img src="[% ctx.media_prefix %]/images/adv_search_plus_btn.png" alt="[% l('Expand') %]" /></a>
+            <a href="[% mkurl('', {'sss_expand' => 1}) %]" title="[% l('Expand') %]"><img src="[% ctx.media_prefix %]/images/staff_search_plus_btn.png" alt="[% l('Expand') %]" /></a>
             [% END %]
         </div>
         <div class="clear">&nbsp;</div>
diff --git a/Open-ILS/web/images/adv_row_close_btn.png b/Open-ILS/web/images/adv_row_close_btn.png
deleted file mode 100644
index edccf374d6..0000000000
Binary files a/Open-ILS/web/images/adv_row_close_btn.png and /dev/null differ
diff --git a/Open-ILS/web/images/adv_search_minus_btn.png b/Open-ILS/web/images/adv_search_minus_btn.png
deleted file mode 100644
index 40505959f7..0000000000
Binary files a/Open-ILS/web/images/adv_search_minus_btn.png and /dev/null differ
diff --git a/Open-ILS/web/images/adv_search_plus_btn.png b/Open-ILS/web/images/adv_search_plus_btn.png
deleted file mode 100644
index 7f1ae93a71..0000000000
Binary files a/Open-ILS/web/images/adv_search_plus_btn.png and /dev/null differ
diff --git a/Open-ILS/web/images/expert_row_close_btn.png b/Open-ILS/web/images/expert_row_close_btn.png
new file mode 100644
index 0000000000..edccf374d6
Binary files /dev/null and b/Open-ILS/web/images/expert_row_close_btn.png differ
diff --git a/Open-ILS/web/images/staff_search_minus_btn.png b/Open-ILS/web/images/staff_search_minus_btn.png
new file mode 100644
index 0000000000..40505959f7
Binary files /dev/null and b/Open-ILS/web/images/staff_search_minus_btn.png differ
diff --git a/Open-ILS/web/images/staff_search_plus_btn.png b/Open-ILS/web/images/staff_search_plus_btn.png
new file mode 100644
index 0000000000..7f1ae93a71
Binary files /dev/null and b/Open-ILS/web/images/staff_search_plus_btn.png differ