Attachment 110409 Details for Bug 24155 – Bug 24155: (follow-up) Template fixes and updates

[patch] Bug 24155: (follow-up) Template fixes and updates

Bug-24155-follow-up-Template-fixes-and-updates.patch (text/plain), 4.86 KB, created by Owen Leonard on 2020-09-18 15:52:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2020-09-18 15:52:06 UTC

Size: 4.86 KB

patch

obsolete

>From d1e08d5f845baf50fc8c8baaca241015b82a6832 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 18 Sep 2020 15:28:17 +0000
>Subject: [PATCH] Bug 24155: (follow-up) Template fixes and updates
>
>This patch makes a few minor changes to the OPAC and staff interface
>templates:
>
>- In both, the "Apply field weights" checkbox will only appear after the
>  "More options" button has been clicked. Otherwise a hidden input sets
>  the value to 1.
>- In both, the checkbox now appears below the search fields.
>- Checkboxes are now wrapped in the <label> tag to ensure the label is
>  clickable.
>---
> .../prog/en/modules/catalogue/advsearch.tt         | 24 +++++++++++++---------
> .../bootstrap/en/modules/opac-advsearch.tt         | 18 ++++++++++------
> 2 files changed, 26 insertions(+), 16 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 120474f38c..673aa2d7c9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
>@@ -93,16 +93,6 @@
> 
>     <fieldset id="searchterms">
>     <legend>Search for </legend>
>-    [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
>-        [% IF Koha.Preference('ElasticsearchMARCFormat') == 'ARRAY' %]
>-            <input type="checkbox" name="whole_record">
>-            <label for="whole_record">Search entire MARC record</label>
>-        [% END %]
>-        <span id="weight_search">
>-            <input type="checkbox" name="weight_search" checked>
>-            <label for="weight_search">Apply field weightings to search</label>
>-        </span>
>-    [% END %]
>     [% FOREACH search_box IN search_boxes_loop %]
>         [% IF ( search_boxes_label ) %]<div style="text-indent: 4.5em;">[% ELSE %]<div>[% END %]
> 			[% IF ( expanded_options ) %]
>@@ -126,6 +116,20 @@
>             [% END %]
> 		</div>
>     [% END %]
>+    [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
>+        [% IF ( expanded_options ) %]
>+            <p>
>+                [% IF Koha.Preference('ElasticsearchMARCFormat') == 'ARRAY' %]
>+                    <label><input type="checkbox" name="whole_record" /> Search entire MARC record</label>
>+                [% END %]
>+                <span id="weight_search">
>+                    <label><input type="checkbox" name="weight_search" checked="checked" /> Apply field weights to search</label>
>+                </span>
>+            <p>
>+        [% ELSE %]
>+            <input type="hidden" name="weight_search" value="1" />
>+        [% END %]
>+    [% END %]
>     </fieldset>
> 
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
>index 0509d37f8d..1965b4d361 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
>@@ -30,12 +30,6 @@
>                     <div id="booleansearch" class="maincontent">
>                         <fieldset>
>                             <legend>Search for:</legend>
>-                            [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
>-                                <span id="weight_search">
>-                                    <input type="checkbox" name="weight_search" checked>
>-                                    <label for="weight_search">Apply field weightings to search</label>
>-                                </span>
>-                            [% END %]
>                             [% IF ( expanded_options ) %]
>                                 <div class="advanced-search-terms extended">
>                             [% ELSE %]
>@@ -135,6 +129,18 @@
>                                         [% END %]
>                                     </div> 
>                                 [% END # FOREACH search_box %]
>+                                [% IF ( expanded_options ) %]
>+                                    [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
>+                                        <div id="weight_search">
>+                                            <label>
>+                                                <input type="checkbox" name="weight_search" checked="checked">
>+                                                Apply field weights to search
>+                                            </label>
>+                                        </div>
>+                                    [% END %]
>+                                [% ELSE %]
>+                                    <input type="hidden" name="weight_search" value="1" />
>+                                [% END %]
>                             </div> 
>                         </fieldset>
>                     </div> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24155: 99650 | 99667 | 100959 | 104441 | 105033 | 105038 | 105039 | 105041 | 105042 | 109264 | 109360 | 110405 | 110406 | 110407 | 110408 | 110409 | 110431 | 110432 | 110433 | 110434 | 111039