Merge branch 'pull/5196'

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


@@ -7,27 +7,27 @@
                                        :id => relation.redaction.id), relation.redaction) %>
   </div>
 <% else %>
                                        :id => relation.redaction.id), relation.redaction) %>
   </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.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
 
     <% 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.count %></summary>
+      <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">
         <ul class="list-unstyled">

-          <%= render :partial => "containing_relation", :collection => relation.containing_relation_members.uniq %>
+          <%= render :partial => "browse/containing_relation", :collection => relation.containing_relation_members.uniq %>

         </ul>
       </details>
     <% end %>
 
     <% unless relation.relation_members.empty? %>
       <h4><%= t ".members" %></h4>
         </ul>
       </details>
     <% end %>
 
     <% 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>
+      <details <%= "open" if relation.relation_members.count < 10 %>>
+        <summary><%= t ".members_count", :count => relation.relation_members.count %></summary>

         <ul class="list-unstyled">
         <ul class="list-unstyled">

-          <%= render :partial => "relation_member", :collection => relation.relation_members %>
+          <%= render :partial => "browse/relation_member", :collection => relation.relation_members %>

         </ul>
       </details>
     <% end %>
         </ul>
       </details>
     <% end %>

-  </div>
+  <% end %>

 <% end %>
 <% end %>