From 76bd4b6f2979858fdc60ff2a59e661ac84325b42 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Wed, 27 Apr 2016 21:44:57 -0400
Subject: [PATCH] Bug 10171 [Follow-up] Add a header in Advanced Search (staff
 interface)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch re-indents the new include file because it's not often you
get to help a new file come into the world, it should be indented
nicely.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../prog/en/includes/adv-search.inc           | 85 +++++++++++--------
 1 file changed, 48 insertions(+), 37 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
index d081ed2109..30731d69b6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
@@ -1,42 +1,53 @@
 <div class="gradient">
-<h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1><!-- Begin Main page Resident Search Box -->
+    <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName %]</a></h1>
 
-<div id="header_search">
-    [% INCLUDE 'patron-search-box.inc' %]
-[% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
-<div id="checkin_search" class="residentsearch">
-    <p class="tip">Scan a barcode to check in:</p>
-    <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
-        <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
-        <input value="Submit" class="submit" type="submit" />
-    </form>
-</div>
-<div id="renew_search" class="residentsearch">
-    <p class="tip">Scan a barcode to renew:</p>
-        <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
-            <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
-            <input value="Submit" class="submit" type="submit" />
-        </form>
-    </div>
-[% END %]
+    <!-- Begin main page resident search box -->
+    <div id="header_search">
+        [% INCLUDE 'patron-search-box.inc' %]
+        [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
+            <div id="checkin_search" class="residentsearch">
+                <p class="tip">Scan a barcode to check in:</p>
+                <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
+                    <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
+                    <input value="Submit" class="submit" type="submit" />
+                </form>
+            </div>
+            <div id="renew_search" class="residentsearch">
+                <p class="tip">Scan a barcode to renew:</p>
+                <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
+                    <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
+                    <input value="Submit" class="submit" type="submit" />
+                </form>
+            </div>
+        [% END %]
 
-[% IF ( CAN_user_borrowers ) %]
-<div id="patron_search" class="residentsearch">
-    <p class="tip">Enter patron card number or partial name:</p>
-    <form action="/cgi-bin/koha/members/member.pl" method="post">
-        <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text"/>
-        <input type="hidden" name="quicksearch" value="1" />
-        <input value="Submit" class="submit" type="submit" />
-    </form>
-</div>[% END %]
+        [% IF ( CAN_user_borrowers ) %]
+            <div id="patron_search" class="residentsearch">
+                <p class="tip">Enter patron card number or partial name:</p>
+                <form action="/cgi-bin/koha/members/member.pl" method="post">
+                    <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text" />
+                    <input type="hidden" name="quicksearch" value="1" />
+                    <input value="Submit" class="submit" type="submit" />
+                </form>
+            </div>
+        [% END %]
 
-<ul>
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>[% END %]
-    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>[% END %]
-    [% IF ( CAN_user_borrowers ) %]<li><a onclick="keep_text(3)" href="#patron_search">Search patrons</a></li>[% END %]
-</ul>
+        <ul>
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
+                <li><a onclick="keep_text(0)" href="#circ_search">Check out</a></li>
+            [% END %]
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
+                <li><a onclick="keep_text(1)" href="#checkin_search">Check in</a></li>
+            [% END %]
+            [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
+                <li><a onclick="keep_text(2)" href="#renew_search">Renew</a></li>
+            [% END %]
+            [% IF ( CAN_user_borrowers ) %]
+                <li><a onclick="keep_text(3)" href="#patron_search">Search patrons</a></li>
+            [% END %]
+        </ul>
 
-</div><!-- /header_search -->
-</div><!-- /gradient -->
-<!-- End Main page Resident Search Box -->
+    </div><!-- /#header_search -->
+    <!-- End advanced search page resident search box -->
+
+</div><!-- /.gradient -->
-- 
2.20.1