Application welcome text is now textilized.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@652 e93f8b46-1217-0410-a6f0-8f06a7374b81

Application welcome text is now textilized.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@652 e93f8b46-1217-0410-a6f0-8f06a7374b81
00238738 · Jean-Philippe Lang · 7b366758 · 00238738 · 00238738
Commit 00238738 authored Aug 17, 2007 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

edit.rhtml app/views/settings/edit.rhtml +2 -1

index.rhtml app/views/welcome/index.rhtml +1 -1

No files found.
--- 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>

--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
 <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 %>