Change markup to use nav; also much more complete

sinefunc · Jun 10, 2010 · 8837a30 · 8837a30
1 parent 3e94e46
commit 8837a30
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 25 deletions.
diff --git a/lib/pagination/collection.rb b/lib/pagination/collection.rb
@@ -73,19 +73,18 @@ def render?
     def each(&block)
       collection.each(&block) 
     end
+
+    def total_pages
+      (total / per_page.to_f).ceil
+    end
 
   protected
     def collection
       raise Unimplemented, "You must implement collection"  
     end
 
     def pages
-      1..last_page
+      1..total_pages
-    end
-
-    def last_page
-      (total / per_page.to_f).ceil
     end
-
   end
 end
diff --git a/test/test_pagination_template.rb b/test/test_pagination_template.rb
@@ -33,23 +33,23 @@ def doc
 
     should "have a ul > li.next-link with page=2" do
       assert_equal 1, 
-        doc.search('div.pagination > a.next-link[href="?page=2"]').length
+        doc.search('nav.pagination > a.next-link[href="?page=2"]').length
     end
 
     should "display the first page as the current page" do
-      assert_equal 1, doc.search('div.pagination > ul > li > span').length
+      assert_equal 1, doc.search('nav.pagination > nav.page-numbers > ul > li > span').length
 
-      assert_equal '1', doc.search('div.pagination > ul > li > span').text
+      assert_equal '1', doc.search('nav.pagination > nav.page-numbers > ul > li > span').text
     end
 
     should "display pages 2 to 5 as links" do
       (2..5).each do |page|
         assert_equal 1, 
-          doc.search(%(div.pagination > ul > li > 
+          doc.search(%(nav.pagination > nav.page-numbers > ul > li > 
                        a[href="?page=#{page}"])).length
 
         assert_equal page.to_s, 
-          doc.search(%(div.pagination > ul > li > 
+          doc.search(%(nav.pagination > nav.page-numbers > ul > li > 
                        a[href="?page=#{page}"])).text
       end
     end

diff --git a/views/paginate.haml b/views/paginate.haml
@@ -1,19 +1,24 @@
 - if items.render?
-  %div.pagination
+  %nav.pagination
     - if items.prev_page
-      %a.prev-link{:href => ("?page=%s" % items.prev_page)}
+      %a.prev-link{:href => ("?page=%d" % items.prev_page)}
         %span &larr; Previous
-
+    %nav.page-numbers
-    %ul
+      %span.current-page
-      - items.displayed_pages.each do |page|
+        %span
-        - if items.current?(page)
+          %strong
-          %li.active
+            Page
-            %span= page
+          = items.page
-        - else
+          of
-          %li
+          = items.total_pages
-            %a{:href => ("?page=%s" % page)}= page
+      %ul                        
-
+        - items.displayed_pages.each do |page|
+          - if items.current?(page)
+            %li.active
+              %span= page           
+          - else
+            %li
+              %a{:href => ("?page=%d" % page)}= page
     - if items.next_page
-      %a.next-link{:href => ("?page=%s" % items.next_page)}
+      %a.next-link{:href => ("?page=%d" % items.next_page)}
         %span Next &rarr;
-