Permalink
Browse files

Merge remote branch 'origin/master'

  • Loading branch information...
2 parents 78c05fd + d1a2519 commit 358db075c42f8dec15c1744b2afc7b190c91d5c9 @jeremy jeremy committed Jun 28, 2010
Showing with 6 additions and 3 deletions.
  1. +1 −1 README.rdoc
  2. +1 −1 lib/will_paginate/version.rb
  3. +2 −0 lib/will_paginate/view_helpers.rb
  4. +2 −1 will_paginate.gemspec
View
@@ -94,7 +94,7 @@ Denis Barushev, Ben Pickles.
== Usable pagination in the UI
There are some CSS styles to get you started in the "examples/" directory. They
-are {showcased online here}[http://mislav.caboo.se/static/will_paginate/].
+are {showcased online here}[http://mislav.uniqpath.com/will_paginate/].
More reading about pagination as design pattern:
@@ -2,7 +2,7 @@ module WillPaginate
module VERSION
MAJOR = 2
MINOR = 3
- TINY = 12
+ TINY = 14
STRING = [MAJOR, MINOR, TINY].join('.')
end
@@ -238,6 +238,7 @@ def to_html
links.push page_link_or_span(@collection.next_page, 'disabled next_page', @options[:next_label])
html = links.join(@options[:separator])
+ html = html.html_safe if html.respond_to? :html_safe
@options[:container] ? @template.content_tag(:div, html, html_attributes) : html
end
@@ -297,6 +298,7 @@ def visible_page_numbers
def page_link_or_span(page, span_class, text = nil)
text ||= page.to_s
+ text = text.html_safe if text.respond_to? :html_safe
if page and page != current_page
classnames = span_class && span_class.index(' ') && span_class.split(' ', 2).last
View
@@ -1,10 +1,11 @@
+# encoding: utf-8
require File.expand_path('../lib/will_paginate/version', __FILE__)
require 'date'
Gem::Specification.new do |gem|
gem.name = 'will_paginate'
gem.version = WillPaginate::VERSION::STRING
- gem.date = Date.today.to_s
+ gem.date = Time.now.strftime('%Y-%m-%d')
gem.summary = "Pagination for Rails"
gem.description = "The will_paginate library provides a simple, yet powerful and extensible API for ActiveRecord pagination and rendering of pagination links in ActionView templates."

0 comments on commit 358db07

Please sign in to comment.