Skip to content

bugzilla
bugzilla
Commit 8a17e45f authored by Frédéric Buclin's avatar Frédéric Buclin
Browse files
Options

Bug 746947: Determine the size of the images dynamically for graphical reports

r=dkl a=LpSolit
parent a05220de
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 72 deletions
report.cgi
View file @ 8a17e45f
...@@ -103,20 +103,18 @@ if (!($col_field || $row_field || $tbl_field)) { ...@@ -103,20 +103,18 @@ if (!($col_field || $row_field || $tbl_field)) {
ThrowUserError("no_axes_defined"); ThrowUserError("no_axes_defined");
} }
my $width = $cgi->param('width'); # There is no UI for these parameters anymore,
my $height = $cgi->param('height'); # but they are still here just in case.
my $width = $cgi->param('width') || 1024;
my $height = $cgi->param('height') || 600;
if (defined($width)) { (detaint_natural($width) && $width > 0)
(detaint_natural($width) && $width > 0) || ThrowCodeError("invalid_dimensions");
|| ThrowCodeError("invalid_dimensions"); $width <= 2000 || ThrowUserError("chart_too_large");
$width <= 2000 || ThrowUserError("chart_too_large");
}
if (defined($height)) { (detaint_natural($height) && $height > 0)
(detaint_natural($height) && $height > 0) || ThrowCodeError("invalid_dimensions");
|| ThrowCodeError("invalid_dimensions"); $height <= 2000 || ThrowUserError("chart_too_large");
$height <= 2000 || ThrowUserError("chart_too_large");
}
# These shenanigans are necessary to make sure that both vertical and # These shenanigans are necessary to make sure that both vertical and
# horizontal 1D tables convert to the correct dimension when you ask to # horizontal 1D tables convert to the correct dimension when you ask to
...@@ -244,7 +242,7 @@ $vars->{'row_names'} = \@row_names; ...@@ -244,7 +242,7 @@ $vars->{'row_names'} = \@row_names;
$vars->{'tbl_names'} = \@tbl_names; $vars->{'tbl_names'} = \@tbl_names;
# Below a certain width, we don't see any bars, so there needs to be a minimum. # Below a certain width, we don't see any bars, so there needs to be a minimum.
if ($width && $cgi->param('format') eq "bar") { if ($cgi->param('format') eq "bar") {
my $min_width = (scalar(@col_names) || 1) * 20; my $min_width = (scalar(@col_names) || 1) * 20;
if (!$cgi->param('cumulate')) { if (!$cgi->param('cumulate')) {
...@@ -254,9 +252,8 @@ if ($width && $cgi->param('format') eq "bar") { ...@@ -254,9 +252,8 @@ if ($width && $cgi->param('format') eq "bar") {
$vars->{'min_width'} = $min_width; $vars->{'min_width'} = $min_width;
} }
$vars->{'width'} = $width if $width; $vars->{'width'} = $width;
$vars->{'height'} = $height if $height; $vars->{'height'} = $height;
$vars->{'query'} = $query; $vars->{'query'} = $query;
$vars->{'saved_report_id'} = $cgi->param('saved_report_id'); $vars->{'saved_report_id'} = $cgi->param('saved_report_id');
$vars->{'debug'} = $cgi->param('debug'); $vars->{'debug'} = $cgi->param('debug');
......
skins/standard/IE-fixes.css
View file @ 8a17e45f
...@@ -52,3 +52,7 @@ form#Create #comp_desc { ...@@ -52,3 +52,7 @@ form#Create #comp_desc {
/* color:inherit */ /* color:inherit */
color: expression(this.parentNode.currentStyle['color']); color: expression(this.parentNode.currentStyle['color']);
} }
#graphical_report {
width: auto\9; /* IE6-8 */
}
skins/standard/reports.css
View file @ 8a17e45f
...@@ -77,3 +77,28 @@ ...@@ -77,3 +77,28 @@
padding-bottom: .5em; padding-bottom: .5em;
color: #333; color: #333;
} }
.t1 {
background-color: #ffffff; /* white */
}
.t2 {
background-color: #dfefff; /* light blue */
}
.t3 {
background-color: #dddddd; /* grey */
}
.t4 {
background-color: #c3d3ed; /* darker blue */
}
.ttotal, .ttotal td {
background-color: #cfffdf; /* light green */
}
#graphical_report {
max-width: 100%;
height: auto;
}
template/en/default/reports/report.html.tmpl
View file @ 8a17e45f
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
# cumulate: boolean. For bar/line charts, whether to cumulate data sets. # cumulate: boolean. For bar/line charts, whether to cumulate data sets.
#%] #%]
[% DEFAULT width = 600 [% DEFAULT width = 1024
height = 350 height = 600
%] %]
[% IF min_width AND width < min_width %] [% IF min_width AND width < min_width %]
...@@ -55,14 +55,8 @@ ...@@ -55,14 +55,8 @@
[% time = time FILTER time('%Y-%m-%d %H:%M:%S') FILTER html %] [% time = time FILTER time('%Y-%m-%d %H:%M:%S') FILTER html %]
[% PROCESS global/header.html.tmpl [% PROCESS global/header.html.tmpl
style = "
.t1 { background-color: #ffffff } /* white */
.t2 { background-color: #dfefff } /* light blue */
.t3 { background-color: #dddddd } /* grey */
.t4 { background-color: #c3d3ed } /* darker blue */
.ttotal, .ttotal td { background-color: #cfffdf } /* light green */
"
header_addl_info = time header_addl_info = time
style_urls = ['skins/standard/reports.css']
yui = ['datatable'] yui = ['datatable']
%] %]
...@@ -98,57 +92,29 @@ ...@@ -98,57 +92,29 @@
[% END %] [% END %]
[% END %] [% END %]
[% END %] [% END %]
[% END %]width=[% width %]&amp;height=[% height %] [% END %]width=[% width %]&amp;height=[% height %]
[% END %] [% END %]
<img alt="Graphical report results" src="[% imageurl %]" <img id="graphical_report" alt="Graphical report results" src="[% imageurl %]">
width="[% width %]" height="[% height %]">
[% END %] [% END %]
<br> <br>
[% END %] [% END %]
<table> [% formats = [ { name => "pie", description => "Pie" },
<tr> { name => "bar", description => "Bar" },
<td> { name => "line", description => "Line" },
[% formats = [ { name => "pie", description => "Pie" }, { name => "table", description => "Table" } ] %]
{ name => "bar", description => "Bar" },
{ name => "line", description => "Line" }, [% formaturl = "report.cgi?$switchbase&amp;width=$width&amp;height=$height&amp;action=wrap" %]
{ name => "table", description => "Table" } ] %] [% FOREACH other_format = formats %]
[% NEXT IF other_format.name == "pie" AND row_field AND col_field %]
[% formaturl = "report.cgi?$switchbase&amp;width=$width" _ [% UNLESS other_format.name == format %]
"&amp;height=$height&amp;action=wrap" %] <a href="[% formaturl %]&amp;format=[% other_format.name %]">
[% FOREACH other_format = formats %] [% END %]
[% NEXT IF other_format.name == "pie" AND row_field AND col_field %] [% other_format.description FILTER html %]
[% UNLESS other_format.name == format %] [% "</a>" UNLESS other_format.name == format %] |
<a href="[% formaturl %]&amp;format=[% other_format.name %]"> [% END %]
[% END %] <a href="[% formaturl %]&amp;ctype=csv&amp;format=table">CSV</a>
[% other_format.description FILTER html %]
[% "</a>" UNLESS other_format.name == format %] |
[% END %]
<a href="[% formaturl %]&amp;ctype=csv&amp;format=table">CSV</a>
</td>
[% IF format != "table" %]
<td>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</td>
[% sizeurl = BLOCK %]report.cgi?
[% switchbase %]&amp;action=wrap&amp;format=
[% format FILTER html %][% END %]
<td align="center">
<a href="[% sizeurl %]&amp;width=[% width %]&amp;height=
[% height + 100 %]">Taller</a><br>
<a href="[% sizeurl %]&amp;width=[% width - 100 %]&amp;height=
[% height %]">Thinner</a> *
<a href="[% sizeurl %]&amp;width=[% width + 100 %]&amp;height=
[% height %]">Fatter</a>&nbsp;&nbsp;&nbsp;&nbsp;<br>
<a href="[% sizeurl %]&amp;width=[% width %]&amp;height=
[% height - 100 %]">Shorter</a><br>
</td>
[% END %]
</tr>
</table>
<table> <table>
<tr> <tr>
...@@ -161,7 +127,7 @@ ...@@ -161,7 +127,7 @@
Edit this report</a> Edit this report</a>
[% END %] [% END %]
</td> </td>
<td>&nbsp;</td> <td>|</td>
<td> <td>
[% IF saved_report_id %] [% IF saved_report_id %]
<a href="report.cgi?action=del&amp;saved_report_id=[% saved_report_id FILTER uri %]&amp;token= <a href="report.cgi?action=del&amp;saved_report_id=[% saved_report_id FILTER uri %]&amp;token=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment