Attachment 149313 Details for Bug 33372 – Bug 33372: Use template wrapper for breadcrumbs: Circulation part 2

[patch] Bug 33372: Use template wrapper for breadcrumbs: Circulation part 2

Bug-33372-Use-template-wrapper-for-breadcrumbs-Cir.patch (text/plain), 9.74 KB, created by Katrin Fischer on 2023-04-08 21:09:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-04-08 21:09:23 UTC

Size: 9.74 KB

patch

obsolete

>From d5176871e7c2bae42d399b4582f83e2a567bd44d Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 30 Mar 2023 18:34:08 +0000
>Subject: [PATCH] Bug 33372: Use template wrapper for breadcrumbs: Circulation
> part 2
>
>This patch updates several circulation 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.
>
>- Circulation
>  - Check out
>    - Check out to patron
>  - Curbside pickups
>  - Built-in offline circulation
>  - Pending on-site checkouts
>  - Overdues
>  - Holds to pull
>  - Renew
>
>Signed-off-by: Philip Orr <philip.orr@lmscloud.de>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../prog/en/modules/circ/circulation.tt       | 36 +++++++------------
> .../prog/en/modules/circ/curbside_pickups.tt  | 23 +++++-------
> .../prog/en/modules/circ/offline.tt           | 16 +++------
> .../prog/en/modules/circ/on-site_checkouts.tt | 23 +++++-------
> .../prog/en/modules/circ/overdue.tt           | 23 +++++-------
> .../prog/en/modules/circ/pendingreserves.tt   | 24 +++++--------
> .../prog/en/modules/circ/renew.tt             | 23 +++++-------
> 7 files changed, 59 insertions(+), 109 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index ffb0a930d8..881b75c54d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -30,34 +30,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/circ/circulation-home.pl">Circulation</a>
>-            </li>
>-
>+            [% END %]
>             [% IF patron %]
>-                <li>
>+                [% WRAPPER breadcrumb_item %]
>                     <a href="/cgi-bin/koha/circ/circulation.pl">Checkouts</a>
>-                </li>
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        [% INCLUDE 'patron-title.inc' %]
>-                    </a>
>-                </li>
>+                [% END %]
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    [% INCLUDE 'patron-title.inc' %]
>+                [% END %]
>             [% ELSE %]
>-                <li>
>-                    <a href="#" aria-current="page">
>-                        Checkouts
>-                    </a>
>-                </li>
>+                [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                    <span>Checkouts</span>
>+                [% END %]
>             [% END %]
>-        </ol>
>-    </nav>
>-    [% END %]
>+        [% END #/ WRAPPER breadcrumbs %]
>+    [% END #/ WRAPPER sub-header.inc %]
> 
>     <div class="main container-fluid">
>         <main>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
>index cd79451dc8..87ba7e7d8d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
>@@ -42,21 +42,16 @@
>     [% INCLUDE 'header.inc' %]
>     [% INCLUDE 'cat-search.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/circ/circulation-home.pl">Circulation</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">Curbside pickups</a>
>-        </li>
>-    </ol>
>-</nav>
>-
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active = 1 %]
>+            <span>Curbside pickups</span>
>+        [% END %]
>+    [% END #/ WRAPPER breadcrumbs %]
>+[% END #/ WRAPPER sub-header.inc %]
> 
> [% BLOCK waiting_holds %]
>     [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>index 55c98ca511..5016d005c1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt
>@@ -23,19 +23,13 @@
>     <div>Downloading records, please wait...</div>
> </div>
> 
>-
> [% 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 id="go-to-home" href="#offline-home" aria-current="page">Offline circulation</a>
>-        </li>
>-    </ol>
>-</nav>
>-[% 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/circ/on-site_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>index 1124ce92e8..06620173cb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/on-site_checkouts.tt
>@@ -16,22 +16,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/circ/circulation-home.pl">Circulation</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Pending on-site checkouts
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Pending on-site checkouts</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/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>index 27d7dfb269..2ce96dcef0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
>@@ -36,22 +36,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/circ/circulation-home.pl">Circulation</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Overdues as of [% todaysdate | $KohaDates %]
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Overdues as of [% todaysdate | $KohaDates %]</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/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>index 5d44bf09e7..4f265aaa7d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
>@@ -17,24 +17,16 @@
>     [% INCLUDE 'circ-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 breadcrumbs %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Holds to pull
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Holds to pull</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/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>index efcebc45f3..a6f121eb73 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
>@@ -16,22 +16,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/circ/circulation-home.pl">Circulation</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Renew
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Renew</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 33372: 149005 | 149040 | 149313