Bugzilla – Attachment 163520 Details for
Bug 35850
Use template wrapper for tabs: Header search forms
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35850: Use template wrapper for tabs: Header search forms
Bug-35850-Use-template-wrapper-for-tabs-Header-sea.patch (text/plain), 92.88 KB, created by
Owen Leonard
on 2024-03-20 10:39:00 UTC
(
hide
)
Description:
Bug 35850: Use template wrapper for tabs: Header search forms
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2024-03-20 10:39:00 UTC
Size:
92.88 KB
patch
obsolete
>From 206816746008abfcdb6265c45a92471d47196e0c Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 rebuild the staff interface CSS. > >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 <martin.aubeut@gmail.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../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 | 49 ++++---- > .../prog/en/includes/catalogue-search-box.inc | 83 +++++++------- > .../prog/en/includes/checkin-search-box.inc | 10 +- > .../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 | 38 ++++--- > .../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 | 10 +- > .../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 | 41 ++++--- > .../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, 537 insertions(+), 502 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 562f230873..86ca5e0204 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' %] > <!-- acquisitions-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="supplier_search" role="tabpanel" class="tab-pane active"> >- <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="get"> >- <div class="form-title"> >- <label class="control-label" for="supplier"><span class="control-text">Vendor search</span> <i class="fa fa-fw fa-upload" aria-hidden="true"></i></label> >- </div> >+[% FILTER collapse %] >+ [% WRAPPER tabs id="header_search" %] > >- <div class="form-content"> >- <input type="text" name="supplier" id="supplier" class="head-searchbox form-control" placeholder="Search vendors" /> >- </div> >- <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> >- </form> >- </div> >- >- <div id="orders_search" role="tabpanel" class="tab-pane"> >- <form action="/cgi-bin/koha/acqui/histsearch.pl" method="get"> >- <div class="form-title"> >- <label class="control-label" for="order_title"><span class="control-text">Orders search</span> <i class="fa fa-fw fa-download" aria-hidden="true"></i></label> >- </div> >- >- <div class="form-content"> >- <input type="text" id="order_title" class="form-control" placeholder="Title" name="title" size="13" value="[% title | html %]" /> >- <input type="text" id="searchsupplier" class="form-control" placeholder="Vendor" name="name" size="13" value="[% name | html %]" /> >- <button type="button" class="form-extra-content-toggle" title="More options"><i class="form-extra-content-icon fa-solid fa-sliders" aria-hidden="true"></i></button> >- <input type="hidden" id="do_search" name="do_search" value="do" /> >- </div> >- <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="supplier_search" bt_active= 1 %] >+ <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="get"> >+ <div class="form-title"> >+ <label class="control-label" for="supplier"><span class="control-text">Vendor search</span> <i class="fa fa-fw fa-upload" aria-hidden="true"></i></label> >+ </div> > >- <div class="form-extra-content"> >- <div> >- <label for="basket" class="control-label">Basket</label> >- <input type="text" class="form-control" placeholder="Basket" name="basket" id="basket" /> >+ <div class="form-content"> >+ <input type="text" name="supplier" id="supplier" class="head-searchbox form-control" placeholder="Search vendors" /> > </div> >- <div> >- <label for="booksellerinvoicenumber" class="control-label">Invoice number</label> >- <input type="text" class="form-control" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" /> >+ <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> >+ </form> >+ [% END # /tab_panel# %] >+ [% WRAPPER tab_panel tabname="orders_search" %] >+ <form action="/cgi-bin/koha/acqui/histsearch.pl" method="get"> >+ <div class="form-title"> >+ <label class="control-label" for="order_title"><span class="control-text">Orders search</span> <i class="fa fa-fw fa-download" aria-hidden="true"></i></label> > </div> >- <div> >- <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a> >+ >+ <div class="form-content"> >+ <input type="text" id="order_title" class="form-control" placeholder="Title" name="title" size="13" value="[% title | html %]" /> >+ <input type="text" id="searchsupplier" class="form-control" placeholder="Vendor" name="name" size="13" value="[% name | html %]" /> >+ <button type="button" class="form-extra-content-toggle" title="More options"><i class="form-extra-content-icon fa-solid fa-sliders" aria-hidden="true"></i></button> >+ <input type="hidden" id="do_search" name="do_search" value="do" /> > </div> >- </div> >- </form> >- </div> >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Vendor search" href="#supplier_search" aria-controls="supplier_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-upload" aria-hidden="true"></i> <span class="tab-title">Vendor search</span></a> >- </li> >- <li role="presentation"> >- <a title="Orders search" href="#orders_search" aria-controls="orders_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-download" aria-hidden="true"></i> <span class="tab-title">Orders search</span></a> >- </li> >- </ul> >-</div><!-- /#header_search --> >+ <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> >+ >+ <div class="form-extra-content"> >+ <div> >+ <label for="basket" class="control-label">Basket</label> >+ <input type="text" class="form-control" placeholder="Basket" name="basket" id="basket" /> >+ </div> >+ <div> >+ <label for="booksellerinvoicenumber" class="control-label">Invoice number</label> >+ <input type="text" class="form-control" placeholder="Invoice number" name="booksellerinvoicenumber" id="booksellerinvoicenumber" /> >+ </div> >+ <div> >+ <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a> >+ </div> >+ </div> >+ </form> >+ [% END # /tab_panel# %] >+ [% END # /WRAPPER tab_panels %] >+ >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "supplier_search" bt_active= 1 %] >+ <i class="fa fa-upload" aria-hidden="true"></i> <span class="tab-title">Vendor search</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "orders_search" %] >+ <i class="fa fa-download" aria-hidden="true"></i> <span class="tab-title">Orders search</span> >+ [% END %] >+ [% END # /WRAPPER tabs_nav %] >+ >+ [% END # /WRAPPER tabs %] >+[% END %] >+ > <!-- /acquisitions-search.inc --> >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 150b9c7a78..aa48fc4961 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc >@@ -1,7 +1,8 @@ >+[% USE raw %] >+[% PROCESS 'html_helpers.inc' %] > <!-- adv-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- >+[% WRAPPER tabs id= "header_search" %] >+ [% WRAPPER tab_panels %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' bs_tab_active= 1 %] > [% INCLUDE 'checkin-search-box.inc' %] >@@ -10,25 +11,25 @@ > [% IF ( CAN_user_borrowers_edit_borrowers ) %] > [% INCLUDE 'member-search-box.inc' %] > [% END %] >+ [% END %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >+ [% WRAPPER tabs_nav %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation" class="active"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" aria-expanded="true" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >- <li role="presentation"> >- <a title="Check in" href="#checkin_search" aria-controls="checkin_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title">Check in</span></a> >- </li> >- <li role="presentation"> >- <a title="Renew" href="#renew_search" aria-controls="renew_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >+ [% END %] >+ [% WRAPPER tab_item tabname= "checkin_search" %] >+ <i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title">Check in</span></a> >+ [% END %] >+ [% WRAPPER tab_item tabname= "renew_search" %] >+ <i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span></a> >+ [% END %] > [% END %] > [% IF ( CAN_user_borrowers_edit_borrowers ) %] >- <li role="presentation"> >- <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card" aria-hidden="true"></i> <span class="tab-title">Search patrons</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "patron_search" %] >+ <i class="fa fa-fw fa-id-card" aria-hidden="true"></i> <span class="tab-title">Search patrons</span></a> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /WRAPPER tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- adv-search.inc --> >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 3f1fad882a..87fd69c7c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc >@@ -1,3 +1,5 @@ >+[% USE raw %] >+[% PROCESS 'html_helpers.inc' %] > <!-- authorities-search.inc --> > > [% BLOCK orderby %] >@@ -70,9 +72,9 @@ > </div> > [% END %] > >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="mainmain_heading" role="tabpanel" class="tab-pane active"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="mainmain_heading" bt_active= 1 %] > <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> > <input type="hidden" name="op" value="do_search" /> > <input type="hidden" name="type" value="intranet" /> >@@ -97,9 +99,9 @@ > [% INCLUDE orderby %] > </div> > </form> >- </div> >+ [% END # /tab_panel %] > >- <div id="main_heading" role="tabpanel" class="tab-pane"> >+ [% WRAPPER tab_panel tabname="main_heading" %] > <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> > <input type="hidden" name="marclist" value="mainentry" /> > <input type="hidden" name="and_or" value="and" /> >@@ -124,9 +126,9 @@ > [% INCLUDE orderby %] > </div> > </form> >- </div> >+ [% END # /tab_panel %] > >- <div id="matchheading_search" role="tabpanel" class="tab-pane"> >+ [% WRAPPER tab_panel tabname="matchheading_search" %] > <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> > <input type="hidden" name="op" value="do_search" /> > <input type="hidden" name="type" value="intranet" /> >@@ -149,9 +151,9 @@ > [% INCLUDE orderby %] > </div> > </form> >- </div> >+ [% END # /tab_panel %] > >- <div id="entire_record" role="tabpanel" class="tab-pane"> >+ [% WRAPPER tab_panel tabname="entire_record" %] > <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get"> > <input type="hidden" name="op" value="do_search" /> > <input type="hidden" name="type" value="intranet" /> >@@ -176,23 +178,22 @@ > [% INCLUDE orderby %] > </div> > </form> >- </div> >- >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search main heading ($a only)" href="#mainmain_heading" aria-controls="mainmain_heading" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-main-heading-a" aria-hidden="true"></i> <span class="tab-title">Main heading ($a only)</span></a> >- </li> >- <li role="presentation"> >- <a title="Search main heading" href="#main_heading" aria-controls="main_heading" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-header" aria-hidden="true"></i> <span class="tab-title">Main heading</span></a> >- </li> >- <li role="presentation"> >- <a title="Search all headings" href="#matchheading_search" aria-controls="matchheading_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-align-center" aria-hidden="true"></i> <span class="tab-title">All headings</span></a> >- </li> >- <li role="presentation"> >- <a title="Search entire record" href="#entire_record" aria-controls="entire_record" role="tab" data-toggle="tab" class="keep_text"><i class="fa-solid fa-fw fa-folder-open" aria-hidden="true"></i> <span class="tab-title">Entire record</span></a> >- </li> >- <li role="presentation"> >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tab_panel %] >+ >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "mainmain_heading" bt_active= 1 %] >+ <i class="fa fa-fw fa-main-heading-a" aria-hidden="true"></i> <span class="tab-title">Main heading ($a only)</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "main_heading" %] >+ <i class="fa fa-fw fa-header" aria-hidden="true"></i> <span class="tab-title">Main heading</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "matchheading_search" %] >+ <i class="fa fa-fw fa-align-center" aria-hidden="true"></i> <span class="tab-title">All headings</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "entire_record" %] >+ <i class="fa-solid fa-fw fa-folder-open" aria-hidden="true"></i> <span class="tab-title">Entire record</span> >+ [% END %] >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /authorities-search.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 b4cb6c4a61..24f29d4617 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 %] > <!-- budgets-admin-search.inc --> >- >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="budgets_search" role="tabpanel" class="tab-pane active"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="budgets_search" bt_active= 1 %] > <form action="/cgi-bin/koha/admin/aqbudgets.pl" method="get"> > <input type="hidden" name="budget_period_id" value="[% budget_period_id | html %]" /> > >@@ -35,7 +36,7 @@ > </select> > </div> > </form> >- </div> >+ [% END # /tab_panel %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -44,21 +45,21 @@ > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search funds" href="#budgets_search" aria-controls="budgets_search" aria-expanded="true" role="tab" data-toggle="tab" class="keep_text"><i class="fa-solid fa-fw fa-credit-card"></i> <span class="tab-title">Search funds</span></a> >- </li> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "budgets_search" bt_active= 1 %] >+ <i class="fa-solid fa-fw fa-credit-card"></i> <span class="tab-title">Search funds</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /budgets-admin-search.inc --> >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' %] > <!-- cat-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] > [% INCLUDE 'checkin-search-box.inc' %] >@@ -10,25 +12,25 @@ > [% IF ( CAN_user_catalogue ) %] > [% INCLUDE 'catalogue-search-box.inc' bs_tab_active= 1 %] > [% END %] >+ [% END # /tab_panels %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >+ [% WRAPPER tabs_nav %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >- <li role="presentation"> >- <a title="Check in" href="#checkin_search" aria-controls="checkin_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title">Check in</span></a> >- </li> >- <li role="presentation"> >- <a title="Renew" href="#renew_search" aria-controls="renew_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "checkin_search" %] >+ <i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title">Check in</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "renew_search" %] >+ <i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation" class="active"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /cat-search.inc --> >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 2fe9f23eab..697abf3b6c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc >@@ -1,12 +1,12 @@ >+[% USE raw %] > [% USE Koha %] > [% PROCESS 'html_helpers.inc' %] > [% PROCESS 'patronfields.inc' %] > <!-- cataloging-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- >- <div id="addbooks_search" role="tabpanel" class="tab-pane active"> >- <form method="get" name="search" action="addbooks.pl"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="addbooks_search" bt_active= 1 %] >+ <form name="search" action="addbooks.pl" method="get"> > <div class="form-title"> > <label class="control-label" for="cat_search"><span class="control-text">Cataloging search</span> <i class="fa fa-fw fa-search" aria-hidden="true"></i></label> > </div> >@@ -17,7 +17,7 @@ > > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -28,27 +28,28 @@ > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <li role="presentation" class="active"> >- <a title="Cataloging search" href="#addbooks_search" aria-controls="addbooks_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Cataloging search</span></a> >- </li> >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >- <li role="presentation"> >- <a title="Check in" href="#checkin_search" aria-controls="checkin_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title">Check in</span></a> >- </li> >- <li role="presentation"> >- <a title="Renew" href="#renew_search" aria-controls="renew_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "addbooks_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Cataloging search</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "checkin_search" %] >+ <i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title">Check in</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "renew_search" %] >+ <i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /cataloging-search.inc --> >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 7f8584782c..31211296ae 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 >@@ -1,49 +1,46 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > [% USE Branches %] >-[% IF ( CAN_user_catalogue ) %] >- <!-- catalogue-search-box.inc --> >- [% IF( bs_tab_active ) %] >- <div id="catalog_search" role="tabpanel" class="tab-pane active"> >- [% ELSE %] >- <div id="catalog_search" role="tabpanel" class="tab-pane"> >- [% END %] >- <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >- <div class="form-title"> >- <label class="control-label" for="search-form"><span class="control-text">Search catalog</span> <i class="fa fa-fw fa-search" aria-hidden="true"></i></label> >- </div> >+<!-- catalogue-search-box.inc --> >+[% WRAPPER tab_panel tabname="catalog_search" bt_active= bs_tab_active %] >+ <form action="/cgi-bin/koha/catalogue/search.pl" method="get" id="cat-search-block"> >+ <div class="form-title"> >+ <label class="control-label" for="search-form"><span class="control-text">Search catalog</span> <i class="fa fa-fw fa-search" aria-hidden="true"></i></label> >+ </div> > >- <div class="form-content"> >- [% 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 %] >+ <div class="form-content"> >+ [% 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('IntranetCatalogSearchPulldown') || Koha.Preference('IntranetAddMastheadLibraryPulldown') %] >- <button type="button" class="form-extra-content-toggle" title="More options"><i class="form-extra-content-icon fa-solid fa-sliders" aria-hidden="true"></i></button> >- [% END %] >- </div> >- <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> >+ [% IF Koha.Preference('IntranetCatalogSearchPulldown') || Koha.Preference('IntranetAddMastheadLibraryPulldown') %] >+ <button type="button" class="form-extra-content-toggle" title="More options"><i class="form-extra-content-icon fa-solid fa-sliders" aria-hidden="true"></i></button> >+ [% END %] >+ </div> >+ <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></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 %] >+ <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> >+[% END # /tab_panel %] >+<!-- /catalogue-search-box.inc --> > >- [% 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> >- <!-- /catalogue-search-box.inc --> >-[% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search-box.inc >index 0b38cd6618..8615eb0602 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search-box.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search-box.inc >@@ -1,10 +1,6 @@ > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <!-- checkin-search-box.inc --> >- [% IF( bs_tab_active ) %] >- <div id="checkin_search" role="tabpanel" class="tab-pane active"> >- [% ELSE %] >- <div id="checkin_search" role="tabpanel" class="tab-pane"> >- [% END %] >+ [% WRAPPER tab_panel tabname="checkin_search" bt_active= bs_tab_active %] > <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off"> > [% INCLUDE 'csrf-token.inc' %] > <div class="form-title"> >@@ -12,11 +8,11 @@ > </div> > > <div class="form-content"> >- <input type="hidden" name="op" value="cud-checkin"> > <input name="barcode" id="ret_barcode" class="head-searchbox form-control" accesskey="r" type="text" placeholder="Scan a barcode to check in" size="40"/> >+ <input type="hidden" name="op" value="cud-checkin" /> > </div> > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > <!-- /checkin-search-box.inc --> > [% 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 34dfccb9dd..a2f2ea9afc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc >@@ -1,7 +1,9 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- checkin-search.inc --> >-<div id="header_search" role="tabpanel" class="tab-pane active"> >- <div class="tab-content"> >+[% WRAPPER tabs id= "header_search" %] >+ [% WRAPPER tab_panels %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' bs_tab_active= 1 %] > [% INCLUDE 'renew-search-box.inc' %] >@@ -9,21 +11,21 @@ > [% IF ( CAN_user_catalogue ) %] > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation" class="active"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >- <li role="presentation"> >- <a title="Renew" href="#renew_search" aria-controls="renew_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "renew_search" %] >+ <i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /checkin-search.inc --> >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 f0d148e11e..844cdfd43d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc >@@ -1,8 +1,9 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- circ-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' bs_tab_active= 1 %] > [% INCLUDE 'checkin-search-box.inc' %] >@@ -12,24 +13,24 @@ > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation" class="active"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >- <li role="presentation"> >- <a title="Check in" href="#checkin_search" aria-controls="checkin_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title">Check in</span></a> >- </li> >- <li role="presentation"> >- <a title="Renew" href="#renew_search" aria-controls="renew_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span></a> >- </li> >+ [% WRAPPER tab_item tabname="circ_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "checkin_search" %] >+ <i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title">Check in</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "renew_search" %] >+ <i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /circ-search.inc --> >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 34c6e00742..9a9a64bc81 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 >@@ -1,8 +1,10 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- cities-admin-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="city_search" role="tabpanel" class="tab-pane active"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="city_search" bt_active= 1 %] > <form action="[% script_name | html %]" method="get"> > <div class="form-title"> > <label class="control-label" for="city_name_filter"><span class="control-text">Search cities</span> <i class="fa fa-fw fa-building" aria-hidden="true"></i></label> >@@ -14,7 +16,7 @@ > > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -23,21 +25,21 @@ > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search cities" href="#city_search" aria-controls="city_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-building" aria-hidden="true"></i> <span class="tab-title">Search cities</span></a> >- </li> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "city_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-building" aria-hidden="true"></i> <span class="tab-title">Search cities</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- cities-admin-search.inc --> >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 9b5405aa65..c62138a6e6 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 >@@ -1,8 +1,10 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- contracts-admin-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="contract_description_search" role="tabpanel" class="tab-pane active"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="contract_description_search" bt_active= 1 %] > <form action="[% script_name | html %]" method="get"> > <div class="form-title"> > <label class="control-label" for="searchfield"><span class="control-text">Search contracts</span> <i class="fa-solid fa-fw fa-pen-to-square" aria-hidden="true"></i></label> >@@ -14,7 +16,7 @@ > > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -22,22 +24,22 @@ > [% IF ( CAN_user_catalogue ) %] > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] >+ [% END # /tab_panels %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search contracts" href="#contract_description_search" aria-controls="contract_description_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa-solid fa-fw fa-pen-to-square" aria-hidden="true"></i> <span class="tab-title">Search contracts</span></a> >- </li> >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "contract_description_search" bt_active= 1 %] >+ <i class="fa-solid fa-fw fa-pen-to-square" aria-hidden="true"></i> <span class="tab-title">Search contracts</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- contracts-admin-search.inc --> >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 8c7983a77a..9f2f6ddd09 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 >@@ -1,9 +1,11 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- currencies-admin-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="currency_search" role="tabpanel" class="tab-pane active"> >- <form action="/cgi-bin/koha/admin/currency.pl" method="get"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="currency_search" bt_active= 1 %] >+ <form action="[% script_name | html %]" method="get"> > <div class="form-title"> > <label class="control-label" for="description"><span class="control-text">Search currencies</span> <i class="fa-solid fa-fw fa-dollar-sign" aria-hidden="true"></i></label> > </div> >@@ -14,7 +16,7 @@ > > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -23,21 +25,21 @@ > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search currencies" href="#currency_search" aria-controls="currency_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa-solid fa-fw fa-dollar-sign" aria-hidden="true"></i> <span class="tab-title">Search currencies</span></a> >- </li> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "currency_search" bt_active= 1 %] >+ <i class="fa-solid fa-fw fa-dollar-sign" aria-hidden="true"></i> <span class="tab-title">Search currencies</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /currencies-admin-search.inc --> >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 ff89f07c58..38851530e9 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 >@@ -1,8 +1,10 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- desks-admin-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="desk_search" role="tabpanel" class="tab-pane active"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="desk_search" bt_active= 1 %] > <form action="[% script_name|html %]" method="get"> > <div class="form-title"> > <label class="control-label" for="search_desk_name"><span class="control-text">Search desks</span> <i class="fa fa-fw fa-desktop" aria-hidden="true"></i></label> >@@ -14,7 +16,7 @@ > > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -23,21 +25,22 @@ > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] > <li role="presentation" class="active"> >- <a title="Search desks" href="#desk_search" aria-controls="desk_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-desktop" aria-hidden="true"></i> <span class="tab-title">Search desks</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "desk_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-desktop" aria-hidden="true"></i> <span class="tab-title">Search desks</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /desks-admin-search.inc --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc >index f0d2835c00..ce617c46e1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/erm-search.inc >@@ -1,8 +1,10 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- erm-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="agreement_search" role="tabpanel" class="tab-pane active"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="agreement_search" bt_active= 1 %] > <form action="/cgi-bin/koha/erm/agreements" method="get"> > <div class="form-title"> > <label class="control-label" for="agreement_filter"><span class="control-text">Agreement search</span> <i class="fa fa-fw fa-check-circle" aria-hidden="true"></i></label> >@@ -12,9 +14,9 @@ > </div> > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > >- <div id="license_search" role="tabpanel" class="tab-pane"> >+ [% WRAPPER tab_panel tabname="license_search" %] > <form action="/cgi-bin/koha/erm/licenses" method="get"> > <div class="form-title"> > <label class="control-label" for="license_filter"><span class="control-text">License search</span> <i class="fa fa-fw fa-gavel" aria-hidden="true"></i></label> >@@ -24,9 +26,9 @@ > </div> > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > >- <div id="package_search" role="tabpanel" class="tab-pane"> >+ [% WRAPPER tab_panel tabname="package_search" %] > <form action="/cgi-bin/koha/erm/eholdings/local/packages" method="get"> > <div class="form-title"> > <label class="control-label" for="package_name_filter"><span class="control-text">Package search</span> <i class="fa fa-fw fa-archive" aria-hidden="true"></i></label> >@@ -36,9 +38,9 @@ > </div> > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > >- <div id="title_search" role="tabpanel" class="tab-pane"> >+ [% WRAPPER tab_panel tabname="title_search" %] > <form action="/cgi-bin/koha/erm/eholdings/local/titles" method="get"> > <div class="form-title"> > <label class="control-label" for="title_filter"><span class="control-text">Title search</span> <i class="fa-solid fa-fw fa-arrow-down-a-z" aria-hidden="true"></i></label> >@@ -48,22 +50,22 @@ > </div> > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >- </div><!-- /.tab-content --> >+ [% END # /tab_panel %] >+ [% END # /tab_panels %] > >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a id="agreement_search_tab" title="Search agreements" href="#agreement_search" aria-controls="agreement_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-check-circle" aria-hidden="true"></i> <span class="tab-title">Search agreements</span></a> >- </li> >- <li role="presentation"> >- <a id="license_search_tab" title="Search licenses" href="#license_search" aria-controls="license_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-gavel" aria-hidden="true"></i> <span class="tab-title">Search licenses</span></a> >- </li> >- <li role="presentation"> >- <a id="package_search_tab" title="Search packages" href="#package_search" aria-controls="package_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-archive" aria-hidden="true"></i> <span class="tab-title">Search packages</span></a> >- </li> >- <li role="presentation"> >- <a id="title_search_tab" title="Search titles" href="#title_search" aria-controls="title_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa-solid fa-fw fa-arrow-down-a-z" aria-hidden="true"></i> <span class="tab-title">Search titles</span></a> >- </li> >- </ul> >-</div><!-- /#header_search --> >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "agreement_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-check-circle" aria-hidden="true"></i> <span class="tab-title">Search agreements</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "license_search" %] >+ <i class="fa fa-fw fa-gavel" aria-hidden="true"></i> <span class="tab-title">Search licenses</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "package_search" %] >+ <i class="fa fa-fw fa-archive" aria-hidden="true"></i> <span class="tab-title">Search packages</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "title_search" %] >+ <i class="fa-solid fa-fw fa-arrow-down-a-z" aria-hidden="true"></i> <span class="tab-title">Search titles</span> >+ [% END %] >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /erm-search.inc --> >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 0a5ec44c8b..1cc3766158 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc >@@ -1,6 +1,10 @@ >+[% USE raw %] >+[% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] >+ > <!-- home-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% circ_active_tab = 1 %] > [% circ_active = "active" %] >@@ -22,29 +26,29 @@ > [% IF ( CAN_user_catalogue ) %] > [% INCLUDE 'catalogue-search-box.inc' bs_tab_active= search_active_tab %] > [% END %] >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation" class="[% circ_active | html %]"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >- <li role="presentation"> >- <a title="Check in" href="#checkin_search" aria-controls="checkin_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title">Check in</span></a> >- </li> >- <li role="presentation"> >- <a title="Renew" href="#renew_search" aria-controls="renew_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" bt_active= circ_active_tab %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "checkin_search" bt_active= patrons_active_tab %] >+ <i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title">Check in</span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "renew_search" %] >+ <i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title">Renew</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_borrowers_edit_borrowers ) %] >- <li role="presentation" class="[% patrons_active | html %]"> >- <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card" aria-hidden="true"></i> <span class="tab-title">Search patrons</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "patron_search" bt_active= search_active_tab %] >+ <i class="fa fa-fw fa-id-card" aria-hidden="true"></i> <span class="tab-title">Search patrons</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation" class="[% search_active | html %]"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /home-search.inc --> >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 bef1cabca0..37ac4b494d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc >@@ -1,8 +1,10 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- letters-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="notices_search" role="tabpanel" class="tab-pane active"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="notices_search" bt_active= 1 %] > <form action="/cgi-bin/koha/tools/letter.pl" method="get"> > <div class="form-title"> > <label class="control-label" for="searchfield"><span class="control-text">Search notices</span> <i class="fa-solid fa-fw fa-comment-dots" aria-hidden="true"></i></label> >@@ -14,7 +16,7 @@ > > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -23,21 +25,21 @@ > [% IF ( CAN_user_catalogue ) %] > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search notices" href="#notices_search" aria-controls="notices_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa-solid fa-fw fa-comment-dots" aria-hidden="true"></i> <span class="tab-title">Search notices</span></a> >- </li> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "notices_search" bt_active= 1 %] >+ <i class="fa-solid fa-fw fa-comment-dots" aria-hidden="true"></i> <span class="tab-title">Search notices</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /letters-search.inc --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc >index a4ea643d90..2cdfecd535 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc >@@ -5,12 +5,8 @@ > [% PROCESS 'patronfields.inc' %] > [% IF CAN_user_borrowers_edit_borrowers || CAN_user_borrowers_list_borrowers %] > [%- SET searchtype = searchtype || Koha.Preference('DefaultPatronSearchMethod') -%] >- [% IF( bs_tab_active ) %] >- <div id="patron_search" role="tabpanel" class="tab-pane active"> >- [% ELSE %] >- <div id="patron_search" role="tabpanel" class="tab-pane"> >- [% END %] >- <form action="/cgi-bin/koha/members/member.pl" method="get"> >+ [% WRAPPER tab_panel tabname="patron_search" bt_active= bs_tab_active %] >+ <form method="get" action="/cgi-bin/koha/members/member.pl"> > <input type="hidden" name="quicksearch" value="1" /> > > <div class="form-title"> >@@ -74,6 +70,6 @@ > </div> > </div> > </form> >- </div> >+ [% END # /tab_panel %] > [% END %] > <!-- /member-search-box.inc --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc >index 752c437b61..f0c9cb674e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc >@@ -1,10 +1,6 @@ > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <!-- patron-search-box.inc --> >- [% IF( bs_tab_active ) %] >- <div id="circ_search" role="tabpanel" class="tab-pane active"> >- [% ELSE %] >- <div id="circ_search" role="tabpanel" class="tab-pane"> >- [% END %] >+ [% WRAPPER tab_panel tabname="circ_search" bt_active= bs_tab_active %] > <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="get"> > <div class="form-title"> > <label class="control-label" for="findborrower"><span class="control-text">Check out</span> <i class="fa fa-fw fa-upload" aria-hidden="true"></i></label> >@@ -21,6 +17,6 @@ > > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > <!-- /patron-search-box.inc --> > [% END %] >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 b3a21080be..0240efb69e 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 >@@ -1,6 +1,10 @@ >+[% USE raw %] >+[% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] >+ > <!-- patron-search-header.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] > [% INCLUDE 'member-search-box.inc' bs_tab_active= 1 %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >@@ -12,28 +16,29 @@ > [% IF ( CAN_user_catalogue ) %] > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search patrons" href="#patron_search" aria-controls="patron_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card" aria-hidden="true"></i> <span class="tab-title">Search patrons</span></a> >- </li> >+ [% END # /tab_panels %] >+ >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname="patron_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-id-card" aria-hidden="true"></i> <span class="tab-title">Search patrons</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title"><span class="tab-title">Check out</span></span></a> >- </li> >- <li role="presentation"> >- <a title="Check in" href="#checkin_search" aria-controls="checkin_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title"><span class="tab-title">Check in</span></span></a> >- </li> >- <li role="presentation"> >- <a title="Renew" href="#renew_search" aria-controls="renew_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title"><span class="tab-title">Renew</span></span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title"><span class="tab-title">Check out</span></span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "checkin_search" %] >+ <i class="fa fa-fw fa-download" aria-hidden="true"></i> <span class="tab-title"><span class="tab-title">Check in</span></span> >+ [% END %] >+ [% WRAPPER tab_item tabname= "renew_search" %] >+ <i class="fa fa-fw fa-retweet" aria-hidden="true"></i> <span class="tab-title"><span class="tab-title">Renew</span></span> >+ [% END %] > [% END %] > > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title"><span class="tab-title">Search catalog</span></span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title"><span class="tab-title">Search catalog</span></span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /patron-search-header.inc --> >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 1621e3f244..e5bf3de2a3 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 >@@ -1,8 +1,11 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- patrons-admin-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="patron_category_search" role="tabpanel" class="tab-pane active"> >+ >+[% WRAPPER tabs id= "header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="patron_category_search" bt_active= 1 %] > <form action="[% script_name | html %]" method="get"> > <div class="form-title"> > <label class="control-label" for="category_search"><span class="control-text">Search patron categories</span> <i class="fa fa-fw fa-id-card" aria-hidden="true"></i></label> >@@ -14,7 +17,7 @@ > > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -23,22 +26,22 @@ > [% IF ( CAN_user_catalogue ) %] > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] >+ [% END # /WRAPPER tab_panels %] > >- </div> <!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search patron categories" href="#patron_category_search" aria-controls="patron_category_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-id-card" aria-hidden="true"></i> <span class="tab-title">Search patron categories</span></a> >- </li> >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "patron_category_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-id-card" aria-hidden="true"></i> <span class="tab-title">Search patron categories</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-fw fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div> <!-- /#header_search --> >+ [% END # /WRAPPER tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /patrons-admin-search.inc --> >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 94d34dc853..26dfcd7f4c 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 >@@ -1,8 +1,12 @@ >+[% USE raw %] >+[% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] >+ > <!-- prefs-admin-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="syspref_search" role="tabpanel" class="tab-pane active"> >- <form method="get" action="/cgi-bin/koha/admin/preferences.pl"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="syspref_search" bt_active= 1 %] >+ <form action="/cgi-bin/koha/admin/preferences.pl" method="get"> > <input type="hidden" name="tab" value="[% last_tab | html %]" /> > <input type="hidden" name="op" value="search" /> > >@@ -16,7 +20,7 @@ > > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -25,21 +29,22 @@ > [% IF ( CAN_user_catalogue ) %] > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search system preferences" href="#syspref_search" aria-controls="syspref_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-cogs" aria-hidden="true"></i> <span class="tab-title">Search system preferences</span></a> >- </li> >+ [% END # /tab_panels %] >+ >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "syspref_search" bt_active= 1 %] >+ <i class="fa fa-fw fa-cogs" aria-hidden="true"></i> <span class="tab-title">Search system preferences</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /prefs-admin-search.inc --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/renew-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/renew-search-box.inc >index 011bd318a5..1c32118773 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/renew-search-box.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/renew-search-box.inc >@@ -1,10 +1,6 @@ > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > <!-- renew-search-box.inc --> >- [% IF( bs_tab_active ) %] >- <div id="renew_search" role="tabpanel" class="tab-pane active"> >- [% ELSE %] >- <div id="renew_search" role="tabpanel" class="tab-pane"> >- [% END %] >+ [% WRAPPER tab_panel tabname="renew_search" bt_active= bs_tab_active %] > <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off"> > [% INCLUDE 'csrf-token.inc' %] > >@@ -18,6 +14,6 @@ > <input type="hidden" name="op" value="cud-renew" /> > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > <!-- /renew-search-box.inc --> > [% 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 d848588739..199dbc5ff4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc >@@ -1,8 +1,10 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- serials-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="subscription_search" role="tabpanel" class="tab-pane active"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="subscription_search" bt_active= 1 %] > <form action="/cgi-bin/koha/serials/serials-search.pl" method="get"> > [% IF ( routing ) %] > <input type="hidden" name="routing" value="[% routing | html %]" /> >@@ -44,7 +46,7 @@ > </div> > </div> <!-- /.form-extra-content --> > </form> >- </div> <!-- /#subscription_search --> >+ [% END # /tab_panel %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -53,21 +55,21 @@ > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search subscriptions" href="#subscription_search" aria-controls="subscription_search" aria-expanded="true" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-book" aria-hidden="true"></i> <span class="tab-title">Search subscriptions</span></a> >- </li> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "subscription_search" bt_active= 1 %] >+ <i class="fa fa-book" aria-hidden="true"></i> <span class="tab-title">Search subscriptions</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /serials-search.inc --> >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 ad344a8806..201b09af24 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 >@@ -1,9 +1,9 @@ >- >+[% USE raw %] > [% USE Koha %] >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- >- <div id="suggestions_search" role="tabpanel" class="tab-pane active"> >+[% PROCESS 'html_helpers.inc' %] >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="suggestions_search" bt_active= 1 %] > <form action="/cgi-bin/koha/acqui/newordersuggestion.pl" method="get"> > <input type="hidden" name="booksellerid" value="[% booksellerid | html %]" /> > >@@ -19,7 +19,7 @@ > > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -28,21 +28,21 @@ > [% IF ( CAN_user_catalogue ) %] > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search suggestions" href="#suggestions_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa-solid fa-comment" aria-hidden="true"></i> <span class="tab-title">Search suggestions</span></a> >- </li> >+ [% END # /tab_panels %] >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "suggestions_search" bt_active= 1 %] >+ <i class="fa-solid fa-comment" aria-hidden="true"></i> <span class="tab-title">Search suggestions</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /suggestions-add-search.inc --> >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 1aa5529efc..a7809b425e 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 >@@ -1,8 +1,10 @@ >+[% USE raw %] > [% USE Koha %] >+[% PROCESS 'html_helpers.inc' %] > <!-- z3950-admin-search.inc --> >-<div id="header_search" role="tablist"> >- <div class="tab-content"> >- <div id="z3950_search" role="tabpanel" class="tab-pane active"> >+[% WRAPPER tabs id="header_search" %] >+ [% WRAPPER tab_panels %] >+ [% WRAPPER tab_panel tabname="z3950_search" bt_active= 1 %] > <form action="/cgi-bin/koha/admin/z3950servers.pl" method="get"> > <div class="form-title"> > <label class="control-label" for="searchfield"><span class="control-text">Search Z39.50/SRU servers</span> <i class="fa fa-fw fa-search" aria-hidden="true"></i></label> >@@ -14,7 +16,7 @@ > <input type="hidden" name="op" value="search" /> > <button type="submit" aria-label="Search"><i class="fa fa-arrow-right"></i></button> > </form> >- </div> >+ [% END # /tab_panel %] > > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] > [% INCLUDE 'patron-search-box.inc' %] >@@ -22,22 +24,22 @@ > [% IF ( CAN_user_catalogue ) %] > [% INCLUDE 'catalogue-search-box.inc' %] > [% END %] >+ [% END # /tab_panels %] > >- </div><!-- /.tab-content --> >- <ul class="nav nav-tabs" role="tablist"> >- <li role="presentation" class="active"> >- <a title="Search Z39.50/SRU servers" href="#z3950_search" aria-controls="z3950_search" role="tab" aria-expanded="true" data-toggle="tab" class="keep_text"><i class="fa fa-search" aria-hidden="true"></i> <span class="tab-title">Search Z39.50/SRU servers</span></a> >- </li> >+ [% WRAPPER tabs_nav %] >+ [% WRAPPER tab_item tabname= "z3950_search" bt_active= 1 %] >+ <i class="fa fa-search" aria-hidden="true"></i> <span class="tab-title">Search Z39.50/SRU servers</span> >+ [% END %] > [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %] >- <li role="presentation"> >- <a title="Check out" href="#circ_search" aria-controls="circ_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "circ_search" %] >+ <i class="fa fa-upload" aria-hidden="true"></i> <span class="tab-title">Check out</span> >+ [% END %] > [% END %] > [% IF ( CAN_user_catalogue ) %] >- <li role="presentation"> >- <a title="Search catalog" href="#catalog_search" aria-controls="catalog_search" role="tab" data-toggle="tab" class="keep_text"><i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span></a> >- </li> >+ [% WRAPPER tab_item tabname= "catalog_search" %] >+ <i class="fa fa-fw fa-search" aria-hidden="true"></i> <span class="tab-title">Search catalog</span> >+ [% END %] > [% END %] >- </ul> >-</div><!-- /#header_search --> >+ [% END # /tabs_nav %] >+[% END # /WRAPPER tabs %] > <!-- /z3950-admin-search.inc --> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >index ab24a9304e..7e4567bc59 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js >@@ -131,7 +131,7 @@ $(document).ready(function() { > return checkEnter(e); > }); > >- $(".keep_text").on("click",function(){ >+ $("#header_search .nav-tabs a").on("click",function(){ > var field_index = $(this).parent().index(); > keep_text( field_index ); > }); >-- >2.30.2
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 35850
:
161252
|
161298
|
161497
| 163520