Merge branch 'master' into notes

[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..d21365b45a949f2b78480bd5a3e4c9c546515c23 100644 (file)
--- a/app/views/browse/_way_details.html.erb
+++ b/app/views/browse/_way_details.html.erb
@@ -1,35 +1,35 @@
-<table class="browse_details" id="<%= way_details.version %>">
+<% 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 %>
+
+<div class="browse_details" id="<%= way_details.version %>">

 
   <%= render :partial => "common_details", :object => way_details %>
 
   <% unless way_details.way_nodes.empty? %>
 
   <%= render :partial => "common_details", :object => way_details %>
 
   <% unless way_details.way_nodes.empty? %>

-    <tr valign="top">
-      <th><%= t'browse.way_details.nodes' %></th>
-      <td>
-        <table cellpadding="0">
+    <div class='browse-section'>
+      <h4><%= t'browse.way_details.nodes' %></h4>
+        <ul>

           <% way_details.way_nodes.each do |wn| %>
           <% way_details.way_nodes.each do |wn| %>

-            <tr><td>
+            <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 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 %>
               <% end %>

-            </td></tr>
+            </li>

           <% end %>
           <% end %>

-        </table>
-      </td>
-    </tr>
+        </ul>
+    </div>

   <% end %>
 
   <% unless way_details.containing_relation_members.empty? %>
   <% end %>
 
   <% unless way_details.containing_relation_members.empty? %>

-    <tr valign="top">
-      <th><%= t'browse.way_details.part_of' %></th>
-      <td>
-        <table cellpadding="0">
+    <div class='browse-section'>
+      <h4><%= t'browse.way_details.part_of' %></h4>
+      <ul>

           <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>
           <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>

-        </table>
-      </td>
-    </tr>      
+      </ul>

   <% end %>
 
   <% end %>
 

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