From bd54185a49e4e8a4520d16bc6f6bc991ef9c03d2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sol=C3=A8ne=20Desvaux?= <solene.desvaux@biblibre.com>
Date: Mon, 25 Jul 2022 16:37:41 +0200
Subject: [PATCH] Bug 30952: Move "Go to advanced/item search" link to toolbar

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/catalogue/advsearch.tt           | 12 ++++++------
 .../prog/en/modules/catalogue/itemsearch.tt          |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index b65c740ebb..c90040441f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -53,12 +53,9 @@
                 <div id="advanced-search">
                     <input type="hidden" name="advsearch" value="1"/>
                     <h1>Advanced search</h1>
-                    <p>
-                        <a href="/cgi-bin/koha/catalogue/itemsearch.pl">Go to item search</a>
-                        [% IF searchid %]
-                            <div id="previous_search_link"></div>
-                        [% END %]
-                    </p>
+                    [% IF searchid %]
+                        <div id="previous_search_link"></div>
+                    [% END %]
 
                     <!-- SEARCH BUTTONS -->
                     <div id="toolbar" class="btn-toolbar">
@@ -77,6 +74,9 @@
                             <div class="btn-group">
                                 <a href="/cgi-bin/koha/catalogue/search.pl?do=Clear&expanded_options=[% expanded_options | uri %]" class="btn btn-link"><i class="fa fa-trash"></i> Clear fields</a>
                             </div>
+                            <div class="btn-group">
+                                <a href="/cgi-bin/koha/catalogue/itemsearch.pl" class="btn btn-default"><i class="fa fa-search"></i> Go to item search</a>
+                            </div>
                         </fieldset> <!-- /.action -->
                     </div> <!-- /#toolbar -->
                     <!-- /SEARCH BUTTONS -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
index df0c3db11e..d8d2f6a2ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
@@ -177,13 +177,15 @@
     <div id="item-search-block">
       <h1>Item search</h1>
 
-      <p><a href="/cgi-bin/koha/catalogue/search.pl">Go to advanced search</a></p>
       <form action="/cgi-bin/koha/catalogue/itemsearch.pl" method="get" id="itemsearchform">
           <div id="toolbar" class="btn-toolbar">
               <fieldset class="action">
                   <div class="btn-group">
                       <button class="btn btn-default"><i class="fa fa-search"></i> Search</button>
                   </div>
+                  <div class="btn-group">
+                      <a href="/cgi-bin/koha/catalogue/search.pl" class="btn btn-default"><i class="fa fa-search"></i> Go to advanced search</a>
+                  </div>
               </fieldset>
           </div>
           <fieldset>
-- 
2.39.5