express_admin 1.7.9 → 1.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8bc19fd24bd98b3afd55f7e72ddc8cbe4fd6099
-  data.tar.gz: c9dfba635f5672dcf521fff814f1fef382ff717d
+  metadata.gz: 2972d25a2243977f45c739326ed68e392eb3d499
+  data.tar.gz: 9baaab612d8f4d19410cb7a7a1e687eeb874d266
 SHA512:
-  metadata.gz: 1c822eb288cdb70471b93219cc73f672389da85dd569021c2a584edc2f50744b3dab0ea9ea589988071d0ee7c04caeb2bef293ec349d92204b7d9df9bced77ff
-  data.tar.gz: 31de509e8ec5fbb51aec181b18458ceaab8f45f69359efaedd00f84d68fa4ecfdd8eee6176961191ebbe093307cfa26a3e4a1b796662c4fc7a4234ab393c0a6e
+  metadata.gz: 1450e40fabe94ceca90166c672fb6e80eba4995b5bbe5732afb99daf5eaf0fafb43ca23a4651f3b65131478d945bbb7f9c2483a281233b9ba0533b9f717c8d0f
+  data.tar.gz: 48f0a65fa264523866996ed7d133f161d781e417e2bfaf9825eb3adef8f03b4411a15d35f8e3c8e10c698d3daba25d08711dab9f8e279f391565b03a0b98f101

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

@@ -0,0 +1,4 @@
+.oauth-sign-in-links
+  border-top: 1px $gray solid
+  padding-top: 1em
+  margin-top: 1em

data/app/assets/stylesheets/express_admin/screen.sass

@@ -15,6 +15,7 @@
 @import 'sections/sidebar_region'
 
 @import 'components/main_menu'
+@import 'components/oauth_sign_in_links'
 @import 'components/sub_menu'
 @import 'components/module_sidebar'
 @import 'components/widget_box'

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

@@ -1,10 +1,11 @@
 .flash-messages
   z-index: 999
-  position: absolute
+  position: fixed
   left: 50%
+  top: 5%
   -webkit-transform: translateX(-50%)
   transform: translateX(-50%)
-  width: 400px
+  width: auto
 
   .success
     background-color: $success-color
@@ -37,17 +38,20 @@
     style: solid
     width: 1px
   margin: 0.5rem 0 1.11111rem 0
-  padding: 0.77778rem 1.33333rem 0.77778rem 0.77778rem
+  padding: 1rem
+  padding-right: 2rem
   transition: opacity 300ms ease-out
 
 
   .close
+    font-weight: 700
+    font-size: 1.5em
     text-decoration: none !important
-    top: 1px !important
     position: absolute
-    top: 50% !important
-    margin-top: -12.7777px
-    right: 12.4444px
+    top: 45%
+    right: 0.5rem
+    transform: translateY(-50%)
+
 
 
   a

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

@@ -38,5 +38,5 @@
 .login-box
   background: #fff
   border: 1px solid #ddd
-  margin: 100px 0
+  margin: 150px 0
   padding: 40px 20px

data/app/components/express_admin/oauth_sign_in_links.rb

@@ -10,6 +10,10 @@ module ExpressAdmin
       end
     }
 
+    before_build {
+      set_attribute(:class, "#{default_class_name} hide") if providers.empty?
+    }
+
     def sign_in_link(provider)
       link_to "#{provider_name(provider)}", user_omniauth_authorize_path(provider), class: 'hollow button button-login'
     end

data/app/views/devise/passwords/edit.html.et

@@ -0,0 +1,26 @@
+div(class: 'grid-container') {
+  div(class: 'large columns') {
+    div(class: 'login-box') {
+      div(class: 'row') {
+        div(class: 'form-header') {
+          h1 "Change your password"
+        }
+
+        div(class: 'large-12 columns') {
+          express_form(:user, action: helpers.user_password_path, method: :put) {
+            div(class: 'row') {
+              div(class: 'large-12 columns') {
+                hidden(:reset_password_token)
+                password(:password)
+                password(:password_confirmation)
+              }
+              submit value: 'Change my password', class: 'button'
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+

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

@@ -0,0 +1,29 @@
+div(class: 'grid-container') {
+  div(class: 'large columns') {
+    div(class: 'login-box') {
+      div(class: 'row') {
+        div(class: 'form-header') {
+          h1 "Forgot Password"
+        }
+
+        div(class: 'large-12 columns') {
+          express_form(:user, class: 'new_user', action: helpers.user_password_path) {
+
+            div(class: 'row') {
+              div(class: 'large-12 columns') {
+                email(:email)
+              }
+            }
+
+            submit value: "Send me reset password instructions", class: "button"
+          }
+          div(class: 'row') {
+            div(class: 'large-12 columns') {
+              helpers.link_to "Log in", new_user_session_path, class: "gray-link"
+            }
+          }
+        }
+      }
+    }
+  }
+}

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

@@ -3,24 +3,24 @@ div(class: 'grid-container') {
     div(class: 'login-box') {
       div(class: 'row') {
         div(class: 'form-header') {
-          h3 "Log In"
+          h1 "Log In"
         }
-        
+
         div(class: 'large-12 columns') {
           form(:class => 'new_user', 'accept-charset' => "UTF-8", :action => "/users/sign_in", id: "new_user", method: "post") {
 
             div(style: "display:none") {
-              add_child helpers.utf8_enforcer_tag
-              add_child helpers.send(:token_tag)
+              text_node helpers.utf8_enforcer_tag
+              text_node helpers.send(:token_tag)
             }
-            
+
             div(class: 'row') {
               div(class: 'large-12 columns') {
                 label(class: 'hide', for: "user_email") { "Email" }
                 input autofocus: "autofocus", id: "user_email", name: "user[email]", placeholder: "Email", type: "email", value: ""
               }
             }
-            
+
             div(class: 'row') {
               div(class: 'large-12 columns') {
                 label(class: 'hide', for: "user_password") { "Password" }
@@ -46,12 +46,10 @@ div(class: 'grid-container') {
                   div(class: 'large-12 columns') {
                     a(class: "gray-link", href: "/users/password/new") { "Forgot password?" }
                   }
+                  oauth_sign_in_links(Devise.omniauth_providers)
                 }
               }
             }
-
-            hr
-            oauth_sign_in_links(Devise.omniauth_providers)
           }
         }
       }

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

@@ -0,0 +1,18 @@
+'<!DOCTYPE html>'.html_safe+
+html(lang: 'en') {
+  head {
+    title { title_content }
+    meta(charset: 'utf-8')
+    meta(name: "description", content: "#{helpers.description_meta_content}")
+    meta(name: "viewport", content: "width=device-width, initial-scale=1.0")
+
+    stylesheet_link_tag "express_admin"
+    javascript_include_tag "express_admin"
+    csrf_meta_tags
+  }
+  
+  body {
+    flash_messages
+    current_arbre_element.add_child yield
+  }
+}

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.9"
+  VERSION = "1.7.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.9
+  version: 1.7.10
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -421,6 +421,7 @@ files:
 - app/assets/stylesheets/express_admin/components/_h_box.sass
 - app/assets/stylesheets/express_admin/components/_main_menu.sass
 - app/assets/stylesheets/express_admin/components/_module_sidebar.sass
+- app/assets/stylesheets/express_admin/components/_oauth_sign_in_links.sass
 - app/assets/stylesheets/express_admin/components/_pane.sass
 - app/assets/stylesheets/express_admin/components/_sub_menu.sass
 - app/assets/stylesheets/express_admin/components/_v_box.sass
@@ -482,9 +483,11 @@ files:
 - app/controllers/express_admin/standard_controller.rb
 - app/helpers/express_admin/admin_helper.rb
 - app/helpers/express_admin/module_settings_helper.rb
+- app/views/devise/passwords/edit.html.et
+- app/views/devise/passwords/new.html.et
 - app/views/devise/sessions/new.html.et
 - app/views/express_admin/dashboard/show.html.et
-- app/views/layouts/devise.html.erb
+- app/views/layouts/devise.html.et
 - app/views/layouts/express_admin/admin.html.et
 - app/views/layouts/express_admin/external.html.et
 - app/views/shared/express_admin/_messages.html.et

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

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
-    <title><%= content_for?(:title) ? yield(:title) : "AppExpress" %></title>
-
-    <%= stylesheet_link_tag    "express_admin" %>
-    <%= javascript_include_tag "express_admin", 'data-turbolinks-track' => true %>
-    <%= csrf_meta_tags %>
-  </head>
-
-  <body>
-
-    <%= yield %>
-
-  </body>
-</html>