Simple pagination

app/controllers/alchemy/admin/base_controller.rb

@@ -109,8 +109,13 @@ def render_errors_or_redirect(object, redirect_url, flash_notice)
         end
       end
 
+      def items_per_page
+        params[:per_page] || Alchemy::Config.get(:items_per_page)
+      end
+
       def per_page_value_for_screen_size
-        return 25 if session[:screen_size].blank?
+        Alchemy::Deprecation.warn("#per_page_value_for_screen_size is deprecated, please use #items_per_page instead")
+        return items_per_page if session[:screen_size].blank?
         screen_height = session[:screen_size].split('x').last.to_i
         (screen_height / 50) - 12
       end

app/controllers/alchemy/admin/languages_controller.rb

@@ -5,7 +5,7 @@ module Admin
     class LanguagesController < ResourcesController
       def index
         @query = Language.on_current_site.ransack(search_filter_params[:q])
-        @languages = @query.result.page(params[:page] || 1).per(per_page_value_for_screen_size)
+        @languages = @query.result.page(params[:page] || 1).per(items_per_page)
       end
 
       def new

app/controllers/alchemy/admin/pictures_controller.rb

@@ -113,13 +113,12 @@ def destroy
       def pictures_per_page_for_size(size)
         case size
         when 'small'
-          per_page = in_overlay? ? 25 : (per_page_value_for_screen_size * 2.9).floor
+          in_overlay? ? 25 : 60
         when 'large'
-          per_page = in_overlay? ? 4 : (per_page_value_for_screen_size / 1.7).floor + 1
+          in_overlay? ? 4 : 12
         else
-          per_page = in_overlay? ? 9 : (per_page_value_for_screen_size / 1.0).ceil + 4
+          in_overlay? ? 9 : 20
         end
-        per_page
       end
 
       def in_overlay?

app/controllers/alchemy/admin/resources_controller.rb

@@ -37,7 +37,7 @@ def index
 
         respond_to do |format|
           format.html {
-            items = items.page(params[:page] || 1).per(per_page_value_for_screen_size)
+            items = items.page(params[:page] || 1).per(items_per_page)
             instance_variable_set("@#{resource_handler.resources_name}", items)
           }
           format.csv {

app/controllers/alchemy/admin/tags_controller.rb

@@ -10,7 +10,7 @@ def index
         @tags = @query
                   .result
                   .page(params[:page] || 1)
-                  .per(per_page_value_for_screen_size)
+                  .per(items_per_page)
                   .order("name ASC")
       end
 

config/alchemy/config.yml

@@ -57,6 +57,11 @@ sitemap:
 #
 url_nesting: true
 
+# === Default items per page in admin views
+#
+# In Alchemy's Admin, change how many items you would get shown per page by Kaminari
+items_per_page: 10
+
 # === Picture rendering settings
 #
 # Alchemy uses Dragonfly to render images. Use {size: "XXXxYYY", crop: BOOLEAN [true]} to resize images.