Application welcome text is now textilized.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@652 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
7b366758fd
commit
00238738b1
|
@ -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>
|
||||
|
|
|
@ -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 %>
|
||||
|
|
Loading…
Reference in New Issue