# HG changeset patch
# User luisf
# Date 1290516435 0
# Node ID 22ae926000f9e3b7e4fb0b7e22582148f16e6a17
# Parent  9c8afcb2f7e56304fc0c95dbab43028ef504e068
Added Notifications Area in Welcome page.
Minor changes to welcome page layout;

diff -r 9c8afcb2f7e5 -r 22ae926000f9 app/views/settings/_general.rhtml
--- a/app/views/settings/_general.rhtml	Tue Nov 23 12:32:08 2010 +0000
+++ b/app/views/settings/_general.rhtml	Tue Nov 23 12:47:15 2010 +0000
@@ -3,6 +3,9 @@
 <div class="box tabular settings">
 <p><%= setting_text_field :app_title, :size => 30 %></p>
 
+<p><%= setting_text_area :notifications_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
+ <%= wikitoolbar_for 'settings_notifications_text' %>
+
 <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
 <%= wikitoolbar_for 'settings_welcome_text' %>
 
diff -r 9c8afcb2f7e5 -r 22ae926000f9 app/views/welcome/index.rhtml
--- a/app/views/welcome/index.rhtml	Tue Nov 23 12:32:08 2010 +0000
+++ b/app/views/welcome/index.rhtml	Tue Nov 23 12:47:15 2010 +0000
@@ -1,11 +1,14 @@
+<div class="notifications flash error">
+    <%= textilizable Setting.notifications_text %>
+</div>
+
 <h2><%= l(:label_home) %></h2>
 
 <div class="splitcontentleft">
   <%= textilizable Setting.welcome_text %>
   
-  <!-- luisf. Tip of the day placeholder -->
   <div class="newsoftheday box">
-    <h2><%=l(:label_tipoftheday)%></h2>
+    <h3><%=l(:label_tipoftheday)%></h3>
     <%= textilizable Setting.tipoftheday_text %>
   </div>
 
diff -r 9c8afcb2f7e5 -r 22ae926000f9 config/locales/en-GB.yml
--- a/config/locales/en-GB.yml	Tue Nov 23 12:32:08 2010 +0000
+++ b/config/locales/en-GB.yml	Tue Nov 23 12:47:15 2010 +0000
@@ -292,6 +292,7 @@
   setting_app_subtitle: Application subtitle
   setting_welcome_text: Welcome text
   setting_tipoftheday_text: Tip of the Day
+  setting_notifications_text: Notifications
   setting_default_language: Default language
   setting_login_required: Authentication required
   setting_self_registration: Self-registration
@@ -408,6 +409,7 @@
   project_module_boards: Boards
   
   label_tipoftheday: Tip of the day
+  label_notifications: Important Message
   label_user: User
   label_user_plural: Users
   label_user_new: New user
diff -r 9c8afcb2f7e5 -r 22ae926000f9 config/locales/en.yml
--- a/config/locales/en.yml	Tue Nov 23 12:32:08 2010 +0000
+++ b/config/locales/en.yml	Tue Nov 23 12:47:15 2010 +0000
@@ -303,6 +303,7 @@
   setting_app_subtitle: Application subtitle
   setting_welcome_text: Welcome text
   setting_tipoftheday_text: Tip of the Day
+  setting_notifications_text: Notifications
   setting_default_language: Default language
   setting_login_required: Authentication required
   setting_self_registration: Self-registration
diff -r 9c8afcb2f7e5 -r 22ae926000f9 config/settings.yml
--- a/config/settings.yml	Tue Nov 23 12:32:08 2010 +0000
+++ b/config/settings.yml	Tue Nov 23 12:47:15 2010 +0000
@@ -27,6 +27,8 @@
   default:
 tipoftheday_text:
     default:    
+notifications_text:
+    default:
 login_required:
   default: 0
 self_registration: