Bug 32571: (follow-up) Use more unique variable name to avoid collisions

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

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 abe7f11..7ea0a2b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
@@ -345,12 +345,12 @@
 [%# BOOTSTRAP TAB WRAPPER USAGE
     [ WRAPPER tabs id= "tabs container id" ]
         [ WRAPPER tabs_nav ]
-            [ WRAPPER tab_item tabname= "tab name 1" ] [ content ] [ END ]
+            [ WRAPPER tab_item tabname= "tab name 1" bt_active= 1 ] [ content ] [ END ]
             [ WRAPPER tab_item tabname= "tab name 2" ] [ content ] [ END ]
             ...
         [ END ]
         [ WRAPPER tab_panels ]
-            [ WRAPPER tab_panel id="tab name 1"] [ content ] [ END ]
+            [ WRAPPER tab_panel id="tab name 1" bt_active= 1 ] [ content ] [ END ]
             [ WRAPPER tab_panel id="tab name 2"] [ content ] [ END ]
             ...
         [ END ]
@@ -374,7 +374,7 @@
 [% END %]
 
 [% BLOCK tab_item %]
-    [% IF ( active ) %]
+    [% IF ( bt_active ) %]
         <li role="presentation" class="active">
     [% ELSE %]
         <li role="presentation">
@@ -392,7 +392,7 @@
 [% END %]
 
 [% BLOCK tab_panel %]
-    [% IF ( active ) %]
+    [% IF ( bt_active ) %]
         <div role="tabpanel" class="tab-pane active" id="[% tabname | html %]_panel">
     [% ELSE %]
         <div role="tabpanel" class="tab-pane" id="[% tabname | html %]_panel">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index ed58c59..5aae8a2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -32,7 +32,7 @@
 
             [% WRAPPER tabs id= "abouttabs" %]
                 [% WRAPPER tabs_nav %]
-                    [% WRAPPER tab_item tabname= "about" active= 1 %] Server information [% END %]
+                    [% WRAPPER tab_item tabname= "about" bt_active= 1 %] Server information [% END %]
                     [% WRAPPER tab_item tabname= "perl" %] Perl modules [% END %]
                     [% WRAPPER tab_item tabname= "sysinfo" %] System information [% END %]
                     [% WRAPPER tab_item tabname= "team" %] Koha team [% END %]
@@ -43,7 +43,7 @@
                 [% END %]
 
                 [% WRAPPER tab_panels %]
-                    [% WRAPPER tab_panel tabname= "about" active= 1 %]
+                    [% WRAPPER tab_panel tabname= "about" bt_active= 1 %]
                         <table>
                             <caption>Server information</caption>
                             <tr>