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

[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 77d3a5c16ec55ed86a90d299e1d4b028218d89c5..0ffe7c68b82dd01c9cbafe2ca6966295d4b8532a 100644 (file)
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -1,4 +1,4 @@
-<% if node.redacted? %>
+<% if node.redacted? && !params[:show_redactions] %>

   <div class="browse-section browse-redacted">
     <%= t "browse.redacted.message_html",
           :type => t("browse.redacted.type.node"),
   <div class="browse-section browse-redacted">
     <%= t "browse.redacted.message_html",
           :type => t("browse.redacted.type.node"),


@@ -7,29 +7,29 @@
                                        :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? %>
         <details <%= "open" if node.ways.count < 10 %>>
 
     <% 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>
+          <summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>

           <ul class="list-unstyled">
             <% node.ways.uniq.each do |way| %>
           <ul class="list-unstyled">
             <% 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>
+              <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 %>>
             <% 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>
+          <summary><%= t "browse.part_of_relations", :count => node.containing_relation_members.uniq.count %></summary>

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

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

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

-  </div>
+  <% end %>

 <% end %>
 <% end %>