Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

update for 0.11.0

  • Loading branch information...
commit da144fd72d54022deb44070d45889a1bca39f4d0 1 parent 770701d
@amatsuda amatsuda authored
Showing with 44 additions and 46 deletions.
  1. +0 −1  github/app/views/kaminari/_next_link.html.erb
  2. +0 −1  github/app/views/kaminari/_next_link.html.haml
  3. +1 −0  github/app/views/kaminari/_next_page.html.erb
  4. +2 −0  github/app/views/kaminari/_next_page.html.haml
  5. +0 −1  github/app/views/kaminari/_next_span.html.erb
  6. +0 −1  github/app/views/kaminari/_next_span.html.haml
  7. +1 −3 github/app/views/kaminari/_paginator.html.erb
  8. +2 −2 github/app/views/kaminari/_paginator.html.haml
  9. +0 −1  github/app/views/kaminari/_prev_link.html.erb
  10. +0 −1  github/app/views/kaminari/_prev_link.html.haml
  11. +1 −0  github/app/views/kaminari/_prev_page.html.erb
  12. +2 −0  github/app/views/kaminari/_prev_page.html.haml
  13. +0 −1  github/app/views/kaminari/_prev_span.html.erb
  14. +0 −1  github/app/views/kaminari/_prev_span.html.haml
  15. +0 −1  google/app/views/kaminari/_current_page.html.erb
  16. +0 −3  google/app/views/kaminari/_current_page.html.haml
  17. +0 −1  google/app/views/kaminari/_next_link.html.erb
  18. +5 −0 google/app/views/kaminari/_next_page.html.erb
  19. +3 −1 google/app/views/kaminari/{_next_link.html.haml → _next_page.html.haml}
  20. +0 −1  google/app/views/kaminari/_next_span.html.erb
  21. +0 −2  google/app/views/kaminari/_next_span.html.haml
  22. +4 −0 google/app/views/kaminari/{_page_link.html.erb → _page.html.erb}
  23. +7 −0 google/app/views/kaminari/_page.html.haml
  24. +0 −2  google/app/views/kaminari/_page_link.html.haml
  25. +4 −10 google/app/views/kaminari/_paginator.html.erb
  26. +4 −7 google/app/views/kaminari/_paginator.html.haml
  27. +0 −1  google/app/views/kaminari/_prev_link.html.erb
  28. +5 −0 google/app/views/kaminari/_prev_page.html.erb
  29. +3 −1 google/app/views/kaminari/{_prev_link.html.haml → _prev_page.html.haml}
  30. +0 −1  google/app/views/kaminari/_prev_span.html.erb
  31. +0 −2  google/app/views/kaminari/_prev_span.html.haml
View
1  github/app/views/kaminari/_next_link.html.erb
@@ -1 +0,0 @@
-<%= link_to raw('Older &raquo;'), url, :remote => remote -%>
View
1  github/app/views/kaminari/_next_link.html.haml
@@ -1 +0,0 @@
-~ link_to raw('Older &raquo;'), url, :remote => remote
View
1  github/app/views/kaminari/_next_page.html.erb
@@ -0,0 +1 @@
+<%= link_to_unless current_page.last?, raw('Older &raquo;'), url, :remote => remote do |name| -%><span class="disabled"><%= name %></span><% end -%>
View
2  github/app/views/kaminari/_next_page.html.haml
@@ -0,0 +1,2 @@
+~ link_to_unless current_page.last?, raw('Older &raquo;'), url, :remote => remote do |name|
+ ~ content_tag :span, name, :class => 'disabled'
View
1  github/app/views/kaminari/_next_span.html.erb
@@ -1 +0,0 @@
-<span class="disabled">Older &raquo;</span>
View
1  github/app/views/kaminari/_next_span.html.haml
@@ -1 +0,0 @@
-<span class="disabled">Older &raquo;</span>
View
4 github/app/views/kaminari/_paginator.html.erb
@@ -6,7 +6,5 @@
.pagination span.disabled{padding:.1em .3em;margin:.2em;border:1px solid #eee;color:#ddd;}
</style>
<%= paginator.render do -%>
-<div class="pagination"><%= current_page > 1 ? prev_link_tag : prev_span_tag -%>
-<%= num_pages > current_page ? next_link_tag : next_span_tag -%>
-</div>
+<div class="pagination"><%= prev_page_tag -%><%= next_page_tag -%></div>
<% end -%>
View
4 github/app/views/kaminari/_paginator.html.haml
@@ -6,5 +6,5 @@
.pagination span.disabled{padding:.1em .3em;margin:.2em;border:1px solid #eee;color:#ddd;}
= paginator.render do
.pagination<
- = current_page > 1 ? prev_link_tag : prev_span_tag
- = num_pages > current_page ? next_link_tag : next_span_tag
+ = prev_page_tag
+ = next_page_tag
View
1  github/app/views/kaminari/_prev_link.html.erb
@@ -1 +0,0 @@
-<%= link_to raw('&laquo; Newer'), url, :remote => remote -%>
View
1  github/app/views/kaminari/_prev_link.html.haml
@@ -1 +0,0 @@
-~ link_to raw('&laquo; Newer'), url, :remote => remote
View
1  github/app/views/kaminari/_prev_page.html.erb
@@ -0,0 +1 @@
+<%= link_to_unless current_page.first?, raw('&laquo; Newer'), url, :remote => remote do |name| -%><span class="disabled"><%= name %></span><% end -%>
View
2  github/app/views/kaminari/_prev_page.html.haml
@@ -0,0 +1,2 @@
+~ link_to_unless current_page.first?, raw('&laquo; Newer'), url, :remote => remote do |name|
+ ~ content_tag :span, name, :class => 'disabled'
View
1  github/app/views/kaminari/_prev_span.html.erb
@@ -1 +0,0 @@
-<%= content_tag :span, raw('&laquo; Newer'), :class => 'disabled' -%>
View
1  github/app/views/kaminari/_prev_span.html.haml
@@ -1 +0,0 @@
-~ content_tag :span, raw('&laquo; Newer'), :class => 'disabled'
View
1  google/app/views/kaminari/_current_page.html.erb
@@ -1 +0,0 @@
-<td class="cur"><span class="csb" style="background-position:-53px 0;width:20px"></span><%= page %></td>
View
3  google/app/views/kaminari/_current_page.html.haml
@@ -1,3 +0,0 @@
-%td.cur<
- %span.csb{:style => 'background-position:-53px 0;width:20px'}
- = page
View
1  google/app/views/kaminari/_next_link.html.erb
@@ -1 +0,0 @@
-<td class="b"><%= link_to raw('<span class="csb ch" style="background-position:-96px 0;width:71px"></span><span style="display:block;margin-left:53px;text-decoration:underline">Next</span>'), url, :class => 'pn knavi', :id => 'pnnext', :style => 'text-align:left;text-decoration:none', :remote => remote %></td>
View
5 google/app/views/kaminari/_next_page.html.erb
@@ -0,0 +1,5 @@
+<% if current_page.last? %>
+ <span class="csb" style="background-position:-96px 0;width:45px"></span>
+<% else %>
+ <%= link_to raw('<span class="csb ch" style="background-position:-96px 0;width:71px"></span><span style="display:block;margin-left:53px;text-decoration:underline">Next</span>'), url, :class => 'pn knavi', :id => 'pnnext', :style => 'text-align:left;text-decoration:none', :remote => remote %>
+<% end %>
View
4 google/app/views/kaminari/_next_link.html.haml → google/app/views/kaminari/_next_page.html.haml
@@ -1,2 +1,4 @@
-%td.b<
+- if current_page.last?
+ %span.csb{:style => 'background-position:-96px 0;width:45px'}
+- else
= link_to raw('<span class="csb ch" style="background-position:-96px 0;width:71px"></span><span style="display:block;margin-left:53px;text-decoration:underline">Next</span>'), url, :class => 'pn knavi', :id => 'pnnext', :style => 'text-align:left;text-decoration:none', :remote => remote
View
1  google/app/views/kaminari/_next_span.html.erb
@@ -1 +0,0 @@
-<td class="b"><span class="csb" style="background-position:-96px 0;width:45px"></span></td>
View
2  google/app/views/kaminari/_next_span.html.haml
@@ -1,2 +0,0 @@
-%td.b<
- %span.csb{:style => 'background-position:-96px 0;width:45px'}
View
4 google/app/views/kaminari/_page_link.html.erb → google/app/views/kaminari/_page.html.erb
@@ -1 +1,5 @@
+<% if page.current? %>
+<td class="cur"><span class="csb" style="background-position:-53px 0;width:20px"></span><%= page %></td>
+<% else %>
<td><%= link_to raw(%Q[<span class="csb ch" style="background-position:-74px 0;width:20px"></span>#{page}]), url, :class => 'fl', :remote => remote %></td>
+<% end %>
View
7 google/app/views/kaminari/_page.html.haml
@@ -0,0 +1,7 @@
+- if page.current?
+ %td.cur<
+ %span.csb{:style => 'background-position:-53px 0;width:20px'}
+ = page
+- else
+ %td<
+ = link_to raw(%Q[<span class="csb ch" style="background-position:-74px 0;width:20px"></span>#{page}]), url, :class => 'fl', :remote => remote
View
2  google/app/views/kaminari/_page_link.html.haml
@@ -1,2 +0,0 @@
-%td<
- = link_to raw(%Q[<span class="csb ch" style="background-position:-74px 0;width:20px"></span>#{page}]), url, :class => 'fl', :remote => remote
View
14 google/app/views/kaminari/_paginator.html.erb
@@ -11,15 +11,9 @@
.b {font-weight:bold}
</style>
<%= paginator.render do -%>
- <table id="nav" style="border-collapse:collapse;text-align:left;direction:ltr;margin:17px auto 0"><tbody><tr valign="top">
-<%= current_page > 1 ? prev_link_tag : prev_span_tag -%>
- <% each_page do |page| %>
- <% if page.current? %>
-<%= current_page_tag -%>
- <% elsif page.inside_window? %>
-<%= page_link_tag -%>
- <% end %>
- <% end %>
-<%= num_pages > current_page ? next_link_tag : next_span_tag -%>
+<table id="nav" style="border-collapse:collapse;text-align:left;direction:ltr;margin:17px auto 0"><tbody><tr valign="top">
+<td class="b"><%= prev_page_tag -%></td>
+<% each_page.select(&:inside_window?).each do |page| %><%= page_tag page -%><% end %>
+<td class="b"><%= next_page_tag -%></td>
</tr></tbody></table>
<% end %>
View
11 google/app/views/kaminari/_paginator.html.haml
@@ -13,10 +13,7 @@
%table#nav{:style => 'border-collapse:collapse;text-align:left;direction:ltr;margin:17px auto 0'}<
%tbody><
%tr{:valign => 'top'}><
- = current_page > 1 ? prev_link_tag : prev_span_tag
- - each_page do |page|
- - if page.current?
- = current_page_tag
- - elsif page.inside_window?
- = page_link_tag
- = num_pages > current_page ? next_link_tag : next_span_tag
+ %td.b= prev_page_tag
+ - each_page.select(&:inside_window?).each do |page|
+ = page_tag page
+ %td.b= next_page_tag
View
1  google/app/views/kaminari/_prev_link.html.erb
@@ -1 +0,0 @@
-<td class="b"><%= link_to raw('<span class="csb ch" style="background-position:0 0;float:right;width:53px"></span><span style="display:block;margin-right:35px;clear:right;text-decoration:underline">Previous</span>'), url, :class => 'pn knavi', :id => 'pnprev', :style => 'text-decoration:none', :remote => remote %></td>
View
5 google/app/views/kaminari/_prev_page.html.erb
@@ -0,0 +1,5 @@
+<% if current_page.first? %>
+ <span class="csb" style="background-position:-24px 0;width:28px"></span>
+<% else %>
+ <%= link_to raw('<span class="csb ch" style="background-position:0 0;float:right;width:53px"></span><span style="display:block;margin-right:35px;clear:right;text-decoration:underline">Previous</span>'), url, :class => 'pn knavi', :id => 'pnprev', :style => 'text-decoration:none', :remote => remote %>
+<% end %>
View
4 google/app/views/kaminari/_prev_link.html.haml → google/app/views/kaminari/_prev_page.html.haml
@@ -1,2 +1,4 @@
-%td.b<
+- if current_page.first?
+ %span.csb{:style => 'background-position:-24px 0;width:28px'}
+- else
= link_to raw('<span class="csb ch" style="background-position:0 0;float:right;width:53px"></span><span style="display:block;margin-right:35px;clear:right;text-decoration:underline">Previous</span>'), url, :class => 'pn knavi', :id => 'pnprev', :style => 'text-decoration:none', :remote => remote
View
1  google/app/views/kaminari/_prev_span.html.erb
@@ -1 +0,0 @@
-<td class="b"><span class="csb" style="background-position:-24px 0;width:28px"></span></td>
View
2  google/app/views/kaminari/_prev_span.html.haml
@@ -1,2 +0,0 @@
-%td.b<
- %span.csb{:style => 'background-position:-24px 0;width:28px'}
Please sign in to comment.
Something went wrong with that request. Please try again.