diff options
4 files changed, 66 insertions, 69 deletions
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb index a40542f0852..3eb807b0847 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb @@ -1,4 +1,3 @@ - <% file_complexity=measure('file_complexity') function_complexity=measure('function_complexity') @@ -117,4 +116,3 @@ if file_distribution </table> <div class="clear"></div> <% end %> - diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb index d661b295560..49cc103ff9a 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/coverage.html.erb @@ -7,8 +7,8 @@ if code_coverage_measure || tests_measure %> <table width="100%"> - <tr> - <td valign="top" width="50%" nowrap> + <tr> + <td valign="top" width="50%" nowrap> <div class="dashbox"> <p class="title"><%= message('widget.code_coverage.name') -%></p> <p> diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb index 050cb2d8e98..f039205bc53 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/it_coverage.html.erb @@ -3,8 +3,8 @@ if coverage_measure %> <table width="100%"> - <tr> - <td nowrap valign="top"> + <tr> + <td nowrap valign="top"> <div class="dashbox"> <p class="title"><%= message('widget.it-coverage.name') -%></p> <p> @@ -74,5 +74,3 @@ </tr> </table> <% end %> - - diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb index 4c2f9d1fda8..e6366b32bc8 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/size.html.erb @@ -10,69 +10,70 @@ statements=measure('statements') %> <table width="100%"> - <tr> - <td valign="top" width="48%" nowrap> - <div class="dashbox"> - <h3><%= message('widget.size.lines_of_code') -%></h3> - <% if ncloc %> - <p> - <span class="big"><%= format_measure(ncloc, :suffix => '', :url => url_for_drilldown(ncloc)) -%></span> - <%= dashboard_configuration.selected_period? ? format_variation(ncloc) : trend_icon(ncloc) -%> - </p> - <% - generated_ncloc=measure('generated_ncloc') - if generated_ncloc && generated_ncloc.value>0 - %> - <p>+<%= format_measure(generated_ncloc, :suffix => message('widget.size.generated.suffix'), :url => url_for_drilldown(generated_ncloc)) -%> <%= dashboard_configuration.selected_period? ? format_variation(generated_ncloc) : trend_icon(generated_ncloc) -%></p> - <% end %> - <p><%= format_measure(lines, :suffix => message('widget.size.lines.suffix'), :url => url_for_drilldown(lines)) -%> <%= dashboard_configuration.selected_period? ? format_variation(lines) : trend_icon(lines) -%></p> - <% else%> - <p><span class="big"><%= format_measure(lines, :suffix => '', :url => url_for_drilldown(lines)) -%> <%= trend_icon(lines) -%></span></p> - <% end %> - <% - generated_lines=measure('generated_lines') - if generated_lines && generated_lines.value>0 - %> - <p>incl. <%= format_measure(generated_lines, :suffix => message('widget.size.generated.suffix'), :url => url_for_drilldown(generated_lines)) -%> <%= dashboard_configuration.selected_period? ? format_variation(generated_lines) : trend_icon(generated_lines) -%></p> - <% end %> - <% if statements %> + <tr> + <td valign="top" width="48%" nowrap> + <div class="dashbox"> + <h3><%= message('widget.size.lines_of_code') -%></h3> + <% if ncloc %> <p> - <%= format_measure(statements, :suffix => message('widget.size.statements.suffix'), :url => url_for_drilldown(statements)) -%> <%= dashboard_configuration.selected_period? ? format_variation(statements) : trend_icon(statements) -%> + <span class="big"><%= format_measure(ncloc, :suffix => '', :url => url_for_drilldown(ncloc)) -%></span> + <%= dashboard_configuration.selected_period? ? format_variation(ncloc) : trend_icon(ncloc) -%> </p> + <% + generated_ncloc=measure('generated_ncloc') + if generated_ncloc && generated_ncloc.value>0 + %> + <p>+<%= format_measure(generated_ncloc, :suffix => message('widget.size.generated.suffix'), :url => url_for_drilldown(generated_ncloc)) -%> <%= dashboard_configuration.selected_period? ? format_variation(generated_ncloc) : trend_icon(generated_ncloc) -%></p> <% end %> - <% if files && measure('classes') %> - <p><%= format_measure(files, :suffix => message('widget.size.files.suffix'), :url => url_for_drilldown(files)) -%> <%= dashboard_configuration.selected_period? ? format_variation(files) : trend_icon(files) -%></p> - <% end %> - </div> - </td> - <td width="10"> </td> - <td valign="top"> - <div class="dashbox"> - <% if classes %> - <h3><%= message('widget.size.classes') -%></h3> - <p> - <span class="big"><%= format_measure(classes, :url => url_for_drilldown(classes)) -%></span> - <%= dashboard_configuration.selected_period? ? format_variation(classes) : trend_icon(classes) -%> - </p> - <p><%= format_measure(packages, :suffix => message('widget.size.packages.suffix'), :url => url_for_drilldown(packages)) -%> <%= dashboard_configuration.selected_period? ? format_variation(packages) : trend_icon(packages) -%></p> - <% else %> - <h3><%= message('widget.size.files') -%></h3> - <p><span class="big"><%= format_measure(files, :url => url_for_drilldown(files)) -%></span> - <%= dashboard_configuration.selected_period? ? format_variation(files) : trend_icon(files) -%> - </p> - <p><%= format_measure('directories', :suffix => message('widget.size.directories.suffix'), :url => url_for_drilldown('directories')) -%> <%= dashboard_configuration.selected_period? ? format_variation('directories') : trend_icon('directories') -%></p> - <% end %> - <p><%= format_measure(functions, :suffix => message('widget.size.methods.suffix'), :url => url_for_drilldown(functions)) -%> <%= dashboard_configuration.selected_period? ? format_variation(functions) : trend_icon(functions) -%></p> - <% - if (measure('accessors')) - %> - <p><%= format_measure('accessors', :suffix => message('widget.size.accessors.suffix'), :url => url_for_drilldown('accessors')) -%> <%= dashboard_configuration.selected_period? ? format_variation('accessors') : trend_icon('accessors') -%></p> - <% end %> - <% if measure('paragraphs') %> - <p><%= format_measure('paragraphs', :suffix => message('widget.size.paragraphs.suffix'), :url => url_for_drilldown('paragraphs')) -%> <%= dashboard_configuration.selected_period? ? format_variation('paragraphs') : trend_icon('paragraphs') -%></p> - <% end %> - </div> - </td> - </tr> + <p><%= format_measure(lines, :suffix => message('widget.size.lines.suffix'), :url => url_for_drilldown(lines)) -%> <%= dashboard_configuration.selected_period? ? format_variation(lines) : trend_icon(lines) -%></p> + <% else%> + <p><span class="big"><%= format_measure(lines, :suffix => '', :url => url_for_drilldown(lines)) -%> <%= trend_icon(lines) -%></span></p> + <% end %> + <% + generated_lines=measure('generated_lines') + if generated_lines && generated_lines.value>0 + %> + <p>incl. <%= format_measure(generated_lines, :suffix => message('widget.size.generated.suffix'), :url => url_for_drilldown(generated_lines)) -%> <%= dashboard_configuration.selected_period? ? format_variation(generated_lines) : trend_icon(generated_lines) -%></p> + <% end %> + <% if statements %> + <p> + <%= format_measure(statements, :suffix => message('widget.size.statements.suffix'), :url => url_for_drilldown(statements)) -%> <%= dashboard_configuration.selected_period? ? format_variation(statements) : trend_icon(statements) -%> + </p> + <% end %> + <% if files && measure('classes') %> + <p><%= format_measure(files, :suffix => message('widget.size.files.suffix'), :url => url_for_drilldown(files)) -%> <%= dashboard_configuration.selected_period? ? format_variation(files) : trend_icon(files) -%></p> + <% end %> + </div> + </td> + <td width="10"> </td> + <td valign="top"> + <div class="dashbox"> + <% if classes %> + <h3><%= message('widget.size.classes') -%></h3> + <p> + <span class="big"><%= format_measure(classes, :url => url_for_drilldown(classes)) -%></span> + <%= dashboard_configuration.selected_period? ? format_variation(classes) : trend_icon(classes) -%> + </p> + <p><%= format_measure(packages, :suffix => message('widget.size.packages.suffix'), :url => url_for_drilldown(packages)) -%> <%= dashboard_configuration.selected_period? ? format_variation(packages) : trend_icon(packages) -%></p> + <% else %> + <h3><%= message('widget.size.files') -%></h3> + <p> + <span class="big"><%= format_measure(files, :url => url_for_drilldown(files)) -%></span> + <%= dashboard_configuration.selected_period? ? format_variation(files) : trend_icon(files) -%> + </p> + <p><%= format_measure('directories', :suffix => message('widget.size.directories.suffix'), :url => url_for_drilldown('directories')) -%> <%= dashboard_configuration.selected_period? ? format_variation('directories') : trend_icon('directories') -%></p> + <% end %> + <p><%= format_measure(functions, :suffix => message('widget.size.methods.suffix'), :url => url_for_drilldown(functions)) -%> <%= dashboard_configuration.selected_period? ? format_variation(functions) : trend_icon(functions) -%></p> + <% + if (measure('accessors')) + %> + <p><%= format_measure('accessors', :suffix => message('widget.size.accessors.suffix'), :url => url_for_drilldown('accessors')) -%> <%= dashboard_configuration.selected_period? ? format_variation('accessors') : trend_icon('accessors') -%></p> + <% end %> + <% if measure('paragraphs') %> + <p><%= format_measure('paragraphs', :suffix => message('widget.size.paragraphs.suffix'), :url => url_for_drilldown('paragraphs')) -%> <%= dashboard_configuration.selected_period? ? format_variation('paragraphs') : trend_icon('paragraphs') -%></p> + <% end %> + </div> + </td> + </tr> </table> <% end %>
\ No newline at end of file |