drop colorized labels for issue and rule types

2 files changed, 6 insertions, 12 deletions

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list-item.hbs b/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list-item.hbs
index 608d10f292b..2948ec2b374 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list-item.hbs
+++ b/server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list-item.hbs
@@ -27,15 +27,16 @@
              
         {{/notEq}}
         <span class="note">{{langName}}</span>
+        &nbsp;&nbsp;&nbsp;
+        <span class="note" data-toggle="tooltip" data-placement="bottom"
+              title="{{t 'coding_rules.type.tooltip' this.type}}">
+          {{issueType this.type}}
+        </span>
         {{#notEmpty tags}}
           &nbsp;&nbsp;&nbsp;
           <i class="icon-tags"></i>
           <span class="note">{{join tags ', '}}</span>
         {{/notEmpty}}
-        &nbsp;&nbsp;&nbsp;
-        <span data-toggle="tooltip" data-placement="bottom" title="{{t 'coding_rules.type.tooltip' this.type}}">
-          {{issueType this.type}}
-        </span>
         <a class="js-rule-filter link-no-underline spacer-left" href="#">
           <i class="icon-filter icon-half-transparent"></i>&nbsp;<i class="icon-dropdown"></i>
         </a>
diff --git a/server/sonar-web/src/main/js/helpers/handlebars/issueType.js b/server/sonar-web/src/main/js/helpers/handlebars/issueType.js
index 9dfe9e4abcf..3cabe69bc7f 100644
--- a/server/sonar-web/src/main/js/helpers/handlebars/issueType.js
+++ b/server/sonar-web/src/main/js/helpers/handlebars/issueType.js
@@ -17,15 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import Handlebars from 'handlebars/runtime';
-
 import { translate } from '../../helpers/l10n';
 
 module.exports = function (issueType) {
-  const isCodeSmell = issueType === 'CODE_SMELL';
-  const className = 'badge ' + (isCodeSmell ? 'badge-warning' : 'badge-danger');
-
-  return new Handlebars.default.SafeString(
-      `<span class="${className}">${translate('issue.type', issueType)}</span>`
-  );
+  return translate('issue.type', issueType);
 };