Download as
Browse Code »

Commit f8a6f506ead97fcc5b1abaac3af7c3740473c060

Authored by Nathan Broadbent
2 parents 64294dbd 18edcd8d
Exists in master and in 1 other branch production

Merge pull request #282 from espen/kaminari-num_pages 

kaminari: num_pages has been renamed to total_pages
Showing 13 changed files with 16 additions and 17 deletions   Show diff stats
@@ -46,7 +46,7 @@ GEM @@ -46,7 +46,7 @@ GEM
46 bson (1.6.2) 46 bson (1.6.2)
47 bson_ext (1.6.2) 47 bson_ext (1.6.2)
48 bson (~> 1.6.2) 48 bson (~> 1.6.2)
49 - builder (3.0.3) 49 + builder (3.0.4)
50 campy (0.1.3) 50 campy (0.1.3)
51 multi_json (~> 1.0) 51 multi_json (~> 1.0)
52 capistrano (2.13.3) 52 capistrano (2.13.3)
@@ -126,10 +126,9 @@ GEM @@ -126,10 +126,9 @@ GEM
126 json (1.7.5) 126 json (1.7.5)
127 jwt (0.1.5) 127 jwt (0.1.5)
128 multi_json (>= 1.0) 128 multi_json (>= 1.0)
129 - kaminari (0.13.0) 129 + kaminari (0.14.1)
130 actionpack (>= 3.0.0) 130 actionpack (>= 3.0.0)
131 activesupport (>= 3.0.0) 131 activesupport (>= 3.0.0)
132 - railties (>= 3.0.0)  
133 kgio (2.7.4) 132 kgio (2.7.4)
134 launchy (2.1.2) 133 launchy (2.1.2)
135 addressable (~> 2.3) 134 addressable (~> 2.3)
@@ -220,7 +219,7 @@ GEM @@ -220,7 +219,7 @@ GEM
220 rack-ssl (1.3.2) 219 rack-ssl (1.3.2)
221 rack 220 rack
222 rack-ssl-enforcer (0.2.4) 221 rack-ssl-enforcer (0.2.4)
223 - rack-test (0.6.1) 222 + rack-test (0.6.2)
224 rack (>= 1.0) 223 rack (>= 1.0)
225 rails (3.2.8) 224 rails (3.2.8)
226 actionmailer (= 3.2.8) 225 actionmailer (= 3.2.8)
app/views/kaminari/_first_page.html.haml
  Diff comments   View file @f8a6f50
@@ -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 @f8a6f50
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 @f8a6f50
@@ -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 @f8a6f50
@@ -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 @f8a6f50
@@ -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 @f8a6f50
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 @f8a6f50
@@ -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 @f8a6f50
@@ -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 @f8a6f50
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 @f8a6f50
@@ -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 @f8a6f50
@@ -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 @f8a6f50
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}