Attachment 149216 Details for Bug 33409 – Bug 33409: Use template wrapper for breadcrumbs: Patrons lists

[patch] Bug 33409: Use template wrapper for breadcrumbs: Patrons lists

Bug-33409-Use-template-wrapper-for-breadcrumbs-Pat.patch (text/plain), 5.96 KB, created by ByWater Sandboxes on 2023-04-05 14:54:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ByWater Sandboxes

Created: 2023-04-05 14:54:19 UTC

Size: 5.96 KB

patch

obsolete

>From 33a03350ca96e449a1879e1807f3330f3b60a2ff Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 4 Apr 2023 15:32:08 +0000
>Subject: [PATCH] Bug 33409: Use template wrapper for breadcrumbs: Patrons
> lists
>
>This patch updates several patron lists templates so that they use the
>new WRAPPER for displaying breadcrumbs.
>
>Unrelated minor change: I added <span> around a few other strings in
>add-modify.tt in order to improve translatability.
>
>To test, apply the patch and test each page and its variations.
>Breadcrumbs should look correct, and each link should be correct.
>
>- Tools ->
>  - Patron lists
>    - Main page
>    - Patron list contents view
>    - Add patron list
>    - Edit patron list
>
>Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com>
>---
> .../en/modules/patron_lists/add-modify.tt     | 44 ++++++++-----------
> .../prog/en/modules/patron_lists/list.tt      | 31 +++++--------
> .../prog/en/modules/patron_lists/lists.tt     | 23 ++++------
> 3 files changed, 38 insertions(+), 60 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
>index 265c817fa3..85fabb0c84 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/add-modify.tt
>@@ -17,40 +17,32 @@
>     [% 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="lists.pl">Patron lists</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>+    [% WRAPPER 'sub-header.inc' %]
>+        [% WRAPPER breadcrumbs %]
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="lists.pl">Patron lists</a>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>                 [% IF list.patron_list_id %]
>-                    Modify patron list
>+                    <span>Modify patron list</span>
>                 [% ELSE %]
>-                    New patron list
>+                    <span>New patron list</span>
>                 [% END %]
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>-
>+            [% END %]
>+        [% END #/ WRAPPER breadcrumbs %]
>+    [% END #/ WRAPPER sub-header.inc %]
> 
>     <div class="container-fluid">
>         <div class="row">
>             <div class="col-sm-6 col-sm-offset-3 col-md-6 col-md-offset-3">
>         <h1>
>             [% IF list.patron_list_id %]
>-                Modify patron list
>+                <span>Modify patron list</span>
>             [% ELSE %]
>-                New patron list
>+                <span>New patron list</span>
>             [% END %]
>         </h1>
> 
>@@ -59,9 +51,9 @@
> 
>                 <legend>
>                     [% IF list.patron_list_id %]
>-                    Modify patron list
>+                    <span>Modify patron list</span>
>                     [% ELSE %]
>-                    Create a new patron list
>+                    <span>Create a new patron list</span>
>                     [% END %]
>                 </legend>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>index 49ce23cc11..f51e614410 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/list.tt
>@@ -30,28 +30,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/tools/tools-home.pl">Tools</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="lists.pl">Patron lists</a>
>-        </li>
>-        <li>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/patron_lists/list.pl?patron_list_id=[% list.id | uri %]">[% list.name | html %]</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Add patrons
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Add patrons</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/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>index 229d97c8bd..45fa62f19b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.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/tools/tools-home.pl">Tools</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Patron lists
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Patron lists</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 33409: 149135 | 149137 | 149216 | 149303