Fix changeset comments feed timeout

[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 6befb8aae28daff9106157a0f78c7971ee288157..5dcdffa47f6cc683d657fa8ad215adf546234c7f 100644 (file)
--- a/app/views/browse/_relation.html.erb
+++ b/app/views/browse/_relation.html.erb
@@ -1,23 +1,33 @@
-<% if relation.redacted? %>
-  <div class='browse-section browse-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) %><
+          :redaction_link => link_to(t("browse.redacted.redaction",
+                                       :id => relation.redaction.id), relation.redaction) %>

   </div>
 <% else %>
   </div>
 <% else %>

-  <div class='browse-section browse-relation'>
-    <%= render :partial => "common_details", :object => relation %>
+  <%= 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 %>

-  </div>
+  <% end %>

 <% end %>
 <% end %>