Bug 218569 - Clean up reporting UI. Patch by gerv; r=jouni, a=justdave.

diff --git a/report.cgi b/report.cgi
index 9701907424398f79e742b797d13b4b8113571a32..72e69a0fdaa58e5ffb89f553e4a7195cb3adfd58 100755 (executable)
--- a/report.cgi
+++ b/report.cgi
@@ -287,7 +287,7 @@ if ($action eq "wrap") {
     $vars->{'imagebase'}   = $cgi->canonicalise_query( 
                     $tbl_field, "action", "ctype", "format", "width", "height");
     $vars->{'switchbase'}  = $cgi->canonicalise_query( 
-                                "action", "ctype", "format", "width", "height");
+                "query_format", "action", "ctype", "format", "width", "height");
     $vars->{'data'} = \%data;
 }
 elsif ($action eq "plot") {

diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index 19d8c722faa76943b896d60a51060b83209eda16..535a8c503575cbcd66c2119e4b8e1566c04ef50f 100644 (file)
--- 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 7793f30126fb01e39ccf7f800111b5203370fd71..d5f4a14dca10f7420c1bfe11041acfbef9a7219f 100644 (file)
--- 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 b850f93c87d1e601564a8698ff02e2da57cb1253..713ea88f915e2d802ea0e6eea57726446e2a60ec 100644 (file)
--- 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>