From 120086c8a98a4b95579499a7048cc2375a690f06 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Mon, 19 May 2014 14:56:01 +0200 Subject: [PATCH] SONAR-5209 Basic metrics, complete i18n --- .../resources/org/sonar/l10n/core.properties | 26 +++ .../main/coffee/component-viewer/main.coffee | 7 +- .../src/main/hbs/component-viewer/header.hbs | 20 +-- .../component-viewer/header/_basic-header.hbs | 153 +++++------------- .../header/_coverage-header.hbs | 8 +- .../header/_issues-header.hbs | 20 ++- .../main/js/common/handlebars-extensions.js | 2 +- .../WEB-INF/app/views/issues/search.html.erb | 51 +++--- 8 files changed, 133 insertions(+), 154 deletions(-) diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 3e7898358e4..c7207dc471c 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2640,3 +2640,29 @@ duration.month=about a month duration.months={0} months duration.year=about a year duration.years={0} years + + +#------------------------------------------------------------------------------ +# +# COMPONENT VIEWER +# +#------------------------------------------------------------------------------ +component_viewer.measure_section.size=Size +component_viewer.measure_section.complexity=Complexity +component_viewer.measure_section.structure=Structure +component_viewer.measure_section.documentation=Documentation +component_viewer.measure_section.severities=Severities +component_viewer.measure_section.rules=Rules +component_viewer.measure_section.issues=Issues +component_viewer.measure_section.sqale=SQALE +component_viewer.measure_section.unit_tests=Unit Tests +component_viewer.measure_section.integration_tests=Integration Tests + +component_viewer.issues.current_issue=Current Issue +component_viewer.issues.unresolved_issues=Unresolved Issues +component_viewer.issues.false_positive_issues=False Positive Issues + +component_viewer.header.debt=Debt +component_viewer.header.toggle_issues=Toggle issues +component_viewer.header.toggle_coverage=Toggle coverage +component_viewer.header.toggle_duplications=Toggle duplications \ No newline at end of file diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee index 7c65a008829..25d2ca5775b 100644 --- a/sonar-server/src/main/coffee/component-viewer/main.coffee +++ b/sonar-server/src/main/coffee/component-viewer/main.coffee @@ -28,9 +28,10 @@ define [ LINES_AROUND_ISSUE = 4 LINES_AROUND_COVERED_LINE = 1 - SOURCE_METRIC_LIST = 'lines,ncloc,functions,accessors,classes,statements,complexity,function_complexity,' + - 'comment_lines_density,comment_lines,public_documented_api_density,public_undocumented_api,' + - 'public_api' + SOURCE_METRIC_LIST = 'accessors,classes,functions,public_api,statements,' + + 'generated_lines,generated_ncloc,lines,ncloc,' + + 'complexity,class_complexity,function_complexity' + + '' COVERAGE_METRIC_LIST = 'coverage,line_coverage,lines_to_cover,covered_lines,uncovered_lines,' + 'branch_coverage,conditions_to_cover,uncovered_conditions,' + diff --git a/sonar-server/src/main/hbs/component-viewer/header.hbs b/sonar-server/src/main/hbs/component-viewer/header.hbs index c039f3e2a4b..c06684a5902 100644 --- a/sonar-server/src/main/hbs/component-viewer/header.hbs +++ b/sonar-server/src/main/hbs/component-viewer/header.hbs @@ -33,7 +33,7 @@
{{default component.measures.fDebt 0}} - Debt + {{t 'component_viewer.header.debt'}}
{{#if component.measures.fIssues}}
@@ -45,21 +45,21 @@
+ style="width: {{percent component.measures.fBlockerIssues component.measures.maxIssues}};">
+ style="width: {{percent component.measures.fCriticalIssues component.measures.maxIssues}};">
+ style="width: {{percent component.measures.fMajorIssues component.measures.maxIssues}};">
+ style="width: {{percent component.measures.fMinorIssues component.measures.maxIssues}};">
+ style="width: {{percent component.measures.fInfoIssues component.measures.maxIssues}};"> {{/if}} - @@ -72,7 +72,7 @@ - {{/if}} @@ -82,11 +82,11 @@
{{component.measures.fDuplicationDensity}} - Duplications + {{t 'metric.duplicated_lines_density.name'}}
- {{/if}} diff --git a/sonar-server/src/main/hbs/component-viewer/header/_basic-header.hbs b/sonar-server/src/main/hbs/component-viewer/header/_basic-header.hbs index 377222fe090..b7725e38d04 100644 --- a/sonar-server/src/main/hbs/component-viewer/header/_basic-header.hbs +++ b/sonar-server/src/main/hbs/component-viewer/header/_basic-header.hbs @@ -1,113 +1,46 @@ -
-
Size
- -
+{{#with component.msr}} +
+
+ {{t 'component_viewer.measure_section.size'}} +
+ +
-
-
Lines
- -
+
+
+ {{t 'component_viewer.measure_section.complexity'}} +
+ +
-
-
Complexity
- -
+
+
+ {{t 'component_viewer.measure_section.structure'}} +
+ +
-
-
Design
- -
- -
-
Documentation
- -
\ No newline at end of file +
+
+ {{t 'component_viewer.measure_section.documentation'}} +
+ +
+{{/with}} \ No newline at end of file diff --git a/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs b/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs index fa99fab4b7b..b33187f7952 100644 --- a/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs +++ b/sonar-server/src/main/hbs/component-viewer/header/_coverage-header.hbs @@ -1,6 +1,8 @@ {{#with component.msr}}
-
Unit Tests
+
+ {{t 'component_viewer.measure_section.unit_tests'}} +