From e8d5e8828cdf9c5c4dcb78c6f85bbdb474dc7c8e Mon Sep 17 00:00:00 2001 From: Wainui Witika-Park Date: Mon, 1 Mar 2021 23:20:43 +0000 Subject: [PATCH] Bug 26703: reports folder Swapped the order of the page titles to have the unique information first, i.e. the name of the specific page displays first, and the name of the website (e.g. Koha) displays at the end. To test: 1) Apply patch 2) Ensure each of the files in the reports folder are swapped around to display the most unique information first, and the website name is at the end 3) Ensure the pages displayed on the Staff Client that correspond to these files also display the changes Sponsored-by: Catalyst IT Signed-off-by: Martin Renvoize --- .../en/modules/reports/acquisitions_stats.tt | 2 +- .../prog/en/modules/reports/bor_issues_top.tt | 2 +- .../prog/en/modules/reports/borrowers_out.tt | 2 +- .../en/modules/reports/borrowers_stats.tt | 3 +- .../en/modules/reports/cash_register_stats.tt | 2 +- .../prog/en/modules/reports/cat_issues_top.tt | 2 +- .../prog/en/modules/reports/catalogue_out.tt | 2 +- .../en/modules/reports/catalogue_stats.tt | 2 +- .../prog/en/modules/reports/convert_report.tt | 2 +- .../prog/en/modules/reports/dictionary.tt | 2 +- .../modules/reports/guided_reports_start.tt | 36 +++++++------------ .../en/modules/reports/issues_avg_stats.tt | 2 +- .../prog/en/modules/reports/issues_stats.tt | 2 +- .../prog/en/modules/reports/itemslost.tt | 2 +- .../prog/en/modules/reports/itemtypes.tt | 2 +- .../en/modules/reports/orders_by_budget.tt | 2 +- .../prog/en/modules/reports/reports-home.tt | 2 +- .../prog/en/modules/reports/reserves_stats.tt | 2 +- .../prog/en/modules/reports/serials_stats.tt | 2 +- 19 files changed, 32 insertions(+), 41 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt index 4f24a2c3e0..af06dc3e35 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt @@ -1,6 +1,6 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Reports [% IF ( do_it ) %]› Acquisitions statistics › Results[% ELSE %]› Acquisitions statistics[% END %] +[% IF ( do_it ) %]Acquisitions statistics › Results[% ELSE %]Acquisitions statistics[% END %] › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt index f36386a1a8..502ac75124 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt @@ -3,7 +3,7 @@ [% USE ItemTypes %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Reports › Patrons with the most checkouts +Patrons with the most checkouts › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt index 42290498ae..c54a95118b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tt @@ -1,6 +1,6 @@ [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Reports › Patrons with no checkouts +Patrons with no checkouts › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt index 9e3ca815c2..db1e6eeff3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt @@ -2,7 +2,8 @@ [% USE Koha %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Reports [% IF ( do_it ) %]› Patrons statistics › Results[% ELSE %]› Patrons statistics[% END %] +[% IF ( do_it ) %]Patrons statistics › Results[% ELSE %]Patrons statistics[% END %] › Reports › Koha + [% INCLUDE 'doc-head-close.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 d57cd7e513..a002e404c3 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 @@ -20,31 +20,21 @@ [% INCLUDE 'doc-head-open.inc' %] - Koha › Reports › Guided reports wizard [%- IF ( saved1 ) -%] - › Saved reports - [%- ELSIF ( create ) -%] - › Create from SQL - [%- ELSIF ( showsql ) -%] - › Saved reports › SQL view - [%- ELSIF ( execute ) -%] - › Saved reports › Report [% name | html %] ([% id | html %]) - [%- ELSIF ( editsql ) -%] - › Saved reports › Edit report [% reportname | html %] ([% id | html %]) - [%- END -%] + Saved reports › [%- ELSIF ( create ) -%] + Create from SQL › [%- ELSIF ( showsql ) -%] + SQL view › Saved reports › [%- ELSIF ( execute ) -%] + Report [% name | html %] ([% id | html %]) › Saved reports › [%- ELSIF ( editsql ) -%] + Edit report [% reportname | html %] ([% id | html %]) › Saved reports › [%- END -%] + [%- IF ( build1 ) -%] - › Build a report, step 1 of 6: Choose a module - [%- ELSIF ( build2 ) -%] - › Build a report, step 2 of 6: Pick a report type - [%- ELSIF ( build3 ) -%] - › Build a report, step 3 of 6: Select columns for display - [%- ELSIF ( build4 ) -%] - › Build a report, step 4 of 6: Select criteria to limit on - [%- ELSIF ( build5 ) -%] - › Build a report, step 5 of 6: Pick which columns to total - [%- ELSIF ( build6 ) -%] - › Build a report, step 6 of 6: Select how you want the report ordered - [%- END -%] + Build a report, step 1 of 6: Choose a module › [%- ELSIF ( build2 ) -%] + Build a report, step 2 of 6: Pick a report type › [%- ELSIF ( build3 ) -%] + Build a report, step 3 of 6: Select columns for display › [%- ELSIF ( build4 ) -%] + Build a report, step 4 of 6: Select criteria to limit on › [%- ELSIF ( build5 ) -%] + Build a report, step 5 of 6: Pick which columns to total › [%- ELSIF ( build6 ) -%] + Build a report, step 6 of 6: Select how you want the report ordered › [%- END -%] + Guided reports wizard › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] 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 50e031c322..f976f1cffe 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,7 +1,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Reports › Average loan time +Average loan time › Reports › Koha [% INCLUDE 'doc-head-close.inc' %] 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 935dfdaf7d..ddf42c2bec 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,7 +1,7 @@ [% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Reports › Circulation statistics [% IF ( do_it ) %]› Results[% END %] +Circulation statistics[% IF ( do_it ) %] › Results[% END %] › Reports › Koha [% INCLUDE 'doc-head-close.inc' %]