From 48db71efad29a9b2c856423b5ae4422ea21c064a Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Wed, 30 Aug 2017 11:45:21 -0400
Subject: [PATCH] PINES Customization: Group Records Checkbox

Had moved checkbox to a different spot on page in previous
release. This release added it back, which caused a duplicate
checkbox. This patch removes the duplicate.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 Open-ILS/src/templates/opac/parts/advanced/search.tt2 | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index a3bd33917a..4f777d43e2 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -106,9 +106,6 @@
                         id=adv_chunk.id
                         value=default_sort class='results_header_sel';
                     %]
-
-<<<<<<< HEAD
-<<<<<<< HEAD
                     [% IF NOT metarecords.disabled %]
                         <br/><!-- <br> may seem redundant, but it allows the
                             <input> (below) to drop down inline w/ its label -->
@@ -121,11 +118,9 @@
                                 [% l("Group Formats and Editions") %]</label>
                         </div>
                     [% END %]
-=======
->>>>>>> 099a674... OPAC advanced search page UI tweaks. (Terran)
-
-=======
->>>>>>> 03ad13e... OPAC Updates related to page text and translations. Also required are the
+                    
+<!-- PINES customization: moved group checkbox lower on page -->
+                  
                 [% CASE "copy_location" %]
                     <select id="adv_copy_location_selector"
                         title="[% l('Select Shelving Location') %]"
@@ -157,7 +152,7 @@
         </div>
     </div>
     
-    <!-- moved checkboxes into their own div for readability -->
+    <!-- PINES Customization: moved checkboxes into their own div for readability -->
     <div style="clear:left;padding-left:20px;">
         <input type='checkbox' name="modifier"
             value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
-- 
2.11.0