diff app/views/activities/index.html.erb @ 1116:bb32da3bea34 redmine-2.2-integration

Merge from live

--- a/app/views/activities/index.html.erb	Mon Jan 07 12:01:42 2013 +0000
+++ b/app/views/activities/index.html.erb	Mon Jan 07 14:41:20 2013 +0000
@@ -1,4 +1,14 @@
-<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h2>
+<h2><%=
+  if @author.nil?
+    if @institution_name.blank?
+      l(:label_activity)
+    else
+      l(:label_institution_activity, h(@institution_name))
+    end
+  else
+    l(:label_user_activity, link_to_user(@author)).html_safe
+  end
+  %></h2>
 <p class="subtitle"><%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %></p>
 
 <div id="activity">