Attachment 145533 Details for Bug 32571 – Bug 32571: (follow-up) Use more unique variable name to avoid collisions

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

Bug-32571-follow-up-Use-more-unique-variable-name-.patch (text/plain), 3.06 KB, created by Owen Leonard on 2023-01-20 16:04:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2023-01-20 16:04:08 UTC

Size: 3.06 KB

patch

obsolete

>From 35644b18af9a0831573657877ef1f3af39d20eda Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 20 Jan 2023 15:47:08 +0000
>Subject: [PATCH] Bug 32571: (follow-up) Use more unique variable name to avoid
> collisions
>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc | 8 ++++----
> koha-tmpl/intranet-tmpl/prog/en/modules/about.tt          | 4 ++--
> 2 files 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 32f67bfe4b..a4cde4c25c 100644
>--- 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 b4031e7792..251446e9ac 100644
>--- 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>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 32571: 145059 | 145060 | 145075 | 145076 | 145087 | 145529 | 145530 | 145531 | 145533 | 146199 | 146200 | 146201