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

[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..e0eb55c1b4f941cd74f7431a9d62e0ceb1f47897 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? %>
+<% if node.redacted? %>
+  <div class='browse-section browse-redacted'>

     <%= t 'browse.redacted.message_html',
           :type => t('browse.redacted.type.node'),
           :version => node.version,
           :redaction_link => link_to(t('browse.redacted.redaction',
                                        :id => node.redaction.id), node.redaction) %>
     <%= t 'browse.redacted.message_html',
           :type => t('browse.redacted.type.node'),
           :version => node.version,
           :redaction_link => link_to(t('browse.redacted.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? %>
       <h4><%= t 'browse.part_of' %></h4>
       <ul>
     <%= 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>
+        <% 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 %>