express_admin 1.7.11 → 1.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ac4127fa9be79ffa475bbb0f3d013ac741e4281
-  data.tar.gz: 3ef0828bca7d1fee6502f3523bd59799ab4f9387
+  metadata.gz: 3a69e82e8a3cc8b7bf34bc7cf346832361f1b4bd
+  data.tar.gz: 80feed45c4298db113e753cb5db379d7956883da
 SHA512:
-  metadata.gz: f61a4334c874773565ceaa8047dabe79e1c65d75efcbdfd4690692420a9e76a0609dda80c3d31abc8c278115d7fe112ace234faf2267cb0641b1f98b2e8f2d5f
-  data.tar.gz: 1a3746ff8e20f349aa9c1d0041fb3f3cd990f1b8ff0e82ae2d07699633e9f8ddcd7051405df178c856421e45a551a6433b84332ca30c28f9e29d2990dd8a7420
+  metadata.gz: d14626ed2f47b344e3c769eeaff580783e882fb5f4f3bd57aa3064a5583e078ea465634486eecca72c9637910fb26b71575fa0c9dd2b5b5fe2595aa42383abca
+  data.tar.gz: 578d067b2acfc1035ebfb38970eb5879cfc83d471f3e80503c075b0ffc21349193dd39366488e5e74637f5e464547f5949036eaf5dbeee0d59a3bb53b5925070

data/app/assets/javascripts/express_admin.js

@@ -5,8 +5,6 @@
 //= require tinymce-jquery
 //= require select2
 //= require dropzone
-//= require jquery.validate
-//= require jquery.validate.additional-methods
 //= require ace/ace
 //= require ace/worker-html
 //= require ace/mode-ruby

data/app/assets/stylesheets/express_admin/components/_command_button.sass

@@ -10,14 +10,9 @@
     input
       background-color: $green
 
-  input[disabled]
+  input[disabled="disabled"]
     background-color: $gray
 
-  input[data-command-button-state="success"]
-    background-color: $green !important
-
-  input[data-command-button-state="failed"]
-    background-color: $red !important
 
 .command-button-list
   list-style-type: none

data/app/assets/stylesheets/express_admin/shared/_forms.sass

@@ -9,18 +9,9 @@
     height: 6rem
 
   .error
-    border: 1px solid $red
-    margin-bottom: 0
-
-  span.error
-    display: block
-    border: 0
-    background-color: #f04124
-    color: $light
-    padding: 0.33333rem 0.5rem 0.5rem
-    font:
-      size: 0.85rem
-    margin-bottom: 1rem
+    border: none
+    input, select, textarea, .select2-container
+      border: 1px solid $red
 
   .help
     font:

data/app/components/express_admin/command_button.rb

@@ -16,7 +16,7 @@ module ExpressAdmin
         }
 
         contains -> {
-          button_to command_title, action, button_to_options
+          button_to config[:command].to_s.titleize, action, button_to_options
         }
 
         def resource_name
@@ -24,7 +24,7 @@ module ExpressAdmin
         end
 
         def button_to_options
-          {remote: true, disabled: config[:disabled], confirm: config[:confirm], form_class: 'js-command-button', data: { command: command_title }}
+          {disabled: config[:disabled], confirm: config[:confirm]}
         end
 
         def action
@@ -38,12 +38,6 @@ module ExpressAdmin
           end
           return @parent_button_list
         end
-
-        private
-
-        def command_title
-          config[:command].to_s.titleize
-        end
       end
     end
 

data/app/components/express_admin/flash_messages.rb

@@ -12,13 +12,11 @@ module ExpressAdmin
       content_for(:page_javascript) {
         script {
           %Q(
-            window.addEventListener("load", function() {
-              $(function() {
-                $('a.close').on('click', function(e){
-                  e.preventDefault()
-                  $(this).parents('.flash-messages').remove()
-                })
-              })
+            $(function() {
+              $('a.close').on('click', function(e){
+                e.preventDefault();
+                $(this).parents('.flash-messages').remove();
+              });
             });
           ).html_safe
         }

data/app/views/devise/sessions/new.html.et

@@ -28,28 +28,31 @@ div(class: 'grid-container') {
               }
             }
 
-            input class: "button radius expand small", name: "commit", type: "submit", value: "Sign in"
+            div(class: 'row') {
+              div(class: 'large-12 columns') {
+                label(class: 'hide', for: "user_remember_me")
+                input name: "user[remember_me]", type: "hidden", value: "0"
+                input checked: "checked", id: "user_remember_me", name: "user[remember_me]", type: "checkbox", value: "1"
+                span " Remember me"
+              }
+            }
+
             br
-             div(class: 'row') {
+            input class: "button radius expand small", name: "commit", type: "submit", value: "Sign in"
+
+            div(class: 'row') {
               div(class: 'large-12 columns') {
                 div(class: 'row') {
                   div(class: 'large-12 columns') {
-                    label(class: 'hide', for: "user_remember_me")
-                    input name: "user[remember_me]", type: "hidden", value: "0"
-                    input checked: "checked", id: "user_remember_me", name: "user[remember_me]", type: "checkbox", value: "1"
-                    span " Remember me"
-                    br
-                  }
-                }
-                br
-                div(class: 'row') {
-                  div(class: 'large-12 columns') {
-                    a(class: "gray-link", href: "/users/password/new") { "Forgot password?" }
+                    para {
+                      link_to 'Forgot Password?', new_user_password_path, class: 'gray-link'
+                    }
                   }
                   oauth_sign_in_links(Devise.omniauth_providers)
                 }
               }
             }
+
           }
         }
       }

data/app/views/layouts/devise.html.et

@@ -10,7 +10,7 @@ html(lang: 'en') {
     javascript_include_tag "express_admin"
     csrf_meta_tags
   }
-  
+
   body {
     flash_messages
     current_arbre_element.add_child yield

data/lib/express_admin/engine.rb

@@ -8,7 +8,6 @@ require 'jquery-ui-rails'
 require 'select2-rails'
 require 'dropzonejs-rails'
 require 'sass-rails'
-require 'jquery-validation-rails'
 require 'foundation_apps_styles'
 require 'bourbon'
 require 'gravatar_image_tag'
@@ -60,4 +59,4 @@ module ExpressAdmin
   class Railtie < ::Rails::Railtie
     config.app_generators.template_engine :et
   end
-end
+end

data/lib/express_admin/standard_actions.rb

@@ -63,7 +63,7 @@ module ExpressAdmin
             begin
               resource.send(command)
               respond_to do |format|
-                format.html { redirect_to :show, layout: defaults[:layout] }
+                format.html { redirect_to action: show_view }
                 format.js { render status: :ok, body: nil } # maybe we should return enough info
                                                  #to alter display of available or enabled commands?
 
@@ -72,7 +72,7 @@ module ExpressAdmin
               respond_to do |format|
                 format.html {
                   flash[:error] = e.to_s
-                  redirect_to :show, layout: defaults[:layout]
+                  redirect_to action: show_view
                 }
                 format.js { render status: :bad_request, body: e.to_s }
               end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.11"
+  VERSION = "1.7.12"
 end

data/test/dummy/test/components/command_button_test.rb

@@ -22,9 +22,9 @@ module Components
       }
     end
 
-    test "command button creates a form with a submit button having the correct name and correct data attributes" do
+    test "command button creates a form with a submit button having the correct name" do
       assert_match /form.*action="\/widgets\/\d+\/twiddle"/, command_button(:twiddle, resource_name: :widget)
-      assert_match /input data-command="Twiddle" type="submit" value="Twiddle"/, command_button(:twiddle, resource_name: :widget)
+      assert_match /input type="submit" value="Twiddle"/, command_button(:twiddle, resource_name: :widget)
     end
 
     def command_button_list(*args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.11
+  version: 1.7.12
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-19 00:00:00.000000000 Z
+date: 2015-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -252,20 +252,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-validation-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: textacular
   requirement: !ruby/object:Gem::Requirement
@@ -420,10 +406,8 @@ files:
 - app/assets/javascripts/ace/worker-html.js
 - app/assets/javascripts/express_admin.js
 - app/assets/javascripts/express_admin/admin.js.coffee
-- app/assets/javascripts/express_admin/components/command_button.js.coffee
 - app/assets/javascripts/express_admin/dataTables/dataTables.foundation.js
 - app/assets/javascripts/express_admin/dataTables/jquery.dataTables.js
-- app/assets/javascripts/express_admin/form_validation.js.coffee
 - app/assets/javascripts/express_admin/scrollTableBody.js
 - app/assets/javascripts/express_admin/sub_menu.js
 - app/assets/javascripts/express_admin/utility.js

data/app/assets/javascripts/express_admin/components/command_button.js.coffee

@@ -1,25 +0,0 @@
-$ ->
-  $('.js-command-button').on 'ajax:send', ->
-    setButtonState $(this).find('input[type="submit"]'), 'loading'
-    false
-  $('.js-command-button').on 'ajax:success', ->
-    setButtonState $(this).find('input[type="submit"]'), 'success'
-    false
-  $('.js-command-button').on 'ajax:error', ->
-    setButtonState $(this).find('input[type="submit"]'), 'failed'
-    false
-
-  setButtonState = (button, state) ->
-    if state == 'loading'
-      button.val('Processing...').prop 'disabled', true
-    else if state == 'success'
-      button.val('Success!').attr 'data-command-button-state', 'success'
-      restoreButton(button)
-    else if state == 'failed'
-      button.val('Failed!').attr 'data-command-button-state', 'failed'
-      restoreButton(button)
-
-  restoreButton = (button) ->
-    setTimeout ->
-      button.val(button.data('command')).prop('disabled', false).removeAttr('data-command-button-state')
-    ,1500

data/app/assets/javascripts/express_admin/form_validation.js.coffee

@@ -1,23 +0,0 @@
-$ ->
-  $('form.validate').validate
-    errorElement: 'span'
-
-  email = $('[name$="[email]"]')
-
-  if email.size() > 0
-    email.rules 'add',
-      required:   true
-      email:      true
-
-  password = $('[name$="[password]"]')
-
-  if password.size() > 0
-    password.rules 'add',
-      required:   true
-      minlength:  8
-
-  password_confirmation = $('[name$="[password_confirmation]"]')
-
-  if password_confirmation.size() > 0
-    password_confirmation.rules 'add',
-      equalTo: $('[name$="[password]"]')