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

[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 5b29865dbb1ebf8247980098ca2c8ca877b4f5df..6acc5e01ed9e5f0e5cbc99fe7dc7bb1002cd8adb 100644 (file)
--- a/app/views/browse/_node.html.erb
+++ b/app/views/browse/_node.html.erb
@@ -1,21 +1,23 @@
-<div class='browse-section'>
-  <% if node.redacted? %>
-    <%= t 'browse.redacted.message_html',
-          :type => t('browse.redacted.type.node'),
+<% if node.redacted? %>
+  <div class='browse-section browse-redacted'>
+    <%= t "browse.redacted.message_html",
+          :type => t("browse.redacted.type.node"),

           :version => node.version,
           :version => node.version,

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

                                        :id => node.redaction.id), node.redaction) %>
                                        :id => node.redaction.id), node.redaction) %>

-  <% else %>
+  </div>
+<% else %>
+  <div class='browse-section browse-node'>

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

-      <h4><%= t 'browse.part_of' %></h4>
-      <ul>
-        <% node.ways.each do |way| %>
-          <li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
+      <h4><%= t "browse.part_of" %></h4>
+      <ul class="list-unstyled">
+        <% node.ways.uniq.each do |way| %>
+          <li><%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>

         <% end %>
         <% end %>

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

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

-  <% end %>
-</div>
+  </div>
+<% end %>