Merge remote-tracking branch 'upstream/pull/1833'

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

diff --git a/app/views/changeset/list.html.erb b/app/views/changeset/list.html.erb
index 262cae15ff56bdc194f5e1a14edc3beb104693c4..8dcc121c52c7fee8450359d71a942e280026ad66 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,23 +1,17 @@
-<% content_for :head do -%>
-  <%= javascript_include_tag "index" %>
-  <%= javascript_include_tag "changeset" %>
-
-  <% unless params[:friends] or params[:nearby] -%>
-    <%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
-  <% end -%>
+<% if @edits.present? %>
+  <ol class="changesets">
+    <%= render :partial => 'changeset', :collection => @edits %>
+  </ol>
+<% if @edits.size == 20 -%>
+  <div class="changeset_more">
+    <%= link_to t('.load_more'), url_for(@params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %>
+    <%= image_tag "searching.gif", :class => "loader", :style => "display: none;" %>
+  </div>

 <% end -%>
 <% end -%>

-
-<% content_for :sidebar do %>
-  <h2><%= @heading %></h2>
-
-  <% if @edits.size > 0 %>
-    <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
-    <%= render :partial => 'changeset_paging_nav' %>
-  <% elsif @user and @user.display_name == params[:display_name] %>
-    <h4><%= t('changeset.list.empty_user_html') %></h4>
-  <% else %>
-    <h4><%= t('changeset.list.empty_anon_html') %></h4>
-  <% end %>
+<% elsif params[:bbox] %>
+  <div class="inner22"><%= t(params[:max_id] ? '.no_more_area' : '.empty_area') %></div>
+<% elsif params[:display_name] %>
+  <div class="inner22"><%= t(params[:max_id] ? '.no_more_user' : '.empty_user') %></div>
+<% else %>
+  <div class="inner22"><%= t(params[:max_id] ? '.no_more' : '.empty') %></div>

 <% end %>
 <% end %>

-
-<%= render :template => 'layouts/map' %>