Attachment 149294 Details for Bug 33436 – Bug 33436: Use template wrapper for breadcrumbs: Reports part 1

[patch] Bug 33436: Use template wrapper for breadcrumbs: Reports part 1

Bug-33436-Use-template-wrapper-for-breadcrumbs-Rep.patch (text/plain), 8.17 KB, created by David Nind on 2023-04-07 21:00:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2023-04-07 21:00:27 UTC

Size: 8.17 KB

patch

obsolete

>From b28bb377a4feaf8d11b3cffd4fb1ffd1525c21d9 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Thu, 6 Apr 2023 18:55:50 +0000
>Subject: [PATCH] Bug 33436: Use template wrapper for breadcrumbs: Reports part
> 1
>
>This patch updates several reports 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.
>
>- Reports ->
>  - Acquisitions statistics
>    - Results
>  - Patrons with the most checkouts
>    - Results
>  - Patrons who haven't checked out
>    - Results
>  - Patron statistics wizard
>    - Results
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> .../en/modules/reports/acquisitions_stats.tt  | 36 ++++++++-----------
> .../prog/en/modules/reports/bor_issues_top.tt | 36 ++++++++-----------
> .../prog/en/modules/reports/borrowers_out.tt  | 33 +++++++++--------
> .../en/modules/reports/borrowers_stats.tt     | 36 ++++++++-----------
> 4 files changed, 60 insertions(+), 81 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
>index 32ce2afd63..557507594a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>[% IF ( do_it ) %]Acquisitions statistics &rsaquo; Results[% ELSE %]Acquisitions statistics[% END %] &rsaquo; Reports &rsaquo; Koha</title>
>@@ -10,33 +11,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/reports/reports-home.pl">Reports</a>
>-        </li>
>+        [% END %]
>         [% IF ( do_it ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions statistics</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Results
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Results</span>
>+            [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Acquisitions statistics
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Acquisitions statistics</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/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
>index e9afc3c68f..9c0fcdfac1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE Branches %]
> [% USE KohaDates %]
> [% USE ItemTypes %]
>@@ -13,33 +14,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/reports/reports-home.pl">Reports</a>
>-        </li>
>+        [% END %]
>         [% IF ( do_it ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons with the most checkouts</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Results
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Results</span>
>+            [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Patrons with the most checkouts
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Patrons with the most checkouts</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/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
>index 12d377682a..484eedfad0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Patrons with no checkouts &rsaquo; Reports &rsaquo; Koha</title>
>@@ -10,22 +11,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/reports/reports-home.pl">Reports</a>
>-        </li>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Patrons with no checkouts
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% IF ( do_it ) %]
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons with no checkouts</a>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Results</span>
>+            [% END %]
>+        [% ELSE %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Patrons with no checkouts</span>
>+            [% 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/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>index 7704095b95..4c025c25e9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE Branches %]
> [% USE Koha %]
> [% USE Asset %]
>@@ -18,33 +19,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/reports/reports-home.pl">Reports</a>
>-        </li>
>+        [% END %]
>         [% IF ( do_it ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons statistics</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Results
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Results</span>
>+            [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Patrons statistics
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Patrons statistics</span>
>+            [% END %]
>         [% END %]
>-    </ol>
>-</nav>
>-[% 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 33436: 149272 | 149294 | 149299