Skip to content
Snippets Groups Projects
Commit 9fddd5b4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Refactoring & restyle pagination:

- remove admin kaminari theme. Use gitlab theme everywhere
- use bootstrap styled for gitlab admin themes
- dont reload page when change issue filter
parent 52ad34fd
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -6,11 +6,12 @@
-# remote: data-remote
-# paginator: the paginator that renders the pagination tags inside
= paginator.render do
%nav.gitlab_pagination
= prev_page_tag
- each_page do |page|
- if page.left_outer? || page.right_outer? || page.inside_window?
= page_tag page
- elsif !page.was_truncated?
= gap_tag
= next_page_tag
%div.pagination
%ul
= prev_page_tag unless current_page.first?
- each_page do |page|
- if page.left_outer? || page.right_outer? || page.inside_window?
= page_tag page
- elsif !page.was_truncated?
= gap_tag
= next_page_tag unless current_page.last?
Loading
Loading
@@ -5,5 +5,5 @@
-# num_pages: total number of pages
-# per_page: number of items to fetch per page
-# remote: data-remote
%span.prev
%li{class: "prev" }
= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote
Loading
Loading
@@ -25,11 +25,11 @@
- if @merge_requests.blank?
%li
%h4.nothing_here_message Nothing to show here
- if @merge_requests.present?
%li.bottom
.left= paginate @merge_requests, theme: "gitlab"
.pull-right
%span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
- if @merge_requests.present?
.pull-right
%span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter
= paginate @merge_requests, theme: "gitlab"
 
:javascript
$(merge_requestsPage);
Loading
Loading
@@ -17,4 +17,4 @@
- unless @projects.present?
%h3.nothing_here_message No public projects
 
= paginate @projects, theme: "admin"
= paginate @projects, theme: "gitlab"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment