Improve pagination in changeset details

[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 8e110212893968f9f0c6c15d2e49fb5364386e82..fb08987bb751594ebd5e05232d6ebe065050656c 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,21 +1,59 @@
-<table width="100%">
-  <tr>
-    <td>
-      <h2><%= t 'browse.changeset.changeset', :id => @changeset.id %></h2>
-    </td>
-    <td>
-      <%= render :partial => "navigation" %>
-    </td>
-  </tr>
-  <tr valign="top">
-    <td>
-    <%= render :partial => "changeset_details", :object => @changeset %>
-    <hr />
-    <%= t 'browse.changeset.download', :changeset_xml_link => link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read"), 
-                                       :osmchange_xml_link => link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
-    </td>
-    <% if @changeset.has_valid_bbox? %>
-    <%= render :partial => "map", :object => @changeset %>
-    <% end %>
-  </tr>
-</table>
+<h2>
+  <%= t 'browse.changeset.changeset', :id => @changeset.id %>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+</h2>
+
+<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') %>
+
+<% unless @nodes.empty? %>
+  <div class='browse-section paginate'>
+    <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>
+  </div>
+<% end %>
+
+<% unless @ways.empty? %>
+  <div class='browse-section  paginate'>
+    <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>
+  </div>
+<% end %>
+
+<% unless @relations.empty? %>
+  <div class='browse-section  paginate'>
+    <h4>
+      <%= type_and_paginated_count('relation', @relation_pages) %>
+      <%= render :partial => 'paging_nav', :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
+    </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>
+  </div>
+<% end %>
+
+<div class='browse-section secondary-actions'> 
+  <h4><%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+  &middot;
+  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %></h4>
+</div>