Rebase to current 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 9f0301da02e77ba2eac3676c003a41873fe4a321..cedd3e83aa4d4e75f1f32641e730122b0e6b2aad 100644 (file)
--- a/app/views/changeset/list.html.erb
+++ b/app/views/changeset/list.html.erb
@@ -2,12 +2,16 @@
   <ol class="changesets">
     <%= render :partial => 'changeset', :collection => @edits %>
   </ol>
   <ol class="changesets">
     <%= render :partial => 'changeset', :collection => @edits %>
   </ol>

+<% if @edits.size == 20 -%>

   <div class="changeset_more">
   <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;" %>
+    <%= link_to t('.load_more'), url_for(@params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %>
+    <div class="loader"><%= image_tag "searching.gif" %></div>

   </div>
   </div>

-<% elsif params[:max_id] %>
-  <p class="inner22"><%= t('changeset.list.no_more') %></p>
+<% 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 %>
 <% else %>

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

 <% end %>
 <% end %>