Merge remote-tracking branch 'osmlab/id-editor-embed'

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

diff --git a/app/views/browse/_node_details.html.erb b/app/views/browse/_node_details.html.erb
index f7d4e0e7c4fcd7e47c8334fbc42430ba196f77a7..8dec338d6960db54454226d9759f33e271fe09e5 100644 (file)
--- a/app/views/browse/_node_details.html.erb
+++ b/app/views/browse/_node_details.html.erb
@@ -1,24 +1,28 @@
-<table>
-
+<div class="browse_details" id="<%= node_details.version %>">
+<% if node_details.redacted? %>
+  <div class='browse-section'>
+    <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.node'), :redaction_link => link_to(t('browse.redacted.redaction', :id => node_details.redaction.id), node_details.redaction), :version => node_details.version %>
+  </div>
+<% else %>

   <%= render :partial => "common_details", :object => node_details %>
 
   <%= render :partial => "common_details", :object => node_details %>
 

-  <tr>
-    <th><%= t 'browse.node_details.coordinates' %></th>
-    <td><div class="geo"><%= link_to ("<span class='latitude'>#{number_with_delimiter(node_details.lat)}</span>, <span class='longitude'>#{number_with_delimiter(node_details.lon)}</span>"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}, { :rel => "nofollow" } %></div></td>
-  </tr>
+  <% if node_details.visible -%>
+  <div class='browse-section'>
+    <h4><%= t 'browse.node_details.coordinates' %></h4>
+    <div class="geo"><%= link_to(content_tag(:span, number_with_delimiter(node_details.lat), :class => "latitude") + ", " + content_tag(:span, number_with_delimiter(node_details.lon), :class => "longitude"), {:controller => 'site', :action => 'index', :lat => h(node_details.lat), :lon => h(node_details.lon), :zoom => "18"}) %></div>
+  </div>
+  <% end -%>

 
   <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>
 
   <% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>

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

           <% node_details.ways.each do |way| %>
           <% node_details.ways.each do |way| %>

-            <tr><td><%= link_to h(printable_name(way)), :action => "way", :id => way.id.to_s %></td></tr>
+            <li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>

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

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

   <% end %>
   <% end %>

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