From a0d28c0620da21e18af660acde0b9e2eb223333e Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Wed, 12 Apr 2023 20:59:34 +0000
Subject: [PATCH] Bug 33505: Improve styling of scan index page

This patch makes some changes to the 'scan index' page.

* Updates second h1 heading "Scan index:" to h2 level heading "Scan index"
* Removes table from the search form
* Moves search index pull down and search term into one line
* Reorders options with search index first and search term after, matching
  the advanced search form
* Removes the catalog results toolbar from the top, card hold etc. are not needed
  here.
* Fixes doubled up id attribute: scan-index by turning one into scan-index-term.

To test:
* Go to advanced search in staff interface
* Activate 'More options'
* Check checkbox for scan indexes
* Switch to author (especially when using Elasticsearch)
* Search for C
* Check display, especially search options, options at the top of the page etc.
* Apply patch
* Verify changes listed above
* Regression test the normal search results, all should look the same with and without patch.
* If you think the scan index page is nicer now - sign off.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 358cb91a72e85d6ec0e85b8d88b1793062113bd3)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/modules/catalogue/results.tt      | 83 +++++++++----------
 1 file changed, 38 insertions(+), 45 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 0ab43173bd..10743641b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -72,6 +72,8 @@
                     <h3>
                         [% 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>
+
+                [% UNLESS scan %]
                     <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 ) %]
                         | <a href="#" id="save_search_filter">Save search as filter</a>
@@ -332,6 +334,7 @@
 
                         </div> <!-- /#selection_ops -->
                     </div> <!-- /#searchheader -->
+                [% END %]
 
                 [% ELSE # /IF total %]
                     <form method="post" name="fz3950" class="fz3950bigrpad">
@@ -366,52 +369,42 @@
                 <!-- Search Results Table -->
                 [% IF ( total ) %]
                     [% IF ( scan ) %]
-                        <h1>Scan index:</h1>
+                        <h2>Scan index</h2>
                         <form action="/cgi-bin/koha/catalogue/search.pl" method="get">
-                            <table>
-                                <tr>
-                                    <td>
-                                        [% IF ( scan_search_term_to_use ) %]
-                                            Scan index for: <input type="text" name="q" id="scan-index" size="35" value="[% scan_search_term_to_use | html %]" />
-                                        [% ELSE %]
-                                            Scan index for: <input type="text" name="q" id="scan-index" size="35" value="" />
-                                        [% END %]
-                                    </td>
-                                </tr>
-                                <tr>
-                                    <td>
-                                        <label for="scan-index">Indexed in: </label>
-                                        <select name="idx" id="scan-index">
-                                            [% IF ( header_pulldown == "" ) %]<option selected="selected" value="">Any word</option>
-                                            [% ELSE %]<option selected="selected" value="">Any word</option[% END %]
-                                            [% IF ( header_pulldown == "ms_anycommaphr" ) %]<option selected="selected" value="any,phr">Any phrase</option>
-                                            [% ELSE %]<option value="any,phr">Any phrase</option>[% END %]
-                                            [% IF ( header_pulldown == "ms_ti" ) %]<option selected="selected" value="ti">Title</option>
-                                            [% ELSE %]<option value="ti">Title</option>[% END %]
-                                            [% IF ( header_pulldown == "ms_ticommaphr" ) %]<option selected="selected" value="ti,phr">Title phrase</option>
-                                            [% ELSE %]<option value="ti,phr">Title phrase</option>[% END %]
-                                            [% IF ( header_pulldown == ( "ms_au" || "ms_aucommaphr" ) ) %]<option selected="selected" value="au,phr">Author</option>
-                                            [% ELSE %]<option value="au,phr">Author</option>[% END %]
-                                            [% IF ( header_pulldown == "ms_su" ) %]<option selected="selected" value="su">Subject</option>
-                                            [% ELSE %]<option value="su">Subject</option>[% END %]
-                                            [% IF ( header_pulldown == "ms_sucommaphr" ) %]<option selected="selected" value="su,phr">Subject phrase</option>
-                                            [% ELSE %]<option value="su,phr">Subject phrase</option>[% END %]
-                                            [% IF ( header_pulldown ==  "ms_se" ) %]<option selected="selected" value="se">Series</option>
-                                            [% ELSE %]<option value="se">Series</option>[% END %]
-                                            [% IF ( header_pulldown ==  "ms_pb" ) %]<option selected="selected" value="pb">Publisher</option>
-                                            [% ELSE %]<option value="pb">Publisher</option>[% END %]
-                                            [% IF ( header_pulldown ==  "ms_nt" ) %]<option selected="selected" value="nt">Notes</option>
-                                            [% ELSE %]<option value="nt">Notes</option>[% END %]
-                                            [% IF ( header_pulldown ==  "ms_sn" ) %]<option selected="selected" value="sn">ISBN</option>
-                                            [% ELSE %]<option value="sn">ISBN</option>[% END %]
-                                            [% IF ( header_pulldown ==  "ms_ss" ) %]<option selected="selected" value="ss">ISSN</option>
-                                            [% ELSE %]<option value="ss">ISSN</option>[% END %]
-                                        </select>
-                                        <input type="hidden" name="scan" value="1" />
-                                        <input class="submit" type="submit" value="Submit" />
-                                    </td>
-                                </tr>
-                            </table>
+                           <label for="scan-index">Scan index:</label>
+                            <select name="idx" id="scan-index">
+                                [% IF ( header_pulldown == "" ) %]<option selected="selected" value="">Any word</option>
+                                [% ELSE %]<option selected="selected" value="">Any word</option>[% END %]
+                                [% IF ( header_pulldown == "ms_anycommaphr" ) %]<option selected="selected" value="any,phr">Any phrase</option>
+                                [% ELSE %]<option value="any,phr">Any phrase</option>[% END %]
+                                [% IF ( header_pulldown == "ms_ti" ) %]<option selected="selected" value="ti">Title</option>
+                                [% ELSE %]<option value="ti">Title</option>[% END %]
+                                [% IF ( header_pulldown == "ms_ticommaphr" ) %]<option selected="selected" value="ti,phr">Title phrase</option>
+                                [% ELSE %]<option value="ti,phr">Title phrase</option>[% END %]
+                                [% IF ( header_pulldown == ( "ms_au" || "ms_aucommaphr" ) ) %]<option selected="selected" value="au,phr">Author</option>
+                                [% ELSE %]<option value="au,phr">Author</option>[% END %]
+                                [% IF ( header_pulldown == "ms_su" ) %]<option selected="selected" value="su">Subject</option>
+                                [% ELSE %]<option value="su">Subject</option>[% END %]
+                                [% IF ( header_pulldown == "ms_sucommaphr" ) %]<option selected="selected" value="su,phr">Subject phrase</option>
+                                [% ELSE %]<option value="su,phr">Subject phrase</option>[% END %]
+                                [% IF ( header_pulldown ==  "ms_se" ) %]<option selected="selected" value="se">Series</option>
+                                [% ELSE %]<option value="se">Series</option>[% END %]
+                                [% IF ( header_pulldown ==  "ms_pb" ) %]<option selected="selected" value="pb">Publisher</option>
+                                [% ELSE %]<option value="pb">Publisher</option>[% END %]
+                                [% IF ( header_pulldown ==  "ms_nt" ) %]<option selected="selected" value="nt">Notes</option>
+                                [% ELSE %]<option value="nt">Notes</option>[% END %]
+                                [% IF ( header_pulldown ==  "ms_sn" ) %]<option selected="selected" value="sn">ISBN</option>
+                                [% ELSE %]<option value="sn">ISBN</option>[% END %]
+                                [% IF ( header_pulldown ==  "ms_ss" ) %]<option selected="selected" value="ss">ISSN</option>
+                                [% ELSE %]<option value="ss">ISSN</option>[% END %]
+                            </select>
+                            [% IF ( scan_search_term_to_use ) %]
+                                 <input type="text" name="q" id="scan-index-term" size="35" value="[% scan_search_term_to_use | html %]" />
+                            [% ELSE %]
+                                Scan index for: <input type="text" name="q" id="scan-index-term" size="35" value="" />
+                            [% END %]
+                            <input type="hidden" name="scan" value="1" />
+                            <input class="submit" type="submit" value="Submit" />
                         </form>
 
                         <form action="/cgi-bin/koha/catalogue/search.pl" method="get">
-- 
2.39.5