From e5e87709b1ed341bdfe73b603bf138573e3b063c Mon Sep 17 00:00:00 2001 From: Espen Antonsen Date: Thu, 18 Oct 2012 13:27:04 +0200 Subject: [PATCH] kaminari: num_pages has been renamed to total_pages so just change it to total_pages. --- app/views/kaminari/_first_page.html.haml | 2 +- app/views/kaminari/_gap.html.haml | 2 +- app/views/kaminari/_last_page.html.haml | 2 +- app/views/kaminari/_next_page.html.haml | 2 +- app/views/kaminari/_page.html.haml | 2 +- app/views/kaminari/_paginator.html.haml | 2 +- app/views/kaminari/_prev_page.html.haml | 2 +- app/views/kaminari/notices/_first_page.html.haml | 2 +- app/views/kaminari/notices/_gap.html.haml | 2 +- app/views/kaminari/notices/_last_page.html.haml | 2 +- app/views/kaminari/notices/_page.html.haml | 2 +- app/views/kaminari/notices/_paginator.html.haml | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/views/kaminari/_first_page.html.haml b/app/views/kaminari/_first_page.html.haml index fee8112..09ca225 100644 --- a/app/views/kaminari/_first_page.html.haml +++ b/app/views/kaminari/_first_page.html.haml @@ -2,7 +2,7 @@ -# available local variables -# url: url to the first page -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote %span.first diff --git a/app/views/kaminari/_gap.html.haml b/app/views/kaminari/_gap.html.haml index f82f185..40c954b 100644 --- a/app/views/kaminari/_gap.html.haml +++ b/app/views/kaminari/_gap.html.haml @@ -1,7 +1,7 @@ -# Non-link tag that stands for skipped pages... -# available local variables -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote %span.page.gap diff --git a/app/views/kaminari/_last_page.html.haml b/app/views/kaminari/_last_page.html.haml index 6e41d23..c4b4492 100644 --- a/app/views/kaminari/_last_page.html.haml +++ b/app/views/kaminari/_last_page.html.haml @@ -2,7 +2,7 @@ -# available local variables -# url: url to the last page -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote %span.last diff --git a/app/views/kaminari/_next_page.html.haml b/app/views/kaminari/_next_page.html.haml index cc64f68..e8eb955 100644 --- a/app/views/kaminari/_next_page.html.haml +++ b/app/views/kaminari/_next_page.html.haml @@ -2,7 +2,7 @@ -# available local variables -# url: url to the next page -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote %span.next diff --git a/app/views/kaminari/_page.html.haml b/app/views/kaminari/_page.html.haml index 528bba8..08cc535 100644 --- a/app/views/kaminari/_page.html.haml +++ b/app/views/kaminari/_page.html.haml @@ -3,7 +3,7 @@ -# page: a page object for "this" page -# url: url to this page -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote %span{:class => "page#{' current' if page.current?}"} diff --git a/app/views/kaminari/_paginator.html.haml b/app/views/kaminari/_paginator.html.haml index f89aa2a..65d872f 100644 --- a/app/views/kaminari/_paginator.html.haml +++ b/app/views/kaminari/_paginator.html.haml @@ -1,7 +1,7 @@ -# The container tag -# available local variables -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote -# paginator: the paginator that renders the pagination tags inside diff --git a/app/views/kaminari/_prev_page.html.haml b/app/views/kaminari/_prev_page.html.haml index 6433b11..25d1ab8 100644 --- a/app/views/kaminari/_prev_page.html.haml +++ b/app/views/kaminari/_prev_page.html.haml @@ -2,7 +2,7 @@ -# available local variables -# url: url to the previous page -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote %span.prev diff --git a/app/views/kaminari/notices/_first_page.html.haml b/app/views/kaminari/notices/_first_page.html.haml index fee8112..09ca225 100644 --- a/app/views/kaminari/notices/_first_page.html.haml +++ b/app/views/kaminari/notices/_first_page.html.haml @@ -2,7 +2,7 @@ -# available local variables -# url: url to the first page -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote %span.first diff --git a/app/views/kaminari/notices/_gap.html.haml b/app/views/kaminari/notices/_gap.html.haml index f82f185..40c954b 100644 --- a/app/views/kaminari/notices/_gap.html.haml +++ b/app/views/kaminari/notices/_gap.html.haml @@ -1,7 +1,7 @@ -# Non-link tag that stands for skipped pages... -# available local variables -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote %span.page.gap diff --git a/app/views/kaminari/notices/_last_page.html.haml b/app/views/kaminari/notices/_last_page.html.haml index 6e41d23..c4b4492 100644 --- a/app/views/kaminari/notices/_last_page.html.haml +++ b/app/views/kaminari/notices/_last_page.html.haml @@ -2,7 +2,7 @@ -# available local variables -# url: url to the last page -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote %span.last diff --git a/app/views/kaminari/notices/_page.html.haml b/app/views/kaminari/notices/_page.html.haml index 528bba8..08cc535 100644 --- a/app/views/kaminari/notices/_page.html.haml +++ b/app/views/kaminari/notices/_page.html.haml @@ -3,7 +3,7 @@ -# page: a page object for "this" page -# url: url to this page -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote %span{:class => "page#{' current' if page.current?}"} diff --git a/app/views/kaminari/notices/_paginator.html.haml b/app/views/kaminari/notices/_paginator.html.haml index ed73a6e..9bb71c7 100644 --- a/app/views/kaminari/notices/_paginator.html.haml +++ b/app/views/kaminari/notices/_paginator.html.haml @@ -1,7 +1,7 @@ -# The container tag -# available local variables -# current_page: a page object for the currently displayed page --# num_pages: total number of pages +-# total_pages: total number of pages -# per_page: number of items to fetch per page -# remote: data-remote -# paginator: the paginator that renders the pagination tags inside @@ -11,4 +11,4 @@ |  = prev_page_tag .notice-pagination-loader= image_tag 'loader.gif' -viewing occurrence #{page_count_from_end(current_page, num_pages)} of #{num_pages} +viewing occurrence #{page_count_from_end(current_page, total_pages)} of #{total_pages} -- libgit2 0.21.2