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

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

diff --git a/app/views/browse/_node.html.erb b/app/views/browse/_node.html.erb
index 5b29865dbb1ebf8247980098ca2c8ca877b4f5df..0ffe7c68b82dd01c9cbafe2ca6966295d4b8532a 100644 (file)
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -1,21 +1,35 @@
-<div class='browse-section'>
-  <% if node.redacted? %>
-    <%= t 'browse.redacted.message_html',
-          :type => t('browse.redacted.type.node'),
+<% if node.redacted? && !params[:show_redactions] %>
+  <div class="browse-section browse-redacted">
+    <%= t "browse.redacted.message_html",
+          :type => t("browse.redacted.type.node"),

           :version => node.version,
           :version => node.version,

-          :redaction_link => link_to(t('browse.redacted.redaction',
+          :redaction_link => link_to(t("browse.redacted.redaction",

                                        :id => node.redaction.id), node.redaction) %>
                                        :id => node.redaction.id), node.redaction) %>

-  <% else %>
-    <%= render :partial => "common_details", :object => node %>
+  </div>
+<% else %>
+  <%= tag.div :class => ["browse-section", "browse-node", { "text-body-secondary" => node.redacted? }] do %>
+    <%= render :partial => "browse/common_details", :object => node %>

 
     <% unless node.ways.empty? and node.containing_relation_members.empty? %>
 
     <% unless node.ways.empty? and node.containing_relation_members.empty? %>

-      <h4><%= t 'browse.part_of' %></h4>
-      <ul>
-        <% node.ways.each do |way| %>
-          <li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
-        <% end %>
-        <%= render :partial => "containing_relation", :collection => node.containing_relation_members %>
-      </ul>
+      <h4><%= t "browse.part_of" %></h4>
+      <% unless node.ways.empty? %>
+        <details <%= "open" if node.ways.count < 10 %>>
+          <summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>
+          <ul class="list-unstyled">
+            <% node.ways.uniq.each do |way| %>
+              <li><%= element_single_current_link "way", way %></li>
+            <% end %>
+          </ul>
+        </details>
+      <% end %>
+      <% unless node.containing_relation_members.empty? %>
+        <details <%= "open" if node.containing_relation_members.count < 10 %>>
+          <summary><%= t "browse.part_of_relations", :count => node.containing_relation_members.uniq.count %></summary>
+          <ul class="list-unstyled">
+            <%= render :partial => "browse/containing_relation", :collection => node.containing_relation_members.uniq %>
+          </ul>
+        </details>
+      <% end %>

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

-</div>
+<% end %>