updates for 0.9.12

amatsuda · Feb 17, 2011 · 2dfb41c · 2dfb41c
1 parent 9065eb6
commit 2dfb41c
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 15 deletions.
diff --git a/github/erb/_current_page.html.erb b/github/erb/_current_page.html.erb
diff --git a/github/erb/_page_link.html.erb b/github/erb/_page_link.html.erb
diff --git a/github/erb/_paginator.html.erb b/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 -%>
diff --git a/github/erb/_truncated_span.html.erb b/github/erb/_truncated_span.html.erb
diff --git a/github/haml/_current_page.html.haml b/github/haml/_current_page.html.haml
diff --git a/github/haml/_page_link.html.haml b/github/haml/_page_link.html.haml
diff --git a/github/haml/_paginator.html.haml b/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
diff --git a/github/haml/_truncated_span.html.haml b/github/haml/_truncated_span.html.haml
diff --git a/google/erb/_paginator.html.erb b/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 %>
diff --git a/google/erb/_truncated_span.html.erb b/google/erb/_truncated_span.html.erb
diff --git a/google/haml/_paginator.html.haml b/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
diff --git a/google/haml/_truncated_span.html.haml b/google/haml/_truncated_span.html.haml