@@ -33,7 +33,8 @@ module WillPaginate :renderer => 'WillPaginate::LinkRenderer', :page_links => true, :container => true, - :semantic => false + :semantic => false, + :semantic_container => :ul } mattr_reader :pagination_options @@ -57,7 +58,8 @@ module WillPaginate # * <tt>:id</tt> -- HTML ID for the container (default: nil). Pass +true+ to have the ID # automatically generated from the class name of objects in collection: for example, paginating # ArticleComment models would yield an ID of "article_comments_pagination". - # * <tt>:semantic</tt> -- pagination links rendered with UL/LI tags + # * <tt>:semantic</tt> -- semantic pagination render, defaults to false + # * <tt>:semantic_container</tt> -- container for li elements, defaults to :ul # # Advanced options: # * <tt>:param_name</tt> -- parameter name for page number in URLs (default: <tt>:page</tt>) @@ -242,7 +244,7 @@ module WillPaginate links.push page_link_or_span(@collection.next_page, 'disabled next_page', @options[:next_label]) html = links.join(@options[:separator]) - container_tag = @options[:semantic] ? :ul : :div + container_tag = @options[:semantic] ? @options[:semantic_container] : :div @options[:container] ? @template.content_tag(container_tag, html, html_attributes) : html end lib/will_paginate/view_helpers.rb @@ -377,6 +377,11 @@ class ViewTest < WillPaginate::ViewTestCase assert_select('ul li', false) end + def test_specified_semantic_container + paginate([1].paginate({ :page => 1, :total_entries => 13, :per_page => 4 }), :semantic => true, :semantic_container => :ol) + assert_select('ol li', true) + end + def test_semantic paginate([1].paginate({ :page => 1, :total_entries => 13, :per_page => 4 }), :semantic => true) do |pagination| assert_select 'li a[href]', 4 do |elements| test/view_test.rb @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = 'will_paginate' s.version = '2.3.11' - s.date = '2009-06-02' + s.date = '2009-08-08' s.summary = "Most awesome pagination solution for Rails" s.description = "The will_paginate library provides a simple, yet powerful and extensible API for ActiveRecord pagination and rendering of pagination links in ActionView templates." will_paginate.gemspec 746f5d46d6d5f2cebdb13337391568fa28638f63 Les Hill leshill@gmail.com http://github.com/leshill/will_paginate/commit/bafa652bc7a449ba19f9a0b9d5c7dd348d1a85b9 bafa652bc7a449ba19f9a0b9d5c7dd348d1a85b9 2009-08-08T19:40:29-07:00 2009-08-08T19:40:29-07:00 Option for using ul/ol container for semantic pagination dca50d2075ce79a45d1acdbb07d4ddc18f205944 Les Hill leshill@gmail.com