SONAR-3825 many different improvements on usability

3 files changed, 35 insertions, 11 deletions

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 aaf89c1c938..8fc028e7661 100644
--- 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
@@ -28,6 +28,7 @@ changelog=Changelog
 change_verb=Change
 class=Class
 classes=Classes
+close=Close
 closed=Closed
 code=Code
 color=Color
@@ -96,6 +97,7 @@ plugin=Plugin
 project=Project
 projects=Projects
 raw=Raw
+refresh=Refresh
 remove=Remove
 rename=Rename
 reset_verb=Reset
@@ -392,13 +394,15 @@ measure_filter.criteria.name=Name
 measure_filter.criteria.language=Language
 measure_filter.criteria.metric=Metric
 measure_filter.criteria.project=Project
-measure_filter.criteria.age.from_date=From date
-measure_filter.criteria.age.to_date=To date
-measure_filter.criteria.age.note=year-month-day (2012-01-31)
-measure_filter.criteria.age.more_than=More than
-measure_filter.criteria.age.within_last=Within the last
+measure_filter.criteria.from_date=Inspected since
+measure_filter.criteria.to_date=Inspected before
+measure_filter.criteria.date_format=year-month-day (2013-01-31)
+measure_filter.criteria.age.more_than=Inspected more than
+measure_filter.criteria.age.within_last=Inspected within the last
 measure_filter.criteria.age.days_ago=days ago
 measure_filter.criteria.age.days=days
+measure_filter.criteria.components_of=Components of
+measure_filter.criteria.components_of_project=Components of project
 measure_filter.new_search=New search
 measure_filter.more_criteria=+ More Criteria
 measure_filter.languages=Languages
@@ -429,8 +433,11 @@ measure_filter.name_contains=Name contains
 measure_filter.manage_filters=Manage Filters
 measure_filter.display.list=List
 measure_filter.display.treemap=Treemap
-measure_filter.configure_columns=Configure Columns
+measure_filter.list.change=Change Columns
+measure_filter.treemap.change=Change Treemap
 measure_filter.too_many_results=Too many results. Please refine your search.
+measure_filter.add_column_button=Add Column
+measure_filter.widget.unknown_filter_warning=This widget is configured to display a measure filter that doesn't exist anymore.
 
 
 #------------------------------------------------------------------------------
@@ -962,6 +969,13 @@ widget.welcome.html=<h3 class="marginbottom5">Welcome to Sonar Dashboard</h3>\
                       <li>If you have a question or an issue, please report it on the <a href="http://redirect.sonarsource.com/4">mailing list</a>.</li>\
                     </ul>
 
+widget.measure_filter_list.name=Measure Filter as List
+widget.measure_filter_list.description=Displays the result of a pre-configured measure filter as a list
+
+widget.measure_filter_treemap.name=Measure Filter as Treemap
+widget.measure_filter_treemap.description=Displays the result of pre-configured measure filter as a Treemap
+
+
 #------------------------------------------------------------------------------
 #
 # COMPONENTS
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_list.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_list.html.erb
index dbfaacd82e9..c92b0abdbd8 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_list.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_list.html.erb
@@ -10,8 +10,13 @@
        filter.execute(self, :user => current_user)
        @widget_title = link_to h(filter.name), {:controller => 'measures', :action => 'filter', :id => filter.id, :display => 'list'}
 %>
+    <% if filter.description.present? %><p><%= h filter.description -%></p><% end %>
     <%= render :partial => "measures/display_#{filter.display.key}", :locals => {:edit_mode => false, :widget => widget, :filter => filter} %>
-  <%
-     end
+<%
      end
-  %>
\ No newline at end of file
+   else
+%>
+  <p><%= image_tag 'warning.png' %> <%= message 'measure_filter.widget.unknown_filter_warning' -%></p>
+<%
+   end
+%>
\ No newline at end of file
diff --git a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_treemap.html.erb b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_treemap.html.erb
index 599d802ae84..d1c59cb5ad0 100644
--- a/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_treemap.html.erb
+++ b/plugins/sonar-core-plugin/src/main/resources/org/sonar/plugins/core/widgets/measure_filter_treemap.html.erb
@@ -21,8 +21,13 @@
 
        @widget_title = link_to h(filter.name), url_options
 %>
+    <% if filter.description.present? %><p><%= h filter.description -%></p><% end %>
     <%= render :partial => "measures/display_#{filter.display.key}", :locals => {:edit_mode => false, :widget => widget, :filter => filter} %>
-  <%
+<%
      end
+  else
+%>
+  <p><%= image_tag 'warning.png' %> <%= message 'measure_filter.widget.unknown_filter_warning' -%></p>
+<%
      end
-  %>
\ No newline at end of file
+%>
\ No newline at end of file