From 8fc4a4af02b97857d4e5b995b3c48a89c7c9e106 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 19 Jan 2024 12:11:43 +0000 Subject: [PATCH] Bug 35850: Use template wrapper for tabs: Header search forms This patch updates search header includes so that the tabs use WRAPPER to build markup. To test, apply the patch and test at least one page which uses each updated search include. Search header tabs should look correct and work correctly. - Acquisitions - Suggestions - Administration - Budgets and funds - Cities - Currencies - Desks - Patron categories - System preferences - Z39.50 - Advanced search - Authorities - Bibliographic detail page - Cataloging home page - Check in - Check out - Acquisitions -> Vendor -> Contracts - ERM - Staff interface home page - Serials - Tool -> Notices Signed-off-by: Martin AUBEUT --- .../intranet-tmpl/prog/css/src/_header.scss | 4 + .../prog/en/includes/acquisitions-search.inc | 105 ++++++++++-------- .../prog/en/includes/adv-search.inc | 39 +++---- .../prog/en/includes/authorities-search.inc | 57 +++++----- .../prog/en/includes/budgets-admin-search.inc | 37 +++--- .../prog/en/includes/cat-search.inc | 40 +++---- .../prog/en/includes/cataloging-search.inc | 47 ++++---- .../prog/en/includes/catalogue-search-box.inc | 83 +++++++------- .../prog/en/includes/checkin-search-box.inc | 8 +- .../prog/en/includes/checkin-search.inc | 32 +++--- .../prog/en/includes/circ-search.inc | 39 +++---- .../prog/en/includes/cities-admin-search.inc | 36 +++--- .../en/includes/contracts-admin-search.inc | 36 +++--- .../en/includes/currencies-admin-search.inc | 36 +++--- .../prog/en/includes/desks-admin-search.inc | 35 +++--- .../prog/en/includes/erm-search.inc | 54 ++++----- .../prog/en/includes/home-search.inc | 46 ++++---- .../prog/en/includes/letters-search.inc | 36 +++--- .../prog/en/includes/member-search-box.inc | 8 +- .../prog/en/includes/patron-search-box.inc | 8 +- .../prog/en/includes/patron-search-header.inc | 47 ++++---- .../prog/en/includes/patrons-admin-search.inc | 37 +++--- .../prog/en/includes/prefs-admin-search.inc | 39 ++++--- .../prog/en/includes/renew-search-box.inc | 8 +- .../prog/en/includes/serials-search.inc | 36 +++--- .../en/includes/suggestions-add-search.inc | 38 +++---- .../prog/en/includes/z3950-admin-search.inc | 36 +++--- .../intranet-tmpl/prog/js/staff-global.js | 2 +- 28 files changed, 532 insertions(+), 497 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss index 292ef7754e..e1bbb99a33 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/_header.scss @@ -242,6 +242,10 @@ a.navbar-toggle { } } + &.toptabs { + margin-top: 0; + } + .nav-tabs { > li { 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 4fabdd4c34..36e01eb171 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -1,56 +1,63 @@ +[% USE raw %] +[% PROCESS 'html_helpers.inc' %] - - - - - + [% END # /tab_panel %] + + [% END # /tab_panels %] + [% WRAPPER tabs_nav %] + [% WRAPPER tab_item tabname= "mainmain_heading" bt_active= 1 %] + Main heading ($a only) + [% END %] + [% WRAPPER tab_item tabname= "main_heading" %] + Main heading + [% END %] + [% WRAPPER tab_item tabname= "matchheading_search" %] + All headings + [% END %] + [% WRAPPER tab_item tabname= "entire_record" %] + Entire record + [% END %] + [% END # /tabs_nav %] +[% END # /WRAPPER tabs %] 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 a422246986..a9e27b92fe 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 @@ -1,10 +1,11 @@ +[% USE raw %] [% USE Koha %] +[% PROCESS 'html_helpers.inc' %] [% USE Branches %] - - - - + [% END # /tabs_nav %] +[% END # /WRAPPER tabs %] 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 985655f611..21639ba064 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc @@ -1,7 +1,9 @@ +[% USE raw %] +[% USE Koha %] +[% PROCESS 'html_helpers.inc' %] - + [% END # /tabs_nav %] +[% END # /WRAPPER tabs %] 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 75b930d313..b86c0ac95f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc @@ -1,11 +1,11 @@ +[% USE raw %] [% USE Koha %] [% PROCESS 'html_helpers.inc' %] [% PROCESS 'patronfields.inc' %] -