Attachment 150049 Details for Bug 33572 – Bug 33572: Use template wrapper for breadcrumbs: Tools, part 3

[patch] Bug 33572: Use template wrapper for breadcrumbs: Tools, part 3

Bug-33572-Use-template-wrapper-for-breadcrumbs-Too.patch (text/plain), 8.71 KB, created by ByWater Sandboxes on 2023-04-21 14:48:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ByWater Sandboxes

Created: 2023-04-21 14:48:54 UTC

Size: 8.71 KB

patch

obsolete

>From 5fede3158b5252f857488689698a524b962558f5 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 21 Apr 2023 11:50:48 +0000
>Subject: [PATCH] Bug 33572: Use template wrapper for breadcrumbs: Tools, part
> 3
>
>This patch updates several templates in the tools directory 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.
>
>- Tools ->
>  - CSV profiles
>    - New CSV profile
>    - Edit CSV profile
>  - Calendar
>  - Import patrons
>    - Results
>- Cataloging ->
>  - Export catalog data
>  - Inventory
>    - Results
>
>Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
>---
> .../prog/en/modules/tools/csv-profiles.tt     | 43 ++++++++-----------
> .../prog/en/modules/tools/export.tt           | 23 ++++------
> .../prog/en/modules/tools/holidays.tt         | 23 ++++------
> .../prog/en/modules/tools/import_borrowers.tt | 35 ++++++---------
> .../prog/en/modules/tools/inventory.tt        | 35 ++++++---------
> 5 files changed, 59 insertions(+), 100 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
>index 6de79e1c8f..601d663c10 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tt
>@@ -21,39 +21,30 @@
> [% 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/tools/tools-home.pl">Tools</a>
>-        </li>
>+        [% END %]
>         [% IF op == 'add_form' %]
>-            <li>
>-                <a href="/cgi-bin/koha/tools/csv-profiles.pl">
>-                    CSV profiles
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="/cgi-bin/koha/tools/csv-profiles.pl">CSV profiles</a>
>+            [% END %]
>             [% IF csv_profile %]
>-                <li>
>-                    <a href="#" aria-current="page">Modify a CSV profile</a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    <span>Modify a CSV profile</span>
>+                [% END %]
>             [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">New CSV profile</a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    <span>New CSV profile</span>
>+                [% END %]
>             [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    CSV profiles
>-                </a>
>-            </li>
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>CSV profiles</span>
>         [% 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/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>index acb46b36d6..f872e1215c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt
>@@ -18,22 +18,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/cataloguing/cataloging-home.pl">Cataloging</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Export data
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Export data</span>
>+        [% 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/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>index 7cf6e11e92..f60f4c2240 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt
>@@ -14,22 +14,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/tools/tools-home.pl">Tools</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                [% Branches.GetName( branch ) | html %] calendar
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>[% Branches.GetName( branch ) | html %] calendar</span>
>+        [% 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/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
>index f271fc58ff..4366ae4655 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
>@@ -23,33 +23,24 @@
> [% 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/tools/tools-home.pl">Tools</a>
>-        </li>
>+        [% END %]
>         [% IF ( uploadborrowers ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Results
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Results</span>
>+            [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Import patrons
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Import patrons</span>
>+            [% END %]
>         [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> [% INCLUDE 'blocking_errors.inc' %]
> <div class="main container-fluid">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>index 3209c016f0..966f7ba179 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tt
>@@ -15,34 +15,25 @@
> [% 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/cataloguing/cataloging-home.pl">Cataloging</a>
>-        </li>
>+        [% END %]
> 
>         [% IF (loop) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/tools/inventory.pl">Inventory</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Results
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Results</span>
>+            [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Inventory
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Inventory</span>
>+            [% 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 33572: 150035 | 150049 | 150070