admin_interface 2.2.2 → 2.2.3

data/admin_interface.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "admin_interface"
-  s.version = "2.2.2"
+  s.version = "2.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Joost Hietbrink"]
-  s.date = "2012-06-20"
+  s.date = "2012-10-25"
   s.description = "A Rails admin interface generator. Theme stolen from Redmine. Similar to web-app-theme but better ;)."
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -118,6 +118,7 @@ Gem::Specification.new do |s|
     "vendor/assets/images/admin/feed.png",
     "vendor/assets/images/admin/files/c.png",
     "vendor/assets/images/admin/files/csharp.png",
+    "vendor/assets/images/admin/files/csv.png",
     "vendor/assets/images/admin/files/default.png",
     "vendor/assets/images/admin/files/image.png",
     "vendor/assets/images/admin/files/pdf.png",
@@ -274,6 +275,10 @@ 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_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"])
@@ -334,6 +339,10 @@ 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<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"])
@@ -395,6 +404,10 @@ 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<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"])

data/app/inputs/country_code_input.rb

@@ -5,6 +5,6 @@
 #
 class CountryCodeInput < SimpleForm::Inputs::Base
   def input
-    @builder.country_code_select(attribute_name, input_options.delete(:priority), input_html_options) #, priority_countries, options)
+    @builder.country_code_select(attribute_name, input_options.delete(:priority) || SimpleForm.country_priority, input_html_options) #, priority_countries, options)
   end
 end

data/lib/admin_interface/version.rb

@@ -3,7 +3,7 @@ module AdminInterface
   module Version
     MAJOR = 2
     MINOR = 2
-    PATCH = 2
+    PATCH = 3
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/generators/admin_interface/templates/setup/controllers/resource_controller.rb

@@ -18,7 +18,9 @@ protected
   # Use meta_search and kaminari gem to load collection.
   # Saves the per parameter to the user's session[:admin_per].
   def collection
-    @search ||= end_of_association_chain.ransack(params[:q])
+    @search ||= end_of_association_chain
+    @search = @search.reorder('') if params[:q].present? && params[:q][:s].present? # We reorder to nothing if we have Ransack sort parameters.
+    @search = @search.ransack(params[:q])
     get_collection_ivar || begin
       session[:admin_per] = params[:per] || session[:admin_per] # Save the per_page to the user's session
       c = @search.result.page(params[:page]).per(session[:admin_per])

data/vendor/assets/stylesheets/admin_interface.css.scss

@@ -21,6 +21,13 @@ div.input {
   padding: 5px 0 8px 180px;
 }
 
+/* Used to add below simple_form input and add extra info/links to an input */
+div.input-extras {
+  margin: 0;
+  padding: 0 0 8px 180px;
+  margin-top:-6px;
+}
+
 /***** Custom additions to Redmine *****/
 .icon-search  { background-image: image-url('admin/search.png'); }
 .icon-download  { background-image: image-url('admin/download.png'); }
@@ -705,6 +712,7 @@ button.tab-right {
 }
 
 /***** Auto-complete *****/
+/* 
 div.autocomplete {
   position:absolute;
   width:400px;
@@ -733,6 +741,7 @@ div.autocomplete ul li span.informal {
   font-size: 80%;
   color: #aaa;
 }
+*/
 
 #parent_issue_candidates ul li {width: 500px;}
 #related_issue_candidates ul li {width: 500px;}
@@ -955,6 +964,7 @@ padding-bottom: 3px;
 .icon-file.text-x-csharp { background-image: image-url('admin/files/csharp.png'); }
 .icon-file.text-x-php { background-image: image-url('admin/files/php.png'); }
 .icon-file.text-x-ruby { background-image: image-url('admin/files/ruby.png'); }
+.icon-file.text-csv { background-image: image-url('admin/files/csv.png'); }
 .icon-file.text-xml { background-image: image-url('admin/files/xml.png'); }
 .icon-file.image-gif { background-image: image-url('admin/files/image.png'); }
 .icon-file.image-jpeg { background-image: image-url('admin/files/image.png'); }
@@ -1099,7 +1109,7 @@ input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hove
 /* Fields */
 input[type="text"], input[type="number"], input[type="tel"], input[type="email"], input[type="password"], input[type="url"], textarea, select { padding: 2px; border: 1px solid #d7d7d7; }
 input[type="text"], input[type="password"] { padding: 3px; }
-input[type="text"]:focus, input[type="password"]:focus, textarea:focus, select:focus { border: 1px solid #888866; }
+input[type="text"]:focus, input[type="number"]:focus, input[type="tel"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="password"]:focus, textarea:focus, select:focus { border: 1px solid #888866; }
 option { border-bottom: 1px dotted #d7d7d7; }
 
 /* Misc */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admin_interface
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: admin_interface
@@ -859,6 +859,70 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: geminabox
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: geminabox
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -1066,6 +1130,7 @@ files:
 - vendor/assets/images/admin/feed.png
 - vendor/assets/images/admin/files/c.png
 - vendor/assets/images/admin/files/csharp.png
+- vendor/assets/images/admin/files/csv.png
 - vendor/assets/images/admin/files/default.png
 - vendor/assets/images/admin/files/image.png
 - vendor/assets/images/admin/files/pdf.png