From 4a52bc9a7a600e60b69405c59fb912fc9c74c83e Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 9 Mar 2023 18:14:04 +0000
Subject: [PATCH] Bug 33307: Use template wrapper for tabs: Lists

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

To test, apply the patch and go to the lists page in the staff
interface.

- Confirm that the two tabs, "Your lists" and "Public lists" look
  correct and work correctly.
- Test that the correct tab is selected when you add the "public" or
  "private" parameter to the url:

  /cgi-bin/koha/virtualshelves/shelves.pl?op=list&public=1
  /cgi-bin/koha/virtualshelves/shelves.pl?op=list&public=0

Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../prog/en/modules/virtualshelves/shelves.tt | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index 57c0111d33..09ec20c821 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -493,18 +493,15 @@
 
             [% IF op == 'list' %]
                 <h1>Lists</h1>
-                <div id="tabs" class="toptabs">
-                    <ul class="nav nav-tabs" role="tablist">
-                        <li id="privateshelves_tab" role="presentation" class="active">
-                            <a href="#shelves_list" aria-controls="shelves_list" role="tab" data-toggle="tab" data-public="0">Your lists</a>
-                        </li>
-                        <li id="publicshelves_tab" role="presentation">
-                            <a href="#shelves_list" aria-controls="shelves_list" role="tab" data-toggle="tab" data-public="1">Public lists</a>
-                        </li>
-                    </ul>
-
-                    <div class="tab-content">
-                        <div role="tabpanel" class="tab-pane active" id="shelves_list">
+
+                [% WRAPPER tabs id= "tabs" %]
+                    [% WRAPPER tabs_nav %]
+                        [% WRAPPER tab_item tabname= "privateshelves_tab" bt_active= 1 %] <span>Your lists</span> [% END %]
+                        [% WRAPPER tab_item tabname= "publicshelves_tab" %] <span>Public lists</span> [% END %]
+                    [% END # /WRAPPER tabs_nav %]
+
+                    [% WRAPPER tab_panels %]
+                        [% WRAPPER tab_panel tabname="shelves_tab" bt_active= 1 %]
                             <table id="listresultst">
                                 <thead>
                                     <tr>
@@ -541,9 +538,10 @@
                                 </thead>
                                 <tbody></tbody>
                             </table> <!-- /#listresultst -->
-                        </div> <!-- /#shelves_list -->
-                    </div> <!-- #/.tab-content -->
-                </div> <!-- /#tabs -->
+                        [% END %]
+                    [% END # /WRAPPER tab_panels %]
+                [% END # /WRAPPER tabs %]
+
             [% END # /IF op == 'list' %]
 
             <form id="hold_form" method="get" action="/cgi-bin/koha/reserve/request.pl">
@@ -698,14 +696,18 @@
 
                 /* Select correct tab based on URL parameter */
                 if( public == 0 ){
-                    $('#privateshelves_tab').tab('show');
+                    $('a[href="#privateshelves_tab_panel"]').tab('show');
                 } else {
-                    $("#publicshelves_tab").tab("show");
+                    $('a[href="#publicshelves_tab_panel"]').tab("show");
                 }
 
-                $('a[data-toggle="tab"]')
-                .on("click", function(){
-                    public = $(this).data("public");
+                $('a[data-toggle="tab"]').on("click", function(e){
+                    let target = $(this).attr("href");
+                    if( target == "#publicshelves_tab_panel" ){
+                        public = 1;
+                    } else {
+                        public = 0;
+                    }
                 })
                 .on('shown.bs.tab', function (e) {
                     dtListResults.fnDraw();
-- 
2.20.1