New setting added to specify how many objects should be displayed on most paginated...

Default is: 25, 50, 100 (users can choose one of these values).
If one value only is entered in this setting (eg. 25), the 'per page' links are not displayed (prior behaviour).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1026 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 5ad3d696b8b598281a85002bf2a3b740e5768cc8..0f8eb32a58fe47d3075e34babe84d745c51d543e 100644 (file)
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -35,7 +35,7 @@ class AdminController < ApplicationController
     
     @project_count = Project.count(:conditions => conditions)
     @project_pages = Paginator.new self, @project_count,
-                                                               25,
+                                                               per_page_option,
                                                                params['page']                                                          
     @projects = Project.find :all, :order => sort_clause,
                         :conditions => conditions,

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index ad86b6b33fa0ac5dbe5419a9b661be6838527367..607ac091b68aff1278ae4d40155837500fadd902 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -158,6 +158,21 @@ class ApplicationController < ActionController::Base
     attachments
   end
 
+  # Returns the number of objects that should be displayed
+  # on the paginated list
+  def per_page_option
+    per_page = nil
+    if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
+      per_page = params[:per_page].to_s.to_i
+      session[:per_page] = per_page
+    elsif session[:per_page]
+      per_page = session[:per_page]
+    else
+      per_page = Setting.per_page_options_array.first || 25
+    end
+    per_page
+  end
+
   # qvalues http header parser
   # code taken from webrick
   def parse_qvalues(value)

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 2007923703887fa948bdd62d13695858fe95a54e..5bf4499bdd723470d7b2dc2aaa3d02796737a8bf 100644 (file)
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -40,7 +40,7 @@ class BoardsController < ApplicationController
     sort_update        
       
     @topic_count = @board.topics.count
-    @topic_pages = Paginator.new self, @topic_count, 25, params['page']
+    @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
     @topics =  @board.topics.find :all, :order => "#{Message.table_name}.sticky DESC, #{sort_clause}",
                                   :include => [:author, {:last_reply => :author}],
                                   :limit  =>  @topic_pages.items_per_page,

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index f202e9bbafa129dcb9ff8ac038bd02c8f7f82cb1..be854f98ea287ef136c05c14e73e074a5ba97260 100644 (file)
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -45,7 +45,7 @@ class IssuesController < ApplicationController
     sort_update
     retrieve_query
     if @query.valid?
-      limit = %w(pdf csv).include?(params[:format]) ? Setting.issues_export_limit.to_i : 25
+      limit = %w(pdf csv).include?(params[:format]) ? Setting.issues_export_limit.to_i : per_page_option
       @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
       @issue_pages = Paginator.new self, @issue_count, limit, params['page']
       @issues = Issue.find :all, :order => sort_clause,

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index ef332eb3790c92ee87b8af4d7423d84855d2f678..f8b1eae8161d104830f728b34e8b92625c7c538d 100644 (file)
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -75,7 +75,7 @@ class RepositoriesController < ApplicationController
   def revisions
     @changeset_count = @repository.changesets.count
     @changeset_pages = Paginator.new self, @changeset_count,
-                                                                     25,
+                                                                     per_page_option,
                                                                      params['page']                                                            
     @changesets = @repository.changesets.find(:all,
                                                :limit  =>  @changeset_pages.items_per_page,

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3f3adb57d92a5c328658403a05d7090c19398d7b..f67d1ae53786e4cd2c949946a58b94b4073cb864 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -39,7 +39,7 @@ class UsersController < ApplicationController
     
     @user_count = User.count(:conditions => conditions)
     @user_pages = Paginator.new self, @user_count,
-                                                               15,
+                                                               per_page_option,
                                                                params['page']                                                          
     @users =  User.find :all,:order => sort_clause,
                         :conditions => conditions,

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index bc4b7b4512469728d45a103fcf1a99666c20f72f..53c5ec53b720f3e5cfb509685292cb5bae7c9e0b 100644 (file)
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -97,7 +97,7 @@ class WikiController < ApplicationController
     @page = @wiki.find_page(params[:page])
     
     @version_count = @page.content.versions.count
-    @version_pages = Paginator.new self, @version_count, 25, params['p']
+    @version_pages = Paginator.new self, @version_count, per_page_option, params['p']
     # don't load text    
     @versions = @page.content.versions.find :all, 
                                             :select => "id, author_id, comments, updated_on, version",

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a3509b99abee7c6ed919d7f25d4f99ea63c69170..e510f881f5b551d95b983468d75910c112459d44 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -103,26 +103,40 @@ module ApplicationHelper
     l(:actionview_datehelper_select_month_names).split(',')[month-1]
   end
 
-  def pagination_links_full(paginator, options={}, html_options={})
+  def pagination_links_full(paginator, count=nil, options={})
     page_param = options.delete(:page_param) || :page
-  
+    url_param = params.dup
+    
     html = ''    
     html << link_to_remote(('&#171; ' + l(:label_previous)), 
-                            {:update => "content", :url => options.merge(page_param => paginator.current.previous)},
-                            {:href => url_for(:params => options.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
+                            {:update => "content", :url => url_param.merge(page_param => paginator.current.previous)},
+                            {:href => url_for(:params => url_param.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
                             
     html << (pagination_links_each(paginator, options) do |n|
       link_to_remote(n.to_s, 
-                      {:url => {:params => options.merge(page_param => n)}, :update => 'content'},
-                      {:href => url_for(:params => options.merge(page_param => n))})
+                      {:url => {:params => url_param.merge(page_param => n)}, :update => 'content'},
+                      {:href => url_for(:params => url_param.merge(page_param => n))})
     end || '')
     
     html << ' ' + link_to_remote((l(:label_next) + ' &#187;'), 
-                                 {:update => "content", :url => options.merge(page_param => paginator.current.next)},
-                                 {:href => url_for(:params => options.merge(page_param => paginator.current.next))}) if paginator.current.next
+                                 {:update => "content", :url => url_param.merge(page_param => paginator.current.next)},
+                                 {:href => url_for(:params => url_param.merge(page_param => paginator.current.next))}) if paginator.current.next
+    
+    unless count.nil?
+      html << [" (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})", per_page_links(paginator.items_per_page)].compact.join(' | ')
+    end
+    
     html  
   end
   
+  def per_page_links(selected=nil)
+    links = Setting.per_page_options_array.collect do |n|
+      n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)}, 
+                                            {:href => url_for(params.dup.merge(:per_page => n))})
+    end
+    links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
+  end
+  
   def set_html_title(text)
     @html_header_title = text
   end

diff --git a/app/models/setting.rb b/app/models/setting.rb
index 4d4cf0045e326d82ce0f63dbf1256d984c5e5ebd..46b6d76ce364a55752627b7a5496bde3ada98f47 100644 (file)
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -95,6 +95,11 @@ class Setting < ActiveRecord::Base
     class_eval src, __FILE__, __LINE__
   end
   
+  # Helper that returns an array based on per_page_options setting
+  def self.per_page_options_array
+    per_page_options.split(%r{[\s,]}).collect(&:to_i).select {|n| n > 0}.sort
+  end
+  
   # Checks if settings have changed since the values were read
   # and clears the cache hash if it's the case
   # Called once per request

diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index e9d5e85376ad00346b76054cb035af81fa3ca50e..295cfd1014e7bd1e7ee4f4ab9dbcfd837c8741db 100644 (file)
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -45,7 +45,6 @@
   </tbody>
 </table>
 
-<p><%= pagination_links_full @project_pages, :status => @status %>
-[ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p>
+<p class="pagination"><%= pagination_links_full @project_pages, @project_count %></p>
 
 <% set_html_title l(:label_project_plural) -%>

diff --git a/app/views/auth_sources/list.rhtml b/app/views/auth_sources/list.rhtml
index f486f45b798dee08de70183e3c7ca471f91ea2d2..6836e6c673bd1de0295a732367f3a74174fb299e 100644 (file)
--- a/app/views/auth_sources/list.rhtml
+++ b/app/views/auth_sources/list.rhtml
@@ -25,4 +25,4 @@
   </tbody>
 </table>
 
-<%= pagination_links_full @auth_source_pages %>
+<p class="pagination"><%= pagination_links_full @auth_source_pages %></p>

diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index 8bcf960b205059744aebf83076cc0cbb87659720..01db0854c17c5f7d82f0ae41806e7a82d8d82f65 100644 (file)
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -43,8 +43,7 @@
   <% end %>
   </tbody>
 </table>
-<p><%= pagination_links_full @topic_pages %>
-[ <%= @topic_pages.current.first_item %> - <%= @topic_pages.current.last_item %> / <%= @topic_count %> ]</p>
+<p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
 <% else %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>

diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml
index 05506f3c71646e557824bc95ab884c23d1fc76e8..a45f5d4d08d8f032e67a7c0db0be01a1f7689ebd 100644 (file)
--- a/app/views/issue_statuses/list.rhtml
+++ b/app/views/issue_statuses/list.rhtml
@@ -32,6 +32,6 @@
   </tbody>
 </table>
 
-<%= pagination_links_full @issue_status_pages %>
+<p class="pagination"><%= pagination_links_full @issue_status_pages %></p>
 
 <% set_html_title(l(:label_issue_status_plural)) -%>

diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index de0fd4addbe68dde426cbb6c751b5865af06ba15..c298b9bcc238f3678af3320d361d5716578b5442 100644 (file)
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -48,8 +48,7 @@
 <%= link_to 'CSV', {:format => 'csv'}, :class => 'icon icon-csv' %>,
 <%= link_to 'PDF', {:format => 'pdf'}, :class => 'icon icon-pdf' %>
 </div>
-<p><%= pagination_links_full @issue_pages %>
-[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]</p>
+<p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
 <% end %>
 <% end %>
 <% end %>

diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index 0b677d241d09e5d52aaa55199d6bd8ce8eae6ef7..35446722923d99599b8e862e54ddae27c10f3925 100644 (file)
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -27,7 +27,7 @@
     <%= textilizable(news.description) %>
 <% end %>
 <% end %>
-<%= pagination_links_full @news_pages %>
+<p class="pagination"><%= pagination_links_full @news_pages %></p>
 
 <% content_for :header_tags do %>
   <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>

diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index d87dfa9555011af5038ff0413bdc40148a9f37cc..265070e37b542915020bdeb23fae36dec4a76bc6 100644 (file)
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -56,8 +56,7 @@
 <% end %>
 </tbody>
 </table>
-<p><%= pagination_links_full @changes_pages, :rev => @changeset.revision %>
-[ <%= @changes_pages.current.first_item %> - <%= @changes_pages.current.last_item %> / <%= @changes_count %> ]</p>
+<p class="pagination"><%= pagination_links_full @changes_pages %></p>
 
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>

diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml
index 4483a482c993e0d946d888c12235e39da504466d..99c3f7afdc7533f2693588f759c3d3cc8c2b2e99 100644 (file)
--- a/app/views/repositories/revisions.rhtml
+++ b/app/views/repositories/revisions.rhtml
@@ -9,8 +9,7 @@
 
 <%= render :partial => 'revisions', :locals => {:project => @project, :path => '', :revisions => @changesets, :entry => nil }%>
 
-<p><%= pagination_links_full @changeset_pages %>
-[ <%= @changeset_pages.current.first_item %> - <%= @changeset_pages.current.last_item %> / <%= @changeset_count %> ]</p>
+<p class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></p>
 
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>

diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml
index 02bb20f5ec6380add04819d6859da8f11ed7fee7..fabc5edcd5646fb6a1126bc2ffa937f631980c66 100644 (file)
--- a/app/views/roles/list.rhtml
+++ b/app/views/roles/list.rhtml
@@ -29,7 +29,7 @@
   </tbody>
 </table>
 
-<p><%= pagination_links_full @role_pages %></p>
+<p class="pagination"><%= pagination_links_full @role_pages %></p>
 
 <p><%= link_to l(:label_permissions_report), :action => 'report' %></p>
 

diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index 758045f05013eefc29c2d7ef750a6a252342db23..b1db0e7ad8c7ab21859615bb343f3e7fe2220137 100644 (file)
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -27,6 +27,9 @@
 <p><label><%= l(:setting_attachment_max_size) %></label>
 <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
 
+<p><label><%= l(:setting_per_page_options) %></label>
+<%= text_field_tag 'settings[per_page_options]', Setting.per_page_options_array.join(', '), :size => 20 %><br /><em><%= l(:text_comma_separated) %></em></p>
+
 <p><label><%= l(:setting_issues_export_limit) %></label>
 <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
 

diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml
index d339bdba0dc9ad599340bda0ba02755b1d627de2..447507210ec48c4ef96970bec30e57f7de6440f1 100644 (file)
--- a/app/views/trackers/list.rhtml
+++ b/app/views/trackers/list.rhtml
@@ -30,6 +30,6 @@
   </tbody>
 </table>
 
-<%= pagination_links_full @tracker_pages %>
+<p class="pagination"><%= pagination_links_full @tracker_pages %></p>
 
 <% set_html_title(l(:label_tracker_plural)) -%>

diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index 3f879d7a644c2713a0b41c59d50b5ce20174a5f0..fbac1e8e920afb717e31ff912842d8935e8ea9da 100644 (file)
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -55,8 +55,6 @@
   </tbody>
 </table>
 
-<p><%= pagination_links_full @user_pages, :status => @status %>
-[ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
-</p>
+<p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
 
 <% set_html_title(l(:label_user_plural)) -%>

diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
index fc77e7fb58fab05629c6c7db4363a1b7bf0053cf..6462e9fdd477751f5a9cbb38e8c204951268aeea 100644 (file)
--- a/app/views/wiki/history.rhtml
+++ b/app/views/wiki/history.rhtml
@@ -31,6 +31,5 @@
 </tbody>
 </table>
 <%= submit_tag l(:label_view_diff), :class => 'small' %>
-<%= pagination_links_full @version_pages, :page_param => :p %>
-[ <%= @version_pages.current.first_item %> - <%= @version_pages.current.last_item %> / <%= @version_count %> ]
+<span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
 <% end %>

diff --git a/config/settings.yml b/config/settings.yml
index 9f6671f0d442a18f017c48ec9b9d083c385ea597..1360b55018a59a5ad6f90950378796f5a22a40ea 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -37,6 +37,8 @@ attachment_max_size:
 issues_export_limit:
   format: int
   default: 500
+per_page_options:
+  default: '25,50,100'
 mail_from:
   default: redmine@somenet.foo
 bcc_recipients:

diff --git a/lang/bg.yml b/lang/bg.yml
index d9bcd6c7c3e9ba04a9a802ecac05fdc3451aaf21..635ead5a53f7b081adcda96ee87b980c31c8c2f0 100644 (file)
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/cs.yml b/lang/cs.yml
index fe29defe68b0650e5f4e939089dc7f86c61cee64..89cc177b58343a3ae5c88a2d373e3d0dd7d199d8 100644 (file)
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/de.yml b/lang/de.yml
index c9cdc0c1203bda7682f5c4d701ad9809f0ccffaa..faa9929335f54205dade6fa598f02704d5f5d01e 100644 (file)
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/en.yml b/lang/en.yml
index 116935f7347edfc09f8ce0212d6e0ed95f6fd09b..36c060d3688e124565e8490a9db0477a9dbad126 100644 (file)
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -198,6 +198,7 @@ setting_issue_list_default_columns: Default columns displayed on the issue list
 setting_repositories_encodings: Repositories encodings
 setting_emails_footer: Emails footer
 setting_protocol: Protocol
+setting_per_page_options: Objects per page options
 
 label_user: User
 label_user_plural: Users
@@ -456,6 +457,7 @@ label_user_mail_no_self_notified: "I don't want to be notified of changes that I
 label_registration_activation_by_email: account activation by email
 label_registration_manual_activation: manual account activation
 label_registration_automatic_activation: automatic account activation
+label_display_per_page: 'Per page: %s'
 
 button_login: Login
 button_submit: Submit

diff --git a/lang/es.yml b/lang/es.yml
index 50c652f2ce227f38d4f3c87df691ea093e9e6e81..6ec8db0f1403fc295037e4d36ffa5aad6495009a 100644 (file)
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -553,3 +553,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/fr.yml b/lang/fr.yml
index d6ad5da563f86f74565b6179171c4f7394ee1a58..c13500e0382a3c8395c98358b7eb1cd4d8664f2b 100644 (file)
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -198,6 +198,7 @@ setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste
 setting_repositories_encodings: Encodages des dépôts
 setting_emails_footer: Pied-de-page des emails
 setting_protocol: Protocole
+setting_per_page_options: Options d'objets affichés par page
 
 label_user: Utilisateur
 label_user_plural: Utilisateurs
@@ -456,6 +457,7 @@ label_user_mail_no_self_notified: "Je ne veux pas être notifié des changements
 label_registration_activation_by_email: activation du compte par email
 label_registration_manual_activation: activation manuelle du compte
 label_registration_automatic_activation: activation automatique du compte
+label_display_per_page: 'Par page: %s'
 
 button_login: Connexion
 button_submit: Soumettre

diff --git a/lang/he.yml b/lang/he.yml
index 0ed57e52710fb305c3a8efc255c5cf67e9b6aa3b..09070bd8269adc747a5adab799e8d1fd5162605e 100644 (file)
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/it.yml b/lang/it.yml
index d266f797e7ad1f1634e471620decd7dd9b6c0afc..8c87a8b341d1b4aacec77423979824075e732392 100644 (file)
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/ja.yml b/lang/ja.yml
index 4206f3db6a1d606ecebd9a03a549ceadfbf57c90..150c622835f8cd8ccb863f0217da1e4b9114dc06 100644 (file)
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -551,3 +551,5 @@ setting_bcc_recipients: ブラインドカーボンコピーで受信(bcc)
 button_annotate: 注釈
 label_issues_by: %s別の問題
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/ko.yml b/lang/ko.yml
index 76debf3457755d25382c7b482391b12fd82b83c8..001ddd3953c2a1a6b64113bac075d3c1979b0fe0 100644 (file)
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/nl.yml b/lang/nl.yml
index a8b5cc64a18b3f5e338cef0fea957c0142b8e814..0c8085ba167786036eb8827db85711eaa0a5f4e3 100644 (file)
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -551,3 +551,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/pl.yml b/lang/pl.yml
index 5fa50ec5149942c6cc1329a9c4fc3b643809c110..c086cce638d9c359bbf561b0c0f797b94606eb0c 100644 (file)
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Odbiorcy kopii tajnej (kt/bcc)
 button_annotate: Adnotuj
 label_issues_by: Zagadnienia wprowadzone przez %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index ed31915dd15ba0889975c130a7dfb087a9a9f9f3..564ee4b0a91575be5b6304671a3b00a28ee1da9a 100644 (file)
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate\r
 label_issues_by: Issues by %s\r
 field_searchable: Searchable\r
+label_display_per_page: 'Per page: %s'\r
+setting_per_page_options: Objects per page options\r

diff --git a/lang/pt.yml b/lang/pt.yml
index 72ba4d2b04822efdf68de1ce42ece8ec5619f194..aaab55a51caf3d0748d85cf376c6bcfc021e4e3f 100644 (file)
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/ro.yml b/lang/ro.yml
index 6f1eb7810c7af06c10fbede416154aa39d9526ac..6fdce20810acda7b308cec442ba9613108f08392 100644 (file)
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/ru.yml b/lang/ru.yml
index c7697ae1a694a964022c9837abafdf31325cdc1d..1be4615bb7ba3f252f5a217f6ffb87a37f4ccf8a 100644 (file)
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/sr.yml b/lang/sr.yml
index b5e9ecfe30f38f8de1b7c783aa7ce9b35531b723..a4bed33eac62b2a2640522248eb952631830d7bb 100644 (file)
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -551,3 +551,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/sv.yml b/lang/sv.yml
index d789a2a37c76646cc579d48fbf9e0be992257d82..fd84f2a589772eec209bcd493ab19258f7cc4031 100644 (file)
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -551,3 +551,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 4d730c1a96f81a38aca1da69b15e24e41521dd55..6bc341cba1bc8a1a1a10faa2092c2ce348016d76 100644 (file)
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -550,3 +550,5 @@ enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/lang/zh.yml b/lang/zh.yml
index 6876daa1756ac17426f04b700a300b210f205bc3..31e8b239b176aa6a1eb53fe681ecb6318b28bd3c 100644 (file)
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -553,3 +553,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index aa4b2971207bdbca0df8322e70f8d444f0bb22d9..37bddbc05f14e2203cf6c13c8a6f8f5d3b7f1aa6 100644 (file)
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -126,6 +126,9 @@ div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
 
+.pagination {font-size: 90%}
+p.pagination {margin-top:8px;}
+
 /***** Tabular forms ******/
 .tabular p{
 margin: 0;