diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index a729dfe09ec420718199b66747c80f3ede5f513b..d6750d3a9dfb506f900a3ef69509e29ea2ca3321 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -476,8 +476,7 @@ img.lil_av { } } - &.bottom { - padding: 0 10px; + .bottom { background:#f5f5f5; border-top: 1px solid #eee; @include round-borders-bottom(4px); @@ -1029,11 +1028,11 @@ p.time { } .gitlab_pagination { - span { - padding:0 10px; - - a { - color:$link_color; - } + span a { color:$link_color; } + .prev, .next, .current, .page a { + padding:10px; + } + .current { + border-bottom:2px solid $style_color; } } diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 1fc59d989c9b2d9046fd67893cdc5f307a5f1fbc..4070f899a12798a299d7e6774dd5dfbf16b17466 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -28,9 +28,9 @@ class IssuesController < ApplicationController when 2 then @project.issues.closed when 3 then @project.issues.opened.assigned(current_user) else @project.issues.opened - end.page(params[:page]).per(10) + end.page(params[:page]).per(20) - @issues = @issues.includes(:author, :project) + @issues = @issues.includes(:author, :project).order("critical, updated_at") respond_to do |format| format.html # index.html.erb diff --git a/app/controllers/merge_requests_controller.rb b/app/controllers/merge_requests_controller.rb index 3a3143cb15f75bc569e63e073f9c46b6662a9a52..f882028fcab652aac936ecd57a806543fbba7c8f 100644 --- a/app/controllers/merge_requests_controller.rb +++ b/app/controllers/merge_requests_controller.rb @@ -28,7 +28,7 @@ class MergeRequestsController < ApplicationController when 2 then @merge_requests.closed when 3 then @merge_requests.opened.assigned(current_user) else @merge_requests.opened - end + end.page(params[:page]).per(20) @merge_requests = @merge_requests.includes(:author, :project).order("created_at desc") end diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml index f18cbe209a8dabb584759ea999c5839ae235b3bf..f82aee94a8fa020e60de629899d7b4d8485123b6 100644 --- a/app/views/issues/_issues.html.haml +++ b/app/views/issues/_issues.html.haml @@ -1,7 +1,12 @@ -- @issues.critical.each do |issue| +- @issues.select(&:critical).each do |issue| = render(:partial => 'issues/show', :locals => {:issue => issue}) -- @issues.non_critical.each do |issue| +- @issues.reject(&:critical).each do |issue| = render(:partial => 'issues/show', :locals => {:issue => issue}) -%li= paginate @issues, :remote => true, :theme => "gitlab" +- if @issues.present? + %li.bottom + .row + .span10= paginate @issues, :remote => true, :theme => "gitlab" + .span4.right + %span.cgray.right #{@issues.total_count} issues for this filter diff --git a/app/views/kaminari/gitlab/_paginator.html.haml b/app/views/kaminari/gitlab/_paginator.html.haml index 858fe9c5e33d5501c4b190b8d659d35fd0f091bf..6dd5a5782a2b963baf17290402ffc32ff85bf85b 100644 --- a/app/views/kaminari/gitlab/_paginator.html.haml +++ b/app/views/kaminari/gitlab/_paginator.html.haml @@ -7,7 +7,6 @@ -# paginator: the paginator that renders the pagination tags inside = paginator.render do %nav.gitlab_pagination - -#= first_page_tag unless current_page.first? = prev_page_tag - each_page do |page| - if page.left_outer? || page.right_outer? || page.inside_window? @@ -15,4 +14,3 @@ - elsif !page.was_truncated? = gap_tag = next_page_tag - -#= last_page_tag unless current_page.last? diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml index 468eaf33179fcd2d1e92dcc24d5df4981fae8d90..9a03d195e883409f8b11743c9f73aa172fe1381c 100644 --- a/app/views/merge_requests/index.html.haml +++ b/app/views/merge_requests/index.html.haml @@ -27,5 +27,10 @@ - if @merge_requests.blank? %li %p.padded Nothing to show here - + - if @merge_requests.present? + %li.bottom + .row + .span10= paginate @merge_requests, :theme => "gitlab" + .span4.right + %span.cgray.right #{@merge_requests.total_count} merge requests for this filter