changeset 662:cd9499a11381 live

Merge from branch "cannam"

--- a/app/views/my/blocks/_issueswatched.rhtml	Tue Sep 06 09:47:02 2011 +0100
+++ b/app/views/my/blocks/_issueswatched.rhtml	Fri Sep 09 16:34:36 2011 +0100
@@ -3,7 +3,7 @@
 
 <%= render :partial => 'issues/list_simple', :locals => { :issues => watched_issues } %>
 <% if watched_issues.length > 0 %>
-<p class="small"><%= link_to l(:label_issue_view_all), :controller => 'issues',
+<p class="small"><%= link_to l(:label_issue_view_all_watched), :controller => 'issues',
 																											 :action => 'index',
 																											 :set_filter => 1,
 																											 :watcher_id => 'me',

--- a/app/views/settings/_general.rhtml	Tue Sep 06 09:47:02 2011 +0100
+++ b/app/views/settings/_general.rhtml	Fri Sep 09 16:34:36 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/app/views/users/show.rhtml	Tue Sep 06 09:47:02 2011 +0100
+++ b/app/views/users/show.rhtml	Fri Sep 09 16:34:36 2011 +0100
@@ -24,7 +24,7 @@
 <%= textilizable @description %>
 
 <h3><%=l(:label_ssamr_institution)%></h3>
-<%= h @institution_name %>
+<p><%= h @institution_name %></p>
 
 
 <% unless @memberships.empty? %>

--- a/config/locales/en.yml	Tue Sep 06 09:47:02 2011 +0100
+++ b/config/locales/en.yml	Fri Sep 09 16:34:36 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
@@ -489,6 +491,7 @@
   label_issue_new: New issue
   label_issue_plural: Issues
   label_issue_view_all: View all issues
+  label_issue_view_all_watched: View all watched issues
   label_issues_by: "Issues by %{value}"
   label_issue_added: Issue added
   label_issue_updated: Issue updated