Improve pagination

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 3fddd669e805876bdc3f789eb4c53dca3b6d247d..6e1c8e016f2bf560e4db4d3463eb675dc875ffe7 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1013,6 +1013,10 @@ a.donate {
     }
   }
 
     }
   }
 

+  .paginate ul {
+    padding-left: 20px;
+  }
+

   .browse-field {
     margin-bottom: 10px;
 
   .browse-field {
     margin-bottom: 10px;
 

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 9f0683aef539cbb138558ca7c6d4bf174f311f0c..2820e242d5f44d450507c9654367627f9c483f9c 100644 (file)
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -62,9 +62,9 @@ class BrowseController < ApplicationController
     @type = "changeset"
 
     @changeset = Changeset.find(params[:id])
     @type = "changeset"
 
     @changeset = Changeset.find(params[:id])

-    @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'node_page')
-    @way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'way_page')
-    @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'relation_page')
+    @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'node_page')
+    @way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'way_page')
+    @relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'relation_page')

       
     @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}"
     @next = Changeset.where("id > ?", @changeset.id).order(:id => :asc).first
       
     @title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}"
     @next = Changeset.where("id > ?", @changeset.id).order(:id => :asc).first

diff --git a/app/views/browse/_paging_nav.html.erb b/app/views/browse/_paging_nav.html.erb
index f236b44650160450004a53cf8ac28722a5668f41..f691d4504cba173c5a765e30be278a1cacf08477 100644 (file)
--- a/app/views/browse/_paging_nav.html.erb
+++ b/app/views/browse/_paging_nav.html.erb
@@ -1,14 +1,15 @@
 <div>
 <% current_page = pages.current_page %>
 
 <div>
 <% current_page = pages.current_page %>
 

-<%= t'browse.paging_nav.showing_page' %>
-<%= current_page.number %> (<%= current_page.first_item %><%
-if (current_page.first_item < current_page.last_item) # if more than 1 trace on page
-  %>-<%= current_page.last_item %><%
-end %>
-<%= t'browse.paging_nav.of'%> <%= pages.item_count %>)
-

 <% if pages.page_count > 1 %>
 <% if pages.page_count > 1 %>

-| <%= raw pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %>
+    <%= t'browse.paging_nav.showing_page' %>
+    <%= current_page.number %> (<%= current_page.first_item %><%
+    if (current_page.first_item < current_page.last_item) # if more than 1 trace on page
+      %>-<%= current_page.last_item %><%
+    end %>
+    <%= t'browse.paging_nav.of'%> <%= pages.item_count %>)
+
+&middot;
+<%= raw pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %>

 <% end %>
 <% end %>

-</div>
\ No newline at end of file
+</div>

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index e6a4db70789c8f619dd89c9ec94fa325a814588d..d8a60a66c0cad82c87cbfb60cca5a57f8ae333d6 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -21,39 +21,39 @@
 <%= render :partial => "tag_details", :object => @changeset %>
 
 <% unless @nodes.empty? %>
 <%= render :partial => "tag_details", :object => @changeset %>
 
 <% unless @nodes.empty? %>

-  <div class='browse-section clearfix'>
+  <div class='browse-section clearfix 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>
     <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>
   </div>

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

 <% end %>
 
 <% unless @ways.empty? %>
 <% end %>
 
 <% unless @ways.empty? %>

-  <div class='browse-section clearfix'>
+  <div class='browse-section clearfix  paginate'>

     <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></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>
     <h4><%= t 'browse.changeset_details.has_ways', :count => @way_pages.item_count %></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>

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

   </div>
   </div>

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

 <% end %>
 
 <% unless @relations.empty? %>
 <% end %>
 
 <% unless @relations.empty? %>

-  <div class='browse-section clearfix'>
+  <div class='browse-section clearfix  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>
     <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>

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

   </div>
   </div>

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

 <% end %>
 
 <div class='browse-section secondary-actions clearfix'> 
 <% end %>
 
 <div class='browse-section secondary-actions clearfix'>