Rebase to current master

[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..4f331b5e9be43ee96ffa8d87b25ce3396bdc80cf 100644 (file)
--- a/app/views/browse/_way.html.erb
+++ b/app/views/browse/_way.html.erb
@@ -1,33 +1,35 @@
-<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) %>
     <%= 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 %>
 
     <%= render :partial => "common_details", :object => way %>
 

+    <% unless way.containing_relation_members.empty? %>
+      <h4><%= t'browse.part_of' %></h4>
+      <ul>
+        <%= render :partial => "containing_relation", :collection => way.containing_relation_members.uniq %>
+      </ul>
+    <% end %>
+

     <% unless way.way_nodes.empty? %>
     <% unless way.way_nodes.empty? %>

-      <h4><%= t'browse.way.nodes' %></h4>
+      <h4><%= t '.nodes' %></h4>

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

-            <%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(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 'browse.way.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
+              (<%= 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 %>)

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

-
-    <% unless way.containing_relation_members.empty? %>
-      <h4><%= t'browse.part_of' %></h4>
-      <ul>
-        <%= render :partial => "containing_relation", :collection => way.containing_relation_members %>
-      </ul>
-    <% end %>
-  <% end %>
-</div>
+  </div>
+<% end %>