SONAR-1927 Better Widget meta-data

5 files changed, 13 insertions, 11 deletions

diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/FilterWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/FilterWidget.java
index 36784a0f081..95bf442625c 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/FilterWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/FilterWidget.java
@@ -19,16 +19,16 @@
  */
 package org.sonar.plugins.core.widgets;
 
-import org.sonar.api.web.WidgetProperties;
-import org.sonar.api.web.WidgetProperty;
-import org.sonar.api.web.WidgetPropertyType;
+import org.sonar.api.web.WidgetCategory;
 
 import org.sonar.api.web.AbstractRubyTemplate;
 import org.sonar.api.web.RubyRailsWidget;
-import org.sonar.api.web.WidgetCategory;
 import org.sonar.api.web.WidgetGlobal;
+import org.sonar.api.web.WidgetProperties;
+import org.sonar.api.web.WidgetProperty;
+import org.sonar.api.web.WidgetPropertyType;
 
-@WidgetCategory("Beta")
+@WidgetCategory("Filters")
 @WidgetGlobal
 @WidgetProperties({
   @WidgetProperty(key = "filter", type = WidgetPropertyType.FILTER, defaultValue = "1")
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/GlobalWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/GlobalWidget.java
index 02fffc1047b..8f940ec04f6 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/GlobalWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/GlobalWidget.java
@@ -24,7 +24,7 @@ import org.sonar.api.web.RubyRailsWidget;
 import org.sonar.api.web.WidgetCategory;
 import org.sonar.api.web.WidgetGlobal;
 
-@WidgetCategory("Beta")
+@WidgetCategory("Misc")
 @WidgetGlobal
 public class GlobalWidget extends AbstractRubyTemplate implements RubyRailsWidget {
 
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ImageWidget.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ImageWidget.java
index f8e7f6afb9a..574b004924d 100644
--- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ImageWidget.java
+++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/widgets/ImageWidget.java
@@ -27,7 +27,7 @@ import org.sonar.api.web.WidgetProperties;
 import org.sonar.api.web.WidgetProperty;
 import org.sonar.api.web.WidgetPropertyType;
 
-@WidgetCategory("Beta")
+@WidgetCategory("Misc")
 @WidgetGlobal
 @WidgetProperties(
 {
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/filter.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/filter.html.erb
index c827262043f..9ec1cab5376 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/filter.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/filter.html.erb
@@ -1,6 +1,8 @@
 <%
-   @filter=::Filter.find(widget_properties['filter'])
-   @filter_context=Filters.execute(@filter, self, params)
+  @filter=::Filter.find(widget_properties['filter'])
+  @filter_context=Filters.execute(@filter, self, params)
 %>
 
-<%= render :partial => "filters/#{@filter.default_view}", :locals => {:edit_mode => false} %>
+<div class="filter_widget">
+  <%= render :partial => "filters/#{@filter.default_view}", :locals => {:edit_mode => false} %>
+</div>
diff --git a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
index 4fb89630784..ec5569bc335 100644
--- a/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
+++ b/plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties
@@ -761,7 +761,7 @@ widget.image.name=Image
 widget.image.description=Shows an image with a link
 
 widget.filter.name=Filter
-widget.filter.description=TODO
+widget.filter.description=Shows a pre-configured filter
 
 #------------------------------------------------------------------------------
 #