Use start.html.erb views instead of _sidebar.html.erb partials

[rails.git] / app / views / browse / _way_details.html.erb

diff --git a/app/views/browse/_way_details.html.erb b/app/views/browse/_way_details.html.erb
index ce5c86dda601fdfec9a8058df1ba53b25a5672b2..1313cb250575e80fce986c556380dce7b8840602 100644 (file)
--- a/app/views/browse/_way_details.html.erb
+++ b/app/views/browse/_way_details.html.erb
@@ -1,3 +1,6 @@
+<% if way_details.redacted? %>
+<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.way'), :redaction_link => link_to(t('browse.redacted.redaction', :id => way_details.redaction.id), way_details.redaction), :version => way_details.version %></p>
+<% else %>

 <table class="browse_details" id="<%= way_details.version %>">
 
   <%= render :partial => "common_details", :object => way_details %>
 <table class="browse_details" id="<%= way_details.version %>">
 
   <%= render :partial => "common_details", :object => way_details %>


@@ -10,9 +13,9 @@
           <% way_details.way_nodes.each do |wn| %>
             <tr><td>
               <%= 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) %>
           <% way_details.way_nodes.each do |wn| %>
             <tr><td>
               <%= 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) %>

-              <% related_ways = wn.node.ways.reject { |w| w.id == way_details.id } %>
+              <% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>

               <% if related_ways.size > 0 then %>
               <% if related_ways.size > 0 then %>

-                (<%= t 'browse.way_details.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 'browse.way_details.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 %>)

               <% end %>
             </td></tr>
           <% end %>
               <% end %>
             </td></tr>
           <% end %>


@@ -33,3 +36,4 @@
   <% end %>
 
 </table>
   <% end %>
 
 </table>

+<% end %>