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

[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 cc8597292d058f3360daef8a77c23af97a2507ba..4e2ae0343d2e57f5ba7a460b5701892ed0d923b3 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,7 +7,7 @@
                                        :id => node.redaction.id), node.redaction) %>
   </div>
 <% else %>
                                        :id => node.redaction.id), node.redaction) %>
   </div>
 <% else %>

-  <div class="browse-section browse-node">
+  <%= tag.div :class => ["browse-section", "browse-node", { "text-muted" => node.redacted? }] do %>

     <%= render :partial => "browse/common_details", :object => node %>
 
     <% unless node.ways.empty? and node.containing_relation_members.empty? %>
     <%= render :partial => "browse/common_details", :object => node %>
 
     <% unless node.ways.empty? and node.containing_relation_members.empty? %>


@@ -17,7 +17,7 @@
           <summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>
           <ul class="list-unstyled">
             <% node.ways.uniq.each do |way| %>
           <summary><%= t "browse.part_of_ways", :count => node.ways.uniq.count %></summary>
           <ul class="list-unstyled">
             <% node.ways.uniq.each do |way| %>

-              <li><%= link_to printable_name(way), way_path(way), { :class => link_class("way", way), :title => link_title(way) } %></li>
+              <li><%= element_single_current_link "way", way %></li>

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


@@ -31,5 +31,5 @@
         </details>
       <% end %>
     <% end %>
         </details>
       <% end %>
     <% end %>

-  </div>
+  <% end %>

 <% end %>
 <% end %>