From 90265bdf06eb8cb2d03493c6bc1a76aa94f6c1a5 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 18 Jan 2024 16:21:56 +0000
Subject: [PATCH] Bug 35838: Use template wrapper for tabs: Curbside pickups
 administration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch updates the curbside pickups administration template so that
it uses the new WRAPPER directive to build tabbed navigation.

To test, apply the patch and enable curbside pickups if necessary:
Administration -> System preferences -> CurbsidePickup.

- Go to Administration -> Curbside pickups.
- Confirm that the tabs look correct and behave as expected.

Signed-off-by: Loïc Vassaux--Artur <loic.vassaux-artur@outlook.fr>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/modules/admin/curbside_pickup.tt  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
index 7a2a532a7b5..2715aff6115 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/curbside_pickup.tt
@@ -65,27 +65,27 @@
     [% END %]
     <form method="post" class="form">
         [% INCLUDE 'csrf-token.inc' %]
-        <div id="curbside_pickup_tabs" class="toptabs">
-            <ul class="nav nav-tabs" role="tablist">
+        [% WRAPPER tabs id= "curbside_pickup_tabs" %]
+            [% WRAPPER tabs_nav %]
                 [% FOREACH l IN libraries %]
                     [% IF loop.first %]
-                    <li role="presentation" class="active">
+                        [% SET bt_active = 1 %]
                     [% ELSE %]
-                    <li role="presentation">
+                        [% SET bt_active = 0 %]
                     [% END %]
-                        <a href="#conf-[% l.branchcode | uri %]" aria-controls="conf-[% l.branchcode | html %]" role="tab" data-toggle="tab">[% l.branchname | html %]</a>
-                    </li>
+                    [% WRAPPER tab_item tabname= "conf-${l.branchcode}" bt_active= bt_active %] <span>[% l.branchname | html %]</span> [% END %]
                 [% END %]
-            </ul>
+            [% END # /WRAPPER tabs_nav %]
 
-            <div class="tab-content">
+            [% WRAPPER tab_panels %]
                 [% FOREACH l IN libraries %]
                     [% SET branchcode = l.branchcode %]
                     [% IF loop.first %]
-                    <div id="conf-[% l.branchcode | html %]" role="tabpanel" class="tab-pane active">
+                        [% SET bt_active = 1 %]
                     [% ELSE %]
-                    <div id="conf-[% l.branchcode | html %]" role="tabpanel" class="tab-pane">
+                        [% SET bt_active = 0 %]
                     [% END %]
+                    [% WRAPPER tab_panel tabname= "conf-${l.branchcode}" bt_active= bt_active %]
                         <fieldset class="rows" style="float: none;">
                             <ol>
                                 <li>
@@ -162,10 +162,10 @@
 
                             </ol>
                         </fieldset>
-                    </div>
-                [% END %]
-            </div>
-        </div>
+                    [% END # /tab_panel %]
+                [% END #FOREACH l %]
+            [% END # /WRAPPER tab_panels %]
+        [% END # /WRAPPER tabs %]
 
         <input type="hidden" name="op" value="cud-save" />
 
-- 
2.34.1