Merge remote-tracking branch 'openstreetmap/pull/1347' into master

[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 f715e237b0cd78bbd3bcd734259847dc242cfe60..36ec593793f85f0327edd7d2133748e36f2bcbbc 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -1,25 +1,17 @@
-<h1><%= @heading %></h1>
-<p><%= raw(@description) %></p>
-
-<% if @edits.size > 0 %>
-  <%= render :partial => 'changeset_paging_nav' %>
-
-  <div id="changeset_list_container">
-    <%= render :partial => 'map' %>
-    <%= render :partial => 'changesets', :locals => { :showusername => !params.has_key?(:display_name) } %>
+<% if @edits.present? %>
+  <ol class="changesets">
+    <%= render :partial => 'changeset', :collection => @edits %>
+  </ol>
+<% if @edits.size == 20 -%>
+  <div class="changeset_more">
+    <%= link_to t('changeset.list.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>
   </div>

-
-  <%= render :partial => 'changeset_paging_nav' %>
-<% elsif @user and @user.display_name == params[:display_name] %>
-  <p><%= t('changeset.list.empty_user_html') %></p>
+<% end -%>
+<% elsif params[:bbox] %>
+  <div class="inner22"><%= t(params[:max_id] ? 'changeset.list.no_more_area' : 'changeset.list.empty_area') %></div>
+<% elsif params[:display_name] %>
+  <div class="inner22"><%= t(params[:max_id] ? 'changeset.list.no_more_user' : 'changeset.list.empty_user') %></div>

 <% else %>
 <% else %>

-  <p><%= t('changeset.list.empty_anon_html') %></p>
+  <div class="inner22"><%= t(params[:max_id] ? 'changeset.list.no_more' : 'changeset.list.empty') %></div>

 <% end %>
 <% end %>

-
-<% unless params[:friends] or params[:nearby] -%>
-<%= atom_link_to params.merge({ :page => nil, :action => :feed }) %>
-
-<% content_for :head do -%>
-<%= auto_discovery_link_tag :atom, params.merge({ :page => nil, :action => :feed }) %>
-<% end -%>
-<% end -%>