activeadmin 0.6.0 → 0.6.1

data/CONTRIBUTING.md

@@ -3,6 +3,16 @@
 This is a guide to contributing to Active Admin. It should walk you through the
 major steps to contributing code to the project.
 
+### 0. 'The test suite is failing locally!'
+
+If your test suite is failing locally and the 
+[Travis build](https://secure.travis-ci.org/gregbell/active_admin.png?branch=master)
+ is passing, you've likely already generated the rails app that is used by 
+ActiveAdmin's test suite and the generated rails app has erroneous files.
+
+To fix this, remove the generated rails app by deleting the directory and its 
+contents (`rm -rf spec/rails`) and then re-running the test suite.
+
 ### 1. Create an Issue on GitHub
 
 The first step to contributing to Active Admin is creating a ticket in our
@@ -28,7 +38,7 @@ working on):
 
 ### 3. Get the test suite running
 
-Active Admin is a gem that many people and businesses rely on for managing data 
+Active Admin is a gem that many people and businesses rely on for managing data
 in their production applications. Bugs are not cool. Although we're not perfect,
 we pride ourselves on writing well tested code. I hope you do too :)
 
@@ -96,7 +106,7 @@ browser, you're ready to test it against multiple versions of Rails.
     $> rake test:major_supported_rails
 
 This command runs the cukes and specs against a couple of major versions of
-Rails.  We will run this command when we review your pull request, if this 
+Rails.  We will run this command when we review your pull request, if this
 rake task isn't passing, the pull request will not be merged in.
 
 

data/Gemfile

@@ -1,4 +1,4 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec
 
@@ -21,6 +21,11 @@ else
   raise "Rails #{rails_version} is not supported yet"
 end
 
+group :development do
+  gem 'better_errors',     '~> 0.9.0' # Web UI to debug exceptions. Go to /__better_errors to access the latest one
+  gem 'binding_of_caller', '~> 0.7.1' # Retrieve the binding of a method's caller in MRI Ruby >= 1.9.2
+end
+
 group :development, :test do
   gem 'haml', '~> 3.1.7',  :require => false
   gem 'rake', '~> 10.0.2', :require => false
@@ -33,8 +38,9 @@ end
 group :test do
   gem 'cancan'
   gem 'capybara',        '1.1.2'
+  gem 'coveralls',       '~> 0.6.7', require: false # Test coverage tool: www.coveralls.io
   gem 'cucumber-rails',  '1.3.0', :require => false
-  gem 'database_cleaner'
+  gem 'database_cleaner', '<= 1.0.1'
   gem 'guard-coffeescript'
   gem 'guard-rspec'
   gem 'jasmine'
@@ -42,6 +48,6 @@ group :test do
   gem 'launchy'
   gem 'parallel_tests'
   gem 'rspec-rails',     '~> 2.9.0'
-  gem 'shoulda-matchers', '1.5.0' # See active_admin#2004
+  gem 'shoulda-matchers'
   gem 'sqlite3'
 end

data/README.rdoc

@@ -1,10 +1,12 @@
 = Active Admin
 
-Active Admin is a framework for creating administration style interfaces. It
-abstracts common business application patterns to make it simple for developers
-to implement beautiful and elegant interfaces with very little effort.
+Active Admin is a Ruby on Rails framework for creating elegant backends for website administration.
 
-{<img src="https://secure.travis-ci.org/gregbell/active_admin.png?branch=master" />}[http://travis-ci.org/gregbell/active_admin] {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/gregbell/active_admin] {<img src="https://gemnasium.com/gregbell/active_admin.png" />}[https://gemnasium.com/gregbell/active_admin]
+{<img src="https://secure.travis-ci.org/gregbell/active_admin.png?branch=master" />}[http://travis-ci.org/gregbell/active_admin]
+{<img src="https://codeclimate.com/github/gregbell/active_admin.png" />}[https://codeclimate.com/github/gregbell/active_admin]
+{<img src="https://gemnasium.com/gregbell/active_admin.png" />}[https://gemnasium.com/gregbell/active_admin]
+{<img src="https://coveralls.io/repos/gregbell/active_admin/badge.png?branch=master" />}[https://coveralls.io/r/gregbell/active_admin?branch=master]
+{<img src="http://badgr.co/gittip/activeadmin.png" />}[https://www.gittip.com/activeadmin/]
 
 == Documentation & Support
 
@@ -23,93 +25,64 @@ to implement beautiful and elegant interfaces with very little effort.
 3. Ensure that developers can easily customize every nook and cranny of the interface.
 4. Build common interfaces as shareable gems so that the entire community benefits.
 
-== Bugs Reports & Contributing
-
-* Bug Reports: https://github.com/gregbell/active_admin/issues
-* Want to Contribute? Read the Guide: https://github.com/gregbell/active_admin/blob/master/CONTRIBUTING.md
-
-== Feature Requests
-
-Please don't put feature requests in Github Issues. They will be closed as soon as they
-are reviewed by one of the core team members. If you would like a feature in Active Admin,
-please submit a well tested pull request with the desired changes. If you're not a coder,
-then the mailing list may be a good place to try to convince someone to help you out
-with your cause.
-
-If you are going to submit a pull request, please read the contributing guide:
-https://github.com/gregbell/active_admin/blob/master/CONTRIBUTING.md
-
-
 == Getting Started
 
-Active Admin is released as a Ruby Gem. The gem is to be installed within a Ruby
-on Rails 3 application. To install, simply add the following to your Gemfile:
+Active Admin is a Ruby Gem.
 
   gem 'activeadmin'
 
-After updating your bundle, run the installer
+More accurately, it's a {Rails Engine}[http://guides.rubyonrails.org/engines.html]
+that can be injected into your existing Ruby on Rails application.
 
   $> rails generate active_admin:install
 
-The installer creates an initializer used for configuring defaults used by Active Admin as well
-as a new folder at <tt>app/admin</tt> to put all your admin configurations.
+The generator adds these core files, among others:
+
+  app/admin/dashboard.rb
+  app/assets/javascripts/active_admin.js
+  app/assets/stylesheets/active_admin.css.scss
+  config/initializers/active_admin.rb
 
-Migrate your db and start the server:
+Migrate your database and start the server:
 
   $> rake db:migrate
   $> rails server
 
-Visit http://localhost:3000/admin and log in using:
+Visit http://localhost:3000/admin and log in as the default user:
 
 * *User*: admin@example.com
 * *Password*: password
 
 Voila! You're on your brand new Active Admin dashboard.
 
-To register your first model, run:
+To register an existing model with Active Admin:
 
-  $> rails generate active_admin:resource [MyModelName]
+  $> rails generate active_admin:resource MyModel
 
-This creates a file at <tt>app/admin/my_model_names.rb</tt> for configuring the resource.
-Refresh your web browser to see the interface.
+This creates a file at <tt>app/admin/my_model.rb</tt> to set up the UI; refresh your browser to see it.
 
 == Upgrading
 
-When upgrading to a new version of ActiveAdmin you may need to run
-  $> rails generate active_admin:assets
-
-If you get:
-  uninitialized constant Admin::DashboardController
-when trying to view the dashboard (at +/admin+), ensure +app/admin/dashboards.rb+ looks like the current {default}[https://raw.github.com/gregbell/active_admin/master/lib/generators/active_admin/install/templates/dashboard.rb].
+When upgrading to a new version, it's a good idea to check the {CHANGELOG}[https://github.com/gregbell/active_admin/blob/master/CHANGELOG.md].
 
+To update the JS & CSS assets:
+  $> rails generate active_admin:assets
 
-== Next Steps
-
-The best place to get documentation is at http://activeadmin.info/documentation.html.
-
-To view a sample Active Admin application, checkout http://demo.activeadmin.info
-
-If you have any questions, please email the mailing list at http://groups.google.com/group/activeadmin
-
+You should also sync these files with their counterparts in the AA source code:
+* app/admin/dashboard.rb {~>}[https://github.com/gregbell/active_admin/blob/master/lib/generators/active_admin/install/templates/dashboard.rb]
+* config/initializers/active_admin.rb {~>}[https://github.com/gregbell/active_admin/blob/master/lib/generators/active_admin/install/templates/active_admin.rb.erb]
 
 == Tools Being Used
 
-We believe strongly in not writing code unless we have to, so Active Admin is built using many
-other open source projects:
-
-InheritedResources::
-  Inherited Resources speeds up development by making your controllers inherit all restful
-  actions so you just have to focus on what is important.
-Formtastic::
-  A DSL for semantically building amazing forms.
-Devise::
-  User authentication is done using Devise
-Kaminari::
-  Pagination for rails apps
-Iconic Icons::
-  Excellent SVG icon set designed by P.J. Onori: http://somerandomdude.com/projects/iconic
-
-
-== Copyright
-
-Copyright (c) 2011 Greg Bell, VersaPay Corporation. See LICENSE for details.
+We try not to reinvent the wheel, so Active Admin is built using many other open source projects:
+
+{Inherited Resources}[https://github.com/josevalim/inherited_resources]::
+  Simplifies controllers with pre-built RESTful controller actions
+{Formtastic}[https://github.com/justinfrench/formtastic]::
+  A Rails form builder plugin with semantically rich and accessible markup
+{Devise}[https://github.com/plataformatec/devise]::
+  Powerful, extensible user authentication
+{Kaminari}[https://github.com/amatsuda/kaminari]::
+  Clean & powerful pagination for your models
+{Iconic Icons}[http://somerandomdude.com/projects/iconic]::
+  An excellent SVG icon set designed by P.J. Onori

data/Rakefile

@@ -3,7 +3,6 @@ require 'rake'
 Bundler.setup
 Bundler::GemHelper.install_tasks
 
-
 def cmd(command)
   puts command
   raise unless system command
@@ -14,8 +13,7 @@ require File.expand_path('../spec/support/detect_rails_version', __FILE__)
 # Import all our rake tasks
 FileList['tasks/**/*.rake'].each { |task| import task }
 
-# Run the specs & cukes using parallel_tests
-task :default => :parallel_tests
+task :default => :test
 
 begin
   require 'jasmine'

data/activeadmin.gemspec

@@ -18,15 +18,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency("rails", ">= 3.0.0")
-  s.add_dependency("jquery-rails", ">= 1.0.0")
-  s.add_dependency("bourbon", ">= 1.0.0")
-  s.add_dependency("meta_search", ">= 0.9.2")
-  s.add_dependency("devise", ">= 1.1.2")
-  s.add_dependency("formtastic", ">= 2.0.0")
-  s.add_dependency("inherited_resources", ">= 1.3.1")
-  s.add_dependency("kaminari", ">= 0.13.0")
-  s.add_dependency("sass", ">= 3.1.0")
-  s.add_dependency("fastercsv", ">= 0")
-  s.add_dependency("arbre", ">= 1.0.1")
+  s.add_dependency "arbre",               "~> 1.0"
+  s.add_dependency "bourbon",             ">= 1.0.0", "< 4"
+  s.add_dependency "devise",              ">= 1.5.4", "< 4"
+  s.add_dependency "formtastic",          "~> 2.0"
+  s.add_dependency "inherited_resources", "~> 1.3"
+  s.add_dependency "jquery-rails",        ">= 1.0.0", "< 3"
+  s.add_dependency "kaminari",            "~> 0.13"
+  s.add_dependency "meta_search",         "~> 1.0"
+  s.add_dependency "rails",               ">= 3.0.0", "< 4"
+  s.add_dependency "sass",                "~> 3.1"
 end

data/app/assets/images/active_admin/index_list_icons/block_icon.svg

@@ -7,4 +7,4 @@
 <path style="fill:#010101;" d="M12.5,81.25c0,3.455-2.795,6.25-6.25,6.25C2.795,87.5,0,84.705,0,81.25S2.795,75,6.25,75  C9.705,75,12.5,77.795,12.5,81.25z"/>
 <rect x="25" y="25" style="fill:#010101;" width="75" height="12.5"/>
 <rect x="25" y="75" style="fill:#010101;" width="75" height="12.5"/>
-</svg>
+</svg>

data/app/assets/images/active_admin/index_list_icons/blog_icon.svg

@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="100px" height="63.62px" viewBox="0 0 100 63.62" enable-background="new 0 0 100 63.62" xml:space="preserve">
 <path d="M40.592,41.293V23.226c0-4.67,3.617-8.457,8.079-8.457h17.675v-4.307C66.346,4.685,61.868,0,56.35,0H9.996  C4.477,0,0,4.685,0,10.463v22.354c0,5.777,4.477,10.463,9.996,10.463h7.649c0,4.115,0,8.234,0,12.352  c0,0.682,0.936,1.162,1.422,0.59c3.645-4.314,7.287-8.627,10.933-12.941h10.825C40.677,42.641,40.592,41.979,40.592,41.293z"/>
 <path d="M45.178,26.205v20.168c0,4.211,3.263,7.627,7.289,7.627h19.21c2.658,3.145,5.313,6.289,7.97,9.434  c0.354,0.42,1.036,0.068,1.036-0.428c0-3.002,0-6.004,0-9.006h12.029c4.025,0,7.288-3.416,7.288-7.627V26.205  c0-4.212-3.263-7.629-7.288-7.629H52.467C48.441,18.576,45.178,21.992,45.178,26.205z"/>
-</svg>
+</svg>

data/app/assets/images/active_admin/index_list_icons/grid_icon.svg

@@ -10,4 +10,4 @@
 	<path fill="#000000" d="M59.704,72.833H40.373c-1.565,0-2.834,1.269-2.834,2.835v19.33c0,1.566,1.269,2.834,2.834,2.834h19.331   c1.565,0,2.835-1.268,2.835-2.834v-19.33C62.539,74.102,61.27,72.833,59.704,72.833z"/>
 	<path fill="#000000" d="M94.742,72.833h-19.33c-1.566,0-2.835,1.269-2.835,2.835v19.33c0,1.566,1.269,2.834,2.835,2.834h19.33   c1.566,0,2.836-1.268,2.836-2.834v-19.33C97.578,74.102,96.309,72.833,94.742,72.833z"/>
 </g>
-</svg>
+</svg>

data/app/assets/images/active_admin/index_list_icons/table_icon.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
 <path d="M0,0v100h100V0H0z M93.164,39.662H66.55V25.469h2.396h24.219V39.662z M64.499,58.308H35.501V41.706h28.998V58.308z   M35.501,39.662V25.469h2.389h24.219h2.39v14.193H35.501z M31.055,25.469h2.396v14.193H6.836V25.469H31.055z M33.451,41.706v16.602  H6.836V41.706H33.451z M6.836,60.352h26.615v16.575H6.836V60.352z M35.501,60.352h28.998v16.575H35.501V60.352z M66.55,60.352  h26.614v16.575H66.55V60.352z M66.55,58.308V41.706h26.614v16.602H66.55z M6.836,93.164v-14.18h26.615v14.18H6.836z M35.501,93.164  v-14.18h28.998v14.18H35.501z M66.55,78.984h26.614v14.18H66.55V78.984z"/>
-</svg>
+</svg>

data/app/assets/javascripts/active_admin/components/jquery.aa.checkbox-toggler.js.coffee

@@ -1,4 +1,4 @@
-window.AA.CheckboxToggler = class AA.CheckboxToggler
+window.ActiveAdmin.CheckboxToggler = class ActiveAdmin.CheckboxToggler
   constructor: (@options, @container)->
     defaults = {}
     @options = $.extend {}, defaults, options
@@ -34,4 +34,4 @@ window.AA.CheckboxToggler = class AA.CheckboxToggler
       @_didChangeCheckbox(el)
 
 jQuery ($)->
-  $.widget.bridge 'checkboxToggler', AA.CheckboxToggler
+  $.widget.bridge 'checkboxToggler', ActiveAdmin.CheckboxToggler

data/app/assets/javascripts/active_admin/components/jquery.aa.dropdown-menu.js.coffee

@@ -1,4 +1,4 @@
-window.AA.DropdownMenu = class AA.DropdownMenu
+window.ActiveAdmin.DropdownMenu = class ActiveAdmin.DropdownMenu
 
   constructor: (@options, @element) ->
 
@@ -98,7 +98,7 @@ window.AA.DropdownMenu = class AA.DropdownMenu
     $nipple.css "left", nippleLeftPos
 
 (($) ->
-  $.widget.bridge 'aaDropdownMenu', AA.DropdownMenu
+  $.widget.bridge 'aaDropdownMenu', ActiveAdmin.DropdownMenu
 
   $ ->
     $(".dropdown_menu").aaDropdownMenu()

data/app/assets/javascripts/active_admin/components/jquery.aa.popover.js.coffee

@@ -1,5 +1,5 @@
 
-window.AA.Popover = class AA.Popover
+window.ActiveAdmin.Popover = class ActiveAdmin.Popover
 
   constructor: (@options, @element) ->
 
@@ -93,5 +93,5 @@ window.AA.Popover = class AA.Popover
     $nipple.css "left", nippleLeftPos
 
 (($) ->
-  $.widget.bridge 'popover', AA.Popover
+  $.widget.bridge 'popover', ActiveAdmin.Popover
 )(jQuery)

data/app/assets/javascripts/active_admin/components/jquery.aa.table-checkbox-toggler.js.coffee

@@ -1,4 +1,4 @@
-window.AA.TableCheckboxToggler = class AA.TableCheckboxToggler extends AA.CheckboxToggler
+window.ActiveAdmin.TableCheckboxToggler = class ActiveAdmin.TableCheckboxToggler extends ActiveAdmin.CheckboxToggler
   _init: ->
     super
 
@@ -22,4 +22,4 @@ window.AA.TableCheckboxToggler = class AA.TableCheckboxToggler extends AA.Checkb
     $(cell).parent('tr').find(':checkbox').click()
 
 jQuery ($)->
-  $.widget.bridge 'tableCheckboxToggler', AA.TableCheckboxToggler
+  $.widget.bridge 'tableCheckboxToggler', ActiveAdmin.TableCheckboxToggler

data/app/assets/javascripts/active_admin/lib/namespace.js.coffee

@@ -1,3 +1,4 @@
 # Make a namespace for ActiveAdmin plugins
 
-window.AA = {}
+window.ActiveAdmin = {}
+window.AA = window.ActiveAdmin unless window.AA

data/app/assets/javascripts/active_admin/pages/application.js.coffee

@@ -12,5 +12,10 @@ $ ->
   $('.dropdown_button').popover()
 
   # Filter form: don't send any inputs that are empty
-  $('#q_search').submit ->
+  $('.filter_form').submit ->
     $(@).find(':input').filter(-> @value is '').prop 'disabled', true
+
+  # Filter form: for filters that let you choose the query method from
+  # a dropdown, apply that choice to the filter input field.
+  $('.filter_form_field.select_and_search select').change ->
+    $(@).siblings('input').prop name: "q[#{@value}]"

data/app/assets/stylesheets/active_admin/_base.css.scss

@@ -1,45 +1,40 @@
 /* Active Admin CSS */
 // Reset Away!
-body.active_admin {
-  @include global-reset;
-}
+@include global-reset;
 
 // Partials
-body.active_admin {
-    @import "active_admin/typography";
-    @import "active_admin/header";
-    @import "active_admin/forms";
-    @import "active_admin/components/comments";
-    @import "active_admin/components/flash_messages";
-    @import "active_admin/components/date_picker";
-    @import "active_admin/components/popovers";
-    @import "active_admin/components/tables";
-    @import "active_admin/components/batch_actions";
-    @import "active_admin/components/blank_slates";
-    @import "active_admin/components/breadcrumbs";
-    @import "active_admin/components/dropdown_menu";
-    @import "active_admin/components/buttons";
-    @import "active_admin/components/grid";
-    @import "active_admin/components/links";
-    @import "active_admin/components/pagination";
-    @import "active_admin/components/panels";
-    @import "active_admin/components/columns";
-    @import "active_admin/components/scopes";
-    @import "active_admin/components/status_tags";
-    @import "active_admin/components/table_tools";
-    @import "active_admin/components/index_list";
-    @import "active_admin/pages/dashboard";
-    @import "active_admin/pages/logged_out";
-    @import "active_admin/structure/footer";
-    @import "active_admin/structure/main_structure";
-    @import "active_admin/structure/title_bar";
-}
+@import "active_admin/typography";
+@import "active_admin/header";
+@import "active_admin/forms";
+@import "active_admin/components/comments";
+@import "active_admin/components/flash_messages";
+@import "active_admin/components/date_picker";
+@import "active_admin/components/popovers";
+@import "active_admin/components/tables";
+@import "active_admin/components/batch_actions";
+@import "active_admin/components/blank_slates";
+@import "active_admin/components/breadcrumbs";
+@import "active_admin/components/dropdown_menu";
+@import "active_admin/components/buttons";
+@import "active_admin/components/grid";
+@import "active_admin/components/links";
+@import "active_admin/components/pagination";
+@import "active_admin/components/panels";
+@import "active_admin/components/columns";
+@import "active_admin/components/scopes";
+@import "active_admin/components/status_tags";
+@import "active_admin/components/table_tools";
+@import "active_admin/components/index_list";
+@import "active_admin/pages/logged_out";
+@import "active_admin/structure/footer";
+@import "active_admin/structure/main_structure";
+@import "active_admin/structure/title_bar";
 
-body.active_admin {
+body {
   @include sans-family;
   line-height: 150%;
   font-size: 72%;
-  background: #fff;
+  background: $body-background-color;
   margin: 0;
   padding: 0;
   color: $text-color;

data/app/assets/stylesheets/active_admin/_forms.css.scss

@@ -4,8 +4,8 @@ form {
   ul, ol, li, fieldset, legend, input, textarea, select, p { margin:0; padding:0; }
   ol, ul { list-style: none }
 
-  fieldset { 
-    border: 0; 
+  fieldset {
+    border: 0;
     padding: 10px 0;
     margin-bottom: 20px;
 
@@ -24,8 +24,11 @@ form {
         float: left;
         font-size: 1.0em;
         font-weight: bold;
-        color: $section-header-text-color;
-        abbr { border: none; color: #aaa; }
+        color: $form-label-color;
+        abbr {
+          border: none;
+          color:  $required-field-marker-color;
+        }
       }
     }
 
@@ -37,12 +40,12 @@ form {
       }
     }
 
-    ol > li > li label { 
-      line-height:100%; 
-      padding-top:0; 
-      input { 
-        line-height:100%; 
-        vertical-align:middle; 
+    ol > li > li label {
+      line-height:100%;
+      padding-top:0;
+      input {
+        line-height:100%;
+        vertical-align:middle;
         margin-top:-0.1em;
       }
     }
@@ -50,30 +53,30 @@ form {
 
   /* Nested Fieldsets and Legends */
   fieldset > ol > li {
-    fieldset { 
-      position:relative; 
+    fieldset {
+      position:relative;
       padding: 0;
       margin-bottom: 0;
 
-      legend { 
-        position:absolute; 
-        width:95%; 
-        padding-top:0.1em; 
-        left: 0px; 
-        font-size: 100%; 
+      legend {
+        position:absolute;
+        width:95%;
+        padding-top:0.1em;
+        left: 0px;
+        font-size: 100%;
         font-weight: normal;
         span { position:absolute; }
         &.label label { position:absolute; }
       }
 
-      ol { 
-        float:left; 
-        width:74%; 
-        margin:0; 
-        padding:0 0 0 20%; 
+      ol {
+        float:left;
+        width:74%;
+        margin:0;
+        padding:0 0 0 20%;
 
         li {
-          padding:0; 
+          padding:0;
           border:0;
         }
       }
@@ -89,7 +92,7 @@ form {
     @include sans-family;
     outline: none;
     padding: 8px $text-input-horizontal-padding 7px;
-    
+
     &:focus {
       border: 1px solid #99a2aa;
       @include shadow(0,0,4px,#99a2aa);
@@ -99,17 +102,17 @@ form {
   fieldset > ol > li {
 
     /* Hints */
-    p.inline-hints { 
+    p.inline-hints {
       font-size: 0.95em;
       font-style: italic;
-      color:#666; 
-      margin: 0.5em 0 0 20%;  
+      color:#666;
+      margin: 0.5em 0 0 20%;
     }
 
     /* Date and Time Fields */
     &.date, &.time, &.datetime, &.date_select {
       fieldset ol li {
-        float:left; width:auto; margin:0 0.5em 0 0; 
+        float:left; width:auto; margin:0 0.5em 0 0;
         label { display: none; }
         input { display:inline; margin:0; padding:0;  }
       }
@@ -117,13 +120,13 @@ form {
 
     /* Check Boxes or Radio fields */
     &.check_boxes, &.radio {
-      fieldset ol { 
+      fieldset ol {
         margin-bottom:-0.6em;
-        li { 
-          margin:0.1em 0 0.5em 0; 
-          label { 
-            float:none; 
-            width:100%; 
+        li {
+          margin:0.1em 0 0.5em 0;
+          label {
+            float:none;
+            width:100%;
             input { margin-right:0.2em; }
           }
         }
@@ -133,10 +136,10 @@ form {
     /* Boolean Field */
     &.boolean {
       height: 1.1em;
-      label { 
+      label {
         width: 80%;
-        padding-left:20%; 
-        padding-right: 10px; 
+        padding-left:20%;
+        padding-right: 10px;
         text-transform: none !important;
         font-weight: normal;
         input { margin:0 0.5em 0 0.2em; }
@@ -144,15 +147,15 @@ form {
     }
 
     /* Errors */
-    p.inline-errors { 
+    p.inline-errors {
       color: $error-color;
       font-weight: bold;
-      margin:0.3em 0 0 20%; 
+      margin:0.3em 0 0 20%;
     }
-    ul.errors { 
+    ul.errors {
       color: $error-color;
-      margin:0.5em 0 0 20%; 
-      list-style:square; 
+      margin:0.5em 0 0 20%;
+      list-style:square;
       li { padding:0; border:none; display:list-item; }
     }
 
@@ -164,32 +167,32 @@ form {
   }
 
   /* semantic_errors */
-  ul.errors { 
+  ul.errors {
     background: lighten($error-color, 60%);
     @include rounded(4px);
     color: $error-color;
     font-weight: bold;
     margin-bottom: 10px;
     padding: 10px;
-    list-style:square; 
+    list-style:square;
     li { margin-left:15px; padding:0; border:none; display:list-item; }
   }
 
   /* Buttons */
-  
+
   input[type=submit] {
     @include dark-button;
     cursor: pointer;
-    
+
   }
-  
+
   .buttons, .actions {
-    margin-top: 15px; 
+    margin-top: 15px;
     input[type=submit] { margin-right: 10px; }
   }
-  
+
   fieldset.buttons li, fieldset.actions li {
-    float:left; 
+    float:left;
     padding: 0;
 
     &.cancel {
@@ -201,16 +204,16 @@ form {
 
 }
 
-// -------------------------------------- Sidebar Forms 
+// -------------------------------------- Sidebar Forms
 
 $sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
 
-.sidebar_section { 
+.sidebar_section {
 
   label {
     display: block;
     text-transform: uppercase;
-    color: $section-header-text-color;
+    color:  $form-label-color;
     font-size: 0.9em;
     font-weight: bold;
   }
@@ -218,7 +221,7 @@ $sidebar-inner-content-width: $sidebar-width - ($section-padding * 2);
   select {
     width: $sidebar-inner-content-width;
   }
-  
+
   input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], textarea {
     width: $sidebar-inner-content-width - ($text-input-horizontal-padding * 2);
   }
@@ -238,10 +241,10 @@ $date-range-filter-input-width: ($sidebar-inner-content-width / 2) - $filter-fie
 
 form.filter_form {
   .filter_form_field {
-    margin-bottom: 10px; 
+    margin-bottom: 10px;
     clear: both;
-    
-    &.filter_numeric {
+
+    &.select_and_search {
       input[type=text] {
         margin-left: $filter-field-seperator-width + 4;
         width: $side-by-side-filter-input-width;
@@ -250,11 +253,11 @@ form.filter_form {
         width: $side-by-side-filter-select-width;
       }
     }
-    
+
     &.filter_check_boxes {
       label { margin-bottom: 3px; }
-      .check_boxes_wrapper label { 
-        font-weight: normal; 
+      .check_boxes_wrapper label {
+        font-weight: normal;
         margin-bottom: 3px;
         text-transform: none;
         font-size: 1.0em;
@@ -268,7 +271,7 @@ form.filter_form {
         text-align: center;
         width: $filter-field-seperator-width;
       }
-    
+
       input[type=text] {
         background: #fff url(active_admin_image_path('datepicker/datepicker-input-icon.png')) no-repeat 100% 7px;
         padding-right: $date-range-filter-input-right-padding;