Mercurial > hg > soundsoftware-site
changeset 47:22ae926000f9 luisf
Added Notifications Area in Welcome page.
Minor changes to welcome page layout;
| author | luisf |
|---|---|
| date | Tue, 23 Nov 2010 12:47:15 +0000 |
| parents | 9c8afcb2f7e5 |
| children | 8032b626953b |
| files | app/views/settings/_general.rhtml app/views/welcome/index.rhtml config/locales/en-GB.yml config/locales/en.yml config/settings.yml |
| diffstat | 5 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/settings/_general.rhtml Tue Nov 23 12:32:08 2010 +0000 +++ b/app/views/settings/_general.rhtml Tue Nov 23 12:47:15 2010 +0000 @@ -3,6 +3,9 @@ <div class="box tabular settings"> <p><%= setting_text_field :app_title, :size => 30 %></p> +<p><%= setting_text_area :notifications_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p> + <%= wikitoolbar_for 'settings_notifications_text' %> + <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p> <%= wikitoolbar_for 'settings_welcome_text' %>
--- a/app/views/welcome/index.rhtml Tue Nov 23 12:32:08 2010 +0000 +++ b/app/views/welcome/index.rhtml Tue Nov 23 12:47:15 2010 +0000 @@ -1,11 +1,14 @@ +<div class="notifications flash error"> + <%= textilizable Setting.notifications_text %> +</div> + <h2><%= l(:label_home) %></h2> <div class="splitcontentleft"> <%= textilizable Setting.welcome_text %> - <!-- luisf. Tip of the day placeholder --> <div class="newsoftheday box"> - <h2><%=l(:label_tipoftheday)%></h2> + <h3><%=l(:label_tipoftheday)%></h3> <%= textilizable Setting.tipoftheday_text %> </div>
--- a/config/locales/en-GB.yml Tue Nov 23 12:32:08 2010 +0000 +++ b/config/locales/en-GB.yml Tue Nov 23 12:47:15 2010 +0000 @@ -292,6 +292,7 @@ setting_app_subtitle: Application subtitle setting_welcome_text: Welcome text setting_tipoftheday_text: Tip of the Day + setting_notifications_text: Notifications setting_default_language: Default language setting_login_required: Authentication required setting_self_registration: Self-registration @@ -408,6 +409,7 @@ project_module_boards: Boards label_tipoftheday: Tip of the day + label_notifications: Important Message label_user: User label_user_plural: Users label_user_new: New user
--- a/config/locales/en.yml Tue Nov 23 12:32:08 2010 +0000 +++ b/config/locales/en.yml Tue Nov 23 12:47:15 2010 +0000 @@ -303,6 +303,7 @@ setting_app_subtitle: Application subtitle setting_welcome_text: Welcome text setting_tipoftheday_text: Tip of the Day + setting_notifications_text: Notifications setting_default_language: Default language setting_login_required: Authentication required setting_self_registration: Self-registration