Attachment 146923 Details for Bug 33006 – Bug 33006: Use template wrapper for breadcrumbs: Administration part 1

[patch] Bug 33006: Use template wrapper for breadcrumbs: Administration part 1

Bug-33006-Use-template-wrapper-for-breadcrumbs-Adm.patch (text/plain), 33.12 KB, created by Owen Leonard on 2023-02-18 16:22:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2023-02-18 16:22:04 UTC

Size: 33.12 KB

patch

obsolete

>From 5517387974778ad2eeca528b3c3ba8c086db21a9 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Sat, 18 Feb 2023 15:54:24 +0000
>Subject: [PATCH] Bug 33006: Use template wrapper for breadcrumbs:
> Administration part 1
>
>This patch updates several administration templates so that they
>use the new WRAPPER for displaying breadcrumbs.
>
>To test, apply the patch and test each page and its variations.
>Breadcrumbs should look correct, and each link should be correct.
>
>Administration
>  -> Administration home page
>     - Under "Additional parameters"
>       -> Additional fields
>          -> View, create, edit
>       -> Advanced editor shortcuts
>       -> Audio alerts
>     - Under "Acquisition parameters"
>       -> Budgets
>          -> Add fund
>          -> Close fund
>          -> Budget details
>             -> Planning
>          -> Create, edit, duplicate
>     - Under "Catalog"
>       -> Authority types -> MARC structure
>          -> New, edit, delete
>          -> "Actions" -> Subfields
>            -> Edit, delete
>Acquisitions -> Vendor -> Contracts
>  - View, edit, delete
>---
> .../en/modules/admin/additional-fields.tt     |  77 +++++-------
> .../prog/en/modules/admin/admin-home.tt       |  21 ++--
> .../en/modules/admin/adveditorshortcuts.tt    |  21 ++--
> .../prog/en/modules/admin/aqbudgetperiods.tt  |  99 ++++++---------
> .../prog/en/modules/admin/aqbudgets.tt        |  90 ++++++--------
> .../prog/en/modules/admin/aqcontract.tt       |  81 +++++-------
> .../prog/en/modules/admin/aqplan.tt           |  29 ++---
> .../prog/en/modules/admin/audio_alerts.tt     |  23 ++--
> .../modules/admin/auth_subfields_structure.tt |  64 ++++------
> .../en/modules/admin/auth_tag_structure.tt    | 115 ++++++++----------
> 10 files changed, 253 insertions(+), 367 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>index b8568272096..58cbff59eb5 100755
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/additional-fields.tt
>@@ -21,55 +21,42 @@
>     [% INCLUDE 'cat-search.inc' %]
> [% END %]
> 
>-    [% WRAPPER 'sub-header.inc' %]
>-    <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-        <ol>
>-            <li>
>-                <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-            </li>
>-            <li>
>-                <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-            </li>
>-            [% SWITCH op %]
>-                [% CASE 'add_form' %]
>-                    <li>
>-                        <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
>-                    </li>
>-                    [% IF field %]
>-                        <li>
>-                            <a href="#" aria-current="page">
>-                                Modify field '[% field.name | html %]'
>-                            </a>
>-                        </li>
>-                    [% ELSE %]
>-                        <li>
>-                            <a href="#" aria-current="page">
>-                                Add field
>-                            </a>
>-                        </li>
>+[% WRAPPER 'sub-header.inc' %]
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>+        [% END %]
>+        [% SWITCH op %]
>+            [% CASE 'add_form' %]
>+                [% WRAPPER breadcrumb_item %]
>+                    <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
>+                [% END %]
>+                [% IF field %]
>+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                        Modify field '[% field.name | html %]'
>                     [% END %]
>+                [% ELSE %]
>+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                        Add field
>+                    [% END %]
>+                [% END %]
> 
>-                [% CASE 'list' %]
>-                    <li>
>-                        <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
>-                    </li>
>-                    <li>
>-                        <a href="#" aria-current="page">
>-                            Modify fields for '[% tablename | html %]'
>-                        </a>
>-                    </li>
>+            [% CASE 'list' %]
>+                [% WRAPPER breadcrumb_item %]
>+                    <a href="/cgi-bin/koha/admin/additional-fields.pl">Manage additional fields</a>
>+                [% END %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    Modify fields for '[% tablename | html %]'
>+                [% END %]
> 
>-                [% CASE %]
>-                    <li>
>-                        <a href="#" aria-current="page">
>-                            Manage additional fields
>-                        </a>
>-                    </li>
>+            [% CASE %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    Manage additional fields
>+                [% END %]
> 
>-            [% END %]
>-        </ol>
>-    </nav>
>-    [% END %]
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>index 0e83b367214..d27a03250e8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
>@@ -1,3 +1,5 @@
>+
>+[% USE raw %]
> [% USE Koha %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>@@ -10,19 +12,12 @@
> [% END %]
> 
> [% WRAPPER 'sub-header.inc' %]
>-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-    <ol>
>-        <li>
>-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Administration
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            Administration
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
>index 3b27d3c0176..dea5c51ac6c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/adveditorshortcuts.tt
>@@ -13,20 +13,15 @@
>     [% PROCESS 'keyboard_shortcuts.inc' %]
> 
> [% WRAPPER 'sub-header.inc' %]
>-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-    <ol>
>-        <li>
>-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-        </li>
>-        <li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">Advanced editor shortcuts</a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            Advanced editor shortcuts
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>index 78ef29164a4..1a2a4a0c0e5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt
>@@ -77,96 +77,75 @@
> [% END %]
> 
> [% WRAPPER 'sub-header.inc' %]
>-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-    <ol>
>-        <li>
>-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-        </li>
>-        <li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-        </li>
>+        [% END %]
> 
>         [% IF ( add_form ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-            </li>
>+            [% END %]
>             [% IF ( budget_period_id ) %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Modify budget '[% budget_period_description | html %]'
>-                    </a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    Modify budget '[% budget_period_description | html %]'
>+                [% END %]
>             [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Add budget
>-                    </a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    Add budget
>+                [% END %]
>             [% END %]
>         [% END %]
> 
>         [% IF ( delete_confirm ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-            </li>
>+            [% END %]
>             [% IF ( total || funds_exist ) %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Cannot delete budget '[% budget_period_description | html %]'
>-                    </a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    Cannot delete budget '[% budget_period_description | html %]'
>+                [% END %]
>             [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Delete budget '[% budget_period_description | html %]'?
>-                    </a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    Delete budget '[% budget_period_description | html %]'?
>+                [% END %]
>             [% END %]
>         [% END %]
> 
>             [% IF ( duplicate_form ) %]
>-                <li>
>+                [% WRAPPER breadcrumb_item %]
>                     <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-                </li>
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Duplicate budget
>-                    </a>
>-                </li>
>+                [% END %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    Duplicate budget
>+                [% END %]
>             [% END %]
> 
>         [% IF close_form %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Close budget [% budget_period_description | html %]
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                Close budget [% budget_period_description | html %]
>+            [% END %]
>         [% END %]
> 
>         [% IF closed %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Budget [% budget_period_description | html %] closed
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                Budget [% budget_period_description | html %] closed
>+            [% END %]
>         [% END %]
> 
>         [% IF ( else ) %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Budgets administration
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                Budgets administration
>+            [% END %]
>         [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>index 4ae62099fd1..a9d23c51435 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
>@@ -17,67 +17,55 @@
> [% END %]
> 
> [% WRAPPER 'sub-header.inc' %]
>-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-    <ol>
>-    <li>
>-        <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-    </li>
>-    <li>
>-        <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-    </li>
>-    <li>
>-        <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-    </li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>+        [% END %]
> 
>-    [% IF op == 'list' %]
>-        [% IF budget_period_id %]
>-            <li>
>-                <a href="#" aria-current="page">
>+        [% IF op == 'list' %]
>+            [% IF budget_period_id %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>                     Funds for '[% budget_period_description | html %]'
>-                </a>
>-            </li>
>-        [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>+                [% END %]
>+            [% ELSE %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>                     All funds
>-                </a>
>-            </li>
>+                [% END %]
>+            [% END %]
>         [% END %]
>-    [% END %]
> 
>-    [% IF op == 'add_form' %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a>
>-        </li>
>-        [% IF ( budget_id ) %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                Modify fund
>+        [% IF op == 'add_form' %]
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a>
>+            [% END %]
>+            [% IF ( budget_id ) %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    Modify fund
>                     [% IF ( budget_name ) %] '[% budget_name | html %]'[% END %]
>-                </a>
>-            </li>
>-        [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>+                [% END %]
>+            [% ELSE %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>                     Add fund
>-                </a>
>-            </li>
>+                [% END %]
>+            [% END %]
>         [% END %]
>-    [% END %]
> 
>-    [% IF op == 'delete_confirm' %]
>-        <li>
>-            <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>+        [% IF op == 'delete_confirm' %]
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>                 Delete fund?
>-            </a>
>-        </li>
>-    [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+            [% END %]
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>index 097b2c9c8c4..fc62a847e11 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt
>@@ -23,80 +23,63 @@
> [% END %]
> 
> [% WRAPPER 'sub-header.inc' %]
>-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-    <ol>
>-        <li>
>-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-        </li>
>-        <li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a>
>-        </li>
>+        [% END %]
> 
>         [% IF ( add_form ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>-            </li>
>+            [% END %]
>             [% IF ( contractnumber ) %]
>-                <li>
>-                    <a href="#" aria-current="page">
>+                [% WRAPPER breadcrumb_item bc_active=1 %]
>                         Modify contract '[% contractname | html %]'
>-                    </a>
>-                </li>
>+                [% END %]
>             [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        New contract
>-                    </a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active=1 %]
>+                    New contract
>+                [% END %]
>             [% END %]
>         [% END %]
> 
>         [% IF ( add_validate ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Data recorded
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active=1 %]
>+                Data recorded
>+            [% END %]
>         [% END %]
> 
>         [% IF ( delete_confirm ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Confirm deletion of contract [% contractnumber | html %]
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active=1 %]
>+                Confirm deletion of contract [% contractnumber | html %]
>+            [% END %]
>         [% END %]
> 
>         [% IF ( delete_confirmed ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=[% booksellerid | uri %]">Contracts</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Contract deleted
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active=1 %]
>+                Contract deleted
>+            [% END %]
>         [% END %]
> 
>         [% IF ( else ) %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Contracts
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active=1 %]
>+                Contracts
>+            [% END %]
>         [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>index 29992d14361..a65b9a3b093 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt
>@@ -15,26 +15,21 @@
> [% END %]
> 
> [% WRAPPER 'sub-header.inc' %]
>-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-    <ol>
>-        <li>
>-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-        </li>
>-        <li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/admin/aqbudgets.pl?budget_period_id=[% budget_period_id | uri %]">Funds</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">Planning</a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            Planning
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>index 2019ff2830d..253eafd5f2a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/audio_alerts.tt
>@@ -13,22 +13,15 @@
> [% END %]
> 
> [% WRAPPER 'sub-header.inc' %]
>-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-    <ol>
>-        <li>
>-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-        </li>
>-        <li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Audio alerts
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            Audio alerts
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>index 9db4d0c8b77..4061006a67d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt
>@@ -12,68 +12,58 @@
> [% END %]
> 
> [% WRAPPER 'sub-header.inc' %]
>-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-    <ol>
>-        <li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a>
>-        </li>
>+        [% END %]
> 
>         [% IF ( authtypecode ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri%]">[% authtypecode | html %] framework</a>
>-            </li>
>+            [% END %]
>         [% ELSE %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-            </li>
>+            [% END %]
>         [% END %]
> 
>         [% IF ( else ) %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Authority MARC subfield structure for [% tagfield | html %]
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                Authority MARC subfield structure for [% tagfield | html %]
>+            [% END %]
>         [% ELSE %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/admin/auth_subfields_structure.pl?tagfield=[% tagfield | uri %]&amp;tagsubfield=[% tagsubfield | uri %]&amp;authtypecode=[% authtypecode |uri %]">Authority MARC subfield structure for [% tagfield | html %]</a>
>-            </li>
>+            [% END %]
>         [% END %]
> 
>         [% IF ( delete_confirm ) %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Confirm deletion of subfield [% tagsubfield | html %]?
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                Confirm deletion of subfield [% tagsubfield | html %]?
>+            [% END %]
>         [% END %]
> 
>         [% IF ( add_form ) %]
>             [% IF ( use_heading_flags_p ) %]
>                 [% IF ( heading_edit_subfields_p ) %]
>-                    <li>
>-                        <a href="#" aria-current="page">
>-                            Edit MARC subfields constraints
>-                        </a>
>-                    </li>
>+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                        Edit MARC subfields constraints
>+                    [% END %]
>                 [% END %]
>             [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        [% action | html %]
>-                    </a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    [% action | html %]
>+                [% END %]
>             [% END %]
>         [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>index 3083c15c2b5..b40eac911e8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tt
>@@ -43,125 +43,106 @@ Authority MARC framework &rsaquo; Administration &rsaquo; Koha
> [% END %]
> 
> [% WRAPPER 'sub-header.inc' %]
>-<nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
>-    <ol>
>-        <li>
>-            <a href="/cgi-bin/koha/mainpage.pl">Home</a>
>-        </li>
>-        <li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a>
>-        </li>
>+        [% END %]
> 
>         [% IF ( add_form ) %]
>             [% IF ( use_heading_flags_p ) %]
> 
>                 [% IF ( heading_modify_tag_p ) %]
>                     [% IF ( authtypecode ) %]
>-                        <li>
>+                        [% WRAPPER breadcrumb_item %]
>                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
>-                        </li>
>+                        [% END %]
>                     [% ELSE %]
>-                        <li>
>+                        [% WRAPPER breadcrumb_item %]
>                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-                        </li>
>+                        [% END %]
>+                    [% END %]
>+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                        Modify tag
>                     [% END %]
>-                    <li>
>-                        <a href="#" aria-current="page">
>-                            Modify tag
>-                        </a>
>-                    </li>
>                 [% END %]
> 
>                 [% IF ( heading_add_tag_p ) %]
>                     [% IF ( authtypecode ) %]
>-                        <li>
>+                        [% WRAPPER breadcrumb_item %]
>                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
>-                        </li>
>+                        [% END %]
>                     [% ELSE %]
>-                        <li>
>+                        [% WRAPPER breadcrumb_item %]
>                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-                        </li>
>+                        [% END %]
>+                    [% END %]
>+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                        New tag
>                     [% END %]
>-                    <li>
>-                        <a href="#" aria-current="page">
>-                            New tag
>-                        </a>
>-                    </li>
>                 [% END %]
> 
>             [% ELSE %]
>                 [% IF ( authtypecode ) %]
>-                    <li>
>+                    [% WRAPPER breadcrumb_item %]
>                         <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] Framework</a>
>-                    </li>
>+                    [% END %]
>                 [% ELSE %]
>-                    <li>
>+                    [% WRAPPER breadcrumb_item %]
>                         <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-                    </li>
>+                    [% END %]
>+                [% END %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    [% action | html %]
>                 [% END %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        [% action | html %]
>-                    </a>
>-                </li>
>             [% END %]
> 
>         [% ELSE %]
>             [% IF ( delete_confirm ) %]
>                 [% IF ( authtypecode ) %]
>-                    <li>
>+                    [% WRAPPER breadcrumb_item %]
>                         <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
>-                    </li>
>+                    [% END %]
>                 [% ELSE %]
>-                    <li>
>+                    [% WRAPPER breadcrumb_item %]
>                         <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-                    </li>
>+                    [% END %]
>+                [% END %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    Confirm deletion
>                 [% END %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Confirm deletion
>-                    </a>
>-                </li>
>             [% ELSE %]
>                 [% IF ( delete_confirmed ) %]
>                     [% IF ( authtypecode ) %]
>-                        <li>
>+                        [% WRAPPER breadcrumb_item %]
>                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=[% authtypecode | uri %]">[% authtypecode | html %] framework</a>
>-                        </li>
>+                        [% END %]
>                     [% ELSE %]
>-                        <li>
>+                        [% WRAPPER breadcrumb_item %]
>                             <a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default framework</a>
>-                        </li>
>+                        [% END %]
>+                    [% END %]
>+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                        Data deleted
>                     [% END %]
>-                    <li>
>-                        <a href="#" aria-current="page">
>-                            Data deleted
>-                        </a>
>-                    </li>
>                 [% ELSE %]
>                     [% IF ( authtypecode ) %]
>-                        <li>
>-                            <a href="#" aria-current="page">
>-                                [% authtypecode | html %] Framework
>-                            </a>
>-                        </li>
>+                        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                            [% authtypecode | html %] Framework
>+                        [% END %]
>                     [% ELSE %]
>-                        <li>
>-                            <a href="#" aria-current="page">
>-                                Default framework
>-                            </a>
>-                        </li>
>+                        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                            Default framework
>+                        [% END %]
>                     [% END %]
>                 [% END %]
> 
>             [% END %]
>         [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
>     <div class="row">
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33006: 146923 | 146924 | 147092 | 147338 | 149053 | 149338 | 149339