Attachment 149147 Details for Bug 33389 – Bug 33389: Use template wrapper for breadcrumbs: Patrons part 5

[patch] Bug 33389: Use template wrapper for breadcrumbs: Patrons part 5

Bug-33389-Use-template-wrapper-for-breadcrumbs-Pat.patch (text/plain), 11.29 KB, created by Lucas Gass (lukeg) on 2023-04-04 22:23:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lucas Gass (lukeg)

Created: 2023-04-04 22:23:23 UTC

Size: 11.29 KB

patch

obsolete

>From a60c1f76aa86cffd4708481e13dbe377be98aca7 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 4 Apr 2023 14:39:45 +0000
>Subject: [PATCH] Bug 33389: Use template wrapper for breadcrumbs: Patrons part
> 5
>
>This patch updates several patron 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.
>
>- Patrons ->
>  - Patron details ->
>    (Patron with charges) ->
>      - Accounting ->
>        - Pay
>    - Circulation history
>    - Routing lists
>    - Statistics
>    - Purchase suggestions
>    - More -> Manage two-factor authentication (must have
>      TwoFactorAuthentication enabled)
>
>Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
>---
> .../prog/en/modules/members/paycollect.tt     | 54 +++++++++----------
> .../modules/members/purchase-suggestions.tt   | 26 ++++-----
> .../prog/en/modules/members/readingrec.tt     | 26 ++++-----
> .../prog/en/modules/members/routing-lists.tt  | 26 ++++-----
> .../prog/en/modules/members/statistics.tt     | 37 ++++---------
> .../en/modules/members/two_factor_auth.tt     | 26 ++++-----
> 6 files changed, 80 insertions(+), 115 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>index 8ad95e5855..e97ee03959 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
>@@ -37,39 +37,35 @@
> [% 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/members/members-home.pl">Patrons</a>
>-        </li>
>-        <li>
>-            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Pay charges for [% INCLUDE 'patron-title.inc' %]</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                [% IF ( pay_individual ) %]
>-                    <span>Pay an individual charge</span>
>-                [% ELSIF ( writeoff_individual ) %]
>-                    <span>Write off an individual charge</span>
>-                [% ELSE %]
>-                    [% IF ( selected_accts ) %]
>-                        [% IF type == 'WRITEOFF' %]
>-                            <span>Write off an amount toward selected charges</span>
>-                        [% ELSE %]
>-                            <span>Pay an amount toward selected charges</span>
>-                        [% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">Make a payment</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            [% IF ( pay_individual ) %]
>+                <span>Pay an individual charge</span>
>+            [% ELSIF ( writeoff_individual ) %]
>+                <span>Write off an individual charge</span>
>+            [% ELSE %]
>+                [% IF ( selected_accts ) %]
>+                    [% IF type == 'WRITEOFF' %]
>+                        <span>Write off an amount toward selected charges</span>
>                     [% ELSE %]
>-                        <span>Pay an amount toward all charges</span>
>+                        <span>Pay an amount toward selected charges</span>
>                     [% END %]
>+                [% ELSE %]
>+                    <span>Pay an amount toward all charges</span>
>                 [% END %]
>-            </a>
>-        </li>
>-    </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/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>index 240bd5af26..4ccd814755 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt
>@@ -16,22 +16,18 @@
> [% 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/members/members-home.pl">Patrons</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Purchase suggestions for [% INCLUDE 'patron-title.inc' %]
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Purchase suggestions</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/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>index 2368268526..22a477d366 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>@@ -17,22 +17,18 @@
> [% 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/members/members-home.pl">Patrons</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Circulation history for [% INCLUDE 'patron-title.inc' %]
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Circulation history</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/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>index e4f5204eaf..bc41221adf 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt
>@@ -15,22 +15,18 @@
> [% 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/members/members-home.pl">Patrons</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Subscription routing lists for [% INCLUDE 'patron-title.inc' %]
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Subscription routing lists</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/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>index 14e283adec..1ea5ca9ef0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt
>@@ -19,33 +19,18 @@
> [% 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>
>-
>-        [% IF blocking_error %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Patrons
>-                </a>
>-            </li>
>-
>-        [% ELSE %]
>-            <li>
>-                <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Statistics for [% INCLUDE 'patron-title.inc' invert_name = 1 %]
>-
>-                </a>
>-            </li>
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
>         [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Statistics</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/members/two_factor_auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt
>index 11eea93c7c..9d34b9b8f1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/two_factor_auth.tt
>@@ -13,22 +13,18 @@
> [% PROCESS 'auth-two-factor.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/members/members-home.pl">Patrons</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Manage two-factor authentication
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' %]</a>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Manage two-factor authentication</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 33389: 149129 | 149147 | 149304