Bugzilla – Attachment 119886 Details for
Bug 26703
Modify the "title" elements to contain unique information first
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26703: reports folder
Bug-26703-reports-folder.patch (text/plain), 16.31 KB, created by
Henry Bolshaw
on 2021-04-20 08:54:56 UTC
(
hide
)
Description:
Bug 26703: reports folder
Filename:
MIME Type:
Creator:
Henry Bolshaw
Created:
2021-04-20 08:54:56 UTC
Size:
16.31 KB
patch
obsolete
>From 15d35b38dca5bb01a276a18335a1af07d40c31a6 Mon Sep 17 00:00:00 2001 >From: Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz> >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 <martin.renvoize@ptfs-europe.com> > >Signed-off-by: Henry Bolshaw <bolshawh@parliament.uk> >--- > .../prog/en/modules/reports/acquisitions_stats.tt | 2 +- > .../prog/en/modules/reports/bor_issues_top.tt | 2 +- > .../prog/en/modules/reports/borrowers_out.tt | 2 +- > .../prog/en/modules/reports/borrowers_stats.tt | 3 +- > .../prog/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 +- > .../prog/en/modules/reports/catalogue_stats.tt | 2 +- > .../prog/en/modules/reports/convert_report.tt | 2 +- > .../prog/en/modules/reports/dictionary.tt | 2 +- > .../en/modules/reports/guided_reports_start.tt | 36 ++++++++-------------- > .../prog/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 +- > .../prog/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' %] >-<title>Koha › Reports [% IF ( do_it ) %]› Acquisitions statistics › Results[% ELSE %]› Acquisitions statistics[% END %]</title> >+<title>[% IF ( do_it ) %]Acquisitions statistics › Results[% ELSE %]Acquisitions statistics[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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' %] >-<title>Koha › Reports › Patrons with the most checkouts</title> >+<title>Patrons with the most checkouts › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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' %] >-<title>Koha › Reports › Patrons with no checkouts</title> >+<title>Patrons with no checkouts › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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' %] >-<title>Koha › Reports [% IF ( do_it ) %]› Patrons statistics › Results[% ELSE %]› Patrons statistics[% END %]</title> >+<title>[% IF ( do_it ) %]Patrons statistics › Results[% ELSE %]Patrons statistics[% END %] › Reports › Koha</title> >+ > [% INCLUDE 'doc-head-close.inc' %] > <style> > .sql {display:none;} >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >index a86c1c0cde..29ae067dab 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt >@@ -9,7 +9,7 @@ > [% SET footerjs = 1 %] > [% PROCESS 'accounts.inc' %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports [% IF ( do_it ) %]› Cash register statistics › Results[% ELSE %]› Cash register statistics[% END %]</title> >+<title>[% IF ( do_it ) %]Cash register statistics › Results[% ELSE %]Cash register statistics[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 8ee9825754..ecd1d44026 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,7 +1,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Most-circulated items[% IF ( do_it ) %] › Results[% END %]</title> >+<title>Most-circulated items[% IF ( do_it ) %] › Results[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 36af4a5d38..522f5cbcca 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,6 +1,6 @@ > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Items with no checkouts</title> >+<title>Items with no checkouts › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > .sql {display: none;} >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 d1beb7d139..6d0b879213 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,7 +1,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports [% IF ( do_it ) %]› Catalog statistics › Results[% ELSE %]› Catalog statistics[% END %]</title> >+<title>[% IF ( do_it ) %]Catalog statistics › Results[% ELSE %]Catalog statistics[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt >index f8395d3399..b7d0c940a1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/convert_report.tt >@@ -1,5 +1,5 @@ > [% INCLUDE 'doc-head-open.inc' %] >- <title>Koha › Reports › Convert report</title> >+ <title>Convert report › Reports › Koha</title> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> > </head> > <body id="rep_report_convert" class="rep"> >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 b0fb04539f..30e83f8f6b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt >@@ -1,6 +1,6 @@ > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Guided reports › Dictionary</title> >+<title>Dictionary › Guided reports › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > <style>fieldset.rows table { clear: none; margin: 0;}</style> > </head> >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' %] > > <title> >- 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 > </title> > > [% 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' %] >-<title>Koha › Reports › Average loan time</title> >+<title>Average loan time › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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' %] >-<title>Koha › Reports › Circulation statistics [% IF ( do_it ) %]› Results[% END %]</title> >+<title>Circulation statistics[% IF ( do_it ) %] › Results[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > .sql {display:none;} >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 e85506716c..11552c85fb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt >@@ -8,7 +8,7 @@ > [% USE Price %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Lost items</title> >+<title>Lost items › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > >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 23f90089c3..28cdac564d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemtypes.tt >@@ -4,7 +4,7 @@ > [% USE ItemTypes %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Catalog by item types</title> >+<title>Catalog by item types › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > [% IF ( do_it ) %] > [% END %] >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 37a1f6769f..12ad1fde6a 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 >@@ -4,7 +4,7 @@ > [% USE TablesSettings %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Orders by fund</title> >+<title>Orders by fund › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="rep_orders_by_budget" class="rep"> >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 6979974018..b3ee4d5ba8 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 >@@ -1,7 +1,7 @@ > [% USE Koha %] > [% USE raw %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports</title> >+<title>Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> > <body id="rep_reports-home" class="rep"> >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 4b4826702d..dabfe169ea 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,7 +1,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Holds statistics [% IF ( do_it ) %]› Results[% END %]</title> >+<title>Holds statistics[% IF ( do_it ) %] › Results[% END %] › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > .sql {display:none;} >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 0853550aef..dd7c0e23ce 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 >@@ -4,7 +4,7 @@ > [% USE Branches %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Reports › Serials subscriptions stats</title> >+<title>Serials subscriptions stats › Reports › Koha</title> > [% INCLUDE 'doc-head-close.inc' %] > <style> > .sql {display: none;} >-- >2.11.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=119886">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26703
:
117894
|
117895
|
117896
|
117897
|
117898
|
117899
|
117900
|
117901
|
117902
|
117903
|
117904
|
117905
|
117906
|
117907
|
117908
|
117909
|
117910
|
117911
|
117912
|
117997
|
117998
|
117999
|
118000
|
118001
|
118002
|
118003
|
118004
|
118005
|
118006
|
118007
|
118008
|
118009
|
118010
|
118011
|
118012
|
118013
|
118014
|
118015
|
118034
|
118035
|
118036
|
118037
|
118038
|
118039
|
118040
|
118041
|
118042
|
118043
|
118044
|
118045
|
118046
|
118047
|
118048
|
118049
|
118050
|
118051
|
118052
|
118053
|
119652
|
119653
|
119654
|
119655
|
119656
|
119657
|
119658
|
119659
|
119660
|
119661
|
119662
|
119663
|
119664
|
119665
|
119666
|
119667
|
119668
|
119669
|
119670
|
119671
|
119820
|
119824
|
119873
|
119874
|
119875
|
119876
|
119877
|
119878
|
119879
|
119880
|
119881
|
119882
|
119883
|
119884
|
119885
| 119886 |
119887
|
119888
|
119889
|
119890
|
119891
|
119892
|
119893
|
119894
|
119895
|
119897
|
119940
|
119982
|
119983