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

[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..5dcdffa47f6cc683d657fa8ad215adf546234c7f 100644 (file)
--- a/app/views/browse/_relation.html.erb
+++ b/app/views/browse/_relation.html.erb
@@ -1,21 +1,33 @@
-<div class='browse-section'>
-  <% if relation.redacted? %>
-    <%= t 'browse.redacted.message_html',
-          :type => t('browse.redacted.type.relation'),
+<% if relation.redacted? && !params[:show_redactions] %>
+  <div class="browse-section browse-redacted">
+    <%= t "browse.redacted.message_html",
+          :type => t("browse.redacted.type.relation"),

           :version => relation.version,
           :version => relation.version,

-          :redaction_link => link_to(t('browse.redacted.redaction',
-                                       :id => relation.redaction.id), relation.redaction) %><
-  <% else %>
-    <%= render :partial => "common_details", :object => relation %>
+          :redaction_link => link_to(t("browse.redacted.redaction",
+                                       :id => relation.redaction.id), relation.redaction) %>
+  </div>
+<% else %>
+  <%= tag.div :class => ["browse-section", "browse-relation", { "text-body-secondary" => relation.redacted? }] do %>
+    <%= render :partial => "browse/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>
+    <% unless relation.containing_relation_members.empty? %>
+      <h4><%= t "browse.part_of" %></h4>
+      <details <%= "open" if relation.containing_relation_members.count < 10 %>>
+        <summary><%= t "browse.part_of_relations", :count => relation.containing_relation_members.uniq.count %></summary>
+        <ul class="list-unstyled">
+          <%= render :partial => "browse/containing_relation", :collection => relation.containing_relation_members.uniq %>
+        </ul>
+      </details>

     <% end %>
 
     <% end %>
 

-    <% unless relation.containing_relation_members.empty? %>
-      <h4><%= t'browse.part_of' %></h4>
-      <ul><%= render :partial => "containing_relation", :collection => relation.containing_relation_members %></ul>
+    <% unless relation.relation_members.empty? %>
+      <h4><%= t ".members" %></h4>
+      <details <%= "open" if relation.relation_members.count < 10 %>>
+        <summary><%= t ".members_count", :count => relation.relation_members.count %></summary>
+        <ul class="list-unstyled">
+          <%= render :partial => "browse/relation_member", :collection => relation.relation_members %>
+        </ul>
+      </details>

     <% end %>
   <% end %>
     <% end %>
   <% end %>

-</div>
+<% end %>