From 00238738b190bfbe30d5b3ee2e1438837343d10a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 17 Aug 2007 11:32:58 +0000
Subject: [PATCH] Application welcome text is now textilized.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@652 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/settings/edit.rhtml | 3 ++-
 app/views/welcome/index.rhtml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index 3ae96e3c..4678d0b1 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -10,7 +10,8 @@
 <%= text_field_tag 'settings[app_subtitle]', Setting.app_subtitle, :size => 60 %></p>
 
 <p><label><%= l(:setting_welcome_text) %></label>
-<%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5 %></p>
+<%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
+<%= wikitoolbar_for 'settings[welcome_text]' %>
 
 <p><label><%= l(:setting_default_language) %></label>
 <%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index 399e444e..e5e43f72 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -1,7 +1,7 @@
 <h2><%= l(:label_home) %></h2>
 
 <div class="splitcontentleft">
-  <p><%= Setting.welcome_text %></p>
+  <%= textilizable Setting.welcome_text %>
   <div class="box">
 	<h3><%=l(:label_news_latest)%></h3>
 		<%= render :partial => 'news/news', :collection => @news %>