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

[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 d93321a0fab98f3b14a93cbf23d3f9267d7076fa..9181a3e0804d7f5e5e198bfba4c27fca7b30bdf4 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -7,15 +7,15 @@
                                        :id => way.redaction.id), way.redaction) %>
   </div>
 <% else %>
                                        :id => way.redaction.id), way.redaction) %>
   </div>
 <% else %>

-  <%= tag.div :class => ["browse-section", "browse-way", { "text-muted" => way.redacted? }] do %>
+  <%= 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>
       <details <%= "open" if way.containing_relation_members.count < 10 %>>
         <summary><%= t "browse.part_of_relations", :count => way.containing_relation_members.uniq.count %></summary>
     <%= 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.uniq.count %></summary>

-        <ul class="list-unstyled">
-          <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
+        <ul class="list-unstyled browse-element-list">
+          <%= render :partial => "browse/containing_relation", :collection => way.containing_relation_members.uniq %>

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


@@ -24,17 +24,18 @@
       <h4><%= t ".nodes" %></h4>
       <details <%= "open" if way.way_nodes.count < 10 %>>
         <summary><%= t ".nodes_count", :count => way.way_nodes.count %></summary>
       <h4><%= t ".nodes" %></h4>
       <details <%= "open" if way.way_nodes.count < 10 %>>
         <summary><%= t ".nodes_count", :count => way.way_nodes.count %></summary>

-        <ul class="list-unstyled">
+        <ul class="list-unstyled browse-element-list">

           <% way.way_nodes.each do |wn| %>
           <% way.way_nodes.each do |wn| %>

-            <li>
-              <%= element_single_current_link "node", wn.node, node_path(wn.node) %>
+            <%= element_list_item "node", wn.node do %>
+              <%= element_single_current_link "node", wn.node %>

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

+              <% icon_connector = " " %>

               <% if related_ways.size > 0 then %>
                 (<%= t ".also_part_of_html",
                        :count => related_ways.size,
               <% if related_ways.size > 0 then %>
                 (<%= 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) }) %>)
+                       :related_ways => to_sentence(related_ways.map { |w| element_icon("way", w) + icon_connector + element_single_current_link("way", w) }) %>)

               <% end %>
               <% end %>

-            </li>
+            <% end %>

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