SONAR-3807 SONAR-3966 Quality profiles improvement

Do not expand description during disable/enable rule
Replace expand/collapse link by to separated links

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 c58cd5f6dc582ccc3e52b3f7c75d4d0b9661de48..ff533f8caf420d62c6d8b5c4513d77e921508e0c 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
@@ -1263,7 +1263,8 @@ rules_configuration.tab.new_rule=New rule
 rules_configuration.tab.edit_rule=Edit rule
 rules_configuration.x_found_in_active_rules={0} found in active rules
 rules_configuration.x_found_in_inactive_rules={0} found in inactive rules
-rules_configuration.expand_collapse=expand/collapse
+rules_configuration.expand=expand
+rules_configuration.collapse=collapse
 rules_configuration.html_allowed=HTML is allowed.
 rules_configuration.inherited_from_parent=Inherited from parent
 rules_configuration.overrides_parent_definition=Overrides parent definition

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
index 2476e28d9b5bb76ac1aee95f3a0e188e818a0de8..9d0dfe1d24688b3f766244e3a05575dc03fe756f 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/_rule.html.erb
@@ -34,7 +34,7 @@
   end
   %></div>
 
-  <div id="desc_<%= rule.id -%>" class="rule_detail" style="<%= 'display:none' unless rule.id.to_s == params[:rule_id] -%>">
+  <div id="desc_<%= rule.id -%>" class="rule_detail" style="<%= 'display:none' -%>">
     <a name="rule<%= rule.id -%>"></a>
 
     <div class="spacer-top spacer-bottom" id="rule_note_<%= rule.id -%>">

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
index 043a859d694779e35e0be5adba91c7eae6ec7847..8ad6dda5d6a6c9e3d9a76c9e0d49d2492def91aa 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/rules_configuration/index.html.erb
@@ -19,9 +19,14 @@
     }
     return !localModifications;
   }
-  function toggle_rules(){
+  function expand_rules(){
     $$('.rule_detail').each(function(element) {
-      element.toggle();
+        element.show();
+    });
+  }
+  function collapse_rules(){
+    $$('.rule_detail').each(function(element) {
+      element.hide();
     });
   }
 </script>
@@ -99,7 +104,7 @@
   <thead>
     <tr>
         <th class="left" nowrap><%= message('active') -%>/<%= message('severity') -%></th>
-        <th class="left"><%= message('name') -%> <span style="font-weight: normal">[<%= link_to_function(message('rules_configuration.expand_collapse'), "toggle_rules()") %>]</span></th>
+        <th class="left"><%= message('name') -%> <span style="font-weight: normal">[<%= link_to_function(message('rules_configuration.expand'), "expand_rules()") %> / <%= link_to_function(message('rules_configuration.collapse'), "collapse_rules()") %>]</span></th>
     </tr>
 </thead>
 <tbody>