From fccf15b7db9a7a91e0bf2ff37cfe82ea33fd82f3 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 4 Feb 2014 18:24:23 +0600
Subject: [PATCH] New Issues Page: do not show resolution icon

---
 .../app/views/issues/templates/_issue.hbs.erb |  4 +--
 .../templates/_issue_detail_inner.hbs.erb     |  9 +++----
 .../javascripts/navigator/issues-app.js       | 26 +++++++++----------
 3 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb
index 550e1902959..3534bc04cfd 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue.hbs.erb
@@ -2,9 +2,7 @@
   <div class="line line-small">
       {{severityIcon severity}}{{translate "severities" severity}}&nbsp;
       {{statusIcon status}}{{translate "statuses" status}}
-      {{#if resolution}}
-        &nbsp;{{resolutionIcon resolution}}{{translate "resolutions" resolution}}
-      {{/if}}
+      {{#if resolution}}({{translate "resolutions" resolution}}){{/if}}
 
       <div class="line-right">
         {{fUpdateAge}}
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
index 16fa75c3e88..abe586e4526 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
@@ -120,11 +120,10 @@
       {{/inArray}}
 
 
-      <li>{{statusIcon status}}{{translate "statuses" status}}</li>
-
-      {{#if resolution}}
-        <li>{{resolutionIcon resolution}}{{translate "resolutions" resolution}}</li>
-      {{/if}}
+      <li>
+        {{statusIcon status}}{{translate "statuses" status}}
+        {{#if resolution}}({{translate "resolutions" resolution}}){{/if}}
+      </li>
 
 
       {{#ifNotEmpty transitions}}
diff --git a/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js b/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js
index efe44e91529..1e632cdf72b 100644
--- a/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/issues-app.js
@@ -74,11 +74,11 @@ jQuery(function() {
         enabled: true,
         optional: false,
         choices: {
-          'BLOCKER': window.SS.phrases.severities.blocker,
-          'CRITICAL': window.SS.phrases.severities.critical,
-          'MAJOR': window.SS.phrases.severities.major,
-          'MINOR': window.SS.phrases.severities.minor,
-          'INFO': window.SS.phrases.severities.info
+          'BLOCKER': window.SS.phrases.severities.BLOCKER,
+          'CRITICAL': window.SS.phrases.severities.CRITICAL,
+          'MAJOR': window.SS.phrases.severities.MAJOR,
+          'MINOR': window.SS.phrases.severities.MINOR,
+          'INFO': window.SS.phrases.severities.INFO
         },
         choiceIcons: {
           'BLOCKER': 'severity-blocker',
@@ -96,11 +96,11 @@ jQuery(function() {
         enabled: true,
         optional: false,
         choices: {
-          'OPEN': window.SS.phrases.statuses.open,
-          'CONFIRMED': window.SS.phrases.statuses.confirmed,
-          'REOPENED': window.SS.phrases.statuses.reopened,
-          'RESOLVED': window.SS.phrases.statuses.resolved,
-          'CLOSED': window.SS.phrases.statuses.closed
+          'OPEN': window.SS.phrases.statuses.OPEN,
+          'CONFIRMED': window.SS.phrases.statuses.CONFIRMED,
+          'REOPENED': window.SS.phrases.statuses.REOPENED,
+          'RESOLVED': window.SS.phrases.statuses.RESOLVED,
+          'CLOSED': window.SS.phrases.statuses.CLOSED
         },
         choiceIcons: {
           'OPEN': 'status-open',
@@ -126,9 +126,9 @@ jQuery(function() {
         enabled: false,
         optional: true,
         choices: {
-          'FALSE-POSITIVE': window.SS.phrases.resolutions.falsePositive,
-          'FIXED': window.SS.phrases.resolutions.fixed,
-          'REMOVED': window.SS.phrases.resolutions.removed
+          'FALSE-POSITIVE': window.SS.phrases.resolutions['FALSE-POSITIVE'],
+          'FIXED': window.SS.phrases.resolutions.FIXED,
+          'REMOVED': window.SS.phrases.resolutions.REMOVED
         }
       }),
 
-- 
2.39.5