Mercurial > hg > soundsoftware-site
changeset 637:efdb97a8286c cannam
Restore Tip of the Day settings entry lost during merge of rev cd2282d2aa55
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Tue, 06 Sep 2011 12:07:46 +0100 |
| parents | 12701b2e1bfc |
| children | b4e9410882f1 7fc15203288c |
| files | app/views/settings/_general.rhtml config/locales/en.yml |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/app/views/settings/_general.rhtml Tue Sep 06 11:31:51 2011 +0100 +++ b/app/views/settings/_general.rhtml Tue Sep 06 12:07:46 2011 +0100 @@ -9,8 +9,8 @@ <p><%= setting_text_area :welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p> <%= wikitoolbar_for 'settings_welcome_text' %> -<p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p> - <%= wikitoolbar_for 'settings_tipoftheday_text' %> +<p><%= setting_text_area :tipoftheday_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p> +<%= wikitoolbar_for 'settings_tipoftheday_text' %> <p><%= setting_text_field :attachment_max_size, :size => 6 %> <%= l(:"number.human.storage_units.units.kb") %></p>
--- a/config/locales/en.yml Tue Sep 06 11:31:51 2011 +0100 +++ b/config/locales/en.yml Tue Sep 06 12:07:46 2011 +0100 @@ -390,6 +390,8 @@ setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_activity_id: Activity for logged time setting_gantt_items_limit: Maximum number of items displayed on the gantt chart + setting_tipoftheday_text: Tip of the Day + setting_notifications_text: Notifications permission_add_project: Create project permission_add_subprojects: Create subprojects