diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-17 11:32:58 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-17 11:32:58 +0000 |
| commit | 00238738b190bfbe30d5b3ee2e1438837343d10a (patch) | |
| tree | 6c5ee0aa31ba230f6dedd240d79a724184fde2e2 | |
| parent | 7b366758fdc4867d4f5174e924464fffdcda6a72 (diff) | |
| download | redmine-00238738b190bfbe30d5b3ee2e1438837343d10a.tar.gz redmine-00238738b190bfbe30d5b3ee2e1438837343d10a.zip | |
Application welcome text is now textilized.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@652 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/settings/edit.rhtml | 3 | ||||
| -rw-r--r-- | 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 3ae96e3c2..4678d0b1d 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 399e444ed..e5e43f722 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 %> |