Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Flag update and version bump

  • Loading branch information...
commit 1aa6bdfcbae545ec1908800175b3e4999fc46595 1 parent b930f45
@joost authored
View
11 admin_interface.gemspec
@@ -5,11 +5,11 @@
Gem::Specification.new do |s|
s.name = "admin_interface"
- s.version = "2.1.14"
+ s.version = "2.1.15"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Joost Hietbrink"]
- s.date = "2012-06-14"
+ s.date = "2012-06-15"
s.description = "A Rails admin interface generator. Theme stolen from Redmine. Similar to web-app-theme but better ;)."
s.extra_rdoc_files = [
"README.rdoc"
@@ -125,6 +125,7 @@ Gem::Specification.new do |s|
"vendor/assets/images/admin/files/xml.png",
"vendor/assets/images/admin/files/zip.png",
"vendor/assets/images/admin/flag_black.png",
+ "vendor/assets/images/admin/flag_blue.png",
"vendor/assets/images/admin/flag_green.png",
"vendor/assets/images/admin/flag_red.png",
"vendor/assets/images/admin/folder.png",
@@ -258,6 +259,8 @@ Gem::Specification.new do |s|
s.add_development_dependency(%q<geminabox>, [">= 0"])
s.add_development_dependency(%q<jeweler>, [">= 0"])
s.add_development_dependency(%q<geminabox>, [">= 0"])
+ s.add_development_dependency(%q<jeweler>, [">= 0"])
+ s.add_development_dependency(%q<geminabox>, [">= 0"])
s.add_runtime_dependency(%q<kaminari>, [">= 0.12.4"])
s.add_runtime_dependency(%q<ransack>, [">= 0"])
s.add_runtime_dependency(%q<inherited_resources>, [">= 1.2.2"])
@@ -308,6 +311,8 @@ Gem::Specification.new do |s|
s.add_dependency(%q<geminabox>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<geminabox>, [">= 0"])
+ s.add_dependency(%q<jeweler>, [">= 0"])
+ s.add_dependency(%q<geminabox>, [">= 0"])
s.add_dependency(%q<kaminari>, [">= 0.12.4"])
s.add_dependency(%q<ransack>, [">= 0"])
s.add_dependency(%q<inherited_resources>, [">= 1.2.2"])
@@ -359,6 +364,8 @@ Gem::Specification.new do |s|
s.add_dependency(%q<geminabox>, [">= 0"])
s.add_dependency(%q<jeweler>, [">= 0"])
s.add_dependency(%q<geminabox>, [">= 0"])
+ s.add_dependency(%q<jeweler>, [">= 0"])
+ s.add_dependency(%q<geminabox>, [">= 0"])
s.add_dependency(%q<kaminari>, [">= 0.12.4"])
s.add_dependency(%q<ransack>, [">= 0"])
s.add_dependency(%q<inherited_resources>, [">= 1.2.2"])
View
4 app/helpers/admin/base_helper.rb
@@ -73,11 +73,11 @@ def paginate_info(collection)
content_tag(:nav, html.html_safe, :class => 'pagination info').html_safe
end
- # Shows a 'Per page: 25 50 100'.
+ # Shows a 'Per page: 25 50 100 500'.
# Uses I18n 'en.views.perinate' translation key.
def perinate(collection, options = {})
return if collection.blank?
- options.reverse_merge!(:values => [25, 50, 100])
+ options.reverse_merge!(:values => [25, 50, 100, 500])
page = (collection.offset_value / collection.limit_value).to_i + 1
html = I18n.t('views.perinate', :default => "Per page: ")
html += options[:values].collect do |value|
View
2  lib/admin_interface/version.rb
@@ -3,7 +3,7 @@ module AdminInterface
module Version
MAJOR = 2
MINOR = 1
- PATCH = 14
+ PATCH = 15
BUILD = nil
STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')
View
BIN  vendor/assets/images/admin/flag_blue.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  vendor/assets/images/admin/flag_green.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
1  vendor/assets/stylesheets/admin_interface.css.scss
@@ -31,6 +31,7 @@ div.input {
.icon-flag_red { background-image: image-url('admin/flag_red.png'); }
.icon-flag_green { background-image: image-url('admin/flag_green.png'); }
.icon-flag_black { background-image: image-url('admin/flag_black.png'); }
+.icon-flag_blue { background-image: image-url('admin/flag_blue.png'); }
tfoot th {
text-align: left;
Please sign in to comment.
Something went wrong with that request. Please try again.