Rebase to current master

[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 ead58490cd6f014e53efcfe30956626e36dd1236..cedc6f5e906df44971b134e8ff59611e33a4721c 100644 (file)
--- a/app/views/browse/_relation_member.html.erb
+++ b/app/views/browse/_relation_member.html.erb
@@ -1,10 +1,12 @@
-<tr>
-  <td>
-    <%= t 'activerecord.models.'+relation_member.member_type.downcase %>
-    <%= link_to h(printable_name(relation_member.member)), :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s %>
-    <% unless relation_member.member_role.blank? %>
-      <%= t'browse.relation_member.as' %>
-      <%= h(relation_member.member_role) %>
-    <% end %>
-  </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?
+      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>