jro_apps/redmine Commit - r1013:9a1b46fe4287

0

app/controllers/admin_controller.rb +1 -1

                 @project_count = Project.count(:conditions => conditions)
                 @project_pages = Paginator.new self, @project_count,
-,
+            								per_page_option,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
                                     :conditions => conditions,

0

app/controllers/application.rb +15 0

@@ -158,6 +158,21 class ApplicationController < ActionController::Base
158	attachments	158	attachments
159	end	159	end
160		160
		161	# Returns the number of objects that should be displayed
		162	# on the paginated list
		163	def per_page_option
		164	per_page = nil
		165	if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
		166	per_page = params[:per_page].to_s.to_i
		167	session[:per_page] = per_page
		168	elsif session[:per_page]
		169	per_page = session[:per_page]
		170	else
		171	per_page = Setting.per_page_options_array.first \|\| 25
		172	end
		173	per_page
		174	end
		175
161	# qvalues http header parser	176	# qvalues http header parser
162	# code taken from webrick	177	# code taken from webrick
163	def parse_qvalues(value)	178	def parse_qvalues(value)

0

app/controllers/boards_controller.rb +1 -1

                 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,

0

app/controllers/issues_controller.rb +1 -1

                 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,

0

app/controllers/repositories_controller.rb +1 -1

               def revisions
                 @changeset_count = @repository.changesets.count
                 @changeset_pages = Paginator.new self, @changeset_count,
-,
+            								      per_page_option,
             								      params['page']
                 @changesets = @repository.changesets.find(:all,
             						:limit  =>  @changeset_pages.items_per_page,

0

app/controllers/users_controller.rb +1 -1

                 @user_count = User.count(:conditions => conditions)
                 @user_pages = Paginator.new self, @user_count,
-,
+            								per_page_option,
             								params['page']
                 @users =  User.find :all,:order => sort_clause,
                                     :conditions => conditions,

0

app/controllers/wiki_controller.rb +1 -1

                 @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",

0

app/helpers/application_helper.rb +22 -8

                 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)},
+                                        {:update => "content", :url => url_param.merge(page_param => paginator.current.previous)},
-                                        {:href => url_for(:params => options.merge(page_param => paginator.current.previous))}) + ' ' if 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'},
+                                  {:url => {:params => url_param.merge(page_param => n)}, :update => 'content'},
-                                  {:href => url_for(:params => options.merge(page_param => n))})
+                                  {: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)},
+                                             {:update => "content", :url => url_param.merge(page_param => paginator.current.next)},
-                                             {:href => url_for(:params => options.merge(page_param => paginator.current.next))}) if 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

0

app/models/setting.rb +5 0

                 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

0

app/views/admin/projects.rhtml +1 -2

               </tbody>
             </table>
-            <p><%= pagination_links_full @project_pages, :status => @status %>
+            <p class="pagination"><%= pagination_links_full @project_pages, @project_count %></p>
-            [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p>
             <% set_html_title l(:label_project_plural) -%>

0

app/views/auth_sources/list.rhtml +1 -1

               </tbody>
             </table>
-            <%= pagination_links_full @auth_source_pages %>
+            <p class="pagination"><%= pagination_links_full @auth_source_pages %></p>

0

app/views/boards/show.rhtml +1 -2

               <% end %>
               </tbody>
             </table>
-            <p><%= pagination_links_full @topic_pages %>
+            <p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
-            [ <%= @topic_pages.current.first_item %> - <%= @topic_pages.current.last_item %> / <%= @topic_count %> ]</p>
             <% else %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% end %>

0

app/views/issue_statuses/list.rhtml +1 -1

               </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)) -%>

0

app/views/issues/index.rhtml +1 -2

             <%= 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 %>
+            <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
-            [ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]</p>
             <% end %>
             <% end %>
             <% end %>

0

app/views/news/index.rhtml +1 -1

                 <%= 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})) %>

0

app/views/repositories/revision.rhtml +1 -2

             <% end %>
             </tbody>
             </table>
-            <p><%= pagination_links_full @changes_pages, :rev => @changeset.revision %>
+            <p class="pagination"><%= pagination_links_full @changes_pages %></p>
-            [ <%= @changes_pages.current.first_item %> - <%= @changes_pages.current.last_item %> / <%= @changes_count %> ]</p>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>

0

app/views/repositories/revisions.rhtml +1 -2

             <%= render :partial => 'revisions', :locals => {:project => @project, :path => '', :revisions => @changesets, :entry => nil }%>
-            <p><%= pagination_links_full @changeset_pages %>
+            <p class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></p>
-            [ <%= @changeset_pages.current.first_item %> - <%= @changeset_pages.current.last_item %> / <%= @changeset_count %> ]</p>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>

0

app/views/roles/list.rhtml +1 -1

               </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>

0

app/views/settings/edit.rhtml +3 0

             <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>

0

app/views/trackers/list.rhtml +1 -1

               </tbody>
             </table>
-            <%= pagination_links_full @tracker_pages %>
+            <p class="pagination"><%= pagination_links_full @tracker_pages %></p>
             <% set_html_title(l(:label_tracker_plural)) -%>

0

app/views/users/list.rhtml +1 -3

               </tbody>
             </table>
-            <p><%= pagination_links_full @user_pages, :status => @status %>
+            <p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
-            [ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
-            </p>
             <% set_html_title(l(:label_user_plural)) -%>

0

app/views/wiki/history.rhtml +1 -2

             </tbody>
             </table>
             <%= submit_tag l(:label_view_diff), :class => 'small' %>
-            <%= pagination_links_full @version_pages, :page_param => :p %>
+            <span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
-            [ <%= @version_pages.current.first_item %> - <%= @version_pages.current.last_item %> / <%= @version_count %> ]
             <% end %>

0

config/settings.yml +2 0

             issues_export_limit:
               format: int
               default: 500
+            per_page_options:
+              default: '25,50,100'
             mail_from:
               default: redmine@somenet.foo
             bcc_recipients:

0

lang/bg.yml +2 0

             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

0

lang/cs.yml +2 0

             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

0

lang/de.yml +2 0

             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

0

lang/en.yml +2 0

             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
             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

0

lang/es.yml +2 0

             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

0

lang/fr.yml +2 0

             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
             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

0

lang/he.yml +2 0

             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

0

lang/it.yml +2 0

             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

0

lang/ja.yml +2 0

             button_annotate: 注釈
             label_issues_by: %s別の問題
             field_searchable: Searchable
+            label_display_per_page: 'Per page: %s'
+            setting_per_page_options: Objects per page options

0

lang/ko.yml +2 0

             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

0

lang/nl.yml +2 0

             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

0

lang/pl.yml +2 0

             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

0

lang/pt-br.yml +2 0

             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

0

lang/pt.yml +2 0

             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

0

lang/ro.yml +2 0

             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

0

lang/ru.yml +2 0

             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

0

lang/sr.yml +2 0

             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

0

lang/sv.yml +2 0

             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

0

lang/zh-tw.yml +2 0

             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

0

lang/zh.yml +2 0

             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

0

public/stylesheets/application.css +3 0

             .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;

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages