SONAR-5209 Issues header adjustments

3 files changed, 43 insertions, 42 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 d650fd7c4bf..e6aa5ec764e 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2631,6 +2631,7 @@ 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.resolutions=Resolutions
 component_viewer.measure_section.severities=Severities
 component_viewer.measure_section.rules=Rules
 component_viewer.measure_section.issues=Issues
diff --git a/sonar-server/src/main/hbs/component-viewer/header.hbs b/sonar-server/src/main/hbs/component-viewer/header.hbs
index 3cb0753ce3c..313d7c3ffde 100644
--- a/sonar-server/src/main/hbs/component-viewer/header.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/header.hbs
@@ -60,7 +60,7 @@
       <div class="component-viewer-header-measures-scope">
         <a data-scope="issues" class="component-viewer-header-measures-expand js-header-tab-issues">
             <div class="component-viewer-header-measure">
-              <span class="component-viewer-header-measure-value">{{default component.measures.fDebt '–'}}</span>
+              <span class="component-viewer-header-measure-value">{{default component.measures.fDebt '0'}}</span>
               <span class="component-viewer-header-measure-label">{{t 'component_viewer.header.debt'}}</span>
             </div>
           {{#if component.measures.fIssues}}
@@ -136,4 +136,4 @@
   {{/unless}}
 </div>
 
-<div class="component-viewer-header-expanded-bar"></div>
\ No newline at end of file
+<div class="component-viewer-header-expanded-bar"></div>
diff --git a/sonar-server/src/main/hbs/component-viewer/header/issues-header.hbs b/sonar-server/src/main/hbs/component-viewer/header/issues-header.hbs
index c1547366f67..70193cb3292 100644
--- a/sonar-server/src/main/hbs/component-viewer/header/issues-header.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/header/issues-header.hbs
@@ -6,6 +6,46 @@
   </div>
 {{/if}}
 
+<div class="component-viewer-header-expanded-bar-section">
+  <div class="component-viewer-header-expanded-bar-section-title">
+    {{#if hasIssues}}{{t 'component_viewer.measure_section.resolutions'}}{{else}}{{t 'component_viewer.no_issues'}}{{/if}}
+  </div>
+  <ul class="component-viewer-header-expanded-bar-section-list">
+    {{#if currentIssue}}
+      <li><a class="item js-filter-current-issue">
+        <span>{{t 'component_viewer.issues.current_issue'}}</span>
+        <i class="icon-chevron-right"></i>
+      </a></li>
+    {{/if}}
+    {{#unless state.removed}}
+      <li><a class="item js-filter-unresolved-issues">
+        <span>{{t 'component_viewer.issues.unresolved_issues'}}</span>
+        <i class="icon-chevron-right"></i>
+      </a></li>
+    {{/unless}}
+    {{#unless state.removed}}
+      <li><a class="item js-filter-fixed-issues">
+        <span>{{t 'component_viewer.issues.fixed_issues'}}</span>
+        <i class="icon-chevron-right"></i>
+      </a></li>
+    {{/unless}}
+    {{#unless state.removed}}
+      <li><a class="item js-filter-false-positive-issues">
+        <span>{{t 'component_viewer.issues.false_positive_issues'}}</span>
+        <span class="number">{{component.measures.false_positive_issues}}</span>
+        <i class="icon-chevron-right"></i>
+      </a></li>
+    {{else}}
+      {{#if component.measures.false_positive_issues}}
+        <li><span class="item">
+          <span>{{t 'component_viewer.issues.false_positive_issues'}}</span>
+          <span class="number">{{component.measures.false_positive_issues}}</span>
+        </span></li>
+      {{/if}}
+    {{/unless}}
+  </ul>
+</div>
+
 {{#ifNotEmpty state.severities}}
   <div class="component-viewer-header-expanded-bar-section">
     <div class="component-viewer-header-expanded-bar-section-title">
@@ -54,46 +94,6 @@
   </div>
 {{/ifNotEmpty}}
 
-<div class="component-viewer-header-expanded-bar-section">
-  <div class="component-viewer-header-expanded-bar-section-title">
-    {{#if hasIssues}}&nbsp;{{else}}{{t 'component_viewer.no_issues'}}{{/if}}
-  </div>
-  <ul class="component-viewer-header-expanded-bar-section-list">
-    {{#if currentIssue}}
-      <li><a class="item js-filter-current-issue">
-        <span>{{t 'component_viewer.issues.current_issue'}}</span>
-        <i class="icon-chevron-right"></i>
-      </a></li>
-    {{/if}}
-    {{#unless state.removed}}
-      <li><a class="item js-filter-unresolved-issues">
-        <span>{{t 'component_viewer.issues.unresolved_issues'}}</span>
-        <i class="icon-chevron-right"></i>
-      </a></li>
-    {{/unless}}
-    {{#unless state.removed}}
-      <li><a class="item js-filter-fixed-issues">
-        <span>{{t 'component_viewer.issues.fixed_issues'}}</span>
-        <i class="icon-chevron-right"></i>
-      </a></li>
-    {{/unless}}
-    {{#unless state.removed}}
-      <li><a class="item js-filter-false-positive-issues">
-        <span>{{t 'component_viewer.issues.false_positive_issues'}}</span>
-        <span class="number">{{component.measures.false_positive_issues}}</span>
-        <i class="icon-chevron-right"></i>
-      </a></li>
-    {{else}}
-      {{#if component.measures.false_positive_issues}}
-        <li><span class="item">
-          <span>{{t 'component_viewer.issues.false_positive_issues'}}</span>
-          <span class="number">{{component.measures.false_positive_issues}}</span>
-        </span></li>
-      {{/if}}
-    {{/unless}}
-  </ul>
-</div>
-
 {{#if hasIssues}}
   <div class="component-viewer-header-expanded-bar-section component-viewer-header-expanded-bar-section-actions">
     <div class="component-viewer-header-expanded-bar-section-title">&nbsp;</div>