Merge remote-tracking branch 'upstream/master' into vagrant

[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 9156d23998b8558e3036a8bc458b273e22c0526e..aff405dde2b780f5ae8cac5fcfdb9dcc4f0f3162 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -1,11 +1,13 @@
-<div class='browse-section'>
-  <% if way.redacted? %>
+<% if way.redacted? %>
+  <div class='browse-section browse-redacted'>
     <%= t 'browse.redacted.message_html',
           :type => t('browse.redacted.type.way'),
           :version => way.version,
           :redaction_link => link_to(t('browse.redacted.redaction',
                                        :id => way.redaction.id), way.redaction) %>
-  <% else %>
+  </div>
+<% else %>
+  <div class='browse-section browse-way'>
     <%= render :partial => "common_details", :object => way %>
 
     <% unless way.way_nodes.empty? %>
@@ -26,8 +28,8 @@
     <% unless way.containing_relation_members.empty? %>
       <h4><%= t'browse.part_of' %></h4>
       <ul>
-        <%= render :partial => "containing_relation", :collection => way.containing_relation_members %>
+        <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
       </ul>
     <% end %>
-  <% end %>
-</div>
+  </div>
+<% end %>