From d53d0f653787ad533cab12847db8c11b9faabb91 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 1 Jun 2023 13:40:02 +0000
Subject: [PATCH] Bug 33894: Use template wrapper for tabs: OPAC search history

This patch updates the OPAC search history page so that it uses
the new WRAPPER syntax to generate tabs markup.

To test, apply the patch and view the OPAC search history page. With the
OpacAuthorities system preference enabled you should see two tabs:
Catalog and Authority. Confirm that each tab shows the correct
information.

Deactivate OpacAuthorities and reload the search history page. The
bibliographic search history should display without tabs.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 2c6e64ba962474f5d2a109426c20256acdcd065c)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../en/modules/opac-search-history.tt         | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
index 93377259f9..9672be2f20 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
@@ -51,25 +51,27 @@
                     <h1>Search history</h1>
 
                     [% IF Koha.Preference( 'OpacAuthorities' ) == 1 %]
-                        <div id="tabs" class="toptabs">
-                            <ul class="nav nav-tabs" role="tablist">
-                                <li class="nav-item" role="presentation">
-                                    <a class="nav-link active" id="biblio-tab-link" href="#biblio_tab" aria-controls="biblio_tab" role="tab" data-toggle="tab" aria-selected="true">Catalog</a>
-                                </li>
-                                <li class="nav-item" role="presentation">
-                                    <a class="nav-link" id="authority-tab-link" href="#authority_tab" aria-controls="authority_tab" role="tab" data-toggle="tab" aria-selected="false">Authority</a>
-                                </li>
-                            </ul>
-                            <div class="tab-content">
-                                <div id="biblio_tab" role="tabpanel" class="tab-pane active" aria-labelledby="biblio-tab-link">
-                                    [% PROCESS catalog_search_history %]
-                                </div> <!-- / #biblio_tab -->
 
-                                <div id="authority_tab" role="tabpanel" class="tab-pane" aria-labelledby="authority-tab-link">
-                                    [% PROCESS authority_search_history %]
-                                </div> <!-- / #authority_tab -->
-                            </div> <!-- /.tab-content -->
-                        </div> <!-- / #tabs -->
+                        [% WRAPPER tabs id= "tabs" %]
+                            [% WRAPPER tabs_nav %]
+                                [% WRAPPER tab_item tabname= "biblio_tab" bt_active= 1 %] <span>Catalog</span> [% END %]
+                                [% WRAPPER tab_item tabname= "authority_tab" %] <span>Authority</span> [% END %]
+                            [% END # /WRAPPER tabs_nav %]
+
+                            [% WRAPPER tab_panels %]
+                                [% WRAPPER tab_panel tabname="biblio_tab" bt_active= 1 %]
+                                    <div id="biblio_tab" role="tabpanel" class="tab-pane active" aria-labelledby="biblio-tab-link">
+                                        [% PROCESS catalog_search_history %]
+                                    </div> <!-- / #biblio_tab -->
+                                [% END # /tab_panel# %]
+                                [% WRAPPER tab_panel tabname="authority_tab" %]
+                                    <div id="authority_tab" role="tabpanel" class="tab-pane" aria-labelledby="authority-tab-link">
+                                        [% PROCESS authority_search_history %]
+                                    </div> <!-- / #authority_tab -->
+                                [% END # /tab_panel# %]
+                            [% END # /WRAPPER tab_panels %]
+                        [% END # /WRAPPER tabs %]
+
                     [% ELSE %]
                         [% PROCESS catalog_search_history %]
                     [% END %]
-- 
2.39.5