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

[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 5c96dadaf84d9a31e97cc61c112dcb52ebdf4ad5..d122f0edfed8f327f2c81893a317cbfb588073d8 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,10 +1,9 @@
-<% 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) }
+<% linked_name = link_to printable_element_name(relation_member.member), relation_member.member, { :rel => link_follow(relation_member.member) }

    type_str = t ".type.#{relation_member.member_type.downcase}" %>
    type_str = t ".type.#{relation_member.member_type.downcase}" %>

-<li class="<%= member_class %>">
+<%= element_list_item relation_member.member_type.downcase, relation_member.member do %>

   <%= 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 %>
   <%= 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>
+<% end %>