diff options
| -rw-r--r-- | app/views/admin/photos/index.html.erb | 3 | ||||
| -rw-r--r-- | app/views/kaminari/_first_page.html.erb | 4 | ||||
| -rw-r--r-- | app/views/kaminari/_gap.html.erb | 2 | ||||
| -rw-r--r-- | app/views/kaminari/_last_page.html.erb | 4 | ||||
| -rw-r--r-- | app/views/kaminari/_next_page.html.erb | 4 | ||||
| -rw-r--r-- | app/views/kaminari/_page.html.erb | 4 | ||||
| -rw-r--r-- | app/views/kaminari/_paginator.html.erb | 6 | ||||
| -rw-r--r-- | app/views/kaminari/_prev_page.html.erb | 4 | ||||
| -rw-r--r-- | app/views/shared/_paging.html.erb | 4 |
9 files changed, 17 insertions, 18 deletions
diff --git a/app/views/admin/photos/index.html.erb b/app/views/admin/photos/index.html.erb index 82c00dd7..bcd7aff1 100644 --- a/app/views/admin/photos/index.html.erb +++ b/app/views/admin/photos/index.html.erb @@ -3,7 +3,7 @@ <%= render partial: "my/shared/my_nav" %> </div> <div class="col-9"> - <h1><%= @photos.count %> photos submitted</h1> + <h1><%= @photos.total_count %> photos submitted</h1> <div class="card-columns"> <% @photos.each do |photo| %> <div class="card"> @@ -29,3 +29,4 @@ </div> </div> </div> +<%= render "shared/paging", items: @photos %> diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb index 478fdba9..6cc42360 100644 --- a/app/views/kaminari/_first_page.html.erb +++ b/app/views/kaminari/_first_page.html.erb @@ -7,7 +7,7 @@ remote: data-remote -%> <% unless current_page.first? %> -<li class="first"> - <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %> +<li class="page-item"> + <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, class: 'page-link', :remote => remote %> </li> <% end %> diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb index 53c54315..e56c9fe0 100644 --- a/app/views/kaminari/_gap.html.erb +++ b/app/views/kaminari/_gap.html.erb @@ -5,4 +5,4 @@ per_page: number of items to fetch per page remote: data-remote -%> -<li class="page gap disabled"><a href="#" onclick="return false;"><%= raw(t 'views.pagination.truncate') %></a></li> +<li class="page-item disabled"><a href="#" onclick="return false;"><%= raw(t 'views.pagination.truncate') %></a></li> diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb index e27c2a73..bdab354e 100644 --- a/app/views/kaminari/_last_page.html.erb +++ b/app/views/kaminari/_last_page.html.erb @@ -7,7 +7,7 @@ remote: data-remote -%> <% unless current_page.last? %> -<li class="last next"><%# "next" class present for border styling in twitter bootstrap %> - <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %> +<li class="page-item"><%# "next" class present for border styling in twitter bootstrap %> + <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, remote: remote, class: 'page-link' %> </li> <% end %> diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb index 7bccfdc1..dec0b7a8 100644 --- a/app/views/kaminari/_next_page.html.erb +++ b/app/views/kaminari/_next_page.html.erb @@ -7,7 +7,7 @@ remote: data-remote -%> <% unless current_page.last? %> -<li class="next_page"> - <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %> +<li class="page-item"> + <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, class: 'page-link', :rel => 'next', :remote => remote %> </li> <% end %> diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb index 3cf4a8ed..0d2bb6df 100644 --- a/app/views/kaminari/_page.html.erb +++ b/app/views/kaminari/_page.html.erb @@ -7,6 +7,6 @@ per_page: number of items to fetch per page remote: data-remote -%> -<li class="page<%= ' active' if page.current? %>"> - <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %> +<li class="page-item<%= ' active' if page.current? %>"> + <%= link_to page, url, opts = {:remote => remote, class: 'page-link', :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %> </li> diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb index 92a916da..42bbd5ba 100644 --- a/app/views/kaminari/_paginator.html.erb +++ b/app/views/kaminari/_paginator.html.erb @@ -7,8 +7,8 @@ paginator: the paginator that renders the pagination tags inside -%> <%= paginator.render do -%> - <div class="pagination"> - <ul> + <nav> + <ul class="pagination justify-content-center"> <%= first_page_tag unless current_page.first? %> <%= prev_page_tag unless current_page.first? %> <% each_page do |page| -%> @@ -21,5 +21,5 @@ <%= next_page_tag unless current_page.last? %> <%= last_page_tag unless current_page.last? %> </ul> - </div> + </nav> <% end -%> diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb index 336073b5..131d5904 100644 --- a/app/views/kaminari/_prev_page.html.erb +++ b/app/views/kaminari/_prev_page.html.erb @@ -7,7 +7,7 @@ remote: data-remote -%> <% unless current_page.first? %> -<li class="prev"> - <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %> +<li class="page-item"> + <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote, class: 'page-link' %> </li> <% end %> diff --git a/app/views/shared/_paging.html.erb b/app/views/shared/_paging.html.erb index d0e59b71..c9f7ba8f 100644 --- a/app/views/shared/_paging.html.erb +++ b/app/views/shared/_paging.html.erb @@ -1,3 +1 @@ -<div class="row-fluid"> - <div class="span12 text-center"> <%= paginate items %> </div> -</div> +<%= paginate items %> |