Add coordinate detail to node pages

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

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 0d64ffae62e07cface5b51821c7f3510471f8865..aa333cfff72876e34c16db4767b9630d2c057dce 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,57 +1,55 @@
-<h2><%= t 'browse.changeset.changeset', :id => @changeset.id %>
+<% set_title(t('browse.changeset.title', :id => @changeset.id)) %>
+
+<h2>

   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>

+  <%= t('browse.changeset.title', :id => @changeset.id) %>

 </h2>
 </h2>

+

 <div class="browse-section">
 <div class="browse-section">

-  <p>
-    <%=
-        @changeset.tags['comment'].to_s.presence || t('browse.changeset_details.no_comment')
-    %>
-  </p>
-  <span><%= changeset_time_ago(@changeset) %></span>
-</div>
-  
-<%=
-  render :partial => "tag_details", :object => @changeset.tags.except('comment')
-%>
+  <h4><%= @changeset.tags['comment'].to_s.presence || t('browse.no_comment') %></h4>
+  <div class="details"><%= changeset_details(@changeset) %></div>

 
 

-<% unless @nodes.empty? %>
-  <div class='browse-section paginate'>
-    <h4><%= t 'browse.changeset_details.has_nodes', :count => @node_pages.item_count %></h4>
-    <ul>
-      <% @nodes.each do |node| %>
-        <li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
-      <% end %>
-    </ul>
-    <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
-  </div>
-<% end %>
+  <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>

 
 

-<% unless @ways.empty? %>
-  <div class='browse-section  paginate'>
-    <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></h4>
+  <% unless @ways.empty? %>
+    <h4>
+      <%= type_and_paginated_count('way', @way_pages) %>
+      <%= render :partial => 'paging_nav', :locals => { :pages => @way_pages, :page_param => "way_page" } %>
+    </h4>

     <ul>
       <% @ways.each do |way| %>
         <li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
       <% end %>
     </ul>
     <ul>
       <% @ways.each do |way| %>
         <li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
       <% end %>
     </ul>

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

 
 

-<% unless @relations.empty? %>
-  <div class='browse-section  paginate'>
-    <h4><%= t 'browse.changeset_details.has_relations', :count => @relation_pages.item_count %></h4>
-      <ul>
-        <% @relations.each do |relation| %>
-          <li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
-        <% end %>
-      </ul>
+  <% unless @relations.empty? %>
+    <h4>
+      <%= type_and_paginated_count('relation', @relation_pages) %>

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

-  </div>
-<% end %>
+    </h4>
+    <ul>
+      <% @relations.each do |relation| %>
+        <li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
+      <% end %>
+    </ul>
+  <% end %>
+
+  <% unless @nodes.empty? %>
+    <h4>
+      <%= type_and_paginated_count('node', @node_pages) %>
+      <%= render :partial => 'paging_nav', :locals => { :pages => @node_pages, :page_param => "node_page"} %>
+    </h4>
+    <ul>
+      <% @nodes.each do |node| %>
+        <li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
+      <% end %>
+    </ul>
+  <% end %>
+</div>

 
 

-<div class='browse-section secondary-actions'> 
-  <h4><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+<div class='secondary-actions'>
+  <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>

   &middot;
   &middot;

-  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></h4>
+  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>

 </div>
 </div>