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

[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 504b945aafbf5f1a26de1725f3d6b097ed52ca02..c00396fbd84388c31abc8f6c3374d3a7394e16de 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,12 +1,9 @@
-<% member_class = element_class(relation_member.member_type.downcase, relation_member.member)
-   linked_name = link_to printable_name(relation_member.member), { :controller => :browse, :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_strikethrough 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 %>
-  <% end %>
-</li>
+<%= element_list_item_with_strikethrough 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 %>
+<% end %>