From: simonbrandhof <simon.brandhof@gmail.com>
Date: Thu, 4 Nov 2010 09:09:43 +0000 (+0000)
Subject: SONAR-1643 improve HTML of widget filtering by categories
X-Git-Tag: 2.6~664
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0e7c1da6f8cf80084842ed1d31bc2788b216e009;p=sonarqube.git

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 abb4f2cf5bc..6e9baa8494d 100644
--- 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 @@
  */
 package org.sonar.plugins.core.widgets;
 
-import org.sonar.api.web.AbstractRubyTemplate;
-import org.sonar.api.web.RubyRailsWidget;
+import org.sonar.api.web.*;
 
+@WidgetCategory({"Tests"})
 public class CodeCoverageWidget extends AbstractRubyTemplate implements RubyRailsWidget {
   public String getId() {
     return "code_coverage";
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 50a70b78e97..b43247140c8 100644
--- 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 @@
  */
 package org.sonar.plugins.core.widgets;
 
-import org.sonar.api.web.AbstractRubyTemplate;
-import org.sonar.api.web.RubyRailsWidget;
+import org.sonar.api.web.*;
 
+@WidgetCategory({"Rules"})
 public class RulesWidget extends AbstractRubyTemplate implements RubyRailsWidget {
   public String getId() {
     return "rules";
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 b2b145d1785..0bbcbcec6c6 100644
--- 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 7c54c87ba55..309d95f18d0 100644
--- 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 6d330e40dba..3a34c98cb6d 100644
--- 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>