From 8a3e79d8d8256555b54b88d28ebf52a5f2fc9eb5 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Mon, 9 Jun 2014 15:31:20 +0200
Subject: [PATCH] SONAR-5137 Fix parameter display alignment

---
 .../resources/org/sonar/l10n/core.properties  |  5 ++-
 .../views/coding-rules-detail-view.coffee     |  3 ++
 .../coding-rules-detail-quality-profile.hbs   | 10 ++++-
 sonar-server/src/main/less/coding-rules.less  | 41 +++++++++++--------
 4 files changed, 38 insertions(+), 21 deletions(-)

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 17cd67057f8..4f2d67dae97 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -1755,7 +1755,7 @@ coding_rules.deactivate=Deactivate
 coding_rules.deactivate_in_quality_profile=Deactivate In Quality Profile
 coding_rules.deactivate_in_all_quality_profiles=Deactivate In All {0} Profiles
 coding_rules.found=Found
-coding_rules.inherits="{0}" inherits "{1}"
+coding_rules.inherits="{0}" inherits from "{1}"
 coding_rules.key=Key:
 coding_rules.new_search=New Search
 coding_rules.no_results=No Coding Rules
@@ -1763,6 +1763,7 @@ coding_rules.no_tags=No tags
 coding_rules.order=Order
 coding_rules.ordered_by=Ordered By
 coding_rules.original=Original:
+coding_rules.overrides="{0}" overrides "{1}"
 coding_rules.page=Coding Rules
 coding_rules.parameters=Parameters
 coding_rules.parameters.default_value=Default Value:
@@ -2673,4 +2674,4 @@ component_viewer.transition.coverage=Covered By
 component_viewer.transition.covers=Covers
 component_viewer.transition.duplication=Duplicated By
 
-component_viewer.x_lines_are_covered={0} lines are covered
\ No newline at end of file
+component_viewer.x_lines_are_covered={0} lines are covered
diff --git a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
index c099951eb50..f409374e87d 100644
--- a/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
+++ b/sonar-server/src/main/coffee/coding-rules/views/coding-rules-detail-view.coffee
@@ -60,6 +60,9 @@ define [
     initialize: (options) ->
       super options
 
+      if @model.get 'params'
+        @model.set 'params', _.sortBy(@model.get('params'), 'key')
+
       if @model.get 'isTemplate'
         customRules = new Backbone.Collection()
         jQuery.ajax
diff --git a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs
index db2e36470e9..d0a3db78079 100644
--- a/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs
+++ b/sonar-server/src/main/hbs/coding-rules/coding-rules-detail-quality-profile.hbs
@@ -5,7 +5,13 @@
       {{name}}
       {{#if parent}}
         <div class="coding-rules-detail-quality-profile-inheritance">
-          <i class="icon-inheritance" title="{{tp 'coding_rules.inherits' name parent.name}}"></i> {{parent.name}}
+          {{#eq inherit 'OVERRIDES'}}
+            <i class="icon-inheritance" title="{{tp 'coding_rules.overrides' name parent.name}}"></i>
+          {{/eq}}
+          {{#eq inherit 'INHERITED'}}
+            <i class="icon-inheritance" title="{{tp 'coding_rules.inherits' name parent.name}}"></i>
+          {{/eq}}
+          {{parent.name}}
         </div>
       {{/if}}
     </td>
@@ -26,7 +32,7 @@
             <span class="key">{{key}}</span><span class="sep">:&nbsp;</span><span class="value" title="{{value}}">{{value}}</span>
             {{#if ../parent}}{{#notEq value original}}
               <div class="coding-rules-detail-quality-profile-inheritance">
-                {{t 'coding_rules.original'}}&nbsp;{{original}}
+                {{t 'coding_rules.original'}}&nbsp;<span class="value">{{original}}</span>
               </div>
             {{/notEq}}{{/if}}
           </div>
diff --git a/sonar-server/src/main/less/coding-rules.less b/sonar-server/src/main/less/coding-rules.less
index a579ffdbc75..2e158748b82 100644
--- a/sonar-server/src/main/less/coding-rules.less
+++ b/sonar-server/src/main/less/coding-rules.less
@@ -73,7 +73,7 @@
   .coding-rules-detail-quality-profile-severity,
   .coding-rules-detail-quality-profile-parameters,
   .coding-rules-detail-quality-profile-actions {
-    vertical-align: middle;
+    vertical-align: top;
   }
   .coding-rules-detail-quality-profile-name,
   .coding-rules-detail-quality-profile-severity {
@@ -81,26 +81,33 @@
     padding-right: @navigatorPadding;
     white-space: nowrap;
   }
+
   .coding-rules-detail-quality-profile-parameter {
-    display: inline-block;
-    vertical-align: middle;
-    margin-right: @navigatorPadding;
-    white-space: nowrap;
+    display: table-cell;
+  }
+}
 
-    .key, .value, .sep {
-      display: inline-block;
-      vertical-align: middle;
-    }
-
-    .value {
-      max-width: 300px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
+.coding-rules-detail-quality-profile-parameter {
+  display: block;
+  height: 100%;
+  padding-top: 0;
+  padding-right: @navigatorPadding;
+
+  .key, .value, .sep {
+    display: inline;
+    vertical-align: top;
+  }
+
+  .value {
+    max-width: 300px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    font-family: monospace;
+    vertical-align: baseline;
   }
-  .coding-rules-detail-quality-profile-parameter + .coding-rules-detail-quality-profile-parameter { margin-top: 0; }
 }
+.coding-rules-detail-quality-profile-parameter + .coding-rules-detail-quality-profile-parameter { margin-top: 0; }
 
 .coding-rules-detail-context-actions {
 
-- 
2.39.5