SONAR-1643 improve HTML of widget filtering by categories

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CodeCoverageWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CodeCoverageWidget.java
index abb4f2cf5bc5585c0c1166c57b7e68c0f4b6f972..6e9baa8494d885e674b58332ebf47e505ea78eeb 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CodeCoverageWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/CodeCoverageWidget.java
@@ -19,9 +19,9 @@
  */\r
 package org.sonar.plugins.core.widgets;\r
 \r
-import org.sonar.api.web.AbstractRubyTemplate;\r
-import org.sonar.api.web.RubyRailsWidget;\r
+import org.sonar.api.web.*;\r
 \r
+@WidgetCategory({"Tests"})\r
 public class CodeCoverageWidget extends AbstractRubyTemplate implements RubyRailsWidget {\r
   public String getId() {\r
     return "code_coverage";\r

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/RulesWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/RulesWidget.java
index 50a70b78e972b65062609103c46faacc9584249b..b43247140c8495eea1545892e2f1d92e91b57e54 100644 (file)
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/RulesWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/RulesWidget.java
@@ -19,9 +19,9 @@
  */\r
 package org.sonar.plugins.core.widgets;\r
 \r
-import org.sonar.api.web.AbstractRubyTemplate;\r
-import org.sonar.api.web.RubyRailsWidget;\r
+import org.sonar.api.web.*;\r
 \r
+@WidgetCategory({"Rules"})\r
 public class RulesWidget extends AbstractRubyTemplate implements RubyRailsWidget {\r
   public String getId() {\r
     return "rules";\r

diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/widgets/ChidamberKemererWidget.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/widgets/ChidamberKemererWidget.java
index b2b145d1785d23add02afebc6cc998003b9dc6c6..0bbcbcec6c6cdf0ade732aac047f68217cbf64bf 100644 (file)
--- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/widgets/ChidamberKemererWidget.java
+++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/widgets/ChidamberKemererWidget.java
@@ -22,8 +22,10 @@ package org.sonar.plugins.design.ui.widgets;
 import org.sonar.api.web.AbstractRubyTemplate;
 import org.sonar.api.web.RubyRailsWidget;
 import org.sonar.api.web.UserRole;
+import org.sonar.api.web.WidgetCategory;
 
 @UserRole(UserRole.USER)
+@WidgetCategory({"Design"})
 public final class ChidamberKemererWidget extends AbstractRubyTemplate implements RubyRailsWidget {
   public String getId() {
     return "ckjm";

diff --git a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/widgets/PackageDesignWidget.java b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/widgets/PackageDesignWidget.java
index 7c54c87ba55a97b65a4cb1fc4068590c4ae8cc13..309d95f18d08814643dad996dc9565da29f18668 100644 (file)
--- a/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/widgets/PackageDesignWidget.java
+++ b/plugins/sonar-design-plugin/src/main/java/org/sonar/plugins/design/ui/widgets/PackageDesignWidget.java
@@ -19,11 +19,10 @@
  */
 package org.sonar.plugins.design.ui.widgets;
 
-import org.sonar.api.web.AbstractRubyTemplate;
-import org.sonar.api.web.RubyRailsWidget;
-import org.sonar.api.web.UserRole;
+import org.sonar.api.web.*;
 
 @UserRole(UserRole.USER)
+@WidgetCategory({"Design"})
 public final class PackageDesignWidget extends AbstractRubyTemplate implements RubyRailsWidget {
   public String getId() {
     return "package-design";

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb
index 6d330e40dba29ce46a5467ef39b7f8c38be42f49..3a34c98cb6d0e9cdf39b34202504e1c1cf314500 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboard/_widget_definitions.html.erb
@@ -14,5 +14,8 @@
     <%= render :partial => 'dashboard/widget_definition', :locals => {:definition => definition, :dashboard_id => dashboard_id, :resource_id => resource_id} %>
     <% if index%4==3 %></tr><% end %>
   <% end %>
+  <% for i in 0..(4-(@widget_definitions.size%4)) %>
+    <td> </td>
+  <% end %> 
   <% if @widget_definitions.size%4<3 %></tr><% end %>
 </table>