From 59b092d38a07b93c77a3277298b2969b90a8e581 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit f371c081272f2f0110779cd7fef22c3363f2ec0d) Signed-off-by: Jacob O'Mara --- .../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' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
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' %] - -[% END %] + [% WRAPPER breadcrumbs %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Reports + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
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' %] - -[% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
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' %] - -[% END %] + [% END %] + [% IF ( do_it ) %] + [% WRAPPER breadcrumb_item %] + Serials subscriptions stats + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Results + [% END %] + [% ELSE %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Serials subscriptions stats + [% END %] + [% END %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
-- 2.20.1