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

[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 b797081da679d71e7f49233e7df91c4f9f9d69b3..16842f56922c97d9bd03f25ee6aa0a3936ffb283 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,14 +1,9 @@
-<%
-  member_class = link_class(relation_member.member_type.downcase, relation_member.member)
-  linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member)
-  type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase 
-%>
-<tr>
-  <td class="<%= member_class %>"><%=
-    if relation_member.member_role.blank?
-      t'browse.relation_member.entry', :type => type_str, :name => linked_name
-    else
-      t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
-    end
-  %></td>
-</tr> 
+<% linked_name = link_to printable_element_name(relation_member.member), { :controller => :browse, :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, { :rel => link_follow(relation_member.member) }
+   type_str = t ".type.#{relation_member.member_type.downcase}" %>
+<%= 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 %>
+<% end %>