aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2014-07-29 11:10:06 +0200
committerStas Vilchik <vilchiks@gmail.com>2014-07-29 11:10:06 +0200
commit75e6a69a88174f4eabffffef8de879862c4fb8e5 (patch)
tree1b58eb6205babbabbed7905178f6f2a585b47129
parent0e52f9b94431d39ec0daad9f1a3992d54187e9aa (diff)
downloadsonarqube-75e6a69a88174f4eabffffef8de879862c4fb8e5.tar.gz
sonarqube-75e6a69a88174f4eabffffef8de879862c4fb8e5.zip
SONAR-5490 Improve readability and payload of results in the Coding Rules page
Fix the pb with manual rules. Remove pipe and orange color for non-ready status.
-rw-r--r--server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee1
-rw-r--r--server/sonar-web/src/main/hbs/coding-rules/coding-rules-list-item.hbs15
-rw-r--r--server/sonar-web/src/main/less/coding-rules.less4
-rw-r--r--sonar-core/src/main/resources/org/sonar/l10n/core.properties1
4 files changed, 11 insertions, 10 deletions
diff --git a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee b/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee
index 77efec04259..92d7aa3aead 100644
--- a/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee
+++ b/server/sonar-web/src/main/coffee/coding-rules/views/coding-rules-list-item-view.coffee
@@ -25,4 +25,5 @@ define [
serializeData: ->
_.extend super,
+ manualRuleLabel: t 'coding_rules.manual_rule'
allTags: _.union @model.get('sysTags'), @model.get('tags')
diff --git a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-list-item.hbs b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-list-item.hbs
index ea2a2057d7e..e8005ae79d2 100644
--- a/server/sonar-web/src/main/hbs/coding-rules/coding-rules-list-item.hbs
+++ b/server/sonar-web/src/main/hbs/coding-rules/coding-rules-list-item.hbs
@@ -1,13 +1,16 @@
<div class="line line-small">
- <span class="coding-rules-detail-status">{{language}}</span>
+ <span class="coding-rules-detail-status">{{default language manualRuleLabel}}</span>
<div class="line-right">
- <span class="coding-rules-list-tags">
- <i class="icon-tags"></i>
- <span>{{#if allTags}}{{join allTags ', '}}{{else}}{{t 'coding_rules.no_tags'}}{{/if}}</span>
- </span>
+ {{#if allTags}}
+ <span class="coding-rules-list-tags">
+ <i class="icon-tags"></i>
+ <span>{{join allTags ', '}}</span>
+ </span>
+ &nbsp;&nbsp;
+ {{/if}}
- {{#notEq status 'READY'}}| <span class="coding-rules-detail-not-ready">{{status}}</span>{{/notEq}}
+ {{#notEq status 'READY'}}<span class="coding-rules-detail-not-ready">{{status}}</span>{{/notEq}}
</div>
</div>
<div class="line" title="{{name}}" name="{{key}}">{{name}}</div>
diff --git a/server/sonar-web/src/main/less/coding-rules.less b/server/sonar-web/src/main/less/coding-rules.less
index b58a9f94b7f..e562f811700 100644
--- a/server/sonar-web/src/main/less/coding-rules.less
+++ b/server/sonar-web/src/main/less/coding-rules.less
@@ -379,10 +379,6 @@ textarea.coding-rules-markdown-description {
display: none;
}
-.coding-rules-detail-not-ready {
- color: @orange;
-}
-
.coding-rules-list-tags {
display: inline-block;
vertical-align: top;
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 892226ed05c..d3047752c37 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1741,6 +1741,7 @@ coding_rules.deactivate_in_all_quality_profiles=Deactivate In All {0} Profiles
coding_rules.found=Found
coding_rules.inherits="{0}" inherits from "{1}"
coding_rules.key=Key:
+coding_rules.manual_rule=Manual Rule
coding_rules.new_search=New Search
coding_rules.no_results=No Coding Rules
coding_rules.no_tags=No tags