SONAR-5007 Improve coding rule details display

4 files changed, 10 insertions, 8 deletions

diff --git a/sonar-server/src/main/webapp/coffee/coding-rules/mockjax.coffee b/sonar-server/src/main/webapp/coffee/coding-rules/mockjax.coffee
index eb78a3cfda3..a42a3afe486 100644
--- a/sonar-server/src/main/webapp/coffee/coding-rules/mockjax.coffee
+++ b/sonar-server/src/main/webapp/coffee/coding-rules/mockjax.coffee
@@ -68,7 +68,7 @@ define ['jquery.mockjax'], ->
         'severity.INFO': 'Info'
 
         'coding_rules.activate': 'Activate'
-        'coding_rules.activate_quality_profile': 'Activate Quality Profile'
+        'coding_rules.activate_in_quality_profile': 'Activate in Quality Profile'
         'coding_rules.add_note': 'Add Note'
         'coding_rules.available_since': 'Available Since'
         'coding_rules.bulk_change': 'Bulk Change'
@@ -168,6 +168,8 @@ define ['jquery.mockjax'], ->
         fCreationDate: 'Oct 15, 2013'
         status: 'DEPRECATED'
         repository: 'squid'
+        characteristic: 'Reliability'
+        subcharacteristic: 'Data related reliability'
         key: 'S1190'
         parameters: [
           { key: 'someParameter', type: 'INT', default: 4, description: 'Some parameter description' }
diff --git a/sonar-server/src/main/webapp/less/coding-rules.less b/sonar-server/src/main/webapp/less/coding-rules.less
index 9669c34aceb..389d28309ca 100644
--- a/sonar-server/src/main/webapp/less/coding-rules.less
+++ b/sonar-server/src/main/webapp/less/coding-rules.less
@@ -42,6 +42,7 @@
 .coding-rules-detail-property {
   display: inline-block;
   vertical-align: middle;
+  margin-right: 2 * @navigatorPadding;
   font-size: @smallFontSize;
   height: 22px;
   line-height: 22px;
@@ -49,10 +50,6 @@
   .select2-search-field { line-height: 1; }
 }
 
-.coding-rules-detail-property + .coding-rules-detail-property {
-  margin-left: 2 * @navigatorPadding;
-}
-
 .coding-rules-detail-tag + .coding-rules-detail-tag {
   margin-left: @navigatorPadding;
 }
diff --git a/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-detail.hbs b/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-detail.hbs
index 9a047d15023..4c424f1bd05 100644
--- a/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-detail.hbs
+++ b/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-detail.hbs
@@ -19,6 +19,7 @@
     <input class="coding-rules-detail-tag-input" type="text" value="{{join tags ','}}">
     <a class="link-action coding-rules-detail-tag-edit-done">{{t 'done'}}</a>
   </li>
+  <li class="coding-rules-detail-property">{{characteristic}}&nbsp;>&nbsp;{{subcharacteristic}}</li>
   <li class="coding-rules-detail-property">{{t 'coding_rules.available_since'}} {{fCreationDate}}</li>
   <li class="coding-rules-detail-property">{{t 'coding_rules.repository'}} {{repository}}</li>
   <li class="coding-rules-detail-property">{{t 'coding_rules.key'}} {{key}}</li>
@@ -28,8 +29,10 @@
 
 <div class="coding-rules-detail-description coding-rules-detail-description-extra">
   <div id="coding-rules-detail-description-extra">
-    {{#if extra}}<div class="rule-desc">{{{extra}}}</div>{{/if}}
-    <a class="link-action" id="coding-rules-detail-extend-description">{{t 'coding_rules.extend_description'}}</a>
+    {{#if extra}}<div class="rule-desc marginbottom10">{{{extra}}}</div>{{/if}}
+    <div class="button-group">
+      <button id="coding-rules-detail-extend-description">{{t 'coding_rules.extend_description'}}</button>
+    </div>
   </div>
 
   <div id="coding-rules-detail-extend-description-form" class="admin">
diff --git a/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-quality-profile-activation.hbs b/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-quality-profile-activation.hbs
index e1b322ebcd2..0360cab6f3b 100644
--- a/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-quality-profile-activation.hbs
+++ b/sonar-server/src/main/webapp/templates/coding-rules/coding-rules-quality-profile-activation.hbs
@@ -1,6 +1,6 @@
 <form>
   <div class="modal-head">
-    <h2>{{t 'coding_rules.activate_quality_profile'}}</h2>
+    <h2>{{t 'coding_rules.activate_in_quality_profile'}}</h2>
   </div>
 
   <div class="modal-body">