aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2016-07-29 10:40:27 +0200
committerStas Vilchik <vilchiks@gmail.com>2016-07-29 10:40:36 +0200
commit8e8de73e9bb53bc2e87ab968244141d9c1e314c9 (patch)
treee7ef3c9cf2be004b451bd3d6f83820c1b2294991
parentc47d03434fb4ac172eb6eaf76e8057d465ec9d3a (diff)
downloadsonarqube-8e8de73e9bb53bc2e87ab968244141d9c1e314c9.tar.gz
sonarqube-8e8de73e9bb53bc2e87ab968244141d9c1e314c9.zip
improve ui consistency of rule "deprecated" badges
-rw-r--r--server/sonar-web/src/main/js/apps/coding-rules/templates/coding-rules-workspace-list-item.hbs4
-rw-r--r--server/sonar-web/src/main/js/apps/coding-rules/templates/rule/coding-rules-rule-meta.hbs6
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties3
3 files changed, 11 insertions, 2 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 be7aa781008..e1b7cc0dc81 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
@@ -23,7 +23,9 @@
<td class="coding-rule-table-meta-cell">
<div class="coding-rule-meta">
{{#notEq status 'READY'}}
- <span class="text-danger">{{status}}</span>
+ <span class="badge badge-normal-size badge-danger-light">
+ {{t 'rules.status' status}}
+ </span>
&nbsp;&nbsp;&nbsp;
{{/notEq}}
<span class="note">{{langName}}</span>
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/templates/rule/coding-rules-rule-meta.hbs b/server/sonar-web/src/main/js/apps/coding-rules/templates/rule/coding-rules-rule-meta.hbs
index 33919a00353..902287efe84 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/templates/rule/coding-rules-rule-meta.hbs
+++ b/server/sonar-web/src/main/js/apps/coding-rules/templates/rule/coding-rules-rule-meta.hbs
@@ -27,7 +27,11 @@
{{#notEq status 'READY'}}
<li class="coding-rules-detail-property"
- data-toggle="tooltip" data-placement="bottom" title="Rule status">{{status}}</li>
+ data-toggle="tooltip" data-placement="bottom" title="Rule status">
+ <span class="badge badge-normal-size badge-danger-light">
+ {{t 'rules.status' status}}
+ </span>
+ </li>
{{/notEq}}
<li class="coding-rules-detail-property coding-rules-detail-tag-list {{#if canWrite}}coding-rules-detail-tags-change{{/if}}"
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 a1ca10f5d9a..0a86b12052e 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1859,8 +1859,11 @@ rules.identification=Identification
rules.parameters=Parameters
rules.not_found=The rule "{0}" does not exist
rules.status.beta=Beta
+rules.status.BETA=Beta
rules.status.deprecated=Deprecated
+rules.status.DEPRECATED=Deprecated
rules.status.ready=Ready
+rules.status.READY=Ready
#------------------------------------------------------------------------------