activeadmin 1.0.0 → 1.1.0

data/Gemfile

@@ -1,5 +1,12 @@
 source 'https://rubygems.org'
 
+# Trick to use https without warnings and without having to specify full URLs
+# TODO: Can be removed when Bundler 2.x is released.
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
 # Optional dependencies
 gem 'cancan'
 gem 'pundit'
@@ -9,38 +16,40 @@ gem 'rake'
 gem 'parallel_tests'
 
 # Debugging
-gem 'pry'                                   # Easily debug from your console with `binding.pry`
+gem 'pry' # Easily debug from your console with `binding.pry`
 
 # Code style
-gem 'rubocop', '0.48.1'
+gem 'rubocop', '0.49.1'
+gem 'mdl', '0.4.0'
+
+# Translations
+gem 'i18n-tasks'
+
+# Documentation
+gem 'yard'                        # Documentation generator
+gem 'redcarpet', platforms: :mri  # Markdown implementation (for yard)
+gem 'kramdown', platforms: :jruby # Markdown implementation (for yard)
 
 group :development do
   # Debugging
-  gem 'better_errors'                       # Web UI to debug exceptions. Go to /__better_errors to access the latest one
+  gem 'better_errors' # Web UI to debug exceptions. Go to /__better_errors to access the latest one
 
-  gem 'binding_of_caller', platforms: :mri  # Retrieve the binding of a method's caller
+  gem 'binding_of_caller', platforms: :mri # Retrieve the binding of a method's caller
 
   # Performance
-  gem 'rack-mini-profiler'                  # Inline app profiler. See ?pp=help for options.
-
-  # Documentation
-  gem 'yard'                                # Documentation generator
-  gem 'redcarpet', platforms: :mri          # Markdown implementation (for yard)
-  gem 'kramdown', platforms: :jruby         # Markdown implementation (for yard)
-  gem 'appraisal', '~> 2.2', require: false
+  gem 'rack-mini-profiler' # Inline app profiler. See ?pp=help for options.
 end
 
 group :test do
   gem 'capybara'
-  gem 'simplecov', require: false           # Test coverage generator. Go to /coverage/ after running tests
-  gem 'codecov', require: false             # Test coverage website. Go to https://codecov.io
+  gem 'simplecov', require: false # Test coverage generator. Go to /coverage/ after running tests
+  gem 'codecov', require: false # Test coverage website. Go to https://codecov.io
   gem 'cucumber-rails', require: false
-  gem 'cucumber', '1.3.20'
-  gem 'database_cleaner', git: 'https://github.com/DatabaseCleaner/database_cleaner.git'
+  gem 'cucumber'
+  gem 'database_cleaner'
   gem 'jasmine'
-  gem 'jslint_on_rails'
   gem 'launchy'
-  gem 'rails-i18n'                          # Provides default i18n for many languages
+  gem 'rails-i18n' # Provides default i18n for many languages
   gem 'rspec-rails'
   gem 'i18n-spec'
   gem 'shoulda-matchers', '<= 2.8.0'

data/Rakefile

@@ -1,18 +1,7 @@
 require 'bundler/gem_tasks'
 
-task :enforce_version do
-  if ENV['BUNDLE_GEMFILE'] == File.expand_path('../Gemfile', __FILE__)
-    gemfile_path = File.expand_path('../gemfiles/rails_50.gemfile', __FILE__)
-
-    command = ['bundle', 'exec', 'rake', *ARGV].join(' ')
-    env = { 'BUNDLE_GEMFILE' => gemfile_path }
-
-    Bundler.with_clean_env { Kernel.exec(env, command) }
-  end
-end
-
 desc 'Creates a test rails app for the specs to run against'
-task :setup, [:parallel, :dir, :template] => [:enforce_version] do |_t, opts|
+task :setup, [:parallel, :dir, :template] do |_t, opts|
   require 'rails/version'
 
   base_dir = opts[:dir] || 'spec/rails'

data/activeadmin.gemspec

@@ -14,21 +14,19 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|features)/})
   end
 
-  s.test_files    = `git ls-files -- {spec,features}/*`.split("\n")
+  s.test_files = `git ls-files -- {spec,features}/*`.split("\n")
 
-  s.required_ruby_version = '>= 2.1'
+  s.required_ruby_version = '>= 2.2'
 
-  s.add_dependency 'arbre',               '>= 1.1.1'
-  s.add_dependency 'bourbon'
+  s.add_dependency 'arbre', '>= 1.1.1'
   s.add_dependency 'coffee-rails'
-  s.add_dependency 'formtastic',          '~> 3.1'
+  s.add_dependency 'formtastic', '~> 3.1'
   s.add_dependency 'formtastic_i18n'
   s.add_dependency 'inherited_resources', '~> 1.7'
   s.add_dependency 'jquery-rails'
-  s.add_dependency 'jquery-ui-rails'
-  s.add_dependency 'kaminari',            '>= 0.15', '< 2.0'
-  s.add_dependency 'railties',            '>= 4.2', '< 5.2'
-  s.add_dependency 'ransack',             '~> 1.3'
-  s.add_dependency 'sass-rails'
-  s.add_dependency 'sprockets',           '< 4.1'
+  s.add_dependency 'kaminari', '>= 0.15', '< 2.0'
+  s.add_dependency 'railties', '>= 4.2', '< 5.2'
+  s.add_dependency 'ransack', '~> 1.3'
+  s.add_dependency 'sass', '~> 3.1'
+  s.add_dependency 'sprockets', '< 4.1'
 end

data/app/assets/javascripts/active_admin/base.js.coffee

@@ -1,5 +1,9 @@
-#= require jquery
-#= require ./jquery_ui
+#= require jquery3
+#= require jquery-ui/widgets/datepicker
+#= require jquery-ui/widgets/dialog
+#= require jquery-ui/widgets/sortable
+#= require jquery-ui/widgets/tabs
+#= require jquery-ui/widget
 #= require jquery_ujs
 #= require_self
 #= require_tree ./lib

data/app/assets/javascripts/active_admin/initializers/batch_actions.js.coffee

@@ -1,7 +1,11 @@
-$(document).on 'ready page:load turbolinks:load', ->
+onDOMReady = ->
   # In order for index scopes to overflow properly onto the next line, we have
   # to manually set its width based on the width of the batch action button.
   if (batch_actions_selector = $('.table_tools .batch_actions_selector')).length
     batch_actions_selector.next().css
       width: "calc(100% - 10px - #{batch_actions_selector.outerWidth()}px)"
       'float': 'right'
+
+$(document).
+  ready(onDOMReady).
+  on 'page:load turbolinks:load', onDOMReady

data/app/assets/javascripts/active_admin/initializers/datepicker.js.coffee

@@ -1,4 +1,4 @@
-$(document).on 'ready page:load turbolinks:load', ->
+onDOMReady = ->
   $(document).on 'focus', 'input.datepicker:not(.hasDatepicker)', ->
     input = $(@)
 
@@ -8,3 +8,7 @@ $(document).on 'ready page:load turbolinks:load', ->
     defaults = dateFormat: 'yy-mm-dd'
     options  = input.data 'datepicker-options'
     input.datepicker $.extend(defaults, options)
+
+$(document).
+  ready(onDOMReady).
+  on 'page:load turbolinks:load', onDOMReady

data/app/assets/javascripts/active_admin/initializers/filters.js.coffee

@@ -1,4 +1,4 @@
-$(document).on 'ready page:load turbolinks:load', ->
+onDOMReady = ->
   # Clear Filters button
   $('.clear_filters_btn').click (e) ->
     params = window.location.search.slice(1).split('&')
@@ -20,3 +20,7 @@ $(document).on 'ready page:load turbolinks:load', ->
   # a dropdown, apply that choice to the filter input field.
   $('.filter_form_field.select_and_search select').change ->
     $(@).siblings('input').prop name: "q[#{@value}]"
+
+$(document).
+  ready(onDOMReady).
+  on 'page:load turbolinks:load', onDOMReady

data/app/assets/javascripts/active_admin/initializers/tabs.js.coffee

@@ -1,3 +1,7 @@
-$(document).on 'ready page:load turbolinks:load', ->
+onDOMReady = ->
   # Tab navigation
   $('#active_admin_content .tabs').tabs()
+
+$(document).
+  ready(onDOMReady).
+  on 'page:load turbolinks:load', onDOMReady

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

@@ -1,5 +1,4 @@
-$(document).on 'ready page:load turbolinks:load', ->
-
+onDOMReady = ->
   #
   # Use ActiveAdmin.modal_dialog to prompt user if confirmation is required for current Batch Action
   #
@@ -14,7 +13,7 @@ $(document).on 'ready page:load turbolinks:load', ->
 
   $('.batch_actions_selector li a').on 'confirm:complete', (e, inputs)->
     if val = JSON.stringify inputs
-      $('#batch_action_inputs').val val
+      $('#batch_action_inputs').removeAttr('disabled').val val
     else
       $('#batch_action_inputs').attr 'disabled', 'disabled'
 
@@ -37,3 +36,7 @@ $(document).on 'ready page:load turbolinks:load', ->
         $(".batch_actions_selector").each -> $(@).aaDropdownMenu("enable")
       else
         $(".batch_actions_selector").each -> $(@).aaDropdownMenu("disable")
+
+$(document).
+  ready(onDOMReady).
+  on 'page:load turbolinks:load', onDOMReady

data/app/assets/javascripts/active_admin/lib/checkbox-toggler.js.coffee

@@ -23,15 +23,17 @@ class ActiveAdmin.CheckboxToggler
     @toggle_all_checkbox.change => @_didChangeToggleAllCheckbox()
 
   _didChangeCheckbox: (checkbox)->
-    switch @checkboxes.filter(':checked').length
-      when @checkboxes.length - 1 then @toggle_all_checkbox.prop checked: null
-      when @checkboxes.length     then @toggle_all_checkbox.prop checked: true
+    numChecked = @checkboxes.filter(':checked').length
+
+    allChecked = numChecked == @checkboxes.length
+    someChecked = numChecked > 0 && numChecked < @checkboxes.length
+
+    @toggle_all_checkbox.prop checked: allChecked, indeterminate: someChecked
 
   _didChangeToggleAllCheckbox: ->
-    setting = if @toggle_all_checkbox.prop 'checked' then true else null
-    @checkboxes.each (index, el)=>
-      $(el).prop checked: setting
-      @_didChangeCheckbox(el)
+    setting = @toggle_all_checkbox.prop 'checked'
+    @checkboxes.prop checked: setting
+    setting
 
   option: (key, value) ->
     if $.isPlainObject(key)

data/app/assets/javascripts/active_admin/lib/dropdown-menu.js.coffee

@@ -32,7 +32,6 @@ class ActiveAdmin.DropdownMenu
     @
 
   destroy: ->
-    @$element.unbind()
     @$element = null
     @
 
@@ -97,5 +96,9 @@ class ActiveAdmin.DropdownMenu
 
 $.widget.bridge 'aaDropdownMenu', ActiveAdmin.DropdownMenu
 
-$(document).on 'ready page:load turbolinks:load', ->
+onDOMReady = ->
   $('.dropdown_menu').aaDropdownMenu()
+
+$(document).
+  ready(onDOMReady).
+  on 'page:load turbolinks:load', onDOMReady

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

@@ -23,7 +23,7 @@ class ActiveAdmin.PerPage
     while m = re.exec(query)
       params[@_decode(m[1])] = @_decode(m[2])
     params
-   
+
   _decode: (value) ->
     #replace "+" before decodeURIComponent
     decodeURIComponent(value.replace(/\+/g, '%20'))
@@ -38,5 +38,9 @@ class ActiveAdmin.PerPage
 
 $.widget.bridge 'perPage', ActiveAdmin.PerPage
 
-$(document).on 'ready page:load turbolinks:load', ->
+onDOMReady = ->
   $('.pagination_per_page select').perPage()
+
+$(document).
+  ready(onDOMReady).
+  on 'page:load turbolinks:load', onDOMReady

data/app/assets/javascripts/active_admin/lib/table-checkbox-toggler.js.coffee

@@ -11,12 +11,10 @@ class ActiveAdmin.TableCheckboxToggler extends ActiveAdmin.CheckboxToggler
   _didChangeCheckbox: (checkbox) ->
     super
 
-    $row = $(checkbox).parents 'tr'
+    $(checkbox).parents('tr').toggleClass 'selected', checkbox.checked
 
-    if checkbox.checked
-      $row.addClass 'selected'
-    else
-      $row.removeClass 'selected'
+  _didChangeToggleAllCheckbox: ->
+    @$container.find('tbody tr').toggleClass 'selected', super
 
   _didClickCell: (cell) ->
     $(cell).parent('tr').find(':checkbox').click()

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

@@ -1,6 +1,6 @@
 /* Active Admin CSS */
-// Reset Away!
-@include global-reset;
+// Normalize
+@import "active_admin/normalize";
 
 // Partials
 @import "active_admin/typography";

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

@@ -1,4 +1,3 @@
-//= depend_on_asset "active_admin/datepicker/datepicker-input-icon.png"
 // -------------------------------------- Active Admin Forms
 form {
   /* Reset margins & Padding */
@@ -291,9 +290,7 @@ $filter-field-seperator-width: 12px;
 $side-by-side-filter-input-width: ($sidebar-inner-content-width / 2) - ($text-input-horizontal-padding * 2) - $filter-field-seperator-width;
 $side-by-side-filter-select-width: ($sidebar-inner-content-width / 2) - $filter-field-seperator-width;
 
-$date-range-filter-input-right-padding: 27px;
-$date-range-filter-input-horizontal-padding: $date-range-filter-input-right-padding + $text-input-horizontal-padding;
-$date-range-filter-input-width: ($sidebar-inner-content-width / 2) - $filter-field-seperator-width - $date-range-filter-input-horizontal-padding;
+$date-range-filter-input-width: ($sidebar-inner-content-width / 2) - ($filter-field-seperator-width / 2);
 
 form.filter_form {
   .filter_form_field {
@@ -326,16 +323,13 @@ form.filter_form {
     }
 
     &.filter_date_range {
-      .seperator {
-        display: inline-block;
-        text-align: center;
-        width: $filter-field-seperator-width;
-      }
-
       input[type=text] {
-        background: #fff image-url('active_admin/datepicker/datepicker-input-icon.png') no-repeat 100% 7px;
-        padding-right: $date-range-filter-input-right-padding;
+        box-sizing: border-box;
         width: $date-range-filter-input-width;
+
+        + input {
+          margin-left: 6px;
+        }
       }
     }
   }

data/app/assets/stylesheets/active_admin/components/_batch_actions.scss

@@ -3,9 +3,4 @@
   >.resource_selection_toggle_cell {
     float:left;
   }
-  #collection_selection_toggle_explaination {
-    float:left;
-    margin-left:5px;
-    font-style:italic;
-  }
 }

data/app/assets/stylesheets/active_admin/components/_pagination.scss

@@ -42,3 +42,14 @@
     padding: 1px 5px;
   }
 }
+
+.comments {
+  .pagination {
+    float: left;
+    margin-bottom: 30px;
+  }
+  .pagination_information {
+    float: left;
+    color: #000;
+  }
+}

data/app/assets/stylesheets/active_admin/components/_status_tags.scss

@@ -6,6 +6,7 @@
   padding: 3px 5px 2px 5px;
   font-size: 0.8em;
 
+  // TODO: deprecated, remove in a v2 release
   &.ok, &.published, &.complete, &.completed, &.green { background: #8daa92; }
   &.warn, &.warning, &.orange { background: #e29b20; }
   &.error, &.errored, &.red { background: #d45f53; }

data/app/assets/stylesheets/active_admin/components/_tables.scss

@@ -5,6 +5,10 @@ table tr {
   td {
     vertical-align: top;
   }
+
+  th {
+    text-align: left;
+  }
 }
 
 // --------- Index Tables
@@ -18,7 +22,6 @@ table.index_table {
   th {
     @include section-header;
     border-right: none;
-    text-align: left;
     padding-left: $cell-horizontal-padding;
     padding-right: $cell-horizontal-padding;
 

data/app/assets/stylesheets/active_admin/mixins/_all.scss

@@ -1,5 +1,4 @@
 @import "active_admin/mixins/variables";
-@import "active_admin/mixins/reset";
 @import "active_admin/mixins/gradients";
 @import "active_admin/mixins/shadows";
 @import "active_admin/mixins/rounded";
@@ -7,4 +6,3 @@
 @import "active_admin/mixins/sections";
 @import "active_admin/mixins/utilities";
 @import "active_admin/mixins/typography";
-@import "bourbon";

data/app/assets/stylesheets/active_admin/print.scss

@@ -4,9 +4,8 @@
 $primary-color: black;
 $text-color: black;
 
-// Reset
-@import "active_admin/mixins/reset";
-@include global-reset;
+// Normalize
+@import "active_admin/normalize";
 
 // Partials
 @import "active_admin/typography";

data/app/views/active_admin/devise/sessions/new.html.erb

@@ -5,7 +5,7 @@
   <%= active_admin_form_for(resource, as: resource_name, url: send(:"#{scope}_session_path"), html: { id: "session_new" }) do |f|
     f.inputs do
       resource.class.authentication_keys.each_with_index { |key, index|
-        f.input key, label: t('active_admin.devise.'+key.to_s+'.title'), input_html: { autofocus: index.zero? }
+        f.input key, label: t("active_admin.devise.#{key}.title"), input_html: { autofocus: index.zero? }
       }
       f.input :password, label: t('active_admin.devise.password.title')
       f.input :remember_me, label: t('active_admin.devise.login.remember_me'), as: :boolean if devise_mapping.rememberable?

data/app/views/active_admin/devise/shared/_links.erb

@@ -1,27 +1,33 @@
 <%- if controller_name != 'sessions' %>
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
-  <%= link_to t('active_admin.devise.links.sign_in'), send(:"new_#{scope}_session_path") %><br />
+  <%= link_to t('active_admin.devise.links.sign_in'), send(:"new_#{scope}_session_path") %>
+  <br>
 <% end -%>
 
 <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
-  <%= link_to t('active_admin.devise.links.sign_up'), new_registration_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.sign_up'), new_registration_path(resource_name) %>
+  <br>
 <% end -%>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
-  <%= link_to t('active_admin.devise.links.forgot_your_password'), new_password_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.forgot_your_password'), new_password_path(resource_name) %>
+  <br>
 <% end -%>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
-  <%= link_to t('active_admin.devise.links.resend_confirmation_instructions'), new_confirmation_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.resend_confirmation_instructions'), new_confirmation_path(resource_name) %>
+  <br>
 <% end -%>
 
 <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
-  <%= link_to t('active_admin.devise.links.resend_unlock_instructions'), new_unlock_path(resource_name) %><br />
+  <%= link_to t('active_admin.devise.links.resend_unlock_instructions'), new_unlock_path(resource_name) %>
+  <br>
 <% end -%>
 
 <%- if devise_mapping.omniauthable? %>
   <%- resource_class.omniauth_providers.each do |provider| %>
     <%= link_to t('active_admin.devise.links.sign_in_with_omniauth_provider', provider: provider.to_s.titleize),
-          omniauth_authorize_path(resource_name, provider) %><br />
+          omniauth_authorize_path(resource_name, provider) %>
+    <br>
   <% end -%>
 <% end -%>