From 26d58107fe7e74b71b64c18fdcc0b5cadb105e8f Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 3 Mar 2023 13:40:03 +0000
Subject: [PATCH] Bug 33126: Markup error in staff interface tab wrapper

This patch makes a minor correction to the tab WRAPPER directives: a
<li> which should be </li>.

The patch also modifies the example WRAPPER markup to correct an error
and clarify usage.

To test, apply the patch and test a page which has been updated to use
tab wrappers: The about page, basket groups, library transfer limits.
Tabs should continue to work as expected.

Before the patch, the about page source will include this:

<li role="presentation" class="active">
    <a href="about_panel" aria-controls="about_panel" role="tab" data-toggle="tab">
       Server information
    </a>
<li>

After the patch the closing </li> will be correct.

Signed-off-by: Sally <sally.healey@cheshiresharedservices.gov.uk>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c07ada6c851d492ad696250840cb16ed28dc9362)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../intranet-tmpl/prog/en/includes/html_helpers.inc  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
index 44e14c3212..14827da355 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -343,15 +343,15 @@
 [% END %]
 
 [%# BOOTSTRAP TAB WRAPPER USAGE
-    [ WRAPPER tabs id= "tabs container id" ]
+    [ WRAPPER tabs id= "tabs_container_id" ]
         [ WRAPPER tabs_nav ]
-            [ WRAPPER tab_item tabname= "tab name 1" bt_active= 1 ] [ content ] [ END ]
-            [ WRAPPER tab_item tabname= "tab name 2" ] [ content ] [ END ]
+            [ WRAPPER tab_item tabname= "tab_name_1" bt_active= 1 ] Tab text 1 [ END ]
+            [ WRAPPER tab_item tabname= "tab_name_2" ] Tab text 2 [ END ]
             ...
         [ END ]
         [ WRAPPER tab_panels ]
-            [ WRAPPER tab_panel id="tab name 1" bt_active= 1 ] [ content ] [ END ]
-            [ WRAPPER tab_panel id="tab name 2"] [ content ] [ END ]
+            [ WRAPPER tab_panel tabname="tab_name_1" bt_active= 1 ] Panel contents 1 [ END ]
+            [ WRAPPER tab_panel tabname="tab_name_2" ] Panel contents 2 [ END ]
             ...
         [ END ]
     [ END ]
@@ -382,7 +382,7 @@
         <a href="#[% tabname | uri %]_panel" aria-controls="[% tabname | uri %]_panel" role="tab" data-toggle="tab">
             [% content | $raw %]
         </a>
-    <li>
+    </li>
 [% END %]
 
 [% BLOCK tab_panels %]
-- 
2.39.5