Attachment 141687 Details for Bug 30952 – Bug 30952: Better header search bar on smaller screens

[patch] Bug 30952: Better header search bar on smaller screens

Bug-30952-Better-header-search-bar-on-smaller-scre.patch (text/plain), 46.20 KB, created by Julian Maurice on 2022-10-12 05:35:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2022-10-12 05:35:24 UTC

Size: 46.20 KB

patch

obsolete

>From 0e3b558f26a29b77ece304ce3eb7bfc9a1751dd0 Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Wed, 14 Sep 2022 16:02:52 +0200
>Subject: [PATCH] Bug 30952: Better header search bar on smaller screens
>
>- Show only tab icons on screens <= 992px
>- Hide form title on the left on screens <= 768px
>- Move some dropdown lists to the "extra" filters area
>
>Issue #24
>---
> .../intranet-tmpl/prog/css/src/_header.scss | 32 ++++++++++++--
> .../prog/en/includes/acquisitions-search.inc | 4 +-
> .../prog/en/includes/adv-search.inc | 8 ++--
> .../prog/en/includes/authorities-search.inc | 42 +++++++++++--------
> .../prog/en/includes/budgets-admin-search.inc | 22 ++++++----
> .../prog/en/includes/cat-search.inc | 8 ++--
> .../prog/en/includes/cataloging-search.inc | 10 ++---
> .../prog/en/includes/catalogue-search-box.inc | 29 +++++++++----
> .../prog/en/includes/checkin-search.inc | 6 +--
> .../prog/en/includes/circ-search.inc | 8 ++--
> .../prog/en/includes/cities-admin-search.inc | 6 +--
> .../en/includes/contracts-admin-search.inc | 6 +--
> .../en/includes/currencies-admin-search.inc | 6 +--
> .../prog/en/includes/desks-admin-search.inc | 6 +--
> .../prog/en/includes/home-search.inc | 10 ++---
> .../prog/en/includes/letters-search.inc | 6 +--
> .../prog/en/includes/patron-search-header.inc | 10 ++---
> .../prog/en/includes/patrons-admin-search.inc | 6 +--
> .../prog/en/includes/prefs-admin-search.inc | 6 +--
> .../prog/en/includes/serials-search.inc | 6 +--
> .../en/includes/suggestions-add-search.inc | 6 +--
> .../prog/en/includes/z3950-admin-search.inc | 6 +--
> 22 files changed, 148 insertions(+), 101 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss
>index 193ace5482..ad5f422028 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss
>@@ -63,15 +63,15 @@ a.navbar-toggle {
> }
> 
> > ul {
>- padding: 0 .8em 0 0;
>+ padding: 0;
> margin: 0;
> border-radius: 0 16px 16px 0;
> display: flex;
>- justify-content: space-around;
> align-items: center;
> color: white;
> background-color: #418940;
> z-index: 2;
>+ flex-grow: 1;
> 
> li {
> background: transparent;
>@@ -146,7 +146,6 @@ a.navbar-toggle {
> }
> 
> .form-extra-content {
>- left: 284px;
> right: 60px;
> position: absolute;
> top: 31px;
>@@ -155,7 +154,7 @@ a.navbar-toggle {
> padding: 1em;
> border-radius: 0 0 8px 8px;
> border: 1px solid #418940;
>- border-top: 1px solid #e0e0e0;
>+ border-top: 0 none;
> box-shadow: 0 2px 2px 1px #00000030;
> z-index: 1;
> display: none;
>@@ -164,6 +163,11 @@ a.navbar-toggle {
> display: block;
> width: 100%;
> }
>+
>+ label {
>+ display: block;
>+ margin-bottom: 0;
>+ }
> }
> 
> .form-extra-content-toggle {
>@@ -223,3 +227,23 @@ a.navbar-toggle {
> #lastborrowerlink {
> color: #FFFFFF;
> }
>+
>+@media (max-width: 768px) {
>+ #header_search {
>+ .form-title {
>+ display: none;
>+ }
>+ }
>+}
>+
>+@media (max-width: 992px) {
>+ #header_search {
>+ .tab-title {
>+ display: none;
>+ }
>+
>+ > ul {
>+ flex-grow: 0;
>+ }
>+ }
>+}
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>index 1d28d7d394..3d7f599fd3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>@@ -42,8 +42,8 @@
> </div>
> 
> <ul>
>- <li><a title="Vendor search" href="#supplier_search"> Vendor search</a></li>
>- <li><a title="Orders search" href="#orders_search"> Orders search</a></li>
>+ <li><a title="Vendor search" href="#supplier_search"> Vendor search</a></li>
>+ <li><a title="Orders search" href="#orders_search"> Orders search</a></li>
> </ul>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
>index c531653f87..1312f5f16d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
>@@ -7,10 +7,10 @@
> [% INCLUDE 'member-search-box.inc' %]
> 
> <ul>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>- [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a title="Search patrons" href="#patron_search" class="keep_text"> Search patrons</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>+ [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a title="Search patrons" href="#patron_search" class="keep_text"> Search patrons</a></li>[% END %]
> </ul>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
>index 2909383f4d..67c2ea5f08 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
>@@ -53,16 +53,22 @@
> [% END %]
> 
> [% BLOCK authtype %]
>- <select name="authtypecode" class="form-control">
>- [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
>- [% FOREACH authority_type IN authority_types %]
>- [% IF authority_type.authtypecode == authtypecode %]
>- <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option>
>- [% ELSE %]
>- <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option>
>- [% END %]
>- [% END %]
>- </select>
>+ <div>
>+ <label>
>+ Authority type
>+
>+ <select name="authtypecode" class="form-control">
>+ [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
>+ [% FOREACH authority_type IN authority_types %]
>+ [% IF authority_type.authtypecode == authtypecode %]
>+ <option value="[% authority_type.authtypecode | html %]" selected="selected">[% authority_type.authtypetext | html %]</option>
>+ [% ELSE %]
>+ <option value="[% authority_type.authtypecode | html %]">[% authority_type.authtypetext | html %]</option>
>+ [% END %]
>+ [% END %]
>+ </select>
>+ </label>
>+ </div>
> [% END %]
> 
> <div id="header_search">
>@@ -79,7 +85,6 @@
> 
> 
> 
>- [% INCLUDE authtype %]
> <input id="value_mainentry" class="form-control head-searchbox" type="text" name="value" value="[% value | html %]" placeholder="Search main heading ($a only)" />
> <button type="button" class="form-extra-content-toggle"></button>
> 
>@@ -87,6 +92,7 @@
> <button type="submit"></button>
> 
> 
>+ [% INCLUDE authtype %]
> [% INCLUDE operator %]
> [% INCLUDE orderby %]
> 
>@@ -106,7 +112,6 @@
> 
> 
> 
>- [% INCLUDE authtype %]
> <input id="value_mainheading" class="form-control head-searchbox" type="text" name="value" value="[% value | html %]" placeholder="Search main heading" />
> <button type="button" class="form-extra-content-toggle"></button>
> 
>@@ -114,6 +119,7 @@
> <button type="submit"></button>
> 
> 
>+ [% INCLUDE authtype %]
> [% INCLUDE operator %]
> [% INCLUDE orderby %]
> 
>@@ -131,7 +137,6 @@
> 
> 
> 
>- [% INCLUDE authtype %]
> <input id="value_matchheading" class="form-control head-searchbox" type="text" name="value" value="[% value | html %]" placeholder="Search any heading" />
> <button type="button" class="form-extra-content-toggle"></button>
> 
>@@ -139,6 +144,7 @@
> <button type="submit"></button>
> 
> 
>+ [% INCLUDE authtype %]
> [% INCLUDE operator %]
> [% INCLUDE orderby %]
> 
>@@ -158,7 +164,6 @@
> 
> 
> 
>- [% INCLUDE authtype %]
> <input id="value_anywhere" class="form-control head-searchbox" type="text" name="value" value="[% value | html %]" placeholder="Search any authority field" />
> <button type="button" class="form-extra-content-toggle"></button>
> 
>@@ -166,6 +171,7 @@
> <button type="submit"></button>
> 
> 
>+ [% INCLUDE authtype %]
> [% INCLUDE operator %]
> [% INCLUDE orderby %]
> 
>@@ -173,10 +179,10 @@
> </div>
> 
> <ul>
>- <li><a title="Search main heading ($a only)" href="#mainmain_heading" class="keep_text">$a Search main heading ($a only)</a></li>
>- <li><a title="Search main heading" href="#main_heading" class="keep_text"> Search main heading</a></li>
>- <li><a title="Search all headings" href="#matchheading_search" class="keep_text"> Search all headings</a></li>
>- <li><a title="Search entire record" href="#entire_record" class="keep_text"> Search entire record</a></li>
>+ <li><a title="Search main heading ($a only)" href="#mainmain_heading" class="keep_text">$a Main heading ($a only)</a></li>
>+ <li><a title="Search main heading" href="#main_heading" class="keep_text"> Main heading</a></li>
>+ <li><a title="Search all headings" href="#matchheading_search" class="keep_text"> All headings</a></li>
>+ <li><a title="Search entire record" href="#entire_record" class="keep_text"> Entire record</a></li>
> </ul>
> </div>
> 
>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 b610015f95..3542711de1 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
>@@ -11,6 +11,16 @@
> 
> 
> 
>+ <input class="query form-control" type="text" name="filter_budgetname" id="filter_budgetname" value="[% filter_budgetname | html %]" placeholder="Search funds" />
>+
>+ <button type="button" class="form-extra-content-toggle"></button>
>+ 
>+
>+ <button type="submit"></button>
>+
>+ <div class="form-extra-content">
>+ <label for="filter_budgetbranch">Library</label>
>+
> <select name="filter_budgetbranch" id="filter_budgetbranch" class="form-control">
> <option value="">All libraries</option>
> [% FOREACH branchloo IN Branches.all( selected => selected_branchcode ) %]
>@@ -21,11 +31,7 @@
> [% END %]
> [% END %]
> </select>
>-
>- <input class="query form-control" type="text" name="filter_budgetname" id="filter_budgetname" value="[% filter_budgetname | html %]" placeholder="Search funds" />
>- 
>-
>- <button type="submit"></button>
>+ </div>
> </form>
> </div>
> 
>@@ -34,9 +40,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search funds" href="#budgets_search" class="keep_text"> Search funds</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search funds" href="#budgets_search" class="keep_text"> Search funds</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>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 511893528b..b2b45cde19 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
>@@ -6,10 +6,10 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li class="ui-tabs-active"><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> 
> </div>
>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 f31df2d262..1199c79fe1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
>@@ -25,11 +25,11 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Cataloging search" href="#addbooks_search" class="keep_text"> Cataloging search</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>- <li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>
>+ <li><a title="Cataloging search" href="#addbooks_search" class="keep_text"> Cataloging search</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>+ <li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>
> </ul>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
>index 1106becfaf..00823a1b70 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/catalogue-search-box.inc
>@@ -7,23 +7,34 @@
> 
> 
> 
>- [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>- [% INCLUDE 'search_indexes.inc' $header_pulldown = 1 %]
>- [% END %]
> [% IF ( Koha.Preference('RetainCatalogSearchTerms') ) %]
> <input type="text" name="q" id="search-form" size="20" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="query form-text head-searchbox form-control" placeholder="Enter search keywords" />
> [% ELSE %]
> <input type="text" name="q" id="search-form" size="20" title="Enter the terms you wish to search for." class="query form-text head-searchbox form-control" placeholder="Enter search keywords" />
> [% END %]
> 
>- [% IF ( Koha.Preference('IntranetAddMastheadLibraryPulldown') ) %]
>- <select id="select_library" name="limit" style="margin-left:5px;">
>- <option value="">All libraries</option>
>- [% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all( selected => branch_limit ) %]
>- </select>
>- [% END %]
>+ <button type="button" class="form-extra-content-toggle"></button>
> 
> <button type="submit"></button>
>+
>+ <div class="form-extra-content">
>+ [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+ <div>
>+ <label for="idx">Search index</label>
>+ [% INCLUDE 'search_indexes.inc' $header_pulldown = 1 %]
>+ </div>
>+ [% END %]
>+
>+ [% IF ( Koha.Preference('IntranetAddMastheadLibraryPulldown') ) %]
>+ <div>
>+ <label for="select_library">Library</label>
>+ <select id="select_library" name="limit">
>+ <option value="">All libraries</option>
>+ [% PROCESS options_for_libraries prefix => "branch:" libraries => Branches.all( selected => branch_limit ) %]
>+ </select>
>+ </div>
>+ [% END %]
>+ </div>
> </form>
> </div>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>index e52befd3db..97541c6d30 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>@@ -8,9 +8,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>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 11914086ca..0e770aa46d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
>@@ -9,10 +9,10 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"> Search catalog</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>index cfad7765e2..51620c6fbf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
>@@ -19,9 +19,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search cities" href="#city_search" class="keep_text"> Search cities</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search cities" href="#city_search" class="keep_text"> Search cities</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>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 2edc819dee..42cab98c86 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
>@@ -20,9 +20,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search contracts" href="#contract_description_search" class="keep_text"> Search contracts</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search contracts" href="#contract_description_search" class="keep_text"> Search contracts</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>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 0c458d6fd8..16adca3705 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
>@@ -20,9 +20,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search currencies" href="#currency_search" class="keep_text"> Search currencies</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search currencies" href="#currency_search" class="keep_text"> Search currencies</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
>index 78bca3d346..f25526cade 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
>@@ -19,9 +19,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search desks" href="#desk_search" class="keep_text"> Search desks</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search desks" href="#desk_search" class="keep_text"> Search desks</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>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 f62af7a683..b49ea45843 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>@@ -8,11 +8,11 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>- [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a title="Search patrons" href="#patron_search" class="keep_text"> Search patrons</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>+ [% IF ( CAN_user_borrowers_edit_borrowers ) %]<li><a title="Search patrons" href="#patron_search" class="keep_text"> Search patrons</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>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 959be09300..5ec0553659 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>@@ -20,9 +20,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search notices" href="#notices_search" class="keep_text"> Search notices</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search notices" href="#notices_search" class="keep_text"> Search notices</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc
>index 53d30b08a0..1fc3262562 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-header.inc
>@@ -6,10 +6,10 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search patrons" href="#patron_search" class="keep_text"> Search patrons</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search patrons" href="#patron_search" class="keep_text"> Search patrons</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check in" href="#checkin_search" class="keep_text"> Check in</a></li>[% END %]
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Renew" href="#renew_search" class="keep_text"> Renew</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
>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 a4e8723af3..6733864b89 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
>@@ -20,9 +20,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search patron categories" href="#patron_category_search" class="keep_text"> Search patron categories</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search patron categories" href="#patron_category_search" class="keep_text"> Search patron categories</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>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 96a747f623..6a0672b420 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
>@@ -21,9 +21,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search system preferences" href="#syspref_search" class="keep_text"> Search system preferences</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search system preferences" href="#syspref_search" class="keep_text"> Search system preferences</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>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 8b7592ab9c..5e60974c15 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>@@ -31,9 +31,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search subscriptions" href="#subscription_search" class="keep_text"> Search subscriptions</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search subscriptions" href="#subscription_search" class="keep_text"> Search subscriptions</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>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 9fcb5c6f9f..d6ff5d1411 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
>@@ -24,9 +24,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search suggestions" href="#suggestions_search" class="keep_text"> Search suggestions</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search suggestions" href="#suggestions_search" class="keep_text"> Search suggestions</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>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 9efca7cebb..ed7a88e138 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
>@@ -20,9 +20,9 @@
> [% INCLUDE 'catalogue-search-box.inc' %]
> 
> <ul>
>- <li><a title="Search Z39.50/SRU servers" href="#z3950_search" class="keep_text"> Search Z39.50/SRU servers</a></li>
>- [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>- [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
>+ <li><a title="Search Z39.50/SRU servers" href="#z3950_search" class="keep_text"> Search Z39.50/SRU servers</a></li>
>+ [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]<li><li><a title="Check out" href="#circ_search" class="keep_text"> Check out</a></li>[% END %]
>+ [% IF ( CAN_user_catalogue ) %]<li><a title="Search catalog" href="#catalog_search" class="keep_text"> Search catalog</a></li>[% END %]
> </ul>
> </div>
> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 30952: 136810 | 136812 | 136813 | 136815 | 136816 | 136818 | 136819 | 136820 | 136822 | 136823 | 136825 | 136827 | 136828 | 136830 | 136831 | 136833 | 136834 | 136836 | 136837 | 136839 | 136840 | 136842 | 136844 | 136845 | 136847 | 136848 | 136878 | 136879 | 136880 | 136881 | 136882 | 136883 | 136884 | 136885 | 136886 | 136887 | 136888 | 136889 | 136890 | 136891 | 136892 | 136893 | 136894 | 136895 | 136896 | 136897 | 136898 | 136899 | 136900 | 136901 | 136902 | 136950 | 136951 | 136952 | 136953 | 136954 | 136955 | 136956 | 136957 | 136958 | 136959 | 136960 | 136961 | 136962 | 136963 | 136964 | 136965 | 136966 | 136967 | 136968 | 136969 | 136970 | 136971 | 136972 | 136973 | 136974 | 137408 | 137409 | 137410 | 137411 | 137414 | 137415 | 137416 | 137417 | 137418 | 137419 | 137420 | 137744 | 137767 | 137768 | 137775 | 137776 | 137994 | 138091 | 138092 | 138093 | 138094 | 138095 | 138096 | 138097 | 138098 | 138099 | 138100 | 138101 | 138102 | 138103 | 138245 | 138246 | 138247 | 138293 | 138299 | 138300 | 138302 | 140117 | 140118 | 140119 | 140120 | 140121 | 140122 | 140123 | 140124 | 140125 | 140126 | 140127 | 140128 | 140129 | 140130 | 140131 | 140132 | 140133 | 140134 | 140135 | 140136 | 140137 | 140138 | 140139 | 140140 | 140141 | 140142 | 140143 | 140371 | 140372 | 140373 | 140374 | 140433 | 140435 | 140459 | 140460 | 140512 | 140513 | 140514 | 140515 | 140516 | 140517 | 140519 | 140520 | 140521 | 140522 | 140523 | 140524 | 140525 | 140526 | 140527 | 140528 | 140529 | 140530 | 140531 | 140532 | 140533 | 140534 | 140535 | 140536 | 140537 | 140538 | 140539 | 140540 | 140541 | 140542 | 140543 | 140544 | 140545 | 140546 | 140547 | 140548 | 140549 | 140550 | 140551 | 140552 | 140553 | 140554 | 140555 | 140556 | 140557 | 140558 | 140559 | 140560 | 140566 | 140567 | 140570 | 140571 | 140575 | 140576 | 140577 | 140588 | 140613 | 140617 | 140618 | 140619 | 140620 | 140628 | 140629 | 140635 | 140649 | 140650 | 140651 | 140652 | 140653 | 140654 | 140658 | 140687 | 140976 | 140977 | 141020 | 141024 | 141026 | 141027 | 141041 | 141043 | 141044 | 141047 | 141052 | 141053 | 141054 | 141055 | 141056 | 141057 | 141064 | 141074 | 141075 | 141631 | 141632 | 141633 | 141634 | 141635 | 141636 | 141637 | 141638 | 141639 | 141640 | 141641 | 141642 | 141643 | 141644 | 141645 | 141646 | 141647 | 141648 | 141649 | 141650 | 141651 | 141652 | 141653 | 141654 | 141655 | 141656 | 141657 | 141658 | 141659 | 141660 | 141661 | 141662 | 141663 | 141664 | 141665 | 141666 | 141667 | 141668 | 141669 | 141670 | 141671 | 141672 | 141673 | 141674 | 141675 | 141676 | 141677 | 141678 | 141679 | 141680 | 141681 | 141682 | 141683 | 141684 | 141685 | 141686 | 141687 | 141688 | 141689 | 141690 | 141691 | 141692 | 141693 | 141694 | 141695 | 141696 | 141697 | 141698 | 141699 | 141700 | 141701 | 141702 | 141703 | 141704 | 141705 | 141706 | 141707 | 141708 | 141709 | 141710 | 141711 | 141712 | 141713 | 142604 | 142605