Merge remote-tracking branch 'upstream/master' into routing-merge

[rails.git] / app / views / browse / _containing_relation.html.erb

diff --git a/app/views/browse/_containing_relation.html.erb b/app/views/browse/_containing_relation.html.erb
index ee704acc87cd52e48db190fc7cce453e5d5e295f..de41d92471912bec8cbb73bf43bacc49e21f588c 100644 (file)
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,8 +1,8 @@
-<tr>
-  <td>
-    <%= link_to t('browse.containing_relation.relation', :relation_name => h(printable_name(containing_relation.relation))), :action => "relation", :id => containing_relation.relation.id.to_s %>
-    <% unless containing_relation.member_role.blank? %>
-      <%= t 'browse.containing_relation.relation_as', :relation_role => h(containing_relation.member_role) %>
-    <% end %>
-  </td>
-</tr>
+<li><%=
+  linked_name = link_to h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s
+  if containing_relation.member_role.blank?
+    raw t 'browse.containing_relation.entry', :relation_name => linked_name
+  else
+    raw t 'browse.containing_relation.entry_role', :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
+  end
+%></li>
\ No newline at end of file