Bugzilla – Attachment 120354 Details for
Bug 26247
Search terms retained in header search creates UX inconsistency
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26247: Consolidate search box code
Bug-26247-Consolidate-search-box-code.patch (text/plain), 20.59 KB, created by
Katrin Fischer
on 2021-05-02 15:45:28 UTC
(
hide
)
Description:
Bug 26247: Consolidate search box code
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2021-05-02 15:45:28 UTC
Size:
20.59 KB
patch
obsolete
>From f07b84ef9c573e2b1abd4c9c7aa24ca51b83ea19 Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Sun, 28 Feb 2021 15:20:43 +0000 >Subject: [PATCH] Bug 26247: Consolidate search box code > >This cleans up the various search bar templates to use a single template >for the 'Search the catalog box' > >To test: >1 - Apply patch >2 - Confirm the 'Search the catalog' appears and works from modules: > Budgets > Cataloging > Circulation > Currencies > Contracts > Home page > Notices and slips > Patrons > Administration > Serials > Acquisitions -> suggestions > Z3950 Admin > >Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk> >--- > .../prog/en/includes/budgets-admin-search.inc | 10 +--------- > koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc | 15 +-------------- > .../prog/en/includes/catalog-search-box.inc | 14 ++++++++++++++ > .../intranet-tmpl/prog/en/includes/cataloging-search.inc | 14 +------------- > koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc | 16 +--------------- > .../prog/en/includes/contracts-admin-search.inc | 15 +-------------- > .../prog/en/includes/currencies-admin-search.inc | 14 +------------- > koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc | 11 +---------- > .../intranet-tmpl/prog/en/includes/letters-search.inc | 14 +------------- > .../prog/en/includes/patrons-admin-search.inc | 14 +------------- > .../prog/en/includes/prefs-admin-search.inc | 15 +-------------- > .../intranet-tmpl/prog/en/includes/serials-search.inc | 15 +-------------- > .../prog/en/includes/suggestions-add-search.inc | 15 +-------------- > .../prog/en/includes/z3950-admin-search.inc | 15 +-------------- > 14 files changed, 27 insertions(+), 170 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/catalog-search-box.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >index 894f844a1b..99ed92d8c4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc >@@ -25,16 +25,8 @@ > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+[% INCLUDE 'catalog-search-box.inc' %] > >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" /> >- <input type="submit" value="Submit" class="submit" /> >- </form> >- </div>[% END %] > <ul> > <li><a class="keep_text" href="#budgets_search">Search funds</a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >index cdafcfe01f..e280286ce6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc >@@ -23,20 +23,7 @@ > </div> > [% END %] > >-[% IF ( CAN_user_catalogue ) %] >-<div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" class="submit" value="Submit" /> >- </form> >-</div> >-[% END %] >+[% INCLUDE 'catalog-search-box.inc' %] > > <ul> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-search-box.inc >new file mode 100644 >index 0000000000..7eca35f0b1 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalog-search-box.inc >@@ -0,0 +1,14 @@ >+[% IF ( CAN_user_catalogue ) %] >+ <div id="catalog_search" class="residentsearch"> >+ <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >+ [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >+ <label class="tip" for="search-form">Enter search keywords:</label> >+ [% INCLUDE 'search_indexes.inc' %] >+ [% ELSE %] >+ <label class="tip" for="search-form">Enter search keywords:</label> >+ [% END %] >+ <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >+ <input type="submit" value="Submit" class="submit" /> >+ </form> >+ </div> >+[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >index 20c7d9d2c3..fe5a09163c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >@@ -29,19 +29,7 @@ > </div> > [% END %] > >- >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" class="submit" value="Submit" /> >- </form> >- </div> >+ [% INCLUDE 'catalog-search-box.inc' %] > > <ul> > <li><a class="keep_text" href="#addbooks_search">Cataloging search</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >index 8892c0d264..2e82fb6e89 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >@@ -20,21 +20,7 @@ > </form> > </div> > [% END %] >-[% IF ( CAN_user_catalogue ) %] >-<div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input class="head-searchbox" type="text" name="q" id="search-form" size="40" accesskey="q" /> >- <input type="submit" class="submit" value="Submit"/> >- </form> >-</div> >-[% END %] >- >+[% INCLUDE 'catalog-search-box.inc' %] > <ul> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc >index d6060cea7d..85ad5e2c11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc >@@ -12,20 +12,7 @@ > </div> > > [% INCLUDE 'patron-search-box.inc' %] >- >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" value="Submit" class="submit" /> >- </form> >- </div>[% END %] >+ [% INCLUDE 'catalog-search-box.inc' %] > > <ul> > <li><a class="keep_text" href="#contract_description_search">Search contracts</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc >index 70e00c92b2..48c30f7690 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc >@@ -10,19 +10,7 @@ > </form> > </div> > [% INCLUDE 'patron-search-box.inc' %] >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" value="Submit" class="submit" /> >- </form> >- </div>[% END %] >+ [% INCLUDE 'catalog-search-box.inc' %] > <ul> > <li><a class="keep_text" href="#currency_search">Search currencies</a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >index eb397b8b5a..27c55daa06 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >@@ -30,16 +30,7 @@ > <input value="Submit" class="submit" type="submit" /> > </form> > </div>[% END %] >-[% IF ( CAN_user_catalogue ) %] >-<div id="catalog_search" class="residentsearch"> >- <label class="tip" for="search-form">Enter search keywords:</label> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %] >- <input type="text" name="q" id="search-form" class="head-searchbox" size="40" accesskey="q" /> >- <input type="submit" class="submit" value="Submit"/> >- </form> >-</div>[% END %] >- >+ [% INCLUDE 'catalog-search-box.inc' %] > <ul> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#checkin_search">Check in</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >index 3f60b68533..281ce2df1a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >@@ -10,19 +10,7 @@ > </form> > </div> > [% INCLUDE 'patron-search-box.inc' %] >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" name="op" value="Submit" class="submit" /> >- </form> >- </div>[% END %] >+ [% INCLUDE 'catalog-search-box.inc' %] > <ul> > <li><a class="keep_text" href="#notices_search">Search notices</a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >index 80a24122ff..b781094798 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc >@@ -10,19 +10,7 @@ > </form> > </div> > [% INCLUDE 'patron-search-box.inc' %] >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" value="Submit" class="submit" /> >- </form> >- </div>[% END %] >+ [% INCLUDE 'catalog-search-box.inc' %] > > <ul> > <li><a class="keep_text" href="#patron_category_search">Search patron categories</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >index 996f7cacad..bbd27362e4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc >@@ -12,20 +12,7 @@ > </form> > </div> > [% INCLUDE 'patron-search-box.inc' %] >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" value="Submit" class="submit" /> >- </form> >- </div> >- [% END %] >+ [% INCLUDE 'catalog-search-box.inc' %] > <ul> > <li><a class="keep_text" href="#syspref_search">Search system preferences</a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >index ee25012e20..db75ea0132 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >@@ -19,20 +19,7 @@ > </form> > </div> > [% INCLUDE 'patron-search-box.inc' %] >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" value="Submit" class="submit" /> >- </form> >- </div> >- [% END %] >+ [% INCLUDE 'catalog-search-box.inc' %] > <ul> > <li><a href="#subscription_search">Search subscriptions</a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >index 12b3fab3a5..ae9358ef3c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc >@@ -14,21 +14,8 @@ > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+ [% INCLUDE 'catalog-search-box.inc' %] > >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" value="Submit" class="submit" /> >- </form> >- </div> >- [% END %] > <ul> > <li><a href="#suggestions_search">Search suggestions</a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >index 51f77ee0b3..3d78eafdaf 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc >@@ -11,21 +11,8 @@ > </div> > > [% INCLUDE 'patron-search-box.inc' %] >+ [% INCLUDE 'catalog-search-box.inc' %] > >- [% IF ( CAN_user_catalogue ) %] >- <div id="catalog_search" class="residentsearch"> >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% INCLUDE 'search_indexes.inc' %] >- [% ELSE %] >- <label class="tip" for="search-form">Enter search keywords:</label> >- [% END %] >- <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" /> >- <input type="submit" value="Submit" class="submit" /> >- </form> >- </div> >- [% END %] > <ul> > <li><a class="keep_text" href="#z3950_search">Search Z39.50/SRU servers</a></li> > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a class="keep_text" href="#circ_search">Check out</a></li>[% END %] >-- >2.11.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26247
:
117408
|
117409
|
117410
|
117411
|
117461
|
117535
|
117536
|
117537
|
117538
|
117539
|
120353
|
120354
|
120355
|
120356
|
120357
|
120358
|
120359
|
120360
|
136683
|
136767
|
137310
|
138478
|
140473
|
140474