From 2dfb41c0da4fd1bd598ddb7cfe3f4bba0d5d27e6 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Thu, 17 Feb 2011 11:18:30 +0900 Subject: [PATCH] updates for 0.9.12 --- github/erb/_current_page.html.erb | 1 - github/erb/_page_link.html.erb | 1 - github/erb/_paginator.html.erb | 6 +++++- github/erb/_truncated_span.html.erb | 1 - github/haml/_current_page.html.haml | 1 - github/haml/_page_link.html.haml | 1 - github/haml/_paginator.html.haml | 5 ++++- github/haml/_truncated_span.html.haml | 1 - google/erb/_paginator.html.erb | 14 +++++++++++++- google/erb/_truncated_span.html.erb | 1 - google/haml/_paginator.html.haml | 15 +++++++++++---- google/haml/_truncated_span.html.haml | 1 - 12 files changed, 33 insertions(+), 15 deletions(-) delete mode 100644 github/erb/_current_page.html.erb delete mode 100644 github/erb/_page_link.html.erb delete mode 100644 github/erb/_truncated_span.html.erb delete mode 100644 github/haml/_current_page.html.haml delete mode 100644 github/haml/_page_link.html.haml delete mode 100644 github/haml/_truncated_span.html.haml delete mode 100644 google/erb/_truncated_span.html.erb delete mode 100644 google/haml/_truncated_span.html.haml diff --git a/github/erb/_current_page.html.erb b/github/erb/_current_page.html.erb deleted file mode 100644 index 6874dad..0000000 --- a/github/erb/_current_page.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%# EMPTY! %> diff --git a/github/erb/_page_link.html.erb b/github/erb/_page_link.html.erb deleted file mode 100644 index 6874dad..0000000 --- a/github/erb/_page_link.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%# EMPTY! %> diff --git a/github/erb/_paginator.html.erb b/github/erb/_paginator.html.erb index 89b77ee..206b7f1 100644 --- 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;} - +<%= paginator.render do -%> + +<% end -%> diff --git a/github/erb/_truncated_span.html.erb b/github/erb/_truncated_span.html.erb deleted file mode 100644 index 6874dad..0000000 --- a/github/erb/_truncated_span.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%# EMPTY! %> diff --git a/github/haml/_current_page.html.haml b/github/haml/_current_page.html.haml deleted file mode 100644 index 21ee649..0000000 --- a/github/haml/_current_page.html.haml +++ /dev/null @@ -1 +0,0 @@ --# EMPTY! diff --git a/github/haml/_page_link.html.haml b/github/haml/_page_link.html.haml deleted file mode 100644 index 21ee649..0000000 --- a/github/haml/_page_link.html.haml +++ /dev/null @@ -1 +0,0 @@ --# EMPTY! diff --git a/github/haml/_paginator.html.haml b/github/haml/_paginator.html.haml index cb839de..6f603b0 100644 --- 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 deleted file mode 100644 index 21ee649..0000000 --- a/github/haml/_truncated_span.html.haml +++ /dev/null @@ -1 +0,0 @@ --# EMPTY! diff --git a/google/erb/_paginator.html.erb b/google/erb/_paginator.html.erb index 6005aa0..eeb3cef 100644 --- 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} -<%= content_for :kaminari_paginator_tags %> +<%= paginator.render do -%> + +<%= 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 -%> + +<% end %> diff --git a/google/erb/_truncated_span.html.erb b/google/erb/_truncated_span.html.erb deleted file mode 100644 index 39ae040..0000000 --- a/google/erb/_truncated_span.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%# Nothing! -%> diff --git a/google/haml/_paginator.html.haml b/google/haml/_paginator.html.haml index bf3add5..cecee4e 100644 --- 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 deleted file mode 100644 index 4aa2c5a..0000000 --- a/google/haml/_truncated_span.html.haml +++ /dev/null @@ -1 +0,0 @@ --# Nothing!