Rationalize browse translation keys

[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 1313cb250575e80fce986c556380dce7b8840602..dbb0030bfd236a2a31fb52a718cdd4b813e724f5 100644 (file)
--- a/app/views/browse/_way_details.html.erb
+++ b/app/views/browse/_way_details.html.erb
@@ -1,39 +1,33 @@
-<% 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 %>">
+<div class='browse-section'>
+  <% if way_details.redacted? %>
+    <%= t 'browse.redacted.message_html',
+          :type => t('browse.redacted.type.way'),
+          :version => way_details.version,
+          :redaction_link => link_to(t('browse.redacted.redaction',
+                                       :id => way_details.redaction.id), way_details.redaction) %>
+  <% else %>
+    <%= render :partial => "common_details", :object => way_details %>
 
-  <%= render :partial => "common_details", :object => way_details %>
+    <% unless way_details.way_nodes.empty? %>
+      <h4><%= t'browse.way.nodes' %></h4>
+      <ul>
+        <% way_details.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) %>
+            <% 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 %>)
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    <% end %>
 
-  <% unless way_details.way_nodes.empty? %>
-    <tr valign="top">
-      <th><%= t'browse.way_details.nodes' %></th>
-      <td>
-        <table cellpadding="0">
-          <% 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 == wn.way_id } %>
-              <% if related_ways.size > 0 then %>
-                (<%= 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 %>
-        </table>
-      </td>
-    </tr>
+    <% unless way_details.containing_relation_members.empty? %>
+      <h4><%= t'browse.part_of' %></h4>
+      <ul>
+        <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>
+      </ul>
+    <% end %>
   <% end %>
-
-  <% unless way_details.containing_relation_members.empty? %>
-    <tr valign="top">
-      <th><%= t'browse.way_details.part_of' %></th>
-      <td>
-        <table cellpadding="0">
-          <%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>
-        </table>
-      </td>
-    </tr>      
-  <% end %>
-
-</table>
-<% end %>
+</div>