Better help for exclusions

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 b1473380a6abee6c3fa0a3df615e7958e7242b41..38ec2a4e151db227fa16de90785f19c80d675dac 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
@@ -588,7 +588,7 @@ property.sonar.global.exclusions.name=Global source exclusions
 property.sonar.global.exclusions.description=Exclude sources from code analysis. Applies to every project. Cannot be overriden at project level. Changes will be applied during next code analysis.
 property.sonar.global.test.exclusions.name=Global test exclusions
 property.sonar.global.test.exclusions.description=Exclude tests from code analysis. Applies to every project. Cannot be overriden at project level. Changes will be applied during next code analysis.
-property.sonar.global.test.exclusions.help=<h2>Wildcards</h2>\
+category.exclusions.help=<h2>Wildcards</h2>\
  <p>Following rules are applied:</p>\
  <table class="data">\
    <thead><tr><th colspan="2"></th></tr></thead>\

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
index 1ddd6320627ab38c7862e5fd6aee22239668f0fa..4ad4d3b3687ee6100af9994b5d7ed52a29a23562 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/settings_helper.rb
@@ -52,8 +52,8 @@ module SettingsHelper
     end
   end
 
-  def property_help(property)
-    message("property.#{property.key}.help", :default => '')
+  def category_help(category)
+    message("category.#{category}.help", :default => '')
   end
 
   def property_value(property)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
index e1297cc8c88f50c0c06caf20472509881341b87c..1dd4fffea75c7df75e3a81eb92cf533e11061de4 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/settings/_properties.html.erb
@@ -46,16 +46,15 @@
             <% unless default_prop_value.blank? -%>
               <div class="note">Default: <%= property.type.to_s=='PASSWORD' ? '********' : h(default_prop_value) -%></div>
             <% end -%>
-
-            <% details = property_help(property) -%>
-            <% unless details.blank? -%>
-              <br/>
-
-              <div class="help"><%= details -%></div>
-            <% end -%>
           </td>
         </tr>
       <% end -%>
+
+      <% unless category_help(@category).blank? -%>
+        <tr class="property <%= cycle('even', 'odd', :name => 'properties') -%>">
+          <td class="help"><%= category_help(@category) -%> </td>
+        </tr>
+      <% end -%>
       </tbody>
     </table>
     <div style="padding-left: 16px;">