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

[rails.git] / app / views / changesets / index.html.erb

diff --git a/app/views/changesets/index.html.erb b/app/views/changesets/index.html.erb
index cedd3e83aa4d4e75f1f32641e730122b0e6b2aad..527a0a23280839ee129c2769de87dd59054d1315 100644 (file)
--- a/app/views/changesets/index.html.erb
+++ b/app/views/changesets/index.html.erb
@@ -1,17 +1,17 @@
-<% if @edits.present? %>
-  <ol class="changesets">
-    <%= render :partial => 'changeset', :collection => @edits %>
+<% if @changesets.present? %>
+  <ol class="changesets list-group list-group-flush">
+    <%= render @changesets %>

   </ol>
   </ol>

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

   <div class="changeset_more">
   <div class="changeset_more">

-    <%= link_to t('.load_more'), url_for(@params.merge(:max_id => @edits.last.id - 1)), :class => "button load_more" %>
+    <%= link_to t(".load_more"), url_for(@params.merge(:max_id => @changesets.last.id - 1)), :class => "button load_more" %>

     <div class="loader"><%= image_tag "searching.gif" %></div>
   </div>
 <% end -%>
 <% elsif params[:bbox] %>
     <div class="loader"><%= image_tag "searching.gif" %></div>
   </div>
 <% end -%>
 <% elsif params[:bbox] %>

-  <div class="inner22"><%= t(params[:max_id] ? '.no_more_area' : '.empty_area') %></div>
+  <div class="inner22"><%= t(params[:max_id] ? ".no_more_area" : ".empty_area") %></div>

 <% elsif params[:display_name] %>
 <% elsif params[:display_name] %>

-  <div class="inner22"><%= t(params[:max_id] ? '.no_more_user' : '.empty_user') %></div>
+  <div class="inner22"><%= t(params[:max_id] ? ".no_more_user" : ".empty_user") %></div>

 <% else %>
 <% else %>

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

 <% end %>
 <% end %>