Rename foundation => foundation5 & foundation6 => foundation

foundation/README.md

@@ -1,6 +1,17 @@
-# Pagination theme for [Zurb Foundation](http://foundation.zurb.com)
+# Pagination theme for [Zurb Foundation 6.2.0](http://foundation.zurb.com)
 
-With support for:
+This theme follows [the documented mark-up](http://foundation.zurb.com/sites/docs/pagination.html)
+for version 6.2.0.
 
-- erb
-- haml
+## Supported template engines:
+
+- erb (untested)
+- [haml](http://haml.info)
+- [hamlit](https://github.com/k0kubun/hamlit)
+- [slim](http://slim-lang.com/) (untested)
+
+## Tips
+
+- The pagination is not centered by default. To render the pagination centered,
+  simply add the `text-centered` class to the `ul` or a wrapping container, or
+  apply a `text-align: center` style as per [the documentation](http://foundation.zurb.com/sites/docs/pagination.html#centered).

foundation/app/views/kaminari/_first_page.html.slim

@@ -1,3 +1,2 @@
 li
-  = link_to_unless(current_page.first?,
-                   raw(t 'views.pagination.first'), url, :remote => remote)
+  = link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote

foundation/app/views/kaminari/_gap.html.erb

@@ -1,3 +1 @@
-<li class="unavailable">
-  <%= link_to raw(t 'views.pagination.truncate'), '#' %>
-</li>
+<li aria-hidden="true" class="ellipsis"></li>

foundation/app/views/kaminari/_gap.html.haml

@@ -1,2 +1 @@
-%li.unavailable
-  = link_to raw(t 'views.pagination.truncate'), '#'
+%li.ellipsis{ :"aria-hidden" => "true" }

foundation/app/views/kaminari/_gap.html.slim

@@ -1,2 +1 @@
-li.unavailable
-  = link_to raw(t 'views.pagination.truncate'), '#'
+li.ellipsis  aria-hidden=("true" ) 

foundation/app/views/kaminari/_last_page.html.slim

@@ -1,3 +1,2 @@
 li
-  = link_to_unless(current_page.last?,
-                   raw(t 'views.pagination.last'), url, { :remote => remote })
+  = link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote}

foundation/app/views/kaminari/_next_page.html.slim

@@ -1,4 +1,2 @@
 li
-  = link_to_unless(current_page.last?,
-                   raw(t 'views.pagination.next'),
-                   url, :rel => 'next', :remote => remote)
+  = link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote

foundation/app/views/kaminari/_page.html.erb

@@ -1,3 +1,7 @@
 <li class="<%= 'current' if page.current? %>">
-  <%= link_to page, page.current? ? '#' : url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+  <% if page.current? %>
+    <%= page %>
+  <% else %>
+    <%= link_to page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+  <% end %>
 </li>

foundation/app/views/kaminari/_page.html.haml

@@ -1,2 +1,5 @@
 %li{class: "#{'current' if page.current?}"}
-  = link_to page, page.current? ? '#' : url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}
+  - if page.current?
+    = page
+  - else
+    = link_to page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}

foundation/app/views/kaminari/_page.html.slim

@@ -1,4 +1,5 @@
-li{class="#{'current' if page.current?}"}
-  = link_to(page, page.current? ? '#' : url,
-           { :remote => remote,
-              :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil })
+li class: "#{'current' if page.current?}" 
+  - if page.current?
+    = page
+  - else
+    = link_to page, url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}

foundation/app/views/kaminari/_paginator.html.erb

@@ -1,17 +1,15 @@
-<%= paginator.render do -%>
-  <div class="pagination-centered">
-    <ul class="pagination">
-      <%= first_page_tag unless current_page.first? %>
-      <%= prev_page_tag unless current_page.first? %>
-      <% each_page do |page| -%>
-        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
-          <%= page_tag page %>
-        <% elsif !page.was_truncated? -%>
-          <%= gap_tag %>
-        <% end -%>
-      <% end -%>
-      <%= next_page_tag unless current_page.last? %>
-      <%= last_page_tag unless current_page.last? %>
-    </ul>
-  </div>
-<% end -%>
+<%= paginator.render do %>
+  <ul aria-label="Pagination" class="pagination" role="pagination">
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
+    <% each_page do |page| %>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? %>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? %>
+        <%= gap_tag %>
+      <% end %>
+    <% end %>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
+  </ul>
+<% end %>

foundation/app/views/kaminari/_paginator.html.haml

@@ -1,12 +1,11 @@
 = paginator.render do
-  .pagination-centered
-    %ul.pagination
-      = first_page_tag unless current_page.first?
-      = prev_page_tag unless current_page.first?
-      - each_page do |page|
-        - if page.left_outer? || page.right_outer? || page.inside_window?
-          = page_tag page
-        - elsif !page.was_truncated?
-          = gap_tag
-      = next_page_tag unless current_page.last?
-      = last_page_tag unless current_page.last?
+  %ul.pagination{ :role => "pagination", :"aria-label" => "Pagination" }
+    = first_page_tag unless current_page.first?
+    = prev_page_tag unless current_page.first?
+    - each_page do |page|
+      - if page.left_outer? || page.right_outer? || page.inside_window?
+        = page_tag page
+      - elsif !page.was_truncated?
+        = gap_tag
+    = next_page_tag unless current_page.last?
+    = last_page_tag unless current_page.last?

foundation/app/views/kaminari/_paginator.html.slim

@@ -1,12 +1,11 @@
 = paginator.render do
-  .pagination-centered
-    ul.pagination
-      == first_page_tag unless current_page.first?
-      == prev_page_tag unless current_page.first?
-      - each_page do |page|
-        - if page.left_outer? || page.right_outer? || page.inside_window?
-          == page_tag page
-        - elsif !page.was_truncated?
-          == gap_tag
-      == next_page_tag unless current_page.last?
-      == last_page_tag unless current_page.last?
+  ul.pagination  role="pagination" aria-label=("Pagination" ) 
+    = first_page_tag unless current_page.first?
+    = prev_page_tag unless current_page.first?
+    - each_page do |page|
+      - if page.left_outer? || page.right_outer? || page.inside_window?
+        = page_tag page
+      - elsif !page.was_truncated?
+        = gap_tag
+    = next_page_tag unless current_page.last?
+    = last_page_tag unless current_page.last?

foundation/app/views/kaminari/_prev_page.html.slim

@@ -1,4 +1,2 @@
 li
-  = link_to_unless(current_page.first?,
-                   raw(t 'views.pagination.previous'),
-                   url, :rel => 'prev', :remote => remote)
+  = link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote

foundation5/README.md

@@ -0,0 +1,6 @@
+# Pagination theme for [Zurb Foundation](http://foundation.zurb.com)
+
+With support for:
+
+- erb
+- haml

foundation5/app/views/kaminari/_first_page.html.slim

@@ -0,0 +1,3 @@
+li
+  = link_to_unless(current_page.first?,
+                   raw(t 'views.pagination.first'), url, :remote => remote)

foundation5/app/views/kaminari/_gap.html.erb

@@ -0,0 +1,3 @@
+<li class="unavailable">
+  <%= link_to raw(t 'views.pagination.truncate'), '#' %>
+</li>

foundation5/app/views/kaminari/_gap.html.haml

@@ -0,0 +1,2 @@
+%li.unavailable
+  = link_to raw(t 'views.pagination.truncate'), '#'

foundation5/app/views/kaminari/_gap.html.slim

@@ -0,0 +1,2 @@
+li.unavailable
+  = link_to raw(t 'views.pagination.truncate'), '#'

foundation5/app/views/kaminari/_last_page.html.slim

@@ -0,0 +1,3 @@
+li
+  = link_to_unless(current_page.last?,
+                   raw(t 'views.pagination.last'), url, { :remote => remote })

foundation5/app/views/kaminari/_next_page.html.slim

@@ -0,0 +1,4 @@
+li
+  = link_to_unless(current_page.last?,
+                   raw(t 'views.pagination.next'),
+                   url, :rel => 'next', :remote => remote)

foundation5/app/views/kaminari/_page.html.erb

@@ -0,0 +1,3 @@
+<li class="<%= 'current' if page.current? %>">
+  <%= link_to page, page.current? ? '#' : url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

foundation5/app/views/kaminari/_page.html.haml

@@ -0,0 +1,2 @@
+%li{class: "#{'current' if page.current?}"}
+  = link_to page, page.current? ? '#' : url, {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil}

foundation5/app/views/kaminari/_page.html.slim

@@ -0,0 +1,4 @@
+li{class="#{'current' if page.current?}"}
+  = link_to(page, page.current? ? '#' : url,
+           { :remote => remote,
+              :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil })

foundation5/app/views/kaminari/_paginator.html.erb

@@ -0,0 +1,17 @@
+<%= paginator.render do -%>
+  <div class="pagination-centered">
+    <ul class="pagination">
+      <%= first_page_tag unless current_page.first? %>
+      <%= prev_page_tag unless current_page.first? %>
+      <% each_page do |page| -%>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end -%>
+      <% end -%>
+      <%= next_page_tag unless current_page.last? %>
+      <%= last_page_tag unless current_page.last? %>
+    </ul>
+  </div>
+<% end -%>

foundation5/app/views/kaminari/_paginator.html.haml

@@ -0,0 +1,12 @@
+= paginator.render do
+  .pagination-centered
+    %ul.pagination
+      = first_page_tag unless current_page.first?
+      = prev_page_tag unless current_page.first?
+      - each_page do |page|
+        - if page.left_outer? || page.right_outer? || page.inside_window?
+          = page_tag page
+        - elsif !page.was_truncated?
+          = gap_tag
+      = next_page_tag unless current_page.last?
+      = last_page_tag unless current_page.last?

foundation5/app/views/kaminari/_paginator.html.slim

@@ -0,0 +1,12 @@
+= paginator.render do
+  .pagination-centered
+    ul.pagination
+      == first_page_tag unless current_page.first?
+      == prev_page_tag unless current_page.first?
+      - each_page do |page|
+        - if page.left_outer? || page.right_outer? || page.inside_window?
+          == page_tag page
+        - elsif !page.was_truncated?
+          == gap_tag
+      == next_page_tag unless current_page.last?
+      == last_page_tag unless current_page.last?

foundation5/app/views/kaminari/_prev_page.html.slim

@@ -0,0 +1,4 @@
+li
+  = link_to_unless(current_page.first?,
+                   raw(t 'views.pagination.previous'),
+                   url, :rel => 'prev', :remote => remote)