Mercurial > hg > soundsoftware-site
diff app/views/activities/index.html.erb @ 1009:066b55d7c053 browsing
Add busy institutions list
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Mon, 12 Nov 2012 13:34:32 +0000 |
parents | cbb26bc654de |
children | bb32da3bea34 |
line wrap: on
line diff
--- a/app/views/activities/index.html.erb Mon Nov 12 13:34:21 2012 +0000 +++ b/app/views/activities/index.html.erb Mon Nov 12 13:34:32 2012 +0000 @@ -1,4 +1,14 @@ -<h2><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)) %></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)) + 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">