Skip to content

Commit

Permalink
update views according to new convention
Browse files Browse the repository at this point in the history
  • Loading branch information
amatsuda committed Feb 11, 2011
1 parent dd77a7d commit da88729
Show file tree
Hide file tree
Showing 20 changed files with 148 additions and 130 deletions.
14 changes: 7 additions & 7 deletions app/views/kaminari/_current_page.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<%# available local variables:
page: the page number of this page
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
<%# The current page
- available local variables
page: the page number of 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 current"><%= page %></span>
14 changes: 7 additions & 7 deletions app/views/kaminari/_current_page.html.haml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
-# available local variables:
page: the page number of this page
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
-# The current page
- available local variables
page: the page number of 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.page.current
= page
17 changes: 9 additions & 8 deletions app/views/kaminari/_first_page_link.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<%# available local variables:
page: the page number of this page
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 with page number that appears at the leftmost
- available local variables
page: the page number of this 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">
<%= link_to page, page_url, :remote => remote %>
<%= link_to page, url, :remote => remote %>
</span>
17 changes: 9 additions & 8 deletions app/views/kaminari/_first_page_link.html.haml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
-# available local variables:
page: the page number of this page
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 with page number that appears at the leftmost
- available local variables
page: the page number of this 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.page.first
= link_to page, page_url, :remote => remote
= link_to page, url, :remote => remote
17 changes: 9 additions & 8 deletions app/views/kaminari/_last_page_link.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<%# available local variables:
page: the page number of this page
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 with page number that appears at the rightmost
- available local variables
page: the page number of this 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 last">
<%= link_to page, page_url, :remote => remote %>
<%= link_to page, url, :remote => remote %>
</span>
17 changes: 9 additions & 8 deletions app/views/kaminari/_last_page_link.html.haml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
-# available local variables:
page: the page number of this page
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 with page number that appears at the rightmost
- available local variables
page: the page number of this 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.page.last
= link_to page, page_url, :remote => remote
= link_to page, url, :remote => remote
15 changes: 8 additions & 7 deletions app/views/kaminari/_next_link.html.erb
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<%# available local variables:
next_url: url to the next 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
<%# "Next" with link
- available local variables
url: url to the next 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="next">
<%= link_to raw('Next &raquo;'), next_url, :class => 'next', :rel => 'next', :remote => remote %>
<%= link_to raw('Next &raquo;'), url, :class => 'next', :rel => 'next', :remote => remote %>
</span>
15 changes: 8 additions & 7 deletions app/views/kaminari/_next_link.html.haml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
-# available local variables:
next_url: url to the next 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
-# "Next" with link
- available local variables
url: url to the next 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.next
= link_to raw('Next &raquo;'), next_url, :class => 'next', :rel => 'next', :remote => remote
= link_to raw('Next &raquo;'), url, :class => 'next', :rel => 'next', :remote => remote
11 changes: 6 additions & 5 deletions app/views/kaminari/_next_span.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<%# available local variables:
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
<%# "Next" without link
- available local variables
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="next"></span>
11 changes: 6 additions & 5 deletions app/views/kaminari/_next_span.html.haml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
-# available local variables:
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
-# "Next" without link
- available local variables
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.next
17 changes: 9 additions & 8 deletions app/views/kaminari/_page_link.html.erb
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<%# available local variables:
page: the page number of this page
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 showing page number
- available local variables
page: the page number of this 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">
<%= link_to page, page_url, :remote => remote %>
<%= link_to page, url, :remote => remote %>
</span>
17 changes: 9 additions & 8 deletions app/views/kaminari/_page_link.html.haml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
-# available local variables:
page: the page number of this page
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 showing page number
- available local variables
page: the page number of this 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.page
= link_to page, page_url, :remote => remote
= link_to page, url, :remote => remote
11 changes: 6 additions & 5 deletions app/views/kaminari/_paginator.html.erb
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<%# available local variables:
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
<%# The container tag
- available local variables
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
-%>
<nav class='pagination'>
<%= content_for :kaminari_paginator_tags %>
Expand Down
11 changes: 6 additions & 5 deletions app/views/kaminari/_paginator.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
-# available local variables:
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
-# The container tag
- available local variables
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
%nav.pagination
= content_for :kaminari_paginator_tags
15 changes: 8 additions & 7 deletions app/views/kaminari/_prev_link.html.erb
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<%# available local variables:
prev_url: url to the previous 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
<%# "Previous" with link
- available local variables
url: url to the previous 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="prev">
<%= link_to raw('&laquo; Prev'), prev_url, :class => 'prev', :rel => 'prev', :remote => remote %>
<%= link_to raw('&laquo; Prev'), url, :class => 'prev', :rel => 'prev', :remote => remote %>
</span>
15 changes: 8 additions & 7 deletions app/views/kaminari/_prev_link.html.haml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
-# available local variables:
prev_url: url to the previous 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
-# "Previous" with link
- available local variables
url: url to the previous 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.prev
= link_to raw('&laquo; Prev'), prev_url, :class => 'prev', :rel => 'prev', :remote => remote
= link_to raw('&laquo; Prev'), url, :class => 'prev', :rel => 'prev', :remote => remote
11 changes: 6 additions & 5 deletions app/views/kaminari/_prev_span.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<%# available local variables:
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
<%# "Previous" without link
- available local variables
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="prev"></span>
11 changes: 6 additions & 5 deletions app/views/kaminari/_prev_span.html.haml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
-# available local variables:
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
-# "Previous" without link
- available local variables
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.prev
11 changes: 6 additions & 5 deletions app/views/kaminari/_truncated_span.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<%# available local variables:
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
<%# Non-link tag that stands for skipped pages...
- available local variables
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">...</span>
11 changes: 6 additions & 5 deletions app/views/kaminari/_truncated_span.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
-# available local variables:
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
-# Non-link tag that stands for skipped pages...
- available local variables
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.page
\...

0 comments on commit da88729

Please sign in to comment.