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

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


@@ -7,29 +7,31 @@
                                        :id => node.redaction.id), node.redaction) %>
   </div>
 <% else %>
                                        :id => node.redaction.id), node.redaction) %>
   </div>
 <% else %>

-  <div class='browse-section browse-node'>
-    <%= render :partial => "common_details", :object => node %>
+  <%= 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? %>
       <h4><%= t "browse.part_of" %></h4>
       <% unless node.ways.empty? %>
 
     <% unless node.ways.empty? and node.containing_relation_members.empty? %>
       <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.count %></summary>
-          <ul class="list-unstyled">
+        <details <%= "open" if node.ways.count < 10 %>>
+          <summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>
+          <ul class="list-unstyled browse-element-list">

             <% node.ways.uniq.each do |way| %>
             <% node.ways.uniq.each do |way| %>

-              <li><%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
+              <%= element_list_item "way", way do %>
+                <%= element_single_current_link "way", way %>
+              <% end %>

             <% end %>
           </ul>
         </details>
       <% end %>
       <% unless node.containing_relation_members.empty? %>
             <% 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.count %></summary>
-          <ul class="list-unstyled">
-            <%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
+        <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 browse-element-list">
+            <%= render :partial => "browse/containing_relation", :collection => node.containing_relation_members.uniq %>

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

-  </div>
+  <% end %>

 <% end %>
 <% end %>