Attachment 149990 Details for Bug 33439 – Bug 33439: Use template wrapper for breadcrumbs: Reports part 4

[patch] Bug 33439: Use template wrapper for breadcrumbs: Reports part 4

Bug-33439-Use-template-wrapper-for-breadcrumbs-Rep.patch (text/plain), 6.94 KB, created by Katrin Fischer on 2023-04-20 20:36:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-04-20 20:36:43 UTC

Size: 6.94 KB

patch

obsolete

>From 3a094880e5a0db6f21d562c2b659f5fa46d1d42a Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 17 Apr 2023 18:58:18 +0000
>Subject: [PATCH] Bug 33439: Use template wrapper for breadcrumbs: Reports part
> 4
>
>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 ->
>  - Reports home
>    - Orders by fund
>      - Results
>    - Holds statistics wizard
>      - Results
>    - Serials statistics wizard
>      - Results
>
>Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../en/modules/reports/orders_by_budget.tt    | 35 +++++++-----------
> .../prog/en/modules/reports/reports-home.tt   | 19 ++++------
> .../prog/en/modules/reports/reserves_stats.tt | 36 ++++++++-----------
> .../prog/en/modules/reports/serials_stats.tt  | 32 +++++++++--------
> 4 files changed, 50 insertions(+), 72 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
>index 30057b2fdc..ed2fc4bddc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
>@@ -14,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 ( get_orders ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/reports/orders_by_fund.pl">Orders by fund</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">
>-                    Orders by fund
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Orders by fund</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/reports-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
>index 04736fe13c..2108e2c0b4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
>@@ -10,19 +10,12 @@
> [% 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="#" aria-current="page">
>-                Reports
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+    [% WRAPPER breadcrumbs %]
>+        [% WRAPPER breadcrumb_item bc_active= 1 %]
>+            <span>Reports</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/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
>index f7f3023a38..b0b3298d8f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>@@ -14,33 +15,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/reserves_stats.pl">Holds 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">
>-                    Holds statistics
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Holds 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/serials_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
>index cb26c1cf24..80bc26d369 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tt
>@@ -17,22 +17,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">
>-                Serials subscriptions stats
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% IF ( do_it ) %]
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="/cgi-bin/koha/reports/serials_stats.pl">Serials subscriptions stats</a>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Results</span>
>+            [% END %]
>+        [% ELSE %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Serials subscriptions stats</span>
>+            [% END %]
>+        [% 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 33439: 149789 | 149808 | 149990