13 files changed, 15 insertions, 20 deletions
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index e9d5e8537..295cfd101 100644
--- 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 f486f45b7..6836e6c67 100644
--- 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 8bcf960b2..01db0854c 100644
--- 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 05506f3c7..a45f5d4d0 100644
--- 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 de0fd4add..c298b9bcc 100644
--- 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 0b677d241..354467229 100644
--- 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 d87dfa955..265070e37 100644
--- 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 4483a482c..99c3f7afd 100644
--- 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 02bb20f5e..fabc5edcd 100644
--- 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 758045f05..b1db0e7ad 100644
--- 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 d339bdba0..447507210 100644
--- 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 3f879d7a6..fbac1e8e9 100644
--- 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 fc77e7fb5..6462e9fdd 100644
--- 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 %>