Merge pull request #3349 from projectblacklight/release-8.x-3272

Add configuration to opt-in to the new paginator layout. Backports #3272

Author: jcoyne

app/views/kaminari/blacklight/_paginator.html.erb

@@ -11,13 +11,14 @@
 <%= paginator.render do -%>
   <ul class="pagination">
     <%= prev_page_tag %>
-    <%= next_page_tag  %>
+    <%= next_page_tag if Blacklight::Engine.config.blacklight.paginator[:next_page_position] == :before %>
     <% each_relevant_page do |page| -%>
       <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
         <%= page_tag page %>
       <% elsif !page.was_truncated? -%>
         <%= gap_tag %>
       <% end -%>
     <% end -%>  
+    <%= next_page_tag if Blacklight::Engine.config.blacklight.paginator[:next_page_position] == :after %>
   </ul>
 <% end -%>

lib/blacklight/engine.rb

@@ -72,6 +72,12 @@ class Engine < Rails::Engine
       outer_window: 2
     }
 
+    # Blacklight 9 moves the next button after the page numbers. This behavior can be configured
+    # in Blacklight 8 by setting the next_button_position to :after
+    bl_global_config.paginator = {
+      next_button_position: :before
+    }
+
     bl_global_config.search_params_permitted_classes = [ActiveSupport::HashWithIndifferentAccess, Symbol]
 
     # Anything that goes into Blacklight::Engine.config is stored as a class

spec/features/search_context_spec.rb

@@ -47,9 +47,10 @@
       search_for ''
       expect(page).to have_content "1 - 10"
       find_all('.index_title a').last.click
+      expect(page).to have_css "h1", text: "Pluvial nectar"
       click_on "Next »"
 
-      expect(page).to have_content "Naqdī barā-yi tamām-i"
+      expect(page).to have_css "h1", text: "Naqdī barā-yi tamām-i"
       click_on "Back to Search"
       expect(page).to have_content "11 - 20"
     end