Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

updates for 0.9.12

  • Loading branch information...
commit 2dfb41c0da4fd1bd598ddb7cfe3f4bba0d5d27e6 1 parent 9065eb6
@amatsuda authored
View
1  github/erb/_current_page.html.erb
@@ -1 +0,0 @@
-<%# EMPTY! %>
View
1  github/erb/_page_link.html.erb
@@ -1 +0,0 @@
-<%# EMPTY! %>
View
6 github/erb/_paginator.html.erb
@@ -5,4 +5,8 @@
.pagination span.current{padding:.1em .3em;margin:.2em;border:1px solid #369;font-weight:bold;background-color:#369;color:#FFF;}
.pagination span.disabled{padding:.1em .3em;margin:.2em;border:1px solid #eee;color:#ddd;}
</style>
-<div class="pagination"><%= content_for :kaminari_paginator_tags %></div>
+<%= 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>
+<% end -%>
View
1  github/erb/_truncated_span.html.erb
@@ -1 +0,0 @@
-<%# EMPTY! %>
View
1  github/haml/_current_page.html.haml
@@ -1 +0,0 @@
--# EMPTY!
View
1  github/haml/_page_link.html.haml
@@ -1 +0,0 @@
--# EMPTY!
View
5 github/haml/_paginator.html.haml
@@ -4,4 +4,7 @@
.pagination a:hover,.pagination a:active{border:1px solid #369;color:#000;}
.pagination span.current{padding:.1em .3em;margin:.2em;border:1px solid #369;font-weight:bold;background-color:#369;color:#FFF;}
.pagination span.disabled{padding:.1em .3em;margin:.2em;border:1px solid #eee;color:#ddd;}
-.pagination= content_for :kaminari_paginator_tags
+= paginator.render do
+ .pagination<
+ = current_page > 1 ? prev_link_tag : prev_span_tag
+ = num_pages > current_page ? next_link_tag : next_span_tag
View
1  github/haml/_truncated_span.html.haml
@@ -1 +0,0 @@
--# EMPTY!
View
14 google/erb/_paginator.html.erb
@@ -10,4 +10,16 @@
#nav a:visited {color:#2200C1}
.b {font-weight:bold}
</style>
-<table id="nav" style="border-collapse:collapse;text-align:left;direction:ltr;margin:17px auto 0"><tbody><tr valign="top"><%= content_for :kaminari_paginator_tags %></tr></tbody></table>
+<%= 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 -%>
+</tr></tbody></table>
+<% end %>
View
1  google/erb/_truncated_span.html.erb
@@ -1 +0,0 @@
-<%# Nothing! -%>
View
15 google/haml/_paginator.html.haml
@@ -9,7 +9,14 @@
#nav a:active {color:#c11}
#nav a:visited {color:#2200C1}
.b {font-weight:bold}
-%table#nav{:style => 'border-collapse:collapse;text-align:left;direction:ltr;margin:17px auto 0'}
- %tbody
- %tr{:valign => 'top'}
- = content_for :kaminari_paginator_tags
+= paginator.render do
+ %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
View
1  google/haml/_truncated_span.html.haml
@@ -1 +0,0 @@
--# Nothing!
Please sign in to comment.
Something went wrong with that request. Please try again.