From: Aaron Lidman Date: Tue, 19 Nov 2013 00:24:25 +0000 (-0800) Subject: Reorder changeset detail lists X-Git-Tag: live~4657^2~47 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f45437f83622c71468bbfb769fb892f50771b923?hp=df32eee83373142af4bf8b583b54c84f4f903e68 Reorder changeset detail lists Nodes, ways, relations -> Ways, relations, nodes --- diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index 7380ac5bb..29cd6707f 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -57,7 +57,7 @@ class BrowseController < ApplicationController def changeset @type = "changeset" @changeset = Changeset.find(params[:id]) - @node_pages, @nodes = paginate(:old_nodes, :conditions => {:changeset_id => @changeset.id}, :per_page => 10, :parameter => 'node_page') + @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') rescue ActiveRecord::RecordNotFound diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb index ee8948d9b..aa333cfff 100644 --- a/app/views/browse/changeset.html.erb +++ b/app/views/browse/changeset.html.erb @@ -11,18 +11,6 @@ <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %> - <% unless @nodes.empty? %> -

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

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

<%= type_and_paginated_count('way', @way_pages) %> @@ -46,6 +34,18 @@ <% end %> <% end %> + + <% unless @nodes.empty? %> +

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

+ + <% end %>