Couple of bugfixes, brackets and quotes

[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 27335dd888e5bfb6a1198230614e3d222389f57e..6408b489b2307ac6c3b6056b4cfaabdcb6d2f0bf 100644 (file)
--- a/app/views/browse/_changeset_details.rhtml
+++ b/app/views/browse/_changeset_details.rhtml
@@ -5,6 +5,11 @@
     <td><%= h(changeset_details.created_at) %></td>
   </tr>
   
     <td><%= h(changeset_details.created_at) %></td>
   </tr>
   

+  <tr>
+    <th>Closed at:</th>
+    <td><%= h(changeset_details.closed_at) %></td>
+  </tr>
+  

   <% if changeset_details.user.data_public? %>
     <tr>
       <th>Belongs to:</th>
   <% if changeset_details.user.data_public? %>
     <tr>
       <th>Belongs to:</th>


@@ -12,57 +17,79 @@
     </tr>
   <% end %>
   
     </tr>
   <% end %>
   

-  <% unless changeset_details.tags_as_hash.empty? %>
-    <tr valign="top">
-      <th>Tags:</th>
+  <%= render :partial => "tag_details", :object => changeset_details %>
+
+  <tr>
+    <th>Bounding box:</th>
+    <% unless changeset_details.has_valid_bbox? %>
+      <td>No bounding box has been stored for this changeset.</td>
+    <% 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
+          maxlat = changeset_details.max_lat/GeoRecord::SCALE.to_f
+    %>

       <td>
       <td>

-        <table padding="0">
-          <%= render :partial => "tag", :collection => changeset_details.tags_as_hash %>
+        <table>
+          <tr>
+            <td colspan="3" style="text-align:center"><%=maxlat -%></td>
+          </tr>
+          <tr>
+            <td><%=minlon -%></td>
+            <td>(<a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='show area box'>box</a>)</td>
+            <td><%=maxlon -%></td>
+          </tr>
+          <tr>
+            <td colspan="3" style="text-align:center"><%= minlat -%></td>
+          </tr>

         </table>
       </td>
         </table>
       </td>

-    </tr>

     <% end %>
     <% end %>

+  </tr>

 
 

-  <% unless changeset_details.old_nodes.empty? %>
+  <% unless @nodes.empty? %>

     <tr valign="top">
     <tr valign="top">

-      <th>Has the following nodes:</th>
+      <th>Has the following <%= @node_pages.item_count %> nodes:</th>

       <td>
       <td>

-        <table padding="0">
-          <% changeset_details.old_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>
+        <table cellpadding="0">
+          <% @nodes.each do |node| %>
+            <tr><td><%= link_to h(printable_name(node, true)), :action => "node", :id => node.id.to_s %></td></tr>

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

+    <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>

   <% end %>
   
   <% end %>
   

-  <% unless changeset_details.old_ways.empty? %>
+  <% unless @ways.empty? %>

     <tr valign="top">
     <tr valign="top">

-      <th>Has the following ways:</th>
+      <th>Has the following <%= @way_pages.item_count %> ways:</th>

       <td>
       <td>

-        <table padding="0">
-          <% changeset_details.old_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>
+        <table cellpadding="0">
+          <% @ways.each do |way| %>
+          <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 
           %>
         </table>
       </td>
           <% end %>
           <%=
           #render :partial => "containing_relation", :collection => changeset_details.containing_relation_members 
           %>
         </table>
       </td>

-    </tr>      
+    </tr>
+    <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>

   <% end %>
   
   <% end %>
   

-  <% unless changeset_details.old_relations.empty? %>
+  <% unless @relations.empty? %>

     <tr valign="top">
     <tr valign="top">

-      <th>Has the following relations:</th>
+      <th>Has the following <%= @relation_pages.item_count %> relations:</th>

       <td>
       <td>

-        <table padding="0">
-          <% changeset_details.old_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>
+        <table cellpadding="0">
+          <% @relations.each do |relation| %>
+          <tr><td><%= link_to h(printable_name(relation, true)), :action => "relation", :id => relation.id.to_s %></td></tr>

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

+    <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>

   <% end %>
 
 </table>
   <% end %>
 
 </table>