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

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

diff --git a/app/views/browse/_relation.html.erb b/app/views/browse/_relation.html.erb
index e8f9a4f51acd6408c64863907cf9c1773111f1f9..e187da6ca1930d4f3f3f1e2f0ecaeac9199a0ac6 100644 (file)
--- a/app/views/browse/_relation.html.erb
+++ b/app/views/browse/_relation.html.erb
@@ -1,21 +1,23 @@
-<div class='browse-section'>
-  <% if relation.redacted? %>
+<% if relation.redacted? %>
+  <div class='browse-section browse-redacted'>
     <%= t 'browse.redacted.message_html',
           :type => t('browse.redacted.type.relation'),
           :version => relation.version,
           :redaction_link => link_to(t('browse.redacted.redaction',
-                                       :id => relation.redaction.id), relation.redaction) %><
-  <% else %>
+                                       :id => relation.redaction.id), relation.redaction) %>
+  </div>
+<% else %>
+  <div class='browse-section browse-relation'>
     <%= render :partial => "common_details", :object => relation %>
 
-    <% unless relation.relation_members.empty? %>
-      <h4><%= t'browse.relation.members' %></h4>
-      <ul><%= render :partial => "relation_member", :collection => relation.relation_members %></ul>
-    <% end %>
-
     <% unless relation.containing_relation_members.empty? %>
       <h4><%= t'browse.part_of' %></h4>
-      <ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members %></ul>
+      <ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %></ul>
+    <% end %>
+
+    <% unless relation.relation_members.empty? %>
+      <h4><%= t '.members' %></h4>
+      <ul><%= render :partial => "relation_member", :collection => relation.relation_members %></ul>
     <% end %>
-  <% end %>
-</div>
+  </div>
+<% end %>