chr 0.4.10 → 0.4.11
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/chr/themes/basic.scss +57 -1
- data/lib/chr/generators/app_generator.rb +1 -1
- data/lib/chr/version.rb +1 -1
- data/templates/devise_overrides_passwords_edit.html.erb +24 -23
- data/templates/devise_overrides_passwords_new.html.erb +14 -16
- data/templates/devise_overrides_sessions_new.html.erb +24 -26
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9b331853333cec4effe1d01e9a05d30a28bb9fe7
|
|
4
|
+
data.tar.gz: 6013496bac34e610ca97b3ee3fe020f5c4ae3271
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: efc9c773523741564b8cb1777daa03274a94a6531142a4d3287c00f528c19c243cf0bf52d2e2144ad25ca49c224f3f7756b6081c68eec39ae2897d848b6385b9
|
|
7
|
+
data.tar.gz: 3d39306a90f2fbcb684c6749c564e911529ff4cc817b14a3a5409361f5e728e3dea7915e3dea66e164686f92110ff895480b0231c6fff8e41f3acde8dc28ac3c
|
|
@@ -89,6 +89,51 @@ a {
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
+
/* Sign in ----------------------------------------------------------------- */
|
|
93
|
+
|
|
94
|
+
.signin-modal {
|
|
95
|
+
@include position(relative);
|
|
96
|
+
|
|
97
|
+
.notice, .alert {
|
|
98
|
+
text-align : center;
|
|
99
|
+
padding : 0 1em;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
.alert {
|
|
103
|
+
color : $assertive-color;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
h2 {
|
|
107
|
+
text-align : center;
|
|
108
|
+
font-size : 1em;
|
|
109
|
+
margin : 1em 0;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
input[type=submit] {
|
|
113
|
+
background-color : white;
|
|
114
|
+
border-radius : .25em;
|
|
115
|
+
padding : 1em 3em;
|
|
116
|
+
display : block;
|
|
117
|
+
border : 1px solid $positive-color;
|
|
118
|
+
margin : 1.5em auto;
|
|
119
|
+
color : $positive-color;
|
|
120
|
+
|
|
121
|
+
&:hover {
|
|
122
|
+
background-color : $positive-color;
|
|
123
|
+
color : white;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
input[type=submit] + a {
|
|
128
|
+
@include position(absolute, null 1em -2em null);
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
.label a {
|
|
132
|
+
font-size : .8em;
|
|
133
|
+
float : right;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
|
|
92
137
|
/* Icons ------------------------------------------------------------------- */
|
|
93
138
|
|
|
94
139
|
.search .icon { @include icon-search($positive-color); }
|
|
@@ -107,7 +152,18 @@ a {
|
|
|
107
152
|
/* Layouts ----------------------------------------------------------------- */
|
|
108
153
|
|
|
109
154
|
@media #{$tablet} {
|
|
110
|
-
.sidebar {
|
|
155
|
+
.sidebar {
|
|
156
|
+
border-color : $border-color;
|
|
157
|
+
}
|
|
158
|
+
.signin-modal {
|
|
159
|
+
max-width : 26em;
|
|
160
|
+
border : 1px solid $border-color;
|
|
161
|
+
margin : 5em auto 1em;
|
|
162
|
+
|
|
163
|
+
form {
|
|
164
|
+
margin-left: .5em;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
111
167
|
}
|
|
112
168
|
|
|
113
169
|
@media #{$desktop} {
|
|
@@ -58,7 +58,7 @@ module Chr
|
|
|
58
58
|
|
|
59
59
|
def setup_development_environment
|
|
60
60
|
say 'Setting up the development environment'
|
|
61
|
-
build :raise_on_delivery_errors
|
|
61
|
+
#build :raise_on_delivery_errors
|
|
62
62
|
build :raise_on_unpermitted_parameters
|
|
63
63
|
build :provide_setup_script
|
|
64
64
|
build :provide_dev_prime_task
|
data/lib/chr/version.rb
CHANGED
|
@@ -1,30 +1,31 @@
|
|
|
1
1
|
<% set_meta_tags title: 'CMS — Change Password' %>
|
|
2
2
|
|
|
3
|
-
<
|
|
4
|
-
<
|
|
3
|
+
<div class='signin-modal'>
|
|
4
|
+
<h2>Change password</h2>
|
|
5
|
+
<p class='notice'><%= notice %></p>
|
|
6
|
+
<p class='alert'><%= alert %></p>
|
|
5
7
|
|
|
6
|
-
|
|
8
|
+
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
|
|
9
|
+
<%= f.hidden_field :reset_password_token %>
|
|
7
10
|
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
+
<label for='admin_password' class='form-input input-required input-string'>
|
|
12
|
+
<div class='label'>
|
|
13
|
+
New password
|
|
14
|
+
<% if @minimum_password_length %>
|
|
15
|
+
<em>(<%= @minimum_password_length %> characters minimum)</em>
|
|
16
|
+
<% end %>
|
|
17
|
+
</div>
|
|
18
|
+
<%= f.password_field :password, autocomplete: "off", tabindex: 1 %>
|
|
19
|
+
</label>
|
|
11
20
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
<% end %>
|
|
17
|
-
<%= f.password_field :password, autofocus: true, autocomplete: "off" %>
|
|
18
|
-
</div>
|
|
21
|
+
<label for='admin_password_confirmation' class='form-input input-required input-string'>
|
|
22
|
+
<div class='label'>Confirm new password</div>
|
|
23
|
+
<%= f.password_field :password_confirmation, autocomplete: "off", tabindex: 2 %>
|
|
24
|
+
</label>
|
|
19
25
|
|
|
20
|
-
|
|
21
|
-
<%= f.label :password_confirmation, "Confirm new password" %><br />
|
|
22
|
-
<%= f.password_field :password_confirmation, autocomplete: "off" %>
|
|
23
|
-
</div>
|
|
26
|
+
<%= devise_error_messages! %>
|
|
24
27
|
|
|
25
|
-
|
|
26
|
-
<%=
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
<%= link_to 'Sign In', new_session_path(resource_name) %>
|
|
28
|
+
<%= f.submit "Change password", tabindex: 3 %>
|
|
29
|
+
<%= link_to 'Sign In', new_session_path(resource_name) %>
|
|
30
|
+
<% end %>
|
|
31
|
+
</div>
|
|
@@ -1,21 +1,19 @@
|
|
|
1
1
|
<% set_meta_tags title: 'CMS — Reset Password' %>
|
|
2
2
|
|
|
3
|
-
<
|
|
4
|
-
<
|
|
3
|
+
<div class='signin-modal'>
|
|
4
|
+
<h2>Forgot your password?</h2>
|
|
5
|
+
<p class='notice'><%= notice %></p>
|
|
6
|
+
<p class='alert'><%= alert %></p>
|
|
5
7
|
|
|
6
|
-
|
|
8
|
+
<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
|
|
9
|
+
<label for='admin_email' class='form-input input-required input-string'>
|
|
10
|
+
<div class='label'>Email</div>
|
|
11
|
+
<%= f.email_field :email, autofocus: true, tabindex: 1 %>
|
|
12
|
+
</label>
|
|
7
13
|
|
|
8
|
-
<%=
|
|
9
|
-
<%= devise_error_messages! %>
|
|
14
|
+
<%= devise_error_messages! %>
|
|
10
15
|
|
|
11
|
-
|
|
12
|
-
<%=
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
<div class="actions">
|
|
17
|
-
<%= f.submit "Send me reset password instructions" %>
|
|
18
|
-
</div>
|
|
19
|
-
<% end %>
|
|
20
|
-
|
|
21
|
-
<%= link_to 'Sign In', new_session_path(resource_name) %>
|
|
16
|
+
<%= f.submit "Reset password", tabindex: 2 %>
|
|
17
|
+
<%= link_to 'Sign In', new_session_path(resource_name) %>
|
|
18
|
+
<% end %>
|
|
19
|
+
</div>
|
|
@@ -1,31 +1,29 @@
|
|
|
1
|
-
<% set_meta_tags title: 'CMS —
|
|
1
|
+
<% set_meta_tags title: 'CMS — Sing in' %>
|
|
2
2
|
|
|
3
|
-
<
|
|
4
|
-
<
|
|
3
|
+
<div class='signin-modal'>
|
|
4
|
+
<h2>Sign in</h2>
|
|
5
|
+
<p class='notice'><%= notice %></p>
|
|
6
|
+
<p class='alert'><%= alert %></p>
|
|
5
7
|
|
|
6
|
-
|
|
8
|
+
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
|
|
9
|
+
<label for='admin_email' class='form-input input-required input-string'>
|
|
10
|
+
<div class='label'>Email</div>
|
|
11
|
+
<%= f.email_field :email, autofocus: true, tabindex: 1 %>
|
|
12
|
+
</label>
|
|
7
13
|
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
</div>
|
|
14
|
+
<label for='admin_password' class='form-input input-required input-string'>
|
|
15
|
+
<div class='label'>Password <%= link_to 'Forgot?', new_password_path(resource_name) %></div>
|
|
16
|
+
<%= f.password_field :password, autocomplete: "off", tabindex: 2 %>
|
|
17
|
+
</label>
|
|
13
18
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
19
|
+
<label for='admin_remember_me' class='form-input input-switch'>
|
|
20
|
+
<div class='switch'>
|
|
21
|
+
<%= f.check_box :remember_me, tabindex: 3 %>
|
|
22
|
+
<div class='checkbox'></div>
|
|
23
|
+
</div>
|
|
24
|
+
<span class='label'>Remember me</span>
|
|
25
|
+
</label>
|
|
18
26
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
<%= f.label :remember_me %>
|
|
23
|
-
</div>
|
|
24
|
-
<% end -%>
|
|
25
|
-
|
|
26
|
-
<div class="actions">
|
|
27
|
-
<%= f.submit "Log in" %>
|
|
28
|
-
</div>
|
|
29
|
-
<% end %>
|
|
30
|
-
|
|
31
|
-
<%= link_to 'Forgot your password?', new_password_path(resource_name) %>
|
|
27
|
+
<%= f.submit "Sign in", tabindex: 4 %>
|
|
28
|
+
<% end %>
|
|
29
|
+
</div>
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: chr
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.4.
|
|
4
|
+
version: 0.4.11
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Alexander Kravets
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2015-09-
|
|
13
|
+
date: 2015-09-10 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rails
|