summaryrefslogtreecommitdiffstats
path: root/template/en/default
diff options
context:
space:
mode:
authorgerv%gerv.net <>2003-09-15 08:00:08 +0200
committergerv%gerv.net <>2003-09-15 08:00:08 +0200
commit5852e76888924d197ae0a2322ce27b506c46b900 (patch)
tree05a82fb77be75d44662e030461182a1d226cb1c0 /template/en/default
parentb23c12c2d3684605bb36eb7e323dc7644da5006d (diff)
downloadbugzilla-5852e76888924d197ae0a2322ce27b506c46b900.tar.gz
bugzilla-5852e76888924d197ae0a2322ce27b506c46b900.tar.xz
Bug 218569 - Clean up reporting UI. Patch by gerv; r=jouni, a=justdave.
Diffstat (limited to 'template/en/default')
-rw-r--r--template/en/default/reports/report.html.tmpl4
-rw-r--r--template/en/default/search/search-report-graph.html.tmpl32
-rw-r--r--template/en/default/search/search-report-table.html.tmpl13
3 files changed, 29 insertions, 20 deletions
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index 19d8c722f..535a8c503 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -165,8 +165,8 @@
<a href="query.cgi?[% switchbase %]&amp;format=report-table">Edit
this report</a>
[% ELSE %]
- <a href="query.cgi?[% switchbase %]&amp;format=report-graph&amp;
- chart_format=[% format %]&amp;cumulate=[% cumulate %]">
+ <a href="query.cgi?[% switchbase %]&amp;chart_format=
+ [% format %]&amp;format=report-graph&amp;cumulate=[% cumulate %]">
Edit this report
</a>
[% END %]
diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl
index 7793f3012..d5f4a14dc 100644
--- a/template/en/default/search/search-report-graph.html.tmpl
+++ b/template/en/default/search/search-report-graph.html.tmpl
@@ -27,19 +27,34 @@
[% PROCESS global/variables.none.tmpl %]
[% PROCESS global/header.html.tmpl
- title = "Generate Report"
- onload = "selectProduct(document.forms['reportform']);"
+ title = "Generate Graphical Report"
+ onload = "selectProduct(document.forms['reportform']);chartTypeChanged()"
%]
[% PROCESS "search/search-report-select.html.tmpl" %]
<p>
- Produce a pictorial graph of [% terms.bug %] counts by choosing one or more fields as
- your axes, and then refining your set of [% terms.bugs %] using the rest of the form.
- If you choose a third axis, it will be represented by multiple tables of data.
- Note: vertical axis settings will be ignored for pie charts.
+ Choose one or more fields as your axes, and then refine your set of
+ [% terms.bugs %] using the rest of the form.
</p>
+<script type="text/javascript"><!--
+ [%# The Y-axis fields are not used for pie charts %]
+ function chartTypeChanged() {
+ // format[2] is the pie chart radio button
+ if (document.reportform.format[2].checked == true) {
+ document.reportform.y_axis_field.disabled = true;
+ document.reportform.cumulate[0].disabled = true;
+ document.reportform.cumulate[1].disabled = true;
+ } else {
+ document.reportform.y_axis_field.disabled = false;
+ document.reportform.cumulate[0].disabled = false;
+ document.reportform.cumulate[1].disabled = false;
+ }
+ }
+// -->
+</script>
+
[% button_name = "Generate Report" %]
<form method="get" action="report.cgi" name="reportform">
@@ -48,6 +63,7 @@
<tr>
<td valign="middle">
<b>Vertical Axis:</b><br>
+ <noscript><small>(not for pie charts)</small><br></noscript>
[% PROCESS select name = 'y_axis_field' %]<br>
<br>
<b>Plot Data Sets:</b><br>
@@ -56,8 +72,7 @@
Individually<br>
<input type="radio" name="cumulate" value="1"
[% " checked" IF default.cumulate.0 == "1" %]>
- Added
-
+ Summed
</td>
<td width="150" height="150">
<table border="1" width="100%" height="100%">
@@ -80,6 +95,7 @@
[% FOREACH chart_format = chart_formats %]
<input type="radio" name="format"
value="[% chart_format.name FILTER html %]"
+ onchange="chartTypeChanged()"
[% " checked" IF default.chart_format.0 == chart_format.name %]>
[% chart_format.description FILTER html %]<br>
[% END %]
diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl
index b850f93c8..713ea88f9 100644
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
@@ -27,16 +27,15 @@
[% PROCESS global/variables.none.tmpl %]
[% PROCESS global/header.html.tmpl
- title = "Generate Report"
+ title = "Generate Tabular Report"
onload = "selectProduct(document.forms['reportform']);"
%]
[% PROCESS "search/search-report-select.html.tmpl" %]
<p>
- Produce a table of [% terms.bug %] counts by choosing one or more fields as your axes,
- and then refining your set of [% terms.bugs %] using the rest of the form.
- If you choose a third axis, it will be represented by multiple tables of data.
+ Choose one or more fields as your axes, and then refine your set of
+ [% terms.bugs %] using the rest of the form.
</p>
[% button_name = "Generate Report" %]
@@ -51,12 +50,6 @@
<b>Horizontal Axis:</b>
[% PROCESS select name = 'x_axis_field' %]
</td>
- <td>&nbsp;&nbsp;</td>
- <td rowspan="2">
- <b>Format:</b><br>
- <input type="radio" name="ctype" value="html" checked="checked">HTML<br>
- <input type="radio" name="ctype" value="csv">CSV
- </td>
</tr>
<tr>