From: Anton Khorev <tony29@yandex.ru>
Date: Tue, 3 Oct 2023 15:02:11 +0000 (+0300)
Subject: Move bootstrap pagination list wrapper to template
X-Git-Tag: live~742^2~5
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/b7ce0f09e6a06a62e054b3a1a9978eee88edd5a5?ds=sidebyside

Move bootstrap pagination list wrapper to template
---

diff --git a/app/views/browse/_paging_nav.html.erb b/app/views/browse/_paging_nav.html.erb
index 1f4cbee85..738d2f2ee 100644
--- a/app/views/browse/_paging_nav.html.erb
+++ b/app/views/browse/_paging_nav.html.erb
@@ -1,8 +1,8 @@
 <div class="d-flex flex-wrap gap-2">
   <h4 class="fs-5 mb-0"><%= heading %></h4>
   <% if pages.page_count > 1 %>
-    <div class="ms-auto">
+    <ul class="pagination pagination-sm mb-1 ms-auto">
       <%= raw pagination_links_bootstrap(pages, {}) { |n| url_for(page_param => n) } %>
-    </div>
+    </ul>
   <% end %>
 </div>
diff --git a/lib/classic_pagination/pagination_helper.rb b/lib/classic_pagination/pagination_helper.rb
index 3ff7fbf4e..c691360e0 100644
--- a/lib/classic_pagination/pagination_helper.rb
+++ b/lib/classic_pagination/pagination_helper.rb
@@ -133,6 +133,7 @@ module ActionView
 
       # Same as above, but
       # - with bootstrap classes
+      # - no list wrapper
       # - invoked block returns the page url
       def pagination_links_bootstrap(paginator, options)
         options = DEFAULT_OPTIONS.merge(options)
@@ -148,8 +149,6 @@ module ActionView
 
         html = ""
 
-        html << "<ul class='pagination pagination-sm mb-1'>"
-
         if always_show_anchors && !(wp_first = window_pages[0]).first?
           html << bootstrap_page_item_link(first.number.to_s, yield(first.number))
           html << bootstrap_page_item_disabled("...") if wp_first.number - first.number > 1
@@ -168,8 +167,6 @@ module ActionView
           html << bootstrap_page_item_link(last.number.to_s, yield(last.number))
         end
 
-        html << "</ul>"
-
         html
       end