Attachment 149306 Details for Bug 33386 – Bug 33386: Use template wrapper for breadcrumbs: Patrons part 2

[patch] Bug 33386: Use template wrapper for breadcrumbs: Patrons part 2

Bug-33386-Use-template-wrapper-for-breadcrumbs-Pat.patch (text/plain), 8.04 KB, created by Katrin Fischer on 2023-04-08 20:46:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-04-08 20:46:59 UTC

Size: 8.04 KB

patch

obsolete

>From 759014282bda0da559a7d13c1b15bf915e123175 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 31 Mar 2023 18:01:59 +0000
>Subject: [PATCH] Bug 33386: Use template wrapper for breadcrumbs: Patrons part
> 2
>
>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.
>
>- Patron details ->
>  - Files (EnableBorrowerFiles must be enabled)
>  - Holds history
>  - Housebound (HouseboundModule must be enabled)
>  - Ill requests history (ILLModule must be enabled)
>- Staff interface home page -> Discharge requests pending
>  - Must have useDischarge preference enabled
>  - Must log into the OPAC and request a discharge using a patron
>    account which has no checkouts.
>
>Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/members/discharges.tt     | 23 +++++---------
> .../prog/en/modules/members/files.tt          | 26 +++++++---------
> .../prog/en/modules/members/holdshistory.tt   | 26 +++++++---------
> .../prog/en/modules/members/housebound.tt     | 26 +++++++---------
> .../prog/en/modules/members/ill-requests.tt   | 30 ++++++++-----------
> 5 files changed, 54 insertions(+), 77 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
>index cf215eec15..9559c58359 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharges.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/members/members-home.pl">Patrons</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Pending discharge requests
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Pending discharge requests</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/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>index 9e04a619c1..94ea31a6a6 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.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">
>-                Files 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>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/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>index ce521036d1..a2e82c8775 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt
>@@ -18,22 +18,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">
>-                Holds 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>Holds 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/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>index eef273ce55..2b8b61d31c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt
>@@ -60,22 +60,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">
>-                Details 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>Housebound details</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/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>index 1bed9c26dd..d3465cfaa2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt
>@@ -17,23 +17,19 @@
>     [% INCLUDE 'patron-search-header.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/members/members-home.pl">Patrons</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    ILL requests history for [% INCLUDE 'patron-title.inc' %]
>-                </a>
>-            </li>
>-        </ol>
>-    </nav>
>-    [% END %]
>+[% WRAPPER 'sub-header.inc' %]
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>+            <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
>+        [% 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>ILL requests history</span>
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> <div class="main container-fluid">
> 
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33386: 149052 | 149057 | 149306