SONAR-3513 Feedback applied

diff --git a/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs b/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs
index 0b8659bb2a6e3f1e3b1d31d45a9f215ebf7e0beb..19f904c1b3b71c43ddc83abe85a4cd3b3ba74697 100644 (file)
--- a/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs
+++ b/server/sonar-web/src/main/hbs/component-viewer/header/cw-tests-header.hbs
@@ -44,7 +44,13 @@
 
 <div class="component-viewer-header-expanded-bar-section large">
   <div class="component-viewer-header-expanded-bar-section-title justify">
-    <span class="ib">{{t 'component_viewer.measure_section.test_names'}}</span>
+    <span class="ib">
+      {{t 'component_viewer.measure_section.test_cases'}}
+      {{t 'component_viewer.tests.ordered_by'}}
+      <a class="js-sort-tests-name underlined-link">{{t 'component_viewer.tests.test_name'}}</a>
+      /
+      <a class="js-sort-tests-duration underlined-link">{{t 'component_viewer.tests.duration'}}</a>
+    </span>
     {{#if hasCoveragePerTestData}}
       <span class="ib">{{t 'component_viewer.covered_lines'}}</span>
     {{/if}}
@@ -77,9 +83,4 @@
       {{/eq}}
     {{/each}}
   </ul>
-  <div class="component-viewer-header-expanded-bar-section-title">
-    <span>{{t 'component_viewer.tests.sort_by'}}</span>
-    <a class="js-sort-tests-name underlined-link">{{t 'component_viewer.tests.test_name'}}</a>
-    <a class="js-sort-tests-duration underlined-link">{{t 'component_viewer.tests.duration'}}</a>
-  </div>
 </div>

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 8d538ffb62673271d919af86e57d206485edc860..d69d7f43d0c7572b5539d94f59199c9f43a0a904 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2651,7 +2651,7 @@ component_viewer.measure_section.issues=Issues
 component_viewer.measure_section.sqale=SQALE
 component_viewer.measure_section.unit_tests=Unit Tests
 component_viewer.measure_section.tests=Tests
-component_viewer.measure_section.test_names=Test Names
+component_viewer.measure_section.test_cases=Test Cases
 component_viewer.measure_section.integration_tests=Integration Tests
 component_viewer.measure_section.overall=Overall
 
@@ -2673,9 +2673,9 @@ component_viewer.transition.coverage=Covered By
 component_viewer.transition.covers=Covers
 component_viewer.transition.duplication=Duplicated By
 
-component_viewer.tests.sort_by=Sort by
-component_viewer.tests.duration=Duration
-component_viewer.tests.test_name=Test Name
+component_viewer.tests.ordered_by=ordered by
+component_viewer.tests.duration=duration
+component_viewer.tests.test_name=name
 
 component_viewer.x_lines_are_covered={0} lines are covered
 component_viewer.details=Details