From: Aaron Lidman Date: Mon, 18 Nov 2013 23:23:48 +0000 (-0800) Subject: Improve changeset detail display X-Git-Tag: live~4674^2~49 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6c64a74a46c3d75c6526958b9e0474684f49386e Improve changeset detail display --- diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index 6468635cf..60683fcd6 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -996,7 +996,7 @@ header .search_form { #sidebar .changesets { li { - padding: $lineheight; + padding: 10px 20px; border-bottom: 1px solid #ddd; cursor: pointer; diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb index c8375ee06..7380ac5bb 100644 --- a/app/controllers/browse_controller.rb +++ b/app/controllers/browse_controller.rb @@ -58,8 +58,8 @@ class BrowseController < ApplicationController @type = "changeset" @changeset = Changeset.find(params[:id]) @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') + @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 render :action => "not_found", :status => :not_found end diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb index 104b1ec4a..f39bafec7 100644 --- a/app/views/user/view.html.erb +++ b/app/views/user/view.html.erb @@ -4,10 +4,10 @@

<%= @this_user.display_name %><%= role_icons(@this_user) %>

<% if @user and @this_user.id == @user.id %> - + <% else %> - +