From 1c6f72802b1cc5d0c2e8b05cc42f45dec1a50b91 Mon Sep 17 00:00:00 2001 From: Garth Snyder Date: Fri, 25 Feb 2011 14:28:48 -0800 Subject: [PATCH] Some suggested changes to classes and rels --- app/views/kaminari/_first_page.html.erb | 2 +- app/views/kaminari/_first_page.html.haml | 2 +- app/views/kaminari/_gap.html.erb | 2 +- app/views/kaminari/_gap.html.haml | 2 +- app/views/kaminari/_last_page.html.erb | 3 ++- app/views/kaminari/_last_page.html.haml | 4 +++- app/views/kaminari/_next_page.html.erb | 2 +- app/views/kaminari/_next_page.html.haml | 4 ++-- app/views/kaminari/_page.html.erb | 12 +++++++++--- app/views/kaminari/_page.html.haml | 11 ++++++++--- app/views/kaminari/_prev_page.html.erb | 2 +- app/views/kaminari/_prev_page.html.haml | 4 ++-- 12 files changed, 32 insertions(+), 18 deletions(-) diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb index eed2e8a..5951579 100644 --- a/app/views/kaminari/_first_page.html.erb +++ b/app/views/kaminari/_first_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page == 1, raw(t 'views.pagination.first'), url, :class => 'prev', :rel => 'prev', :remote => remote %> + <%= link_to_unless current_page == 1, raw(t 'views.pagination.first'), url, :rel => (current_page == 2) ? 'start prev':'start', :remote => remote %> diff --git a/app/views/kaminari/_first_page.html.haml b/app/views/kaminari/_first_page.html.haml index 1b320a7..7ec6648 100644 --- a/app/views/kaminari/_first_page.html.haml +++ b/app/views/kaminari/_first_page.html.haml @@ -6,4 +6,4 @@ per_page: number of items to fetch per page remote: data-remote %span{:class => "first#{' disabled' if current_page == 1}"} - = link_to_unless current_page == 1, raw(t 'views.pagination.first'), url, :class => 'prev', :rel => 'prev', :remote => remote + = link_to_unless current_page == 1, raw(t 'views.pagination.first'), url, :rel => (current_page == 2) ? 'start prev':'start', :remote => remote diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb index cf4be83..5b294c2 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 -%> -<%= raw(t 'views.pagination.truncate') %> +<%= raw(t 'views.pagination.truncate') %> diff --git a/app/views/kaminari/_gap.html.haml b/app/views/kaminari/_gap.html.haml index 86efc68..b97fe9d 100644 --- a/app/views/kaminari/_gap.html.haml +++ b/app/views/kaminari/_gap.html.haml @@ -4,5 +4,5 @@ num_pages: total number of pages per_page: number of items to fetch per page remote: data-remote -%span.page +%span.page.gap = raw(t 'views.pagination.truncate') diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb index 3fe531c..5a4f80d 100644 --- a/app/views/kaminari/_last_page.html.erb +++ b/app/views/kaminari/_last_page.html.erb @@ -7,5 +7,6 @@ remote: data-remote -%> - <%= link_to_unless current_page == num_pages, raw(t 'views.pagination.last'), url, :class => 'last', :remote => remote %> + <% opts = {:remote => remote}; opts[:rel] = 'next' if current_page == num_pages - 1 %> + <%= link_to_unless current_page == num_pages, raw(t 'views.pagination.last'), url, opts %> diff --git a/app/views/kaminari/_last_page.html.haml b/app/views/kaminari/_last_page.html.haml index 3787c1c..1e5f6e4 100644 --- a/app/views/kaminari/_last_page.html.haml +++ b/app/views/kaminari/_last_page.html.haml @@ -6,4 +6,6 @@ per_page: number of items to fetch per page remote: data-remote %span{:class => "last#{' disabled' if current_page == num_pages}"} - = link_to_unless current_page == num_pages, raw(t 'views.pagination.last'), url, :class => 'last', :remote => remote + - opts = {:remote => remote}; + - opts[:rel] = 'next' if current_page == num_pages - 1 + = link_to_unless current_page == num_pages, raw(t 'views.pagination.last'), url, opts diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb index ea244fa..1b2fc99 100644 --- a/app/views/kaminari/_next_page.html.erb +++ b/app/views/kaminari/_next_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page == num_pages, raw(t 'views.pagination.next'), url, :class => 'next', :rel => 'next', :remote => remote %> + <%= link_to_unless current_page == num_pages, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %> diff --git a/app/views/kaminari/_next_page.html.haml b/app/views/kaminari/_next_page.html.haml index 6f5855c..b4e0ff1 100644 --- a/app/views/kaminari/_next_page.html.haml +++ b/app/views/kaminari/_next_page.html.haml @@ -5,5 +5,5 @@ num_pages: total number of pages per_page: number of items to fetch per page remote: data-remote -%span.next - = link_to_unless current_page == num_pages, raw(t 'views.pagination.next'), url, :class => 'next', :rel => 'next', :remote => remote +%span{:class => "next#{' disabled' if current_page == num_pages}"} + = link_to_unless current_page == num_pages, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb index 6a00dae..40709de 100644 --- a/app/views/kaminari/_page.html.erb +++ b/app/views/kaminari/_page.html.erb @@ -1,12 +1,18 @@ <%# Link showing page number - available local variables - page: the page number of this page + page: the PageProxy for the current page url: url to this page current_page: the page number of currently displayed page num_pages: total number of pages per_page: number of items to fetch per page remote: data-remote -%> - - <%= link_to_unless page == current_page, page, url, :remote => remote %> + + <% + opts = {:remote => remote} + opts[:rel] = 'start' if page.first? + opts[:rel] = 'next' if page.number == current_page + 1 + opts[:rel] = opts[:rel].nil? ? 'prev' : opts[:rel] + ' prev' if page.number == current_page - 1 + %> + <%= link_to_unless page.current?, page, url, opts %> diff --git a/app/views/kaminari/_page.html.haml b/app/views/kaminari/_page.html.haml index 2fda729..37c0063 100644 --- a/app/views/kaminari/_page.html.haml +++ b/app/views/kaminari/_page.html.haml @@ -1,10 +1,15 @@ -# Link showing page number - available local variables - page: the page number of this page + page: the PageProxy for the current page url: url to this page current_page: the page number of currently displayed page num_pages: total number of pages per_page: number of items to fetch per page remote: data-remote -%span{:class => "page#{' first' if page.first?}#{' last' if page.last?}#{' current' if page.current?}"} - = link_to_unless page == current_page, page, url, :remote => remote + +%span{:class => "page#{' current' if page.current?}"} + - opts = {:remote => remote} + - opts[:rel] = 'start' if page.first? + - opts[:rel] = 'next' if page.number == current_page + 1 + - opts[:rel] = opts[:rel].nil? ? 'prev' : opts[:rel] + ' prev' if page.number == current_page - 1 + = link_to_unless page.current?, page, url, opts diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb index d489c22..f489438 100644 --- a/app/views/kaminari/_prev_page.html.erb +++ b/app/views/kaminari/_prev_page.html.erb @@ -7,5 +7,5 @@ remote: data-remote -%> - <%= link_to_unless current_page == 1, raw(t 'views.pagination.previous'), url, :class => 'prev', :rel => 'prev', :remote => remote %> + <%= link_to_unless current_page == 1, raw(t 'views.pagination.previous'), url, :rel => (current_page == 2) ? 'start prev':'prev', :remote => remote %> diff --git a/app/views/kaminari/_prev_page.html.haml b/app/views/kaminari/_prev_page.html.haml index cfef853..7988a66 100644 --- a/app/views/kaminari/_prev_page.html.haml +++ b/app/views/kaminari/_prev_page.html.haml @@ -5,5 +5,5 @@ num_pages: total number of pages per_page: number of items to fetch per page remote: data-remote -%span.prev - = link_to_unless current_page == 1, raw(t 'views.pagination.previous'), url, :class => 'prev', :rel => 'prev', :remote => remote +%span{:class => "prev#{' disabled' if current_page == 1}"} + = link_to_unless current_page == 1, raw(t 'views.pagination.previous'), url, :rel => (current_page == 2) ? 'start prev':'prev', :remote => remote