Mercurial > hg > soundsoftware-site
diff app/views/users/show.rhtml @ 195:172b8d25c1ae live
Merge from branch "feature_64"
author | Chris Cannam |
---|---|
date | Mon, 07 Feb 2011 13:47:47 +0000 |
parents | 361f1e8b2e23 |
children | 7fc15203288c |
line wrap: on
line diff
--- a/app/views/users/show.rhtml Wed Feb 02 11:44:48 2011 +0000 +++ b/app/views/users/show.rhtml Mon Feb 07 13:47:47 2011 +0000 @@ -23,6 +23,9 @@ <h3><%=l(:label_ssamr_description)%></h3> <%= textilizable @description %> +<h3><%=l(:label_ssamr_institution)%></h3> +<%= h @institution_name %> + <% unless @memberships.empty? %> <h3><%=l(:label_project_plural)%></h3>