diff --git a/grapple.gemspec b/grapple.gemspec index 9ed1144..f62bf64 100644 --- a/grapple.gemspec +++ b/grapple.gemspec @@ -1,11 +1,11 @@ Gem::Specification.new do |s| s.name = %q{grapple} - s.version = "0.1.4" + s.version = "0.1.5" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Edward Potocko", "Matt Maiatico", "Matt Guenzel"] - s.date = %q{2016-08-17} + s.date = %q{2016-09-09} s.description = %q{Data tables for Rails} s.summary = "Customizable data grid for Rails" s.email = %q{epotocko@equallevel.com} diff --git a/lib/grapple/components/will_paginate_infobar.rb b/lib/grapple/components/will_paginate_infobar.rb index b181ace..0875919 100644 --- a/lib/grapple/components/will_paginate_infobar.rb +++ b/lib/grapple/components/will_paginate_infobar.rb @@ -2,14 +2,19 @@ module Grapple module Components class WillPaginateInfobar < HtmlComponent - setting :message, "Displaying %d - %d of %d results" + setting :message, "Displaying %s - %s of %s results" setting :no_results_message, "0 results" def render if records.total_entries > 0 start_range = records.offset + 1 end_range = [records.offset + records.per_page, records.total_entries].min - html = sprintf(message, start_range, end_range, records.total_entries) + + start_range = ActiveSupport::NumberHelper.number_to_delimited(start_range) + end_range = ActiveSupport::NumberHelper.number_to_delimited(end_range) + total = ActiveSupport::NumberHelper.number_to_delimited(records.total_entries) + + html = sprintf(message, start_range, end_range, total) else html = no_results_message end diff --git a/lib/grapple/components/will_paginate_pagination.rb b/lib/grapple/components/will_paginate_pagination.rb index 19d561f..7f758ac 100644 --- a/lib/grapple/components/will_paginate_pagination.rb +++ b/lib/grapple/components/will_paginate_pagination.rb @@ -15,17 +15,19 @@ class WillPaginatePagination < HtmlComponent setting :renderer, nil def render(paginate_parameters = {}) + td_class = "" if records.instance_of?(Array) html = ' ' elsif !params[:query].blank? and records.empty? html = h(t(no_results_message)) + td_class = "class='text-left'" else paginate_parameters[:param_name] = url_parameter(:page) if builder.namespace options = { renderer: renderer }.select { |_, value| !value.nil? }.merge(paginate_parameters) html = template.will_paginate(records, options) || ' ' end - builder.row "#{html}" + builder.row "#{html}" end end