Data browser changes, make links more user friendly, displaying name tag where possible.

[rails.git] / app / views / browse / _changeset_details.rhtml

diff --git a/app/views/browse/_changeset_details.rhtml b/app/views/browse/_changeset_details.rhtml
index 07f076e21e13bdb15695d23392fc08e90ea5bf88..6408b489b2307ac6c3b6056b4cfaabdcb6d2f0bf 100644 (file)
--- a/app/views/browse/_changeset_details.rhtml
+++ b/app/views/browse/_changeset_details.rhtml
@@ -17,28 +17,13 @@
     </tr>
   <% end %>
   
-  <% unless changeset_details.tags_as_hash.empty? %>
-    <tr valign="top">
-      <th>Tags:</th>
-      <td>
-        <table padding="0">
-          <%= render :partial => "tag", :collection => changeset_details.tags_as_hash %>
-        </table>
-      </td>
-    </tr>
-  <% else %>
-    <tr>
-      <th>Tags</th>
-      <td>There are no tags for this changeset</td>
-    </tr>
-  <% end %>
+  <%= render :partial => "tag_details", :object => changeset_details %>
 
   <tr>
     <th>Bounding box:</th>
-    <% if changeset_details.max_lat.nil? or changeset_details.min_lat.nil? or changeset_details.max_lon.nil? or changeset_details.min_lon.nil? %>
+    <% unless changeset_details.has_valid_bbox? %>
       <td>No bounding box has been stored for this changeset.</td>
-    <%
-       else
+    <% else
           minlon = changeset_details.min_lon/GeoRecord::SCALE.to_f
           minlat = changeset_details.min_lat/GeoRecord::SCALE.to_f
           maxlon = changeset_details.max_lon/GeoRecord::SCALE.to_f
@@ -55,7 +40,7 @@
             <td><%=maxlon -%></td>
           </tr>
           <tr>
-            <td colspan="3" style="text-align:center"><%= minlon -%></td>
+            <td colspan="3" style="text-align:center"><%= minlat -%></td>
           </tr>
         </table>
       </td>
@@ -66,9 +51,9 @@
     <tr valign="top">
       <th>Has the following <%= @node_pages.item_count %> nodes:</th>
       <td>
-        <table padding="0">
+        <table cellpadding="0">
           <% @nodes.each do |node| %>
-            <tr><td><%= link_to "Node #{node.id.to_s}, version #{node.version.to_s}", :action => "node", :id => node.id.to_s %></td></tr>
+            <tr><td><%= link_to h(printable_name(node, true)), :action => "node", :id => node.id.to_s %></td></tr>
           <% end %>
         </table>
       </td>
@@ -80,9 +65,9 @@
     <tr valign="top">
       <th>Has the following <%= @way_pages.item_count %> ways:</th>
       <td>
-        <table padding="0">
+        <table cellpadding="0">
           <% @ways.each do |way| %>
-            <tr><td><%= link_to "Way #{way.id.to_s}, version #{way.version.to_s}", :action => "way", :id => way.id.to_s %></td></tr>
+          <tr><td><%= link_to h(printable_name(way, true)), :action => "way", :id => way.id.to_s %></td></tr>
           <% end %>
           <%=
           #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members 
@@ -97,9 +82,9 @@
     <tr valign="top">
       <th>Has the following <%= @relation_pages.item_count %> relations:</th>
       <td>
-        <table padding="0">
+        <table cellpadding="0">
           <% @relations.each do |relation| %>
-            <tr><td><%= link_to "Relation #{relation.id.to_s}, version #{relation.version.to_s}", :action => "relation", :id => relation.id.to_s %></td></tr>
+          <tr><td><%= link_to h(printable_name(relation, true)), :action => "relation", :id => relation.id.to_s %></td></tr>
           <% end %>
         </table>
       </td>