Merge remote-tracking branch 'upstream/pull/3714'

[rails.git] / app / views / browse / _relation_member.html.erb

diff --git a/app/views/browse/_relation_member.html.erb b/app/views/browse/_relation_member.html.erb
index 5b6b5c3656f73bfe099f6e1fea67de5bc67ae1e9..5c96dadaf84d9a31e97cc61c112dcb52ebdf4ad5 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,14 +1,10 @@
-<%
-  member_class = link_class(relation_member.member_type.downcase, relation_member.member)
-  linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member), :rel => link_follow(relation_member.member)
-  type_str = t '.type.' + relation_member.member_type.downcase
-%>
+<% member_class = link_class(relation_member.member_type.downcase, relation_member.member)
+   linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :title => link_title(relation_member.member), :rel => link_follow(relation_member.member) }
+   type_str = t ".type.#{relation_member.member_type.downcase}" %>
 <li class="<%= member_class %>">
-  <%=
-    if relation_member.member_role.blank?
-      raw t '.entry', :type => type_str, :name => linked_name
-    else
-      raw t '.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
-    end
-  %>
+  <%= if relation_member.member_role.blank?
+        t ".entry_html", :type => type_str, :name => linked_name
+      else
+        t ".entry_role_html", :type => type_str, :name => linked_name, :role => relation_member.member_role
+      end %>
 </li>