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

[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 cedc6f5e906df44971b134e8ff59611e33a4721c..fe0f363574e0e0904023d4bc1c91f08aa617b16d 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,12 +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
-%>
-  <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
-  %></li>
+<% 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?
+        t ".entry_html", :type => type_str, :name => linked_name
+      else
+        t ".entry_role_html", :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
+      end %>
+</li>