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

[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 d99919e64fa35577b92a4bd899b58d8828f28346..7197298aca6a5501acd0644d429b020eab4f8169 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -8,12 +8,12 @@
   </div>
 <% else %>
   <div class="browse-section browse-way">
-    <%= render :partial => "common_details", :object => way %>
+    <%= render :partial => "browse/common_details", :object => way %>
 
     <% 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>
+        <summary><%= t "browse.part_of_relations", :count => way.containing_relation_members.uniq.count %></summary>
         <ul class="list-unstyled">
           <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
         </ul>
@@ -27,10 +27,12 @@
         <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, node_path(wn.node) %>
               <% 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, way_path(w) }) %>)
               <% end %>
             </li>
           <% end %>