Use {{count}} instead of {{(node|way_relation)_count}} since {{count}}

[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 5b724012abd4d5807c170ea528e5b4477e7e0d70..24d5da08c3c00d4bb5b2adda0ed15cf24f677a42 100644 (file)
--- a/app/views/browse/_changeset_details.rhtml
+++ b/app/views/browse/_changeset_details.rhtml
@@ -1,54 +1,46 @@
 <table>
 
   <tr>
-    <th>Created at:</th>
-    <td><%= h(changeset_details.created_at) %></td>
+    <th><%= t 'browse.changeset_details.created_at' %></th>
+    <td><%= l changeset_details.created_at %></td>
   </tr>
   
   <tr>
-    <th>Closed at:</th>
-    <td><%= h(changeset_details.closed_at) %></td>
+    <th><%= t 'browse.changeset_details.closed_at' %></th>
+    <td><%= l changeset_details.closed_at %></td>
   </tr>
   
   <% if changeset_details.user.data_public? %>
     <tr>
-      <th>Belongs to:</th>
+      <th><%= t 'browse.changeset_details.belongs_to' %></th>
       <td><%= link_to h(changeset_details.user.display_name), :controller => "user", :action => "view", :display_name => changeset_details.user.display_name %></td>
     </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? %>
-      <td>No bounding box has been stored for this changeset.</td>
-    <% else %>
+    <th><%= t 'browse.changeset_details.bounding_box' %></th>
+    <% unless changeset_details.has_valid_bbox? %>
+      <td><%= t 'browse.changeset_details.no_bounding_box' %></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>
         <table>
           <tr>
-            <td colspan="2" style="text-align:center"><%= changeset_details.max_lat/GeoRecord::SCALE.to_f -%></td>
+            <td colspan="3" style="text-align:center"><%=maxlat -%></td>
           </tr>
           <tr>
-            <td><%= changeset_details.min_lon/GeoRecord::SCALE.to_f -%></td>
-            <td><%= changeset_details.max_lon/GeoRecord::SCALE.to_f -%></td>
+            <td><%=minlon -%></td>
+            <td>(<a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='<%= t 'browse.changeset_details.show_area_box' %>'><%= t 'browse.changeset_details.box' %></a>)</td>
+            <td><%=maxlon -%></td>
           </tr>
           <tr>
-            <td colspan="2" style="text-align:center"><%= changeset_details.min_lon/GeoRecord::SCALE.to_f -%></td>
+            <td colspan="3" style="text-align:center"><%= minlat -%></td>
           </tr>
         </table>
       </td>
@@ -57,11 +49,11 @@
 
   <% unless @nodes.empty? %>
     <tr valign="top">
-      <th>Has the following <%= @node_pages.item_count %> nodes:</th>
+      <th><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></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>
@@ -71,11 +63,11 @@
   
   <% unless @ways.empty? %>
     <tr valign="top">
-      <th>Has the following <%= @way_pages.item_count %> ways:</th>
+      <th><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></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 
@@ -88,11 +80,11 @@
   
   <% unless @relations.empty? %>
     <tr valign="top">
-      <th>Has the following <%= @relation_pages.item_count %> relations:</th>
+      <th><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></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>