From 4dd938c67ce1682bf5dfd613956ba4b15c740986 Mon Sep 17 00:00:00 2001 From: simonbrandhof Date: Fri, 5 Nov 2010 17:40:59 +0000 Subject: [PATCH] fix layout of core widgets --- .../org/sonar/plugins/core/CorePlugin.java | 4 +- ...lysisWidget.java => ComplexityWidget.java} | 6 +- ...ticAnalysisWidget.java => SizeWidget.java} | 6 +- .../core/widgets/code_coverage.html.erb | 52 +++++++------- .../widgets/comments_duplications.html.erb | 5 +- ..._analysis.html.erb => complexity.html.erb} | 71 ++++++++++--------- .../sonar/plugins/core/widgets/rules.html.erb | 8 +-- ...static_analysis.html.erb => size.html.erb} | 0 .../design/ui/widgets/FileDesignWidget.java | 2 +- .../ui/widgets/PackageDesignWidget.java | 2 +- .../design/ui/widgets/file_design.html.erb | 4 +- .../design/ui/widgets/package_design.html.erb | 4 +- .../db/migrate/151_create_dashboards.rb | 8 +-- .../src/it/selenium/i18n/french-france.html | 2 +- 14 files changed, 89 insertions(+), 85 deletions(-) rename plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/{DefaultExtendedAnalysisWidget.java => ComplexityWidget.java} (83%) rename plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/{DefaultStaticAnalysisWidget.java => SizeWidget.java} (83%) rename plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/{_extended_analysis.html.erb => complexity.html.erb} (65%) rename plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/{_static_analysis.html.erb => size.html.erb} (100%) diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java index f599ea64c8f..6e082c1c692 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/CorePlugin.java @@ -149,9 +149,9 @@ public class CorePlugin implements Plugin { extensions.add(CodeCoverageWidget.class); extensions.add(CommentsDuplicationsWidget.class); extensions.add(DescriptionWidget.class); - extensions.add(DefaultExtendedAnalysisWidget.class); + extensions.add(ComplexityWidget.class); extensions.add(RulesWidget.class); - extensions.add(DefaultStaticAnalysisWidget.class); + extensions.add(SizeWidget.class); extensions.add(EventsWidget.class); extensions.add(CustomMeasuresWidget.class); diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DefaultExtendedAnalysisWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ComplexityWidget.java similarity index 83% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DefaultExtendedAnalysisWidget.java rename to plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ComplexityWidget.java index 509f51c5b14..90dba687ae3 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DefaultExtendedAnalysisWidget.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ComplexityWidget.java @@ -24,9 +24,9 @@ import org.sonar.api.web.Description; import org.sonar.api.web.RubyRailsWidget; @Description("Reports on complexity, average complexity and complexity distribution.") -public class DefaultExtendedAnalysisWidget extends AbstractRubyTemplate implements RubyRailsWidget { +public class ComplexityWidget extends AbstractRubyTemplate implements RubyRailsWidget { public String getId() { - return "extended_analysis"; + return "complexity"; } public String getTitle() { @@ -35,6 +35,6 @@ public class DefaultExtendedAnalysisWidget extends AbstractRubyTemplate implemen @Override protected String getTemplatePath() { - return "/org/sonar/plugins/core/widgets/_extended_analysis.html.erb"; + return "/org/sonar/plugins/core/widgets/complexity.html.erb"; } } \ No newline at end of file diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DefaultStaticAnalysisWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/SizeWidget.java similarity index 83% rename from plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DefaultStaticAnalysisWidget.java rename to plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/SizeWidget.java index 69ddfc62b0b..3c6a5c42055 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/DefaultStaticAnalysisWidget.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/SizeWidget.java @@ -24,9 +24,9 @@ import org.sonar.api.web.Description; import org.sonar.api.web.RubyRailsWidget; @Description("Reports general metrics on the size of the project.") -public class DefaultStaticAnalysisWidget extends AbstractRubyTemplate implements RubyRailsWidget { +public class SizeWidget extends AbstractRubyTemplate implements RubyRailsWidget { public String getId() { - return "static_analysis"; + return "size"; } public String getTitle() { @@ -35,6 +35,6 @@ public class DefaultStaticAnalysisWidget extends AbstractRubyTemplate implements @Override protected String getTemplatePath() { - return "/org/sonar/plugins/core/widgets/_static_analysis.html.erb"; + return "/org/sonar/plugins/core/widgets/size.html.erb"; } } diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/code_coverage.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/code_coverage.html.erb index 422c131f96b..53f08f4d849 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/code_coverage.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/code_coverage.html.erb @@ -2,29 +2,30 @@ code_coverage_measure=measure(Metric::COVERAGE) tests_measure=measure(Metric::TESTS) if code_coverage_measure || tests_measure %> -
-
-
-

Code coverage

-

<%= format_measure(code_coverage_measure, :suffix => '', :url => url_for_drilldown(Metric::COVERAGE), :default => '-') %> <%= tendency_icon(code_coverage_measure, false) %>

- <% line_coverage=measure(Metric::LINE_COVERAGE) - if line_coverage %> -

<%= format_measure(line_coverage, :suffix => ' line coverage', :url => url_for_drilldown(Metric::UNCOVERED_LINES, :highlight => Metric::LINE_COVERAGE)) %> <%= tendency_icon(line_coverage) %>

- <% end %> - <% branch_coverage=measure(Metric::BRANCH_COVERAGE) - if branch_coverage %> -

<%= format_measure(branch_coverage, :suffix => ' branch coverage', :url => url_for_drilldown(Metric::UNCOVERED_CONDITIONS, :highlight => Metric::BRANCH_COVERAGE)) %> <%= tendency_icon(branch_coverage) %>

- <% end %> -

<%= format_measure(tests_measure, :suffix => ' tests', :url => url_for_drilldown(Metric::TESTS)) %> <%= tendency_icon(tests_measure) %>

- <% skipped_measure=measure(Metric::SKIPPED_TESTS) - if skipped_measure && skipped_measure.value>0 - %> -

+<%= format_measure(skipped_measure, :suffix => ' skipped', :url => url_for_drilldown(Metric::SKIPPED_TESTS)) %> <%= tendency_icon(skipped_measure) %>

- <% end %> -

<%= format_measure(Metric::TEST_EXECUTION_TIME, :suffix => '', :url => url_for_drilldown(Metric::TEST_EXECUTION_TIME)) %> <%= tendency_icon(measure(Metric::TEST_EXECUTION_TIME)) %>

-
-
-
+ + + + + +
+
+

Code coverage

+

<%= format_measure(code_coverage_measure, :suffix => '', :url => url_for_drilldown(Metric::COVERAGE), :default => '-') %> <%= tendency_icon(code_coverage_measure, false) %>

+ <% line_coverage=measure(Metric::LINE_COVERAGE) + if line_coverage %> +

<%= format_measure(line_coverage, :suffix => ' line coverage', :url => url_for_drilldown(Metric::UNCOVERED_LINES, :highlight => Metric::LINE_COVERAGE)) %> <%= tendency_icon(line_coverage) %>

+ <% end %> + <% branch_coverage=measure(Metric::BRANCH_COVERAGE) + if branch_coverage %> +

<%= format_measure(branch_coverage, :suffix => ' branch coverage', :url => url_for_drilldown(Metric::UNCOVERED_CONDITIONS, :highlight => Metric::BRANCH_COVERAGE)) %> <%= tendency_icon(branch_coverage) %>

+ <% end %> +

<%= format_measure(tests_measure, :suffix => ' tests', :url => url_for_drilldown(Metric::TESTS)) %> <%= tendency_icon(tests_measure) %>

+ <% skipped_measure=measure(Metric::SKIPPED_TESTS) + if skipped_measure && skipped_measure.value>0 + %> +

+<%= format_measure(skipped_measure, :suffix => ' skipped', :url => url_for_drilldown(Metric::SKIPPED_TESTS)) %> <%= tendency_icon(skipped_measure) %>

+ <% end %> +

<%= format_measure(Metric::TEST_EXECUTION_TIME, :suffix => '', :url => url_for_drilldown(Metric::TEST_EXECUTION_TIME)) %> <%= tendency_icon(measure(Metric::TEST_EXECUTION_TIME)) %>

+
+ 		<% success_percentage=measure(Metric::TEST_SUCCESS_DENSITY) if success_percentage @@ -40,6 +41,7 @@ if code_coverage_measure || tests_measure %>

<% end %> - - +
<% end %> diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/comments_duplications.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/comments_duplications.html.erb index 28f28552123..078822eb556 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/comments_duplications.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/comments_duplications.html.erb @@ -1,7 +1,7 @@ <% if measure(Metric::LINES) || measure(Metric::NCLOC) %> - - -
+ <% if (measure(Metric::COMMENT_LINES)) %>

Comments

@@ -19,8 +19,7 @@
<% end %> 		+ <% if (measure(Metric::DUPLICATED_LINES_DENSITY)) %>

Duplications

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/_extended_analysis.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb similarity index 65% rename from plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/_extended_analysis.html.erb rename to plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb index 86c1eec3b0f..43bc5683a5d 100644 --- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/_extended_analysis.html.erb +++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/complexity.html.erb @@ -8,36 +8,40 @@ if file_complexity || function_complexity || class_complexity || paragraph_complexity complexity=measure('complexity') %> -
-

Complexity

- <% if function_complexity %> -

- <%= format_measure(function_complexity, :suffix => '', :url => url_for_drilldown(function_complexity)) -%> <%= tendency_icon(function_complexity, false) -%>/ method -

- <% end %> - <% if paragraph_complexity %> -

- <%= format_measure(paragraph_complexity, :suffix => '', :url => url_for_drilldown(paragraph_complexity)) -%> <%= tendency_icon(paragraph_complexity, false) -%>/ paragraph -

- <% end %> - <% if class_complexity %> -

- <%= format_measure(class_complexity, :suffix => '', :url => url_for_drilldown(class_complexity)) -%> <%= tendency_icon(class_complexity, false) -%>/ class -

- <% end %> - <% if file_complexity %> -

- <%= format_measure(file_complexity, :suffix => '', :url => url_for_drilldown(file_complexity)) -%> <%= tendency_icon(file_complexity, false) -%>/ file -

- <% end %> - <% if complexity %> -

- Total: <%= format_measure(complexity, :url => url_for_drilldown(complexity)) -%> <%= tendency_icon(complexity) -%> -

- <% end %> -
- - + + + + +
+
+

Complexity

+ <% if function_complexity %> +

+ <%= format_measure(function_complexity, :suffix => '', :url => url_for_drilldown(function_complexity)) -%> <%= tendency_icon(function_complexity, false) -%>/ method +

+ <% end %> + <% if paragraph_complexity %> +

+ <%= format_measure(paragraph_complexity, :suffix => '', :url => url_for_drilldown(paragraph_complexity)) -%> <%= tendency_icon(paragraph_complexity, false) -%>/ paragraph +

+ <% end %> + <% if class_complexity %> +

+ <%= format_measure(class_complexity, :suffix => '', :url => url_for_drilldown(class_complexity)) -%> <%= tendency_icon(class_complexity, false) -%>/ class +

+ <% end %> + <% if file_complexity %> +

+ <%= format_measure(file_complexity, :suffix => '', :url => url_for_drilldown(file_complexity)) -%> <%= tendency_icon(file_complexity, false) -%>/ file +

+ <% end %> + <% if complexity %> +

+ Total: <%= format_measure(complexity, :url => url_for_drilldown(complexity)) -%> <%= tendency_icon(complexity) -%> +

+ <% end %> +
+ 		<% function_distribution=measure('function_complexity_distribution') paragraph_distribution=measure('paragraph_complexity_distribution') @@ -50,7 +54,7 @@ complexity=measure('complexity') end if selected_distribution %> -
+