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

diff --git a/app/views/notes/_notes_paging_nav.html.erb b/app/views/notes/_notes_paging_nav.html.erb
index 207f8877918bbaedf6af21f503f8b26c72efff8e..5209256d69d572636f3ffb232bbf83b1649f8003 100644 (file)
--- a/app/views/notes/_notes_paging_nav.html.erb
+++ b/app/views/notes/_notes_paging_nav.html.erb
@@ -1,17 +1,36 @@
-<p>
+<nav>
+  <% link_class = "page-link icon-link text-center text-nowrap" %>
+  <ul class="pagination">
+    <% previous_link_content = capture do %>
+      <%= previous_page_svg_tag :class => "flex-shrink-0" %>
+      <%= t(".previous") %>
+    <% end %>
+    <% if @page > 1 %>
+      <li class="page-item">
+        <%= link_to previous_link_content, @params.merge(:page => @page - 1), :class => link_class %>
+      </li>
+    <% else %>
+      <li class="page-item disabled">
+        <%= tag.span previous_link_content, :class => link_class %>
+      </li>
+    <% end %>
 
-<% if @page > 1 %>
-<%= link_to t("changesets.changeset_paging_nav.previous"), @params.merge(:page => @page - 1) %>
-<% else %>
-<%= t("changesets.changeset_paging_nav.previous") %>
-<% end %>
+    <li class="page-item active">
+      <%= tag.span t(".showing_page", :page => @page), :class => link_class %>
+    </li>
 
-| <%= t("changesets.changeset_paging_nav.showing_page", :page => @page) %> |
-
-<% if @notes.size < @page_size %>
-<%= t("changesets.changeset_paging_nav.next") %>
-<% else %>
-<%= link_to t("changesets.changeset_paging_nav.next"), @params.merge(:page => @page + 1) %>
-<% end %>
-
-</p>
+    <% next_link_content = capture do %>
+      <%= t(".next") %>
+      <%= next_page_svg_tag :class => "flex-shrink-0" %>
+    <% end %>
+    <% if @notes.size < @page_size %>
+      <li class="page-item disabled">
+        <%= tag.span next_link_content, :class => link_class %>
+      </li>
+    <% else %>
+      <li class="page-item">
+        <%= link_to next_link_content, @params.merge(:page => @page + 1), :class => link_class %>
+      </li>
+    <% end %>
+  </ul>
+</nav>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 97d5e6f003e5d18737ea5f92e07ef2ff6293af53..9a383569ee3ce97241b24b4dcdf5c612e3a6c5f4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -427,10 +427,6 @@ en:
       timeout:
         sorry: "Sorry, the list of changeset comments you requested took too long to retrieve."
   changesets:
-    changeset_paging_nav:
-      showing_page: "Page %{page}"
-      next: "Next »"
-      previous: "« Previous"
     changeset:
       anonymous: "Anonymous"
       no_edits: "(no edits)"
@@ -3017,6 +3013,10 @@ en:
       anonymous_warning_sign_up: "sign up"
       advice: "Your note is public and may be used to update the map, so don't enter personal information, or information from copyrighted maps or directory listings."
       add: Add Note
+    notes_paging_nav:
+      showing_page: "Page %{page}"
+      next: "Next"
+      previous: "Previous"
   javascripts:
     close: Close
     share: