Download as
Browse Code »

Commit e5e87709b1ed341bdfe73b603bf138573e3b063c

Authored by Espen Antonsen
1 parent 64294dbd
Exists in master and in 1 other branch production

kaminari: num_pages has been renamed to total_pages so just change it to total_pages.

Showing 12 changed files with 13 additions and 13 deletions   Show diff stats
app/views/kaminari/_first_page.html.haml
  Diff comments   View file @e5e8770
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 -# available local variables 2 -# available local variables
3 -# url: url to the first page 3 -# url: url to the first page
4 -# current_page: a page object for the currently displayed page 4 -# current_page: a page object for the currently displayed page
5 --# num_pages: total number of pages 5 +-# total_pages: total number of pages
6 -# per_page: number of items to fetch per page 6 -# per_page: number of items to fetch per page
7 -# remote: data-remote 7 -# remote: data-remote
8 %span.first 8 %span.first
app/views/kaminari/_gap.html.haml
  Diff comments   View file @e5e8770
1 -# Non-link tag that stands for skipped pages... 1 -# Non-link tag that stands for skipped pages...
2 -# available local variables 2 -# available local variables
3 -# current_page: a page object for the currently displayed page 3 -# current_page: a page object for the currently displayed page
4 --# num_pages: total number of pages 4 +-# total_pages: total number of pages
5 -# per_page: number of items to fetch per page 5 -# per_page: number of items to fetch per page
6 -# remote: data-remote 6 -# remote: data-remote
7 %span.page.gap 7 %span.page.gap
app/views/kaminari/_last_page.html.haml
  Diff comments   View file @e5e8770
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 -# available local variables 2 -# available local variables
3 -# url: url to the last page 3 -# url: url to the last page
4 -# current_page: a page object for the currently displayed page 4 -# current_page: a page object for the currently displayed page
5 --# num_pages: total number of pages 5 +-# total_pages: total number of pages
6 -# per_page: number of items to fetch per page 6 -# per_page: number of items to fetch per page
7 -# remote: data-remote 7 -# remote: data-remote
8 %span.last 8 %span.last
app/views/kaminari/_next_page.html.haml
  Diff comments   View file @e5e8770
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 -# available local variables 2 -# available local variables
3 -# url: url to the next page 3 -# url: url to the next page
4 -# current_page: a page object for the currently displayed page 4 -# current_page: a page object for the currently displayed page
5 --# num_pages: total number of pages 5 +-# total_pages: total number of pages
6 -# per_page: number of items to fetch per page 6 -# per_page: number of items to fetch per page
7 -# remote: data-remote 7 -# remote: data-remote
8 %span.next 8 %span.next
app/views/kaminari/_page.html.haml
  Diff comments   View file @e5e8770
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 -# page: a page object for "this" page 3 -# page: a page object for "this" page
4 -# url: url to this page 4 -# url: url to this page
5 -# current_page: a page object for the currently displayed page 5 -# current_page: a page object for the currently displayed page
6 --# num_pages: total number of pages 6 +-# total_pages: total number of pages
7 -# per_page: number of items to fetch per page 7 -# per_page: number of items to fetch per page
8 -# remote: data-remote 8 -# remote: data-remote
9 %span{:class => "page#{' current' if page.current?}"} 9 %span{:class => "page#{' current' if page.current?}"}
app/views/kaminari/_paginator.html.haml
  Diff comments   View file @e5e8770
1 -# The container tag 1 -# The container tag
2 -# available local variables 2 -# available local variables
3 -# current_page: a page object for the currently displayed page 3 -# current_page: a page object for the currently displayed page
4 --# num_pages: total number of pages 4 +-# total_pages: total number of pages
5 -# per_page: number of items to fetch per page 5 -# per_page: number of items to fetch per page
6 -# remote: data-remote 6 -# remote: data-remote
7 -# paginator: the paginator that renders the pagination tags inside 7 -# paginator: the paginator that renders the pagination tags inside
app/views/kaminari/_prev_page.html.haml
  Diff comments   View file @e5e8770
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 -# available local variables 2 -# available local variables
3 -# url: url to the previous page 3 -# url: url to the previous page
4 -# current_page: a page object for the currently displayed page 4 -# current_page: a page object for the currently displayed page
5 --# num_pages: total number of pages 5 +-# total_pages: total number of pages
6 -# per_page: number of items to fetch per page 6 -# per_page: number of items to fetch per page
7 -# remote: data-remote 7 -# remote: data-remote
8 %span.prev 8 %span.prev
app/views/kaminari/notices/_first_page.html.haml
  Diff comments   View file @e5e8770
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 -# available local variables 2 -# available local variables
3 -# url: url to the first page 3 -# url: url to the first page
4 -# current_page: a page object for the currently displayed page 4 -# current_page: a page object for the currently displayed page
5 --# num_pages: total number of pages 5 +-# total_pages: total number of pages
6 -# per_page: number of items to fetch per page 6 -# per_page: number of items to fetch per page
7 -# remote: data-remote 7 -# remote: data-remote
8 %span.first 8 %span.first
app/views/kaminari/notices/_gap.html.haml
  Diff comments   View file @e5e8770
1 -# Non-link tag that stands for skipped pages... 1 -# Non-link tag that stands for skipped pages...
2 -# available local variables 2 -# available local variables
3 -# current_page: a page object for the currently displayed page 3 -# current_page: a page object for the currently displayed page
4 --# num_pages: total number of pages 4 +-# total_pages: total number of pages
5 -# per_page: number of items to fetch per page 5 -# per_page: number of items to fetch per page
6 -# remote: data-remote 6 -# remote: data-remote
7 %span.page.gap 7 %span.page.gap
app/views/kaminari/notices/_last_page.html.haml
  Diff comments   View file @e5e8770
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 -# available local variables 2 -# available local variables
3 -# url: url to the last page 3 -# url: url to the last page
4 -# current_page: a page object for the currently displayed page 4 -# current_page: a page object for the currently displayed page
5 --# num_pages: total number of pages 5 +-# total_pages: total number of pages
6 -# per_page: number of items to fetch per page 6 -# per_page: number of items to fetch per page
7 -# remote: data-remote 7 -# remote: data-remote
8 %span.last 8 %span.last
app/views/kaminari/notices/_page.html.haml
  Diff comments   View file @e5e8770
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 -# page: a page object for "this" page 3 -# page: a page object for "this" page
4 -# url: url to this page 4 -# url: url to this page
5 -# current_page: a page object for the currently displayed page 5 -# current_page: a page object for the currently displayed page
6 --# num_pages: total number of pages 6 +-# total_pages: total number of pages
7 -# per_page: number of items to fetch per page 7 -# per_page: number of items to fetch per page
8 -# remote: data-remote 8 -# remote: data-remote
9 %span{:class => "page#{' current' if page.current?}"} 9 %span{:class => "page#{' current' if page.current?}"}
app/views/kaminari/notices/_paginator.html.haml
  Diff comments   View file @e5e8770
1 -# The container tag 1 -# The container tag
2 -# available local variables 2 -# available local variables
3 -# current_page: a page object for the currently displayed page 3 -# current_page: a page object for the currently displayed page
4 --# num_pages: total number of pages 4 +-# total_pages: total number of pages
5 -# per_page: number of items to fetch per page 5 -# per_page: number of items to fetch per page
6 -# remote: data-remote 6 -# remote: data-remote
7 -# paginator: the paginator that renders the pagination tags inside 7 -# paginator: the paginator that renders the pagination tags inside
@@ -11,4 +11,4 @@ @@ -11,4 +11,4 @@
11 |  11 | 
12 = prev_page_tag 12 = prev_page_tag
13 .notice-pagination-loader= image_tag 'loader.gif' 13 .notice-pagination-loader= image_tag 'loader.gif'
14 -viewing occurrence #{page_count_from_end(current_page, num_pages)} of #{num_pages} 14 +viewing occurrence #{page_count_from_end(current_page, total_pages)} of #{total_pages}