From 7a5240eea6f1cf135b7c2c247217b9a0daa40da4 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Tue, 4 Dec 2012 14:55:36 +0100
Subject: [PATCH] SONAR-3987 l10n of welcome message

---
 .../main/resources/org/sonar/l10n/core.properties | 15 +++++++++++++++
 .../core/widgets/measure_filter_list.html.erb     |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

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 4b71678d861..3b774ffe406 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
@@ -391,6 +391,9 @@ measure_filter.col.links=Links
 measure_filter.col.name=Name
 measure_filter.col.short_name=Short Name
 measure_filter.col.version=Version
+measure_filter.short_col.language=Lang.
+measure_filter.short_col.short_name=Name
+measure_filter.short_col.metric.alert_status=A
 measure_filter.missing_name=Name is missing
 measure_filter.name_too_long=Name is too long
 measure_filter.sharing=Sharing
@@ -961,6 +964,18 @@ widget.rfc.per_class.suffix=\ /class
 
 widget.resource_id=project
 
+widget.welcome.name=Welcome
+widget.welcome.description=
+widget.welcome.html=<h3>Welcome to Sonar Dashboard</h3>\
+                    <p>Since you are able to read this, it means that you have successfully started your Sonar server. Well done!</p>\
+                    <p>If you have not removed this text, it also means that you have not yet played much with Sonar. So here are a few pointers for your next step:</p>\
+                    <ul class="bullet">\
+                      <li>Do you now want to <a href="http://docs.codehaus.org/x/P4LEBg">run analysis</a> on a project?</li>\
+                      <li>Maybe start <a href="http://docs.codehaus.org/x/EYDECQ">customizing dashboards</a>?</li>\
+                      <li>Or simply browse the <a href="http://docs.codehaus.org/x/EoDEBg">complete documentation</a>?</li>\
+                      <li>If you have a question or an issue, please report it on the <a href="http://www.sonarsource.org/support/support/">mailing list</a>.</li>\
+                    </ul>
+
 #------------------------------------------------------------------------------
 #
 # 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 2e4f0db394b..cfbcab78542 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
@@ -5,7 +5,7 @@
    if filter
      filter.load_criteria_from_data
      filter.set_criteria_value('display', 'list')
-     filter.set_criteria_value('pageSize', page_size) if page_size
+     filter.set_criteria_value('pageSize', page_size)
      filter.execute(self, :user => current_user)
      @widget_title = link_to h(filter.name), {:controller => 'measures', :action => 'filter', :id => filter.id, :display => 'list'}
 %>
-- 
2.39.5