Attachment 150156 Details for Bug 33582 – Bug 33582: Use template wrapper for breadcrumbs: Tools, part 4

[patch] Bug 33582: Use template wrapper for breadcrumbs: Tools, part 4

Bug-33582-Use-template-wrapper-for-breadcrumbs-Too.patch (text/plain), 11.33 KB, created by PTFS Europe Sandboxes on 2023-04-24 14:09:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: PTFS Europe Sandboxes

Created: 2023-04-24 14:09:14 UTC

Size: 11.33 KB

patch

obsolete

>From ac5ccbd9483fd30d2d06aabe89682fb0a2c4b177 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 24 Apr 2023 10:51:50 +0000
>Subject: [PATCH] Bug 33582: Use template wrapper for breadcrumbs: Tools, part
> 4
>
>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 ->
>  - Notices and slips
>    - New notice
>    - Edit notice
>    - Confirm deletion
>  - Batch patron modification
>  - Overdue notice/status triggers
>- Cataloging ->
>  - Manage staged records
>    - Batch details
>  - MARC modification templates
>    - Edit actions for a template
>
>Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
>---
> .../prog/en/modules/tools/letter.tt           | 81 +++++++------------
> .../en/modules/tools/manage-marc-import.tt    | 35 +++-----
> .../tools/marc_modification_templates.tt      | 35 +++-----
> .../prog/en/modules/tools/modborrowers.tt     | 21 ++---
> .../prog/en/modules/tools/overduerules.tt     | 23 ++----
> 5 files changed, 72 insertions(+), 123 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>index 910deebfef..a3919205d2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt
>@@ -55,67 +55,46 @@
> [% 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 ( add_form OR copy_form OR add_validate OR copy_validate OR delete_confirm ) %]
>+                [% WRAPPER breadcrumb_item %]
>+                    <a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a>
>+                [% END %]
>+            [% END %]
> 
>             [% IF ( add_form or copy_form) %]
>                 [% IF ( modify ) %]
>-                    <li>
>-                        <a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a>
>-                    </li>
>-                    <li>
>-                        <a href="#" aria-current="page">
>-                            Modify notice
>-                        </a>
>-                    </li>
>+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                        <span>Modify notice</span>
>+                    [% END %]
>                 [% ELSE %]
>-                    <li>
>-                        <a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a>
>-                    </li>
>-                    <li>
>-                        <a href="#" aria-current="page">
>-                            Add notice
>-                        </a>
>-                    </li>
>-                [% END %]
>+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                        <span>Add notice</span>
>+                    [% END %]
>+                [% END # /IF modify %]
>             [% ELSE %]
>                 [% IF ( add_validate or copy_validate) %]
>-                    <li>
>-                        <a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a>
>-                    </li>
>-                    <li>
>-                        <a href="#" aria-current="page">
>-                            Notice added
>-                        </a>
>-                    </li>
>+                    [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                        <span>Notice added</span>
>+                    [% END %]
>                 [% ELSE %]
>                     [% IF ( delete_confirm ) %]
>-                        <li>
>-                            <a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a>
>-                        </li>
>-                        <li>
>-                            <a href="#" aria-current="page">
>-                                Confirm deletion
>-                            </a>
>-                        </li>
>+                        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                            <span>Confirm deletion</span>
>+                        [% END %]
>                     [% ELSE %]
>-                        <li>
>-                            <a href="#" aria-current="page">
>-                                Notices and slips
>-                            </a>
>-                        </li>
>-                    [% END %]
>-                [% END %]
>-            [% END %]
>-        </ol>
>-    </nav> 
>-    [% END %]
>+                        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                            <span>Notices and slips</span>
>+                        [% END %]
>+                    [% END # /IF ( delete_confirm ) %]
>+                [% END # /IF ( add_validate or copy_validate) %]
>+            [% END # /IF ( add_form or copy_form) %]
>+        [% END #/ WRAPPER breadcrumbs %]
>+    [% END #/ WRAPPER sub-header.inc %]
> 
>     <div id="preview_template" class="modal in" tabindex="-1" role="dialog" aria-labelledby="preview_template_label" aria-hidden="true">
>         <div class="modal-dialog modal-lg">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>index 3c17c157bc..1bb87d6f49 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.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/cataloguing/cataloging-home.pl">Cataloging</a>
>-            </li>
>+            [% END %]
>             [% IF ( import_batch_id ) %]
>-                <li>
>+                [% WRAPPER breadcrumb_item %]
>                     <a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage staged MARC records</a>
>-                </li>
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Batch [% import_batch_id | html %]
>-                    </a>
>-                </li>
>+                [% END %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    <span>Batch [% import_batch_id | html %]</span>
>+                [% END %]
>             [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Manage staged MARC records
>-                    </a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    <span>Manage staged MARC records</span>
>+                [% 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/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>index 01c1bfc44f..d9d10d26e9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
>@@ -33,34 +33,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 ( template_name ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/tools/marc_modification_templates.pl">MARC modification templates</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    [% template_name | html %]
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                [% template_name | html %]
>+            [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    MARC modification templates
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>MARC modification templates</span>
>+            [% 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/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>index fdd054868a..88e5a685ef 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
>@@ -17,20 +17,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">Batch patron modification</a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Batch patron modification</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/overduerules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>index 18284ba858..fcbe0866ec 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
>@@ -15,22 +15,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">
>-                Overdue notice/status triggers
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Overdue notice/status triggers</span>
>+        [% 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 33582: 150152 | 150156 | 150407