Mercurial > hg > soundsoftware-site
changeset 43:662737751997 luisf
Added "welcome text" style "Tip of the day" feature.
| author | luisf |
|---|---|
| date | Mon, 22 Nov 2010 15:21:28 +0000 |
| parents | df605e25de58 |
| children | 6c19f4f0542c |
| files | app/views/settings/_general.rhtml app/views/welcome/index.rhtml config/locales/en.yml |
| diffstat | 3 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/settings/_general.rhtml Mon Nov 22 14:16:26 2010 +0000 +++ b/app/views/settings/_general.rhtml Mon Nov 22 15:21:28 2010 +0000 @@ -6,6 +6,9 @@ <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p> <%= wikitoolbar_for 'settings_welcome_text' %> +<p><%= tipoftheday_text_area :tipoftheday_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p> +<%= wikitoolbar_for 'tipoftheday_text' %> + <p><%= setting_text_field :attachment_max_size, :size => 6 %> KB</p> <p><%= setting_text_field :per_page_options, :size => 20 %><br />
--- a/app/views/welcome/index.rhtml Mon Nov 22 14:16:26 2010 +0000 +++ b/app/views/welcome/index.rhtml Mon Nov 22 15:21:28 2010 +0000 @@ -4,7 +4,9 @@ <%= textilizable Setting.welcome_text %> <!-- luisf. Tip of the day placeholder --> - <h2>.</h2> + + <h2>Tip of The Day</h2> + <%= textilizable Setting.tipoftheday_text %> <% if @news.any? %> <div class="news box">
--- a/config/locales/en.yml Mon Nov 22 14:16:26 2010 +0000 +++ b/config/locales/en.yml Mon Nov 22 15:21:28 2010 +0000 @@ -302,6 +302,7 @@ setting_app_title: Application title setting_app_subtitle: Application subtitle setting_welcome_text: Welcome text + setting_welcome_text: Tip of the Day setting_default_language: Default language setting_login_required: Authentication required setting_self_registration: Self-registration