SONAR-4366 Some UI improvements

diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
index 3aab929203e8cb24e1794289130af277414b06f5..2ab11ccf802b785b081cc61e1f27067cbb8fe27f 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -1559,14 +1559,14 @@ quality_profiles.copy_new_name=New name
 #------------------------------------------------------------------------------
 
 quality_gates.noQualityGates=No Quality Gates
-quality_gates.add=Add Quality Gate
+quality_gates.add=Create Quality Gate
 quality_gates.rename=Rename Quality Gate:
 quality_gates.copy=Copy Quality Gate:
 quality_gates.conditions=Conditions
 quality_gates.projects=Projects
 quality_gates.add_condition=Add Condition
 quality_gates.no_conditions=No Conditions
-quality_gates.introduction=Only project measures are checked against thresholds. Modules, packages and classes are ignored.
+quality_gates.introduction=Only project measures are checked against thresholds. Sub-projects, directories and files are ignored.
 quality_gates.health_icons=Project health icons represent:
 quality_gates.projects_for_default=Every project not specifically associated to a quality gate will be associated to this one by default.
 quality_gates.projects_for_default.edit=You must not select specific projects for the default quality gate.

diff --git a/sonar-server/src/main/webapp/coffee/quality-gate/collections/quality-gates.coffee b/sonar-server/src/main/webapp/coffee/quality-gate/collections/quality-gates.coffee
index 976f1058370d205bfd111523218fa81529260714..1d1c8542481414f5481fb528a96fe2beaa3153fa 100644 (file)
--- a/sonar-server/src/main/webapp/coffee/quality-gate/collections/quality-gates.coffee
+++ b/sonar-server/src/main/webapp/coffee/quality-gate/collections/quality-gates.coffee
@@ -25,3 +25,6 @@ define [
     parse: (r) ->
       r.qualitygates.map (gate) ->
         _.extend gate, default: gate.id == r.default
+
+
+    comparator: (item) -> item.get('name').toLowerCase()

diff --git a/sonar-server/src/main/webapp/js/templates/quality-gates.js b/sonar-server/src/main/webapp/js/templates/quality-gates.js
index 47dd03166b62cc5618a49752fd1efd157dd479de..bfb6744a21859a29c6ca2fb035a46610df4b0739 100644 (file)
--- a/sonar-server/src/main/webapp/js/templates/quality-gates.js
+++ b/sonar-server/src/main/webapp/js/templates/quality-gates.js
@@ -12,7 +12,7 @@ function program1(depth0,data) {
   
   var buffer = "", helper, options;
   buffer += "\n  <div class=\"navigator-header-actions button-group\">\n    <button id=\"quality-gate-add\">"
-    + escapeExpression((helper = helpers.t || (depth0 && depth0.t),options={hash:{},data:data},helper ? helper.call(depth0, "add_verb", options) : helperMissing.call(depth0, "t", "add_verb", options)))
+    + escapeExpression((helper = helpers.t || (depth0 && depth0.t),options={hash:{},data:data},helper ? helper.call(depth0, "create", options) : helperMissing.call(depth0, "t", "create", options)))
     + "</button>\n  </div>\n";
   return buffer;
   }

diff --git a/sonar-server/src/main/webapp/templates/quality-gates/quality-gate-actions.hbs b/sonar-server/src/main/webapp/templates/quality-gates/quality-gate-actions.hbs
index df06013aa5443e32d7f47235a08d6f651126cf9d..efab29d21603e9f9daa6372283142ff4eb7083bc 100644 (file)
--- a/sonar-server/src/main/webapp/templates/quality-gates/quality-gate-actions.hbs
+++ b/sonar-server/src/main/webapp/templates/quality-gates/quality-gate-actions.hbs
@@ -1,6 +1,6 @@
 <h1 class="navigator-header-title">{{t 'quality_gates.page'}}</h1>
 {{#if canEdit}}
   <div class="navigator-header-actions button-group">
-    <button id="quality-gate-add">{{t 'add_verb'}}</button>
+    <button id="quality-gate-add">{{t 'create'}}</button>
   </div>
 {{/if}}
\ No newline at end of file