From 639ccd469f4e00e1737e0dec6ee914d845907938 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc=20V=C3=A9ron?= Date: Sun, 13 Dec 2015 22:39:53 +0100 Subject: [PATCH] Bug 15366 - Fix breadcrumbs and html page title in guided reports This patch fixes following issues with breadcrumbs and html page title in Home > Reports > Guided reports wizard: - Sometimes, breadcrumbs display a stray > at the end - While creating a report, steps are not displayed in breadcrumbs and do not appear in html page title - html page title is divided by newlines To test: - Apply patch - Go to Home > Reports > Guided reports wizard - Go to all pages including the steps for creating a new report and verify - that the breadcrumbs display properly and make sense - in html source, the page title makes sense and displays on one line. Signed-off-by: Hector Castro Works as descrived Signed-off-by: Jonathan Druart Signed-off-by: Brendan A Gallagher --- .../modules/reports/guided_reports_start.tt | 57 +++++++++---------- reports/guided_reports.pl | 2 +- 2 files changed, 29 insertions(+), 30 deletions(-) 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 933e8506af..bd1139c693 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 @@ -12,22 +12,21 @@ [%- END -%] [% 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 › [% name %] Report -[% ELSIF ( editsql ) %]› Saved reports › Edit SQL report -[% ELSIF ( buildx ) %]› Build a report, step [% buildx %] of 6: -[% IF ( build1 ) %]Choose a module -[% ELSIF ( build2 ) %]Pick a report type -[% ELSIF ( build3 ) %]Select columns for display -[% ELSIF ( build4 ) %]Select criteria to limit on -[% ELSIF ( build5 ) %]Pick which columns to total -[% ELSIF ( build6 ) %]Select how you want the report ordered -[% END %] -[% END %] - + +Koha › Reports › Guided reports wizard [%- IF ( saved1 ) -%]› Saved reports +[%- ELSIF ( create ) -%]› Create from SQL +[%- ELSIF ( showsql ) -%]› Saved reports › SQL view +[%- ELSIF ( execute ) -%]› Saved reports › [% name %] Report +[%- ELSIF ( editsql ) -%]› Saved reports › Edit SQL report +[%- 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 -%] + [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %]