From 22b9199c98b79cd7d9a91e703b83d1d9cdc38d90 Mon Sep 17 00:00:00 2001 From: Owen Leonard 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 Signed-off-by: Nick Clemens Signed-off-by: Tomas Cohen Arazi (cherry picked from commit fb940cf8c4ad9537e7c7c5ca47124b852ab3703d) Signed-off-by: Martin Renvoize --- .../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' %] - -[% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Most-circulated items + [% END %] + [% END # /IF ( do_it ) %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
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' %] - -[% END %] + [% END %] + [% IF ( do_it ) %] + [% WRAPPER breadcrumb_item %] + Items with no checkouts + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Results + [% END %] + [% ELSE %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Items with no checkouts + [% END %] + [% END # /IF ( do_it ) %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
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' %] - -[% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + Catalog statistics + [% END %] + [% END # /IF ( do_it ) %] + [% END #/ WRAPPER breadcrumbs %] +[% END #/ WRAPPER sub-header.inc %]
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 03491921e2..cd037e8a6f 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' %] Dictionary › Guided reports › Reports › Koha @@ -22,78 +23,45 @@ [%- 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/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 98715ca958..8124dd783e 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 @@ -68,87 +68,66 @@ [% END %] [% WRAPPER 'sub-header.inc' %] - -[% END %] + [% END %] + [% WRAPPER breadcrumb_item bc_active= 1 %] + [% IF ( build1 ) %] + Step 1 of 6: Choose a module + [% ELSIF ( build2 ) %] + Step 2 of 6: Pick a report type + [% ELSIF ( build3 ) %] + Step 3 of 6: Select columns for display + [% ELSIF ( build4 ) %] + Step 4 of 6: Select criteria to limit on + [% ELSIF ( build5 ) %] + Step 5 of 6: Pick which columns to total + [% ELSIF ( build6 ) %] + Step 6 of 6: Select how you want the report ordered + [% END # /IF ( build1 ) %] + [% END # /WRAPPER breadcrumb_item %] + [% END # /IF ( saved1 ) %] + [% END # /WRAPPER breadcrumbs %] +[% END # /WRAPPER 'sub-header.inc' %]