Style load more changesets buttons like pagination links

diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js
index a23a198df2a6d0d117a414de6aea1e78b60b400d..76a2e9b4bec3535e585d4fd965724f23f7ac971c 100644 (file)
--- a/app/assets/javascripts/index/history.js
+++ b/app/assets/javascripts/index/history.js
@@ -173,7 +173,7 @@ OSM.History = function (map) {
 
     const div = $(this).parents(".changeset_more");
 
-    $(this).hide();
+    $(this).closest(".pagination").hide();
     div.find(".loader").show();
 
     const data = new URLSearchParams();

diff --git a/app/views/changesets/index.html.erb b/app/views/changesets/index.html.erb
index d6b07446104c7af60da0df6d79fae44e7e4d8647..865d88043a357da4523fd9cf83e7d13ae1893920 100644 (file)
--- a/app/views/changesets/index.html.erb
+++ b/app/views/changesets/index.html.erb
@@ -1,6 +1,10 @@
 <% if @newer_changesets_id %>
-  <div class="changeset_more my-3 text-center">
-    <%= link_to t(".load_more"), url_for(:after => @newer_changesets_id), :class => "btn btn-primary" %>
+  <div class="changeset_more my-3">
+    <ul class="pagination justify-content-center">
+      <li class="page-item">
+        <%= link_to t(".newer_changesets"), url_for(:after => @newer_changesets_id), :class => "page-link" %>
+      </li>
+    </ul>
     <div class="text-center loader">
       <div class="spinner-border" role="status">
         <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>
@@ -20,8 +24,12 @@
   <p class="mx-3"><%= params[:before] ? t(".no_more") : t(".empty") %></p>
 <% end %>
 <% if @older_changesets_id -%>
-  <div class="changeset_more my-3 text-center">
-    <%= link_to t(".load_more"), url_for(:before => @older_changesets_id), :class => "btn btn-primary" %>
+  <div class="changeset_more my-3">
+    <ul class="pagination justify-content-center">
+      <li class="page-item">
+        <%= link_to t(".older_changesets"), url_for(:before => @older_changesets_id), :class => "page-link" %>
+      </li>
+    </ul>
     <div class="text-center loader">
       <div class="spinner-border" role="status">
         <span class="visually-hidden"><%= t("browse.start_rjs.loading") %></span>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a2b15d754efa023d55046d8bbe62ac7ed22f55af..16b967ead238558d2e84b69e0462f1c392b6e8b2 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -494,7 +494,8 @@ en:
       no_more: "No more changesets found."
       no_more_area: "No more changesets in this area."
       no_more_user: "No more changesets by this user."
-      load_more: "Load more"
+      older_changesets: Older Changesets
+      newer_changesets: Newer Changesets
       feed:
         title: "Changeset %{id}"
         title_comment: "Changeset %{id} - %{comment}"

diff --git a/test/system/history_test.rb b/test/system/history_test.rb
index be7700c3b893699f229feab865c56853f589eb84..37b5cd0aaceeff2fcdba6d86d34ef45fe52d9a0d 100644 (file)
--- a/test/system/history_test.rb
+++ b/test/system/history_test.rb
@@ -35,21 +35,21 @@ class HistoryTest < ApplicationSystemTestCase
       changesets.assert_no_text "bottom-changeset-in-batch-2"
       changesets.assert_no_text "first-changeset-in-history"
       changesets.assert_selector "ol", :count => 1
-      changesets.assert_selector "li", :count => PAGE_SIZE
+      changesets.assert_selector "li[data-changeset]", :count => PAGE_SIZE
 
-      changesets.find(".changeset_more a.btn").click
+      click_on "Older Changesets"
       changesets.assert_text "bottom-changeset-in-batch-1"
       changesets.assert_text "bottom-changeset-in-batch-2"
       changesets.assert_no_text "first-changeset-in-history"
       changesets.assert_selector "ol", :count => 1
-      changesets.assert_selector "li", :count => 2 * PAGE_SIZE
+      changesets.assert_selector "li[data-changeset]", :count => 2 * PAGE_SIZE
 
-      changesets.find(".changeset_more a.btn").click
+      click_on "Older Changesets"
       changesets.assert_text "bottom-changeset-in-batch-1"
       changesets.assert_text "bottom-changeset-in-batch-2"
       changesets.assert_text "first-changeset-in-history"
       changesets.assert_selector "ol", :count => 1
-      changesets.assert_selector "li", :count => (2 * PAGE_SIZE) + 1
+      changesets.assert_selector "li[data-changeset]", :count => (2 * PAGE_SIZE) + 1
     end
   end