diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-10 19:11:41 -0400 |
|---|---|---|
| committer | Eugen <eugen@zeonfederated.com> | 2017-04-11 01:11:41 +0200 |
| commit | 4ada50985a73ed5c859cdf5160500b04116ad0e4 (patch) | |
| tree | 6e51b5cf970bc4f945834e65bf8bd37b1ef8fb5f /app/views/accounts | |
| parent | a28378646393de998663981e6660eb79e7a6375f (diff) | |
Pagination improvements (#1445)
* Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/followers.html.haml | 2 | ||||
| -rw-r--r-- | app/views/accounts/following.html.haml | 2 | ||||
| -rw-r--r-- | app/views/accounts/show.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/accounts/followers.html.haml b/app/views/accounts/followers.html.haml index 493491020..fa5071f38 100644 --- a/app/views/accounts/followers.html.haml +++ b/app/views/accounts/followers.html.haml @@ -9,4 +9,4 @@ - else = render partial: 'grid_card', collection: @followers, as: :account, cached: true -= will_paginate @followers, pagination_options += paginate @followers diff --git a/app/views/accounts/following.html.haml b/app/views/accounts/following.html.haml index 370cd6c48..987dcba1f 100644 --- a/app/views/accounts/following.html.haml +++ b/app/views/accounts/following.html.haml @@ -9,4 +9,4 @@ - else = render partial: 'grid_card', collection: @following, as: :account, cached: true -= will_paginate @following, pagination_options += paginate @following diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index e90897729..3b0d69dcd 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -31,4 +31,4 @@ .pagination - if @statuses.size == 20 - = link_to safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), short_account_url(@account, max_id: @statuses.last.id), class: 'next_page', rel: 'next' + = link_to safe_join([t('pagination.next'), fa_icon('chevron-right')], ' '), short_account_url(@account, max_id: @statuses.last.id), class: 'next', rel: 'next' |