Bugzilla – Attachment 149991 Details for
Bug 33438
Use template wrapper for breadcrumbs: Reports part 3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33438: Use template wrapper for breadcrumbs: Reports part 3
Bug-33438-Use-template-wrapper-for-breadcrumbs-Rep.patch (text/plain), 7.89 KB, created by
Katrin Fischer
on 2023-04-20 20:39:27 UTC
(
hide
)
Description:
Bug 33438: Use template wrapper for breadcrumbs: Reports part 3
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-04-20 20:39:27 UTC
Size:
7.89 KB
patch
obsolete
>From 0d71e0c6bc11c3330283610999c89e10393a07ba Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 17 Apr 2023 17:57:20 +0000 >Subject: [PATCH] Bug 33438: Use template wrapper for breadcrumbs: Reports part > 3 > >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 -> > - Average loan time > - Results > - Circulation statistics > - Results > - Lost items > - Results > - Catalog by item type > - Results > >Signed-off-by: Andrew Auld <andrew.auld@ptfs-europe.com> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > .../en/modules/reports/issues_avg_stats.tt | 36 ++++++++----------- > .../prog/en/modules/reports/issues_stats.tt | 36 ++++++++----------- > .../prog/en/modules/reports/itemslost.tt | 36 +++++++------------ > .../prog/en/modules/reports/itemtypes.tt | 35 +++++++----------- > 4 files changed, 54 insertions(+), 89 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >index c34667db64..d647883a0d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_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/issues_avg_stats.pl">Average loan time</a> >- </li> >- <li> >- <a href="#" aria-current="page"> >- Results >- </a> >- </li> >+ [% END %] >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Results >+ [% END %] > [% ELSE %] >- <li> >- <a href="#" aria-current="page"> >- Average loan time >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ Average loan time >+ [% 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/issues_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >index 57f62314a5..ab28f1f198 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_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/issues_stats.pl">Circulation 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"> >- Circulation statistics >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Circulation 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/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >index 7251adb397..371be36680 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -18,34 +18,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_items ) %] >- <li> >+ [% WRAPPER breadcrumb_item %] > <a href="/cgi-bin/koha/reports/itemslost.pl">Lost 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"> >- Lost items >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Lost items</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/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >index a5f149ef5d..e24cff8ff7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -16,33 +16,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/manager.pl?report_name=itemtypes">Catalog by item type</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 by item type >- </a> >- </li> >+ [% WRAPPER breadcrumb_item bc_active= 1 %] >+ <span>Catalog by item type</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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33438
:
149768
|
149806
| 149991