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

[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 e390eae7864cae99ef0ba895e77dd259e15de2bb..51b2bb3e6dd05cc288f38c1cda03a64a029a4c4a 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,17 +1,10 @@
-<tr>
-  <td><%
-    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 
-    %>
-    <span class="<%=
-     css_class(relation_member.member_type.downcase, relation_member.member)
-      %>">
-      <%=
-    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
-  %>
-  </span></td>
-</tr> 
+<% 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 => relation_member.member_role
+      end %>
+</li>