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

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

diff --git a/app/views/browse/_way.html.erb b/app/views/browse/_way.html.erb
index 2788fdea920111c871d7a336a4c4cf475632bab7..d04eff14030183432704277a9e07802b378c2083 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -1,5 +1,5 @@
-<% if way.redacted? %>
-  <div class='browse-section browse-redacted'>
+<% if way.redacted? && !params[:show_redactions] %>
+  <div class="browse-section browse-redacted">

     <%= t "browse.redacted.message_html",
           :type => t("browse.redacted.type.way"),
           :version => way.version,
     <%= t "browse.redacted.message_html",
           :type => t("browse.redacted.type.way"),
           :version => way.version,


@@ -7,35 +7,37 @@
                                        :id => way.redaction.id), way.redaction) %>
   </div>
 <% else %>
                                        :id => way.redaction.id), way.redaction) %>
   </div>
 <% else %>

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

 
     <% unless way.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>
 
     <% unless way.containing_relation_members.empty? %>
       <h4><%= t "browse.part_of" %></h4>

-      <details <%= 'open' if way.containing_relation_members.count < 10 %>>
-        <summary><%= t 'browse.part_of_relations', :count => way.containing_relation_members.count %></summary>
+      <details <%= "open" if way.containing_relation_members.count < 10 %>>
+        <summary><%= t "browse.part_of_relations", :count => way.containing_relation_members.uniq.count %></summary>

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

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

         </ul>
       </details>
     <% end %>
 
     <% unless way.way_nodes.empty? %>
       <h4><%= t ".nodes" %></h4>
         </ul>
       </details>
     <% end %>
 
     <% unless way.way_nodes.empty? %>
       <h4><%= t ".nodes" %></h4>

-      <details <%= 'open' if way.way_nodes.count < 10 %>>
-        <summary><%= t '.nodes_count', :count => way.way_nodes.count %></summary>
+      <details <%= "open" if way.way_nodes.count < 10 %>>
+        <summary><%= t ".nodes_count", :count => way.way_nodes.count %></summary>

         <ul class="list-unstyled">
           <% way.way_nodes.each do |wn| %>
             <li>
         <ul class="list-unstyled">
           <% way.way_nodes.each do |wn| %>
             <li>

-              <%= link_to printable_name(wn.node), { :action => "node", :id => wn.node_id.to_s }, { :class => link_class("node", wn.node), :title => link_title(wn.node), :rel => link_follow(wn.node) } %>
+              <%= element_single_current_link "node", wn.node %>

               <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
               <% if related_ways.size > 0 then %>
               <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
               <% if related_ways.size > 0 then %>

-                (<%= t ".also_part_of_html", :count => related_ways.size, :related_ways => to_sentence(related_ways.map { |w| link_to(printable_name(w), { :action => "way", :id => w.id.to_s }, { :class => link_class("way", w), :title => link_title(w) }) }) %>)
+                (<%= t ".also_part_of_html",
+                       :count => related_ways.size,
+                       :related_ways => to_sentence(related_ways.map { |w| element_single_current_link "way", w }) %>)

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

-  </div>
+  <% end %>

 <% end %>
 <% end %>