Mercurial > hg > soundsoftware-site
changeset 45:65d9e2cabaa3 luisf
Added tipoftheday to the config/settings in order to correct previous issues.
Tip of the day is now working correctly.
Added the heading strings to the locales files.
| author | luisf |
|---|---|
| date | Tue, 23 Nov 2010 11:50:01 +0000 |
| parents | 6c19f4f0542c |
| children | 9c8afcb2f7e5 |
| 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, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/settings/_general.rhtml Mon Nov 22 15:28:45 2010 +0000 +++ b/app/views/settings/_general.rhtml Tue Nov 23 11:50:01 2010 +0000 @@ -7,7 +7,7 @@ <%= wikitoolbar_for 'settings_welcome_text' %> <p><%= setting_text_area :tipoftheday_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p> -<%= wikitoolbar_for 'tipoftheday_text' %> + <%= wikitoolbar_for 'tipoftheday_text' %> <p><%= setting_text_field :attachment_max_size, :size => 6 %> KB</p>
--- a/app/views/welcome/index.rhtml Mon Nov 22 15:28:45 2010 +0000 +++ b/app/views/welcome/index.rhtml Tue Nov 23 11:50:01 2010 +0000 @@ -4,9 +4,10 @@ <%= textilizable Setting.welcome_text %> <!-- luisf. Tip of the day placeholder --> - - <h2>Tip of The Day</h2> - <%= textilizable Setting.tipoftheday_text %> + <div class="newsoftheday box"> + <h2><%=l(:label_tipoftheday)%></h2> + <%= textilizable Setting.tipoftheday_text %> + </div> <% if @news.any? %> <div class="news box">
--- a/config/locales/en-GB.yml Mon Nov 22 15:28:45 2010 +0000 +++ b/config/locales/en-GB.yml Tue Nov 23 11:50:01 2010 +0000 @@ -291,6 +291,7 @@ setting_app_title: Application title setting_app_subtitle: Application subtitle setting_welcome_text: Welcome text + setting_tipoftheday_text: Tip of the Day setting_default_language: Default language setting_login_required: Authentication required setting_self_registration: Self-registration @@ -406,6 +407,7 @@ project_module_repository: Repository project_module_boards: Boards + label_tipoftheday: Tip of the day label_user: User label_user_plural: Users label_user_new: New user @@ -926,8 +928,8 @@ setting_default_notification_option: Default notification option label_user_mail_option_only_my_events: Only for things I watch or I'm involved in label_user_mail_option_only_assigned: Only for things I am assigned to - notice_not_authorized_archived_project: The project you're trying to access has been archived. + notice_not_authorized_archived_project: The project you're trying to access has been archived. label_principal_search: "Search for user or group:" label_user_search: "Search for user:" - field_visible: Visible - setting_emails_header: Emails header + field_visible: Visible + setting_emails_header: Emails header
--- a/config/locales/en.yml Mon Nov 22 15:28:45 2010 +0000 +++ b/config/locales/en.yml Tue Nov 23 11:50:01 2010 +0000 @@ -302,7 +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_tipoftheday_text: Tip of the Day setting_default_language: Default language setting_login_required: Authentication required setting_self_registration: Self-registration @@ -423,6 +423,7 @@ project_module_calendar: Calendar project_module_gantt: Gantt + label_tipoftheday: Tip of the day label_user: User label_user_plural: Users label_user_new: New user