# HG changeset patch
# User Chris Cannam
# Date 1358941582 0
# Node ID d24c22d420eba8944b7c60006eac0b3ddb085779
# Parent  fc5d582a25f94a627aa7f0c92ccb5da3232ffefc# Parent  74ad60b807ae450068dd36365567b2cce6edb8ce
Merge from branch "cannam"

diff -r fc5d582a25f9 -r d24c22d420eb app/views/my/blocks/_myprojects.html.erb
--- a/app/views/my/blocks/_myprojects.html.erb	Wed Jan 23 11:25:09 2013 +0000
+++ b/app/views/my/blocks/_myprojects.html.erb	Wed Jan 23 11:46:22 2013 +0000
@@ -3,7 +3,7 @@
 <% if @user_projects.empty? %>
 <h3><%=l(:label_my_projects)%></h3>
 <div class="box">
-  <p><%= l(:label_have_no_projects)%> <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}) if User.current.allowed_to?(:add_project, nil, :global => true) %></p>
+  <div class="tip"><%= l(:label_have_no_projects)%> <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}) if User.current.allowed_to?(:add_project, nil, :global => true) %></div>
 </div>
 <% else %>
 <h3><%=l(:label_my_projects)%> (<%= @user_projects.count %>)</h3>
diff -r fc5d582a25f9 -r d24c22d420eb config/locales/en.yml
--- a/config/locales/en.yml	Wed Jan 23 11:25:09 2013 +0000
+++ b/config/locales/en.yml	Wed Jan 23 11:46:22 2013 +0000
@@ -483,7 +483,7 @@
   label_project_plural: Projects
   label_my_project_plural: My Projects
   label_other_project_plural: Other Projects
-  label_have_no_projects: Not a member of any projects.
+  label_have_no_projects: You are not a member of any projects.
   label_x_projects:
     zero:  no projects
     one:   1 project
diff -r fc5d582a25f9 -r d24c22d420eb vendor/plugins/redmine_bibliography/app/views/activities/_recent.html.erb
--- a/vendor/plugins/redmine_bibliography/app/views/activities/_recent.html.erb	Wed Jan 23 11:25:09 2013 +0000
+++ b/vendor/plugins/redmine_bibliography/app/views/activities/_recent.html.erb	Wed Jan 23 11:46:22 2013 +0000
@@ -17,7 +17,7 @@
           if e.class != Publication
             user.member_of? e.project
           else
-            e.projects.map {|p| user.member_of? p }
+            e.projects.map {|p| user.member_of? p }.any?
           end
         }
 
@@ -38,7 +38,7 @@
 <% if events.empty? %>
 
    <% if @project.nil? %>
-     <p><%= l(:label_activity_my_recent_none) %></p>
+     <div class="tip"><%= l(:label_activity_my_recent_none) %></div>
    <% end %>
 
 <% else %>