Attachment 150426 Details for Bug 33566 – Bug 33566: Use template wrapper for breadcrumbs: Tools, part 1

[patch] Bug 33566: Use template wrapper for breadcrumbs: Tools, part 1

Bug-33566-Use-template-wrapper-for-breadcrumbs-Too.patch (text/plain), 9.89 KB, created by Nick Clemens (kidclamp) on 2023-04-29 20:08:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2023-04-29 20:08:22 UTC

Size: 9.89 KB

patch

obsolete

>From 1e7fe609ed10fbc5ed09a2782cb7815c877f0e2c Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 19 Apr 2023 19:10:18 +0000
>Subject: [PATCH] Bug 33566: Use template wrapper for breadcrumbs: Tools, part
> 1
>
>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 ->
>  - Batch extend due dates
>  - Access files (it is not necessary to have file access configured to
>    test, there are no variations to the breadcrumbs)
>  - News, HTML customizations, and Pages: For each category check each
>    variation:
>    - List of entries
>    - New entry
>    - Edit entry
>- Cataloging ->
>  - Batch record deletion
>  - Item modifications by age
>    - Edit rules
>
>Signed-off-by: Barbara Johnson <barbara.johnson@bedfordtx.gov>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> .../prog/en/modules/tools/access_files.tt     | 23 ++++-----
> .../en/modules/tools/additional-contents.tt   | 48 +++++++++----------
> .../automatic_item_modification_by_age.tt     | 38 ++++++---------
> .../en/modules/tools/batch_delete_records.tt  | 21 ++++----
> .../modules/tools/batch_extend_due_dates.tt   | 25 ++++------
> 5 files changed, 62 insertions(+), 93 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
>index f0ef472aae..886d8a4ee3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/access_files.tt
>@@ -12,22 +12,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">
>-                Access files
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Access files</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/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>index f4a2736f28..e5cbd43ac0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>@@ -43,17 +43,13 @@
> [% 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>
>+            [% WRAPPER breadcrumb_item %]
>                 [% IF category == 'news' %]
>                     <a href="/cgi-bin/koha/tools/additional-contents.pl?category=news">News</a>
>                 [% ELSIF category == 'pages' %]
>@@ -61,34 +57,34 @@
>                 [% ELSE %]
>                     <a href="/cgi-bin/koha/tools/additional-contents.pl?category=html_customizations">HTML customizations</a>
>                 [% END %]
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>+            [% END %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>                     [% IF additional_content.idnew %]
>                         <span>Modify additional content</span>
>                     [% ELSE %]
>                         <span>Add additional content</span>
>                     [% END %]
>-                    ([% IF category == 'news' %]<span>News</span>[% ELSIF category == 'pages' %]<span>Pages</span>[% ELSE %]<span>HTML customizations</span>[% END %])
>-                </a>
>-            </li>
>-        [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>                     [% IF category == 'news' %]
>-                        News
>+                        <span>(News)</span>
>                     [% ELSIF category == 'pages' %]
>-                        Pages
>+                        <span>(Pages)</span>
>                     [% ELSE %]
>-                        HTML customizations
>+                        <span>(HTML customizations)</span>
>                     [% END %]
>-                </a>
>-            </li>
>+            [% END %]
>+        [% ELSE %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                [% IF category == 'news' %]
>+                    <span>News</span>
>+                [% ELSIF category == 'pages' %]
>+                    <span>Pages</span>
>+                [% ELSE %]
>+                    <span>HTML customizations</span>
>+                [% END %]
>+            [% END %]
>         [% END %]
>-
>-    </ol>
>-</nav>
>-[% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> [% IF op == 'add_form' %]
> <div class="main container-fluid">
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>index fd48c89394..12bfa63744 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/automatic_item_modification_by_age.tt
>@@ -11,36 +11,26 @@
>     [% 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>
>+[% WRAPPER 'sub-header.inc' %]
>+    [% WRAPPER breadcrumbs %]
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/cataloguing/cataloging-home.pl">Cataloging</a>
>-            </li>
>+            [% END %]
> 
>             [% IF ( op == 'edit_form' ) %]
>-                <li>
>+                [% WRAPPER breadcrumb_item %]
>                     <a href="/cgi-bin/koha/tools/automatic_item_modification_by_age.pl">Automatic item modifications by age</a>
>-                </li>
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Rules
>-                    </a>
>-                </li>
>+                [% END %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    <span>Rules</span>
>+                [% END %]
>             [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Automatic item modifications by age
>-                    </a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    <span>Automatic item modifications by age</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/batch_delete_records.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
>index 8a522832ca..cd76927b2b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_delete_records.tt
>@@ -13,20 +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/cataloguing/cataloging-home.pl">Cataloging</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">Batch record deletion</a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Batch record deletion</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/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
>index e46fbd88c0..7ca54add95 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt
>@@ -18,21 +18,16 @@
>     [% 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/tools/tools-home.pl">Tools</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">Batch extend due dates</a>
>-            </li>
>-        </ol>
>-    </nav>
>-    [% END %]
>+[% WRAPPER 'sub-header.inc' %]
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Batch extend due dates</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 33566: 149940 | 150185 | 150202 | 150426