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

[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 4f331b5e9be43ee96ffa8d87b25ce3396bdc80cf..137d529ff2a1296831a1c44d0c0be00d1dbd8cb6 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -1,9 +1,9 @@
 <% if way.redacted? %>
   <div class='browse-section browse-redacted'>
 <% if way.redacted? %>
   <div class='browse-section browse-redacted'>

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

           :version => way.version,
           :version => way.version,

-          :redaction_link => link_to(t('browse.redacted.redaction',
+          :redaction_link => link_to(t("browse.redacted.redaction",

                                        :id => way.redaction.id), way.redaction) %>
   </div>
 <% else %>
                                        :id => way.redaction.id), way.redaction) %>
   </div>
 <% else %>


@@ -11,21 +11,21 @@
     <%= render :partial => "common_details", :object => way %>
 
     <% unless way.containing_relation_members.empty? %>
     <%= render :partial => "common_details", :object => way %>
 
     <% unless way.containing_relation_members.empty? %>

-      <h4><%= t'browse.part_of' %></h4>
-      <ul>
+      <h4><%= t "browse.part_of" %></h4>
+      <ul class="list-unstyled">

         <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
       </ul>
     <% end %>
 
     <% unless way.way_nodes.empty? %>
         <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
       </ul>
     <% end %>
 
     <% unless way.way_nodes.empty? %>

-      <h4><%= t '.nodes' %></h4>
-      <ul>
+      <h4><%= t ".nodes" %></h4>
+      <ul class="list-unstyled">

         <% way.way_nodes.each do |wn| %>
           <li>
         <% 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) %>
+            <%= 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) } %>

             <% 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 %>

-              (<%= raw t '.also_part_of', :count => related_ways.size, :related_ways => 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) ) }.to_sentence %>)
+              (<%= 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) }) }) %>)

             <% end %>
           </li>
         <% end %>
             <% end %>
           </li>
         <% end %>