Bugzilla – Attachment 45669 Details for
Bug 15366
Fix breadcrumbs and html page title in guided reports
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFf]Bug 15366 - Fix breadcrumbs and html page title in guided reports
SIGNED-OFfBug-15366---Fix-breadcrumbs-and-html-pag.patch (text/plain), 6.05 KB, created by
Héctor Eduardo Castro Avalos
on 2015-12-14 15:49:12 UTC
(
hide
)
Description:
[SIGNED-OFf]Bug 15366 - Fix breadcrumbs and html page title in guided reports
Filename:
MIME Type:
Creator:
Héctor Eduardo Castro Avalos
Created:
2015-12-14 15:49:12 UTC
Size:
6.05 KB
patch
obsolete
>From 685913d25938fef8e527cf5e564d9cf4570ee12b Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch> >Date: Sun, 13 Dec 2015 22:39:53 +0100 >Subject: [PATCH] [SIGNED-OFf]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 <hector.hecaxmmx@gmail.com> >Works as descrived >--- > .../en/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 933e850..bd1139c 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' %] >-<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 › [% 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 %] >-</title> >+ >+<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 › [% 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 -%]</title> >+ > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'calendar.inc' %] > <style type="text/css"> >@@ -226,19 +225,19 @@ $(document).ready(function(){ > <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> > › <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> > › <a href="/cgi-bin/koha/reports/guided_reports.pl">Guided reports wizard</a> >-› >-[% IF ( saved1 ) %]Saved reports >-[% ELSIF ( create ) %]Create from SQL >-[% ELSIF ( showsql ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> › SQL view >-[% ELSIF ( editsql ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> › Edit SQL report >-[% ELSIF ( execute ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> › <em>[% name %]</em> Report >-[% ELSIF ( buildx ) %]<a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a report</a> › 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 >+ >+[% IF ( saved1 ) %]› Saved reports >+[% ELSIF ( create ) %]› Create from SQL >+[% ELSIF ( showsql ) %]› <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> › SQL view >+[% ELSIF ( editsql ) %]› <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> › Edit SQL report >+[% ELSIF ( execute ) %]› <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Use%20saved">Saved reports</a> › <em>[% name %]</em> Report >+[% ELSIF ( build1 || build2 || build3 || build4 || build5 || build6 ) %]› <a href="/cgi-bin/koha/reports/guided_reports.pl?phase=Build%20new">Build a report</a> >+ [% 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 %] > [% END %] > </div> >diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl >index d75a72f..6a03e11 100755 >--- a/reports/guided_reports.pl >+++ b/reports/guided_reports.pl >@@ -954,7 +954,7 @@ sub header_cell_loop { > } > > foreach (1..6) { >- $template->{VARS}->{'build' . $_} and $template->{VARS}->{'buildx' . $_} and last; >+ $template->{VARS}->{'build' . $_} and last; > } > $template->param( 'referer' => $input->referer(), > ); >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 15366
:
45622
|
45669
|
45803
|
46034