Attachment 150423 Details for Bug 33437 – Bug 33437: Use template wrapper for breadcrumbs: Reports part 2

[patch] Bug 33437: Use template wrapper for breadcrumbs: Reports part 2

Bug-33437-Use-template-wrapper-for-breadcrumbs-Rep.patch (text/plain), 16.15 KB, created by Nick Clemens (kidclamp) on 2023-04-29 19:49:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Clemens (kidclamp)

Created: 2023-04-29 19:49:00 UTC

Size: 16.15 KB

patch

obsolete

>From b4016fce017778124505c83ba380a36ab046ed23 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 17 Apr 2023 17:14:05 +0000
>Subject: [PATCH] Bug 33437: Use template wrapper for breadcrumbs: Reports part
> 2
>
>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 ->
>  - Most circulated items
>    - Report results
>  - Items with no checkouts
>    - Report results
>  - Catalog statistics wizard
>    - Report results
>  - View dictionary
>    - New definition (steps 1-5)
>  - Saved reports
>    - View report
>    - New report
>    - Edit report
>  - Guided reports
>    - Build a report
>      - Steps 1 through 6
>
>Signed-off-by: David Nind <david@davidnind.com>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> .../prog/en/modules/reports/cat_issues_top.tt |  38 +++---
> .../prog/en/modules/reports/catalogue_out.tt  |  33 ++---
> .../en/modules/reports/catalogue_stats.tt     |  38 +++---
> .../prog/en/modules/reports/dictionary.tt     |  94 +++++---------
> .../modules/reports/guided_reports_start.tt   | 119 ++++++++----------
> 5 files changed, 128 insertions(+), 194 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
>index f8d08f3b03..1c25a8a18d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>@@ -11,33 +12,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/cat_issues_top.pl">Most-circulated items</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">
>-                    Most-circulated items
>-                </a>
>-            </li>
>-        [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Most-circulated items</span>
>+            [% END %]
>+        [% END # /IF ( do_it ) %]
>+    [% 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/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>index bd43607fe3..99897e7638 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE Branches %]
> [% USE ItemTypes %]
> [% INCLUDE 'doc-head-open.inc' %]
>@@ -14,22 +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>
>-        <li>
>-            <a href="#" aria-current="page">
>-                Items with no checkouts
>-            </a>
>-        </li>
>-    </ol>
>-</nav>
>-[% END %]
>+        [% END %]
>+        [% IF ( do_it ) %]
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="/cgi-bin/koha/reports/catalogue_out.pl">Items with no checkouts</a>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Results</span>
>+            [% END %]
>+        [% ELSE %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Items with no checkouts</span>
>+            [% END %]
>+        [% END # /IF ( do_it ) %]
>+    [% 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/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>index 5884eb6f78..894171b1a7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% USE Branches %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
>@@ -11,33 +12,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/catalogue_stats.pl">Catalog 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">
>-                    Catalog statistics
>-                </a>
>-            </li>
>-        [% END %]
>-    </ol>
>-</nav>
>-[% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Catalog statistics</span>
>+            [% END %]
>+        [% END # /IF ( do_it ) %]
>+    [% 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/dictionary.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>index 38c8ea8965..3100b60c9c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt
>@@ -1,3 +1,4 @@
>+[% USE raw %]
> [% SET footerjs = 1 %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Dictionary &rsaquo; Guided reports &rsaquo; Reports &rsaquo; Koha</title>
>@@ -22,78 +23,45 @@
> [%- 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>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a>
>-        </li>
>-
>-        [% IF ( new_dictionary ) %]
>-            <li>
>+        [% END %]
>+        [% IF ( new_dictionary || step_2 || step_3 || step_4 || step_5 ) %]
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Name the new definition
>-                </a>
>-            </li>
>-
>+            [% END %]
>+        [% END %]
>+        [% IF ( new_dictionary ) %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Name the new definition</span>
>+            [% END %]
>         [% ELSIF ( step_2 ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Step 2: Choose the area
>-                </a>
>-            </li>
>-
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Step 2: Choose the area</span>
>+            [% END %]
>         [% ELSIF ( step_3 ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Step 3: Choose a column
>-                </a>
>-            </li>
>-
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Step 3: Choose a column</span>
>+            [% END %]
>         [% ELSIF ( step_4 ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Step 4: Specify a value
>-                </a>
>-            </li>
>-
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Step 4: Specify a value</span>
>+            [% END %]
>         [% ELSIF ( step_5 ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/reports/dictionary.pl">Dictionary</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Step 5: Confirm definition
>-                </a>
>-            </li>
>-
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Step 5: Confirm definition</span>
>+            [% END %]
>         [% ELSE %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Dictionary
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Dictionary</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/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>index 3e30bc27d2..08b7853251 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>@@ -69,87 +69,66 @@
> [% 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>
>+        [% END %]
>+        [% WRAPPER breadcrumb_item %]
>             <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a>
>-        </li>
>-
>+        [% END %]
>+        [% IF ( showsql || editsql || execute ) %]
>+            [% WRAPPER breadcrumb_item %]
>+                <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a>
>+            [% END %]
>+        [% END %]
>         [% IF ( saved1 ) %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Saved reports
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Saved reports</span>
>+            [% END %]
>         [% ELSIF ( create ) %]
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Create from SQL
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Create from SQL</span>
>+            [% END %]
>         [% ELSIF ( showsql ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    [% reportname | html %] ([% id | html %])
>-                </a>
>-            </li>
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                [% reportname | html %] ([% id | html %])
>+            [% END %]
>         [% ELSIF ( editsql ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a>
>-            </li>
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | uri %]&amp;phase=Show%20SQL">[% reportname | html %] ([% id | html %])</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Edit
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Edit</span>
>+            [% END %]
>         [% ELSIF ( execute ) %]
>-            <li>
>-                <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a>
>-            </li>
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id | uri %]&amp;phase=Show%20SQL">[% name | html %] ([% id | html %])</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    Run
>-                </a>
>-            </li>
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                <span>Run</span>
>+            [% END %]
>         [% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %]
>-            <li>
>+            [% WRAPPER breadcrumb_item %]
>                 <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a report</a>
>-            </li>
>-            <li>
>-                <a href="#" aria-current="page">
>-                    [% IF ( build1 ) %]
>-                        <span>Step 1 of 6: Choose a module</span>
>-                    [% ELSIF ( build2 ) %]
>-                        <span>Step 2 of 6: Pick a report type</span>
>-                    [% ELSIF ( build3 ) %]
>-                        <span>Step 3 of 6: Select columns for display</span>
>-                    [% ELSIF ( build4 ) %]
>-                        <span>Step 4 of 6: Select criteria to limit on</span>
>-                    [% ELSIF ( build5 ) %]
>-                        <span>Step 5 of 6: Pick which columns to total</span>
>-                    [% ELSIF ( build6 ) %]
>-                        <span>Step 6 of 6: Select how you want the report ordered</span>
>-                    [% END %]
>-                </a>
>-        [% END %]
>-    </ol>
>-</nav> 
>-[% END %]
>+            [% END %]
>+            [% WRAPPER breadcrumb_item bc_active= 1 %]
>+                [% IF ( build1 ) %]
>+                    <span>Step 1 of 6: Choose a module</span>
>+                [% ELSIF ( build2 ) %]
>+                    <span>Step 2 of 6: Pick a report type</span>
>+                [% ELSIF ( build3 ) %]
>+                    <span>Step 3 of 6: Select columns for display</span>
>+                [% ELSIF ( build4 ) %]
>+                    <span>Step 4 of 6: Select criteria to limit on</span>
>+                [% ELSIF ( build5 ) %]
>+                    <span>Step 5 of 6: Pick which columns to total</span>
>+                [% ELSIF ( build6 ) %]
>+                    <span>Step 6 of 6: Select how you want the report ordered</span>
>+                [% END # /IF ( build1 ) %]
>+            [% END # /WRAPPER breadcrumb_item %]
>+        [% END # /IF ( saved1 ) %]
>+    [% END # /WRAPPER breadcrumbs %]
>+[% END # /WRAPPER 'sub-header.inc' %]
> 
> <div id="update_sql" class="modal" tabindex="-1" role="dialog" aria-labelledby="update_sql_label" aria-hidden="true">
>     <div class="modal-dialog">
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33437: 149764 | 149809 | 149810 | 149811 | 149867 | 150171 | 150423