From 6ec682ac4ed38cfc404288c056f0eb28514a15fb Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Sat, 19 Aug 2006 00:43:41 +0000 Subject: Bug 252856: HTML charts don't validate - Patch by victory(_RSZ_) r=gerv a=myk --- template/en/default/filterexceptions.pl | 1 - template/en/default/reports/report-table.html.tmpl | 5 ++--- template/en/default/reports/report.html.tmpl | 7 ++++--- 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'template/en/default') diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 062408a09..2723b8dd9 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -123,7 +123,6 @@ ], 'reports/report-table.html.tmpl' => [ - 'buglistbase', '"&$tbl_vals" IF tbl_vals', '"&$col_vals" IF col_vals', '"&$row_vals" IF row_vals', diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl index 679eb1c1d..60965d502 100644 --- a/template/en/default/reports/report-table.html.tmpl +++ b/template/en/default/reports/report-table.html.tmpl @@ -37,10 +37,10 @@ [% row_field_disp = field_descs.$row_field || row_field %] [% IF tbl == "-total-" %] - [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %] + [% urlbase = BLOCK %]buglist.cgi?[% buglistbase FILTER html %] [% "&$tbl_vals" IF tbl_vals %][% END %] [% ELSE %] - [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %]& + [% urlbase = BLOCK %]buglist.cgi?[% buglistbase FILTER html %]& [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %][% END %] [% END %] @@ -154,7 +154,6 @@ [% col_field FILTER url_quote %]=[% col FILTER url_quote %] [% "&$row_vals" IF row_vals %]"> [% col_totals.$col %] - [% END %] diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl index 29157842f..cf4dda827 100644 --- a/template/en/default/reports/report.html.tmpl +++ b/template/en/default/reports/report.html.tmpl @@ -51,6 +51,7 @@ [% tbl_field_disp = field_descs.$tbl_field || tbl_field %] [% col_field_disp = field_descs.$col_field || col_field %] [% row_field_disp = field_descs.$row_field || row_field %] +[% switchbase = switchbase FILTER html %] [% title = BLOCK %] Report: @@ -125,8 +126,8 @@ { name => "line", description => "Line" }, { name => "table", description => "Table" } ] %] - [% formaturl = "report.cgi?$switchbase&width=$width&height=$height" _ - "&action=wrap" %] + [% formaturl = "report.cgi?$switchbase&width=$width" _ + "&height=$height&action=wrap" %] [% FOREACH other_format = formats %] [% NEXT IF other_format.name == "pie" AND row_field AND col_field %] [% UNLESS other_format.name == format %] @@ -157,7 +158,7 @@ [% height - 100 %]">Shorter
[% END %] - +

-- cgit v1.2.3-24-g4f1b