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 %>
-<%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5 %>
+<%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %> +<%= wikitoolbar_for 'settings[welcome_text]' %><%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %>
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 @@<%= Setting.welcome_text %>
+ <%= textilizable Setting.welcome_text %>