# HG changeset patch
# User Chris Cannam
# Date 1316184507 -3600
# Node ID cdddec376920bda759e4cf75cbce46d96449c96e
# Parent  65abc6b392929939b920ff3bae3b76b8227de7c4# Parent  b1debf464389d8ff761a06039e95d718b00bbdf8
Merge from branch "feature_36"

diff -r b1debf464389 -r cdddec376920 .hgtags
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgtags	Fri Sep 16 15:48:27 2011 +0100
@@ -0,0 +1,1 @@
+202986dd17e4e02b3622b65cf38f358b67a393e8 bibliography_plugin_alpha
diff -r b1debf464389 -r cdddec376920 app/views/members/_list.rhtml
--- a/app/views/members/_list.rhtml	Fri Sep 16 15:14:23 2011 +0100
+++ b/app/views/members/_list.rhtml	Fri Sep 16 15:48:27 2011 +0100
@@ -10,7 +10,7 @@
 <dt id="member-<%= member.id %>" class="member <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>">
 <%= avatar(member.user, :size => "24") %>
 <span class="user"><%= link_to_user member.principal %></span>
-<span class="email"><%= member.user.mail %></span>
+<span class="email"><%= member.user.mail if !member.user.pref.hide_mail %></span>
 <dd id="member-<%= member.id %>" class="roles <%= member.principal.class.name.downcase %> <%= User.current.logged? && User.current == member.user ? 'me' : nil %>">
 <span class="roles" id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
 </dd>
diff -r b1debf464389 -r cdddec376920 app/views/my/blocks/_issueswatched.rhtml
--- a/app/views/my/blocks/_issueswatched.rhtml	Fri Sep 16 15:14:23 2011 +0100
+++ b/app/views/my/blocks/_issueswatched.rhtml	Fri Sep 16 15:48:27 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',
diff -r b1debf464389 -r cdddec376920 app/views/projects/index.rhtml
--- a/app/views/projects/index.rhtml	Fri Sep 16 15:14:23 2011 +0100
+++ b/app/views/projects/index.rhtml	Fri Sep 16 15:48:27 2011 +0100
@@ -4,7 +4,6 @@
 
 <div class="contextual">
     <%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
-    <%= '| ' + link_to(l(:label_issue_view_all), { :controller => 'issues' }) if User.current.allowed_to?(:view_issues, nil, :global => true) %>
     <%= '| ' + link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
 </div>
 
diff -r b1debf464389 -r cdddec376920 app/views/settings/_general.rhtml
--- a/app/views/settings/_general.rhtml	Fri Sep 16 15:14:23 2011 +0100
+++ b/app/views/settings/_general.rhtml	Fri Sep 16 15:48:27 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>
 
diff -r b1debf464389 -r cdddec376920 app/views/users/show.rhtml
--- a/app/views/users/show.rhtml	Fri Sep 16 15:14:23 2011 +0100
+++ b/app/views/users/show.rhtml	Fri Sep 16 15:48:27 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? %>
diff -r b1debf464389 -r cdddec376920 config/locales/en.yml
--- a/config/locales/en.yml	Fri Sep 16 15:14:23 2011 +0100
+++ b/config/locales/en.yml	Fri Sep 16 15:48:27 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
@@ -473,7 +475,7 @@
   label_user_new: New user
   label_user_anonymous: Anonymous
   label_project: Project
-  label_project_new: New project
+  label_project_new: Start a new project
   label_project_plural: Projects
   label_my_project_plural: My Projects
   label_other_project_plural: Other Projects
@@ -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