Merge branch 'master' into tag-colour-preview-rebase

[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..b3cb90cec2aa4a7d05b705c1c2745b6f59237a23 100644 (file)
--- a/app/views/browse/_containing_relation.html.erb
+++ b/app/views/browse/_containing_relation.html.erb
@@ -1,8 +1,7 @@
-<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 ".entry", :relation_name => linked_name
+        else
+          raw t ".entry_role", :relation_name => linked_name, :relation_role => h(containing_relation.member_role)
+        end %>
+</li>