# HG changeset patch
# User luisf
# Date 1290439288 0
# Node ID 66273775199724fb9e4f55595a89da1943c72264
# Parent  df605e25de58d4edafe02822b5a961a03c41dd5f
Added "welcome text" style "Tip of the day" feature.

diff -r df605e25de58 -r 662737751997 app/views/settings/_general.rhtml
--- a/app/views/settings/_general.rhtml	Mon Nov 22 14:16:26 2010 +0000
+++ b/app/views/settings/_general.rhtml	Mon Nov 22 15:21:28 2010 +0000
@@ -6,6 +6,9 @@
 <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
 <%= wikitoolbar_for 'settings_welcome_text' %>
 
+<p><%= tipoftheday_text_area :tipoftheday_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
+<%= wikitoolbar_for 'tipoftheday_text' %>
+
 <p><%= setting_text_field :attachment_max_size, :size => 6 %> KB</p>
 
 <p><%= setting_text_field :per_page_options, :size => 20 %><br />
diff -r df605e25de58 -r 662737751997 app/views/welcome/index.rhtml
--- a/app/views/welcome/index.rhtml	Mon Nov 22 14:16:26 2010 +0000
+++ b/app/views/welcome/index.rhtml	Mon Nov 22 15:21:28 2010 +0000
@@ -4,7 +4,9 @@
   <%= textilizable Setting.welcome_text %>
   
   <!-- luisf. Tip of the day placeholder -->
-  <h2>.</h2>
+  
+  <h2>Tip of The Day</h2>
+  <%= textilizable Setting.tipoftheday_text %>
 
   <% if @news.any? %>
   <div class="news box">
diff -r df605e25de58 -r 662737751997 config/locales/en.yml
--- a/config/locales/en.yml	Mon Nov 22 14:16:26 2010 +0000
+++ b/config/locales/en.yml	Mon Nov 22 15:21:28 2010 +0000
@@ -302,6 +302,7 @@
   setting_app_title: Application title
   setting_app_subtitle: Application subtitle
   setting_welcome_text: Welcome text
+  setting_welcome_text: Tip of the Day
   setting_default_language: Default language
   setting_login_required: Authentication required
   setting_self_registration: Self-registration