SONAR-2804 Improve GUI

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index b8a4d8143c68cf78a48377f9df42be939b4d9b16..6c6f94d43bb1707b39f05d62f6703a50da4162d2 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -975,9 +975,10 @@ duplications.collapse=Collapse
 #
 #------------------------------------------------------------------------------
 coverage_viewer.on_new_code=On new code
-coverage_viewer.by.unit_tests=By UTs
+coverage_viewer.by=by unit tests
+it_coverage_viewer.by=by integration tests
+overall_coverage_viewer.by=by all tests
 coverage_viewer.unit_tests=Unit Tests
-coverage_viewer.by.integration_tests=By ITs
 coverage_viewer.integration_tests=Integration Tests
 coverage_viewer.overall_tests=All Tests
 

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/resource_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/resource_helper.rb
index 2a6d24e726767716b1803d006fe9aa56e599ed59..7232249f3ea902bf40f018222d9621d220b2c7c4 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/resource_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/resource_helper.rb
@@ -19,4 +19,16 @@
 #
 module ResourceHelper
   DUPLICATION_SNIPPET_DEFAULT_NB_OF_LINES = 6
+
+  def format(new, prefix, measure_name, options = {})
+    if new
+      format_variation(measure('new_' + prefix + measure_name), :period => @period, :default => '-', :style => 'none')
+    else
+      format_measure(measure(prefix + measure_name), options)
+    end
+  end
+
+  def format_difference(new, prefix, measure_name1, measure_name2, options = {})
+    format(new, prefix, measure_name1, options).to_i - format(new, prefix, measure_name2, options).to_i;
+  end
 end
\ No newline at end of file

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb
index 594a9002a885a510aa82ceb89b7caf5047c06837..73ca5a4e4e7fcac83d8893ca42c4aed02c2a2c9a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/_header_coverage.html.erb
@@ -1,139 +1,41 @@
 <div id="coverage_header" class="tab_header">
-  <% if @period && (measure('new_coverage') || measure('new_it_coverage') || measure('new_overall_coverage')) %>
-    <p><%= message('coverage_viewer.on_new_code') -%> :</p>
-    <table>
-      <tr>
-        <td class="big" rowspan="2"><%= format_variation('new_coverage', :period => @period, :default => '-', :style => 'none') -%></td>
-
-        <td class="sep"></td>
+  <% new = @period && (measure('new_coverage') || measure('new_it_coverage') || measure('new_overall_coverage')) %>
 
-        <% if m=measure('new_line_coverage') %>
-          <td class="name"><%= Metric.name_for('line_coverage') -%>:</td>
-          <td class="value"><%= format_variation(m, :period => @period, :default => '-', :style => 'none') -%></td>
-        <% else %>
-          <td colspan="2"></td>
-        <% end %>
+  <% if new -%>
+    <p><%= message('coverage_viewer.on_new_code') -%> :</p>
+  <% end -%>
 
-        <td class="sep"></td>
-        <% if m=measure('new_branch_coverage') %>
-          <td class="name"><%= Metric.name_for('branch_coverage') -%>:</td>
-          <td class="value"><%= format_variation(m, :period => @period, :default => '-', :style => 'none') -%></td>
-        <% else %>
-          <td colspan="2"></td>
-        <% end %>
-      </tr>
+  <table class="coverage">
+    <% [('overall_' if @display_overall_coverage), '', ('it_' if @display_it_coverage)].compact.each_with_index do |prefix, index| -%>
       <tr>
-        <td class="sep"></td>
-        <% if m=measure('new_uncovered_lines') %>
-          <td class="name"><%= Metric.name_for('uncovered_lines') -%>:</td>
-          <td class="value"><%= format_variation(m, :period => @period, :style => 'none') -%>
-            /<%= format_variation('new_lines_to_cover', :period => @period, :style => 'none') -%></td>
-        <% else %>
+        <% if index == 0 -%>
+          <td class="right big" style="width: 80px;"><%= format(new, prefix, 'coverage', :default => '-') -%></td>
+          <td></td>
+          <td class="sep"></td>
+          <td class="name"><%= h Metric.name_for('line_coverage') -%>:</td>
+          <td class="value">
+            <%= format(new, prefix, 'line_coverage') -%>
+            (<%= format_difference(new, prefix, 'lines_to_cover', 'uncovered_lines') -%>
+            / <%= format(new, prefix, 'lines_to_cover') -%>)
+          </td>
+          <td class="sep"></td>
+          <td class="name"><%= h Metric.name_for('branch_coverage') -%>:</td>
+          <td class="value">
+            <%= format(new, prefix, 'branch_coverage') -%>
+            (<%= format_difference(new, prefix, 'conditions_to_cover', 'uncovered_conditions') -%>
+            / <%= format(new, prefix, 'conditions_to_cover') -%>)
+          </td>
+        <% else -%>
+          <td class="right"><%= format(new, prefix, 'coverage', :default => '-') -%></td>
+          <td><%= message(prefix + 'coverage_viewer.by') -%></td>
+          <td class="sep"></td>
           <td colspan="2"></td>
-        <% end %>
-
-        <td class="sep"></td>
-        <% if m=measure('new_uncovered_conditions') %>
-          <td class="name"><%= Metric.name_for('uncovered_conditions') -%>:</td>
-          <td class="value"><%= format_variation(m, :period => @period, :style => 'none') -%>
-            /<%= format_variation('new_conditions_to_cover', :period => @period, :style => 'none') -%></td>
-        <% else %>
+          <td class="sep"></td>
           <td colspan="2"></td>
-        <% end %>
+        <% end -%>
       </tr>
-      <% if measure('new_it_coverage') %>
-        <tr>
-          <td colspan="7"><br/><%= message('coverage_viewer.integration_tests') -%></td>
-        </tr>
-        <tr>
-          <td class="big" rowspan="2"><%= format_variation('new_it_coverage', :period => @period, :default => '-', :style => 'none') -%></td>
-
-          <td class="sep"></td>
-
-          <% if m=measure('new_it_line_coverage') %>
-            <td class="name"><%= Metric.name_for('it_line_coverage') -%>:</td>
-            <td class="value"><%= format_variation(m, :period => @period, :default => '-', :style => 'none') -%></td>
-          <% else %>
-            <td colspan="2"></td>
-          <% end %>
-
-          <td class="sep"></td>
-          <% if m=measure('new_it_branch_coverage') %>
-            <td class="name"><%= Metric.name_for('it_branch_coverage') -%>:</td>
-            <td class="value"><%= format_variation(m, :period => @period, :default => '-', :style => 'none') -%></td>
-          <% else %>
-            <td colspan="2"></td>
-          <% end %>
-        </tr>
-        <tr>
-          <td class="sep"></td>
-          <% if m=measure('new_it_uncovered_lines') %>
-            <td class="name"><%= Metric.name_for('it_uncovered_lines') -%>:</td>
-            <td class="value"><%= format_variation(m, :period => @period, :style => 'none') -%>
-              /<%= format_variation('new_it_lines_to_cover', :period => @period, :style => 'none') -%></td>
-          <% else %>
-            <td colspan="2"></td>
-          <% end %>
-
-          <td class="sep"></td>
-          <% if m=measure('new_it_uncovered_conditions') %>
-            <td class="name"><%= Metric.name_for('it_uncovered_conditions') -%>:</td>
-            <td class="value"><%= format_variation(m, :period => @period, :style => 'none') -%>
-              /<%= format_variation('new_it_conditions_to_cover', :period => @period, :style => 'none') -%></td>
-          <% else %>
-            <td colspan="2"></td>
-          <% end %>
-        </tr>
-      <% end %>
-    </table>
-  <% else %>
-    <% if @display_it_coverage || @display_overall_coverage -%>
-      <table class="coverage">
-        <tr>
-          <td class="big"><%= format_measure('overall_coverage', :default => '-') -%></td>
-          <td class="sep"></td>
-          <td class="sep"></td>
-          <%= render :partial => 'measure', :locals => {:measure => measure('overall_uncovered_lines'), :title => Metric.name_for('uncovered_lines'), :ratio => measure('overall_lines_to_cover')} -%>
-          <td class="sep"></td>
-          <%= render :partial => 'measure', :locals => {:measure => measure('overall_uncovered_conditions'), :title => Metric.name_for('uncovered_conditions'), :ratio => measure('overall_conditions_to_cover')} -%>
-        </tr>
-
-        <tr>
-          <td><%= format_measure('coverage', :default => '-') -%> <%= message('coverage_viewer.unit_tests') -%></td>
-          <td class="sep"></td>
-          <td class="sep"></td>
-          <%= render :partial => 'measure', :locals => {:measure => measure('uncovered_lines'), :title => message('coverage_viewer.by.unit_tests'), :ratio => measure('lines_to_cover')} -%>
-          <td class="sep"></td>
-          <%= render :partial => 'measure', :locals => {:measure => measure('uncovered_conditions'), :title => message('coverage_viewer.by.unit_tests'), :ratio => measure('conditions_to_cover')} -%>
-        </tr>
-
-        <tr>
-          <td><%= format_measure('it_coverage', :default => '-') -%> <%= message('coverage_viewer.integration_tests') -%></td>
-          <td class="sep"></td>
-          <td class="sep"></td>
-          <%= render :partial => 'measure', :locals => {:measure => measure('it_uncovered_lines'), :title => message('coverage_viewer.by.integration_tests'), :ratio => measure('it_lines_to_cover')} -%>
-          <td class="sep"></td>
-          <%= render :partial => 'measure', :locals => {:measure => measure('it_uncovered_conditions'), :title => message('coverage_viewer.by.integration_tests'), :ratio => measure('it_conditions_to_cover')} -%>
-        </tr>
-      </table>
-    <% else -%>
-      <table>
-        <tr>
-          <td class="big" rowspan="2"><%= format_measure('coverage', :default => '-') -%></td>
-          <td class="sep"></td>
-          <%= render :partial => 'measure', :locals => {:measure => measure('line_coverage'), :title => Metric.name_for('line_coverage')} -%>
-          <td class="sep"></td>
-          <%= render :partial => 'measure', :locals => {:measure => measure('branch_coverage'), :title => Metric.name_for('branch_coverage')} -%>
-        </tr>
-        <tr>
-          <td class="sep"></td>
-          <%= render :partial => 'measure', :locals => {:measure => measure('uncovered_lines'), :title => Metric.name_for('uncovered_lines'), :ratio => measure('lines_to_cover')} -%>
-          <td class="sep"></td>
-          <%= render :partial => 'measure', :locals => {:measure => measure('uncovered_conditions'), :title => Metric.name_for('uncovered_conditions'), :ratio => measure('conditions_to_cover')} -%>
-        </tr>
-      </table>
     <% end -%>
-  <% end %>
+  </table>
 
   <%= render :partial => 'options' -%>
 </div>