From e40c4f643b786b4fe53156c1a03fcae5bb2077e1 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 4 Oct 2022 16:21:46 +0100
Subject: [PATCH] Bug 17170: (QA follow-up) Relocate 'Save'

Another minor rebase issue I believe.. relocate the 'Save search as
filter' link back up to sit next to 'Edit this search'.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/catalogue/results.tt              | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
index 00b662e4dc..52e6ca2bbb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -72,7 +72,11 @@
                         [% total | html %] result(s) found [% IF ( query_desc ) %]for <span class="results_query_desc">'[% query_desc | html %]'</span>[% END %][% IF limit_desc  %]&nbsp;with limit(s): <span class="results_limit_desc">'[% limit_desc | html %]'</span>[% END %][% IF ( LibraryName ) %] in [% LibraryName | html %] Catalog[% END %].
                     </h3>
                     <a href="/cgi-bin/koha/catalogue/search.pl?advsearch=1&edit_search=1&[% query_cgi | $raw %]&[% limit_cgi | $raw %]&sort_by=[% sort_by | $raw %]">Edit this search</a>
-                                                                                                                                      <div id="search_within_results">
+                    [% IF ( Koha.Preference('SavedSearchFilters') && CAN_user_parameters_manage_search_filters ) %]
+                        | <a href="#" id="save_search_filter">Save search as filter</a>
+                    [% END %]
+
+                    <div id="search_within_results">
                         <form id="refine_search">
                             <label for="limit">Search within results</label>
                             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
@@ -82,9 +86,6 @@
                             <input type="submit" id="refine" value="Search">
                         </form>
                     </div>
-                    [% IF ( Koha.Preference('SavedSearchFilters') && CAN_user_parameters_manage_search_filters ) %]
-                        | <a href="#" id="save_search_filter">Save search as filter</a>
-                    [% END %]
 
                     <div class="searchheader" id="searchheader">
                         <div id="selection_ops">
@@ -348,7 +349,7 @@
                                 <p><a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% searchtoorder_basketno | uri %]">View basket<a></p>
                             [% END %]
                             <a href="/cgi-bin/koha/catalogue/search.pl?advsearch=1&edit_search=1&[% query_cgi | $raw %]&[% limit_cgi | $raw %]&sort_by=[% sort_by | $raw %]">Edit this search</a>
-                            [% IF ( Koha.Preference('SavedSearchFilters') &&CAN_user_parameters_manage_search_filters ) %]
+                            [% IF ( Koha.Preference('SavedSearchFilters') && CAN_user_parameters_manage_search_filters ) %]
                                 | <a href="#" id="save_search_filter">Save search as filter</a>
                             [% END %]
                         [% ELSE %]
-- 
2.39.5