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

[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..97e6351a0a108561ac495534a8e30c75ab13cb11 100644 (file)
--- a/app/views/changesets/index.html.erb
+++ b/app/views/changesets/index.html.erb
@@ -1,17 +1,21 @@
-<% 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>
-<% 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" %>
-    <div class="loader"><%= image_tag "searching.gif" %></div>
+<% if @changesets.size == 20 -%>
+  <div class="changeset_more mt-3 text-center">
+    <%= link_to t(".load_more"), url_for(@params.merge(:max_id => @changesets.last.id - 1)), :class => "btn btn-primary" %>
+    <div class="text-center loader">
+      <div class="spinner-border" role="status">
+        <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
+      </div>
+    </div>
   </div>
 <% end -%>
 <% elsif params[:bbox] %>
-  <div class="inner22"><%= t(params[:max_id] ? '.no_more_area' : '.empty_area') %></div>
+  <p class="mx-3"><%= t(params[:max_id] ? ".no_more_area" : ".empty_area") %></p>
 <% elsif params[:display_name] %>
-  <div class="inner22"><%= t(params[:max_id] ? '.no_more_user' : '.empty_user') %></div>
+  <p class="mx-3"><%= t(params[:max_id] ? ".no_more_user" : ".empty_user") %></p>
 <% else %>
-  <div class="inner22"><%= t(params[:max_id] ? '.no_more' : '.empty') %></div>
+  <p class="mx-3"><%= t(params[:max_id] ? ".no_more" : ".empty") %></p>
 <% end %>