express_admin 1.7.9 → 1.7.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/express_admin/components/_oauth_sign_in_links.sass +4 -0
- data/app/assets/stylesheets/express_admin/screen.sass +1 -0
- data/app/assets/stylesheets/express_admin/shared/_alerts.sass +11 -7
- data/app/assets/stylesheets/express_admin/shared/_forms.sass +1 -1
- data/app/components/express_admin/oauth_sign_in_links.rb +4 -0
- data/app/views/devise/passwords/edit.html.et +26 -0
- data/app/views/devise/passwords/new.html.et +29 -0
- data/app/views/devise/sessions/new.html.et +7 -9
- data/app/views/layouts/devise.html.et +18 -0
- data/lib/express_admin/version.rb +1 -1
- metadata +6 -3
- data/app/views/layouts/devise.html.erb +0 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2972d25a2243977f45c739326ed68e392eb3d499
|
4
|
+
data.tar.gz: 9baaab612d8f4d19410cb7a7a1e687eeb874d266
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1450e40fabe94ceca90166c672fb6e80eba4995b5bbe5732afb99daf5eaf0fafb43ca23a4651f3b65131478d945bbb7f9c2483a281233b9ba0533b9f717c8d0f
|
7
|
+
data.tar.gz: 48f0a65fa264523866996ed7d133f161d781e417e2bfaf9825eb3adef8f03b4411a15d35f8e3c8e10c698d3daba25d08711dab9f8e279f391565b03a0b98f101
|
@@ -1,10 +1,11 @@
|
|
1
1
|
.flash-messages
|
2
2
|
z-index: 999
|
3
|
-
position:
|
3
|
+
position: fixed
|
4
4
|
left: 50%
|
5
|
+
top: 5%
|
5
6
|
-webkit-transform: translateX(-50%)
|
6
7
|
transform: translateX(-50%)
|
7
|
-
width:
|
8
|
+
width: auto
|
8
9
|
|
9
10
|
.success
|
10
11
|
background-color: $success-color
|
@@ -37,17 +38,20 @@
|
|
37
38
|
style: solid
|
38
39
|
width: 1px
|
39
40
|
margin: 0.5rem 0 1.11111rem 0
|
40
|
-
padding:
|
41
|
+
padding: 1rem
|
42
|
+
padding-right: 2rem
|
41
43
|
transition: opacity 300ms ease-out
|
42
44
|
|
43
45
|
|
44
46
|
.close
|
47
|
+
font-weight: 700
|
48
|
+
font-size: 1.5em
|
45
49
|
text-decoration: none !important
|
46
|
-
top: 1px !important
|
47
50
|
position: absolute
|
48
|
-
top:
|
49
|
-
|
50
|
-
|
51
|
+
top: 45%
|
52
|
+
right: 0.5rem
|
53
|
+
transform: translateY(-50%)
|
54
|
+
|
51
55
|
|
52
56
|
|
53
57
|
a
|
@@ -10,6 +10,10 @@ module ExpressAdmin
|
|
10
10
|
end
|
11
11
|
}
|
12
12
|
|
13
|
+
before_build {
|
14
|
+
set_attribute(:class, "#{default_class_name} hide") if providers.empty?
|
15
|
+
}
|
16
|
+
|
13
17
|
def sign_in_link(provider)
|
14
18
|
link_to "#{provider_name(provider)}", user_omniauth_authorize_path(provider), class: 'hollow button button-login'
|
15
19
|
end
|
@@ -0,0 +1,26 @@
|
|
1
|
+
div(class: 'grid-container') {
|
2
|
+
div(class: 'large columns') {
|
3
|
+
div(class: 'login-box') {
|
4
|
+
div(class: 'row') {
|
5
|
+
div(class: 'form-header') {
|
6
|
+
h1 "Change your password"
|
7
|
+
}
|
8
|
+
|
9
|
+
div(class: 'large-12 columns') {
|
10
|
+
express_form(:user, action: helpers.user_password_path, method: :put) {
|
11
|
+
div(class: 'row') {
|
12
|
+
div(class: 'large-12 columns') {
|
13
|
+
hidden(:reset_password_token)
|
14
|
+
password(:password)
|
15
|
+
password(:password_confirmation)
|
16
|
+
}
|
17
|
+
submit value: 'Change my password', class: 'button'
|
18
|
+
}
|
19
|
+
}
|
20
|
+
}
|
21
|
+
}
|
22
|
+
}
|
23
|
+
}
|
24
|
+
}
|
25
|
+
|
26
|
+
|
@@ -0,0 +1,29 @@
|
|
1
|
+
div(class: 'grid-container') {
|
2
|
+
div(class: 'large columns') {
|
3
|
+
div(class: 'login-box') {
|
4
|
+
div(class: 'row') {
|
5
|
+
div(class: 'form-header') {
|
6
|
+
h1 "Forgot Password"
|
7
|
+
}
|
8
|
+
|
9
|
+
div(class: 'large-12 columns') {
|
10
|
+
express_form(:user, class: 'new_user', action: helpers.user_password_path) {
|
11
|
+
|
12
|
+
div(class: 'row') {
|
13
|
+
div(class: 'large-12 columns') {
|
14
|
+
email(:email)
|
15
|
+
}
|
16
|
+
}
|
17
|
+
|
18
|
+
submit value: "Send me reset password instructions", class: "button"
|
19
|
+
}
|
20
|
+
div(class: 'row') {
|
21
|
+
div(class: 'large-12 columns') {
|
22
|
+
helpers.link_to "Log in", new_user_session_path, class: "gray-link"
|
23
|
+
}
|
24
|
+
}
|
25
|
+
}
|
26
|
+
}
|
27
|
+
}
|
28
|
+
}
|
29
|
+
}
|
@@ -3,24 +3,24 @@ div(class: 'grid-container') {
|
|
3
3
|
div(class: 'login-box') {
|
4
4
|
div(class: 'row') {
|
5
5
|
div(class: 'form-header') {
|
6
|
-
|
6
|
+
h1 "Log In"
|
7
7
|
}
|
8
|
-
|
8
|
+
|
9
9
|
div(class: 'large-12 columns') {
|
10
10
|
form(:class => 'new_user', 'accept-charset' => "UTF-8", :action => "/users/sign_in", id: "new_user", method: "post") {
|
11
11
|
|
12
12
|
div(style: "display:none") {
|
13
|
-
|
14
|
-
|
13
|
+
text_node helpers.utf8_enforcer_tag
|
14
|
+
text_node helpers.send(:token_tag)
|
15
15
|
}
|
16
|
-
|
16
|
+
|
17
17
|
div(class: 'row') {
|
18
18
|
div(class: 'large-12 columns') {
|
19
19
|
label(class: 'hide', for: "user_email") { "Email" }
|
20
20
|
input autofocus: "autofocus", id: "user_email", name: "user[email]", placeholder: "Email", type: "email", value: ""
|
21
21
|
}
|
22
22
|
}
|
23
|
-
|
23
|
+
|
24
24
|
div(class: 'row') {
|
25
25
|
div(class: 'large-12 columns') {
|
26
26
|
label(class: 'hide', for: "user_password") { "Password" }
|
@@ -46,12 +46,10 @@ div(class: 'grid-container') {
|
|
46
46
|
div(class: 'large-12 columns') {
|
47
47
|
a(class: "gray-link", href: "/users/password/new") { "Forgot password?" }
|
48
48
|
}
|
49
|
+
oauth_sign_in_links(Devise.omniauth_providers)
|
49
50
|
}
|
50
51
|
}
|
51
52
|
}
|
52
|
-
|
53
|
-
hr
|
54
|
-
oauth_sign_in_links(Devise.omniauth_providers)
|
55
53
|
}
|
56
54
|
}
|
57
55
|
}
|
@@ -0,0 +1,18 @@
|
|
1
|
+
'<!DOCTYPE html>'.html_safe+
|
2
|
+
html(lang: 'en') {
|
3
|
+
head {
|
4
|
+
title { title_content }
|
5
|
+
meta(charset: 'utf-8')
|
6
|
+
meta(name: "description", content: "#{helpers.description_meta_content}")
|
7
|
+
meta(name: "viewport", content: "width=device-width, initial-scale=1.0")
|
8
|
+
|
9
|
+
stylesheet_link_tag "express_admin"
|
10
|
+
javascript_include_tag "express_admin"
|
11
|
+
csrf_meta_tags
|
12
|
+
}
|
13
|
+
|
14
|
+
body {
|
15
|
+
flash_messages
|
16
|
+
current_arbre_element.add_child yield
|
17
|
+
}
|
18
|
+
}
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: express_admin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.7.
|
4
|
+
version: 1.7.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Steven Talcott Smith
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-11-
|
11
|
+
date: 2015-11-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bourbon
|
@@ -421,6 +421,7 @@ files:
|
|
421
421
|
- app/assets/stylesheets/express_admin/components/_h_box.sass
|
422
422
|
- app/assets/stylesheets/express_admin/components/_main_menu.sass
|
423
423
|
- app/assets/stylesheets/express_admin/components/_module_sidebar.sass
|
424
|
+
- app/assets/stylesheets/express_admin/components/_oauth_sign_in_links.sass
|
424
425
|
- app/assets/stylesheets/express_admin/components/_pane.sass
|
425
426
|
- app/assets/stylesheets/express_admin/components/_sub_menu.sass
|
426
427
|
- app/assets/stylesheets/express_admin/components/_v_box.sass
|
@@ -482,9 +483,11 @@ files:
|
|
482
483
|
- app/controllers/express_admin/standard_controller.rb
|
483
484
|
- app/helpers/express_admin/admin_helper.rb
|
484
485
|
- app/helpers/express_admin/module_settings_helper.rb
|
486
|
+
- app/views/devise/passwords/edit.html.et
|
487
|
+
- app/views/devise/passwords/new.html.et
|
485
488
|
- app/views/devise/sessions/new.html.et
|
486
489
|
- app/views/express_admin/dashboard/show.html.et
|
487
|
-
- app/views/layouts/devise.html.
|
490
|
+
- app/views/layouts/devise.html.et
|
488
491
|
- app/views/layouts/express_admin/admin.html.et
|
489
492
|
- app/views/layouts/express_admin/external.html.et
|
490
493
|
- app/views/shared/express_admin/_messages.html.et
|
@@ -1,19 +0,0 @@
|
|
1
|
-
<!DOCTYPE html>
|
2
|
-
<html lang="en">
|
3
|
-
<head>
|
4
|
-
<meta charset="utf-8" />
|
5
|
-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
6
|
-
|
7
|
-
<title><%= content_for?(:title) ? yield(:title) : "AppExpress" %></title>
|
8
|
-
|
9
|
-
<%= stylesheet_link_tag "express_admin" %>
|
10
|
-
<%= javascript_include_tag "express_admin", 'data-turbolinks-track' => true %>
|
11
|
-
<%= csrf_meta_tags %>
|
12
|
-
</head>
|
13
|
-
|
14
|
-
<body>
|
15
|
-
|
16
|
-
<%= yield %>
|
17
|
-
|
18
|
-
</body>
|
19
|
-
</html>
|