carnival_devise_views 0.0.2 → 0.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/app/assets/stylesheets/carnival_devise_views.css +5 -2
- data/app/views/erb/devise/passwords/edit.html.erb +23 -16
- data/app/views/erb/devise/passwords/new.html.erb +16 -12
- data/app/views/erb/devise/registrations/edit.html.erb +48 -28
- data/app/views/erb/devise/registrations/new.html.erb +21 -18
- data/app/views/haml/devise/passwords/edit.html.haml +15 -14
- data/app/views/haml/devise/passwords/new.html.haml +13 -11
- data/app/views/haml/devise/registrations/edit.html.haml +31 -32
- data/app/views/haml/devise/registrations/new.html.haml +12 -17
- data/app/views/haml/devise/sessions/new.html.haml +2 -1
- data/lib/carnival_devise_views/version.rb +1 -1
- metadata +4 -4
|
@@ -224,7 +224,6 @@ input::-webkit-inner-spin-button {
|
|
|
224
224
|
|
|
225
225
|
.login-container .sign_up{
|
|
226
226
|
margin: 10px 0px 0px 0px;
|
|
227
|
-
float: left;
|
|
228
227
|
width: 100%;
|
|
229
228
|
}
|
|
230
229
|
|
|
@@ -233,7 +232,7 @@ input::-webkit-inner-spin-button {
|
|
|
233
232
|
width: 100%;
|
|
234
233
|
}
|
|
235
234
|
|
|
236
|
-
.login-container .sign_up a, .login-container .forgot_password a{
|
|
235
|
+
.login-container .sign_up a, .login-container .forgot_password a, .sign_in a{
|
|
237
236
|
text-decoration: none;
|
|
238
237
|
opacity: 0.6;
|
|
239
238
|
}
|
|
@@ -253,3 +252,7 @@ input::-webkit-inner-spin-button {
|
|
|
253
252
|
background: #007ae1;
|
|
254
253
|
color: #fff;
|
|
255
254
|
}
|
|
255
|
+
|
|
256
|
+
.edit-user form{
|
|
257
|
+
margin-top: -250px;
|
|
258
|
+
}
|
|
@@ -1,16 +1,23 @@
|
|
|
1
|
-
<
|
|
2
|
-
|
|
3
|
-
<%=
|
|
4
|
-
|
|
5
|
-
<%=
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
<%=
|
|
1
|
+
<div class="login-container">
|
|
2
|
+
<h2>
|
|
3
|
+
<%= t('carnival_devise.passwords.change_message') %>
|
|
4
|
+
</h2>
|
|
5
|
+
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
|
|
6
|
+
<%= devise_error_messages! %>
|
|
7
|
+
<%= f.hidden_field :reset_password_token %>
|
|
8
|
+
<div>
|
|
9
|
+
<%= f.label :password, t('carnival_devise.passwords.new') %>
|
|
10
|
+
<br/>
|
|
11
|
+
<%= f.password_field :password, :autofocus => true %>
|
|
12
|
+
</div>
|
|
13
|
+
<div>
|
|
14
|
+
<%= f.label :password_confirmation, t('carnival_devise.passwords.confirm') %>
|
|
15
|
+
<br/>
|
|
16
|
+
<%= f.password_field :password_confirmation %>
|
|
17
|
+
</div>
|
|
18
|
+
<div>
|
|
19
|
+
<%= f.submit t('carnival_devise.passwords.change') %>
|
|
20
|
+
</div>
|
|
21
|
+
<%= render "devise/shared/links" %>
|
|
22
|
+
<% end %>
|
|
23
|
+
</div>
|
|
@@ -1,12 +1,16 @@
|
|
|
1
|
-
<
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
<%=
|
|
1
|
+
<div class="login-container">
|
|
2
|
+
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
|
|
3
|
+
<h2>
|
|
4
|
+
<%= t('carnival_devise.passwords.forgot') %>
|
|
5
|
+
?
|
|
6
|
+
</h2>
|
|
7
|
+
<%= devise_error_messages! %>
|
|
8
|
+
<div>
|
|
9
|
+
<%= f.email_field :email, :autofocus => true, :placeholder => 'Email' %>
|
|
10
|
+
</div>
|
|
11
|
+
<div>
|
|
12
|
+
<%= f.submit 'Send Reset Instructions', :class => "button" %>
|
|
13
|
+
</div>
|
|
14
|
+
<%= render "devise/shared/links" %>
|
|
15
|
+
<% end %>
|
|
16
|
+
</div>
|
|
@@ -1,29 +1,49 @@
|
|
|
1
|
-
<
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
1
|
+
<div class="login-container edit-user">
|
|
2
|
+
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
|
|
3
|
+
<h2>
|
|
4
|
+
<%= t('carnival_devise.registrations.edit') %>
|
|
5
|
+
<%= resource_name.to_s.humanize %>
|
|
6
|
+
</h2>
|
|
7
|
+
<%= devise_error_messages! %>
|
|
8
|
+
<div>
|
|
9
|
+
<%= f.email_field :email, :autofocus => true, :placeholder => 'Email' %>
|
|
10
|
+
</div>
|
|
11
|
+
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
|
|
12
|
+
<div>
|
|
13
|
+
Currently waiting confirmation for: #{resource.unconfirmed_email}
|
|
14
|
+
</div>
|
|
15
|
+
<% end %>
|
|
16
|
+
<div>
|
|
17
|
+
<%= f.label :password %>
|
|
18
|
+
<i>
|
|
19
|
+
( #{t('carnival_devise.registrations.blank_message')} )
|
|
20
|
+
</i>
|
|
21
|
+
<br/>
|
|
22
|
+
<%= f.password_field :password, :autocomplete => "off", :placeholder => 'Password' %>
|
|
23
|
+
</div>
|
|
24
|
+
<div>
|
|
25
|
+
<%= f.label :password_confirmation %>
|
|
26
|
+
<br/>
|
|
27
|
+
<%= f.password_field :password_confirmation, :placeholder => 'Password Confirmation' %>
|
|
28
|
+
</div>
|
|
29
|
+
<div>
|
|
30
|
+
<%= f.label :current_password %>
|
|
31
|
+
<i>
|
|
32
|
+
( #{t('carnival_devise.registrations.confirm')} )
|
|
33
|
+
</i>
|
|
34
|
+
<br/>
|
|
35
|
+
<%= f.password_field :current_password %>
|
|
36
|
+
</div>
|
|
37
|
+
<div>
|
|
38
|
+
<%= f.submit t('carnival_devise.registrations.update'),:class => "button" %>
|
|
39
|
+
</div>
|
|
11
40
|
<% end %>
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
<div><%= f.submit t('carnival_devise.registrations.update') %></div>
|
|
23
|
-
<% end %>
|
|
24
|
-
|
|
25
|
-
<h3><%= t('carnival_devise.registrations.cancel') %></h3>
|
|
26
|
-
|
|
27
|
-
<p>Unhappy? <%= button_to t('carnival_devise.registrations.cancel') , registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %></p>
|
|
28
|
-
|
|
29
|
-
<%= link_to t('carnival_devise.back'), :back %>
|
|
41
|
+
<!-- %h3= t('carnival_devise.registrations.cancel')
|
|
42
|
+
-->
|
|
43
|
+
<!-- %p
|
|
44
|
+
-->
|
|
45
|
+
<!-- Unhappy? #{button_to t('carnival_devise.registrations.cancel') , registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete}
|
|
46
|
+
-->
|
|
47
|
+
<!-- = link_to t('carnival_devise.back'), :back
|
|
48
|
+
-->
|
|
49
|
+
</div>
|
|
@@ -1,18 +1,21 @@
|
|
|
1
|
-
<
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
1
|
+
<div class="login-container">
|
|
2
|
+
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
|
|
3
|
+
<h2>
|
|
4
|
+
<%= t('carnival_devise.sign_up') %>
|
|
5
|
+
</h2>
|
|
6
|
+
<%= devise_error_messages! %>
|
|
7
|
+
<div>
|
|
8
|
+
<%= f.email_field :email, :autofocus => true, :placeholder => t('carnival_devise.new.email') %>
|
|
9
|
+
</div>
|
|
10
|
+
<div>
|
|
11
|
+
<%= f.password_field :password, :placeholder => t('carnival_devise.new.password') %>
|
|
12
|
+
</div>
|
|
13
|
+
<div>
|
|
14
|
+
<%= f.password_field :password_confirmation, :placeholder => 'Password Confirmation' %>
|
|
15
|
+
</div>
|
|
16
|
+
<div>
|
|
17
|
+
<%= f.submit t('carnival_devise.sign_up'), :class => "button" %>
|
|
18
|
+
</div>
|
|
19
|
+
<%= render "devise/shared/links" %>
|
|
20
|
+
<% end %>
|
|
21
|
+
</div>
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
|
|
2
|
-
=
|
|
3
|
-
=
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
=
|
|
1
|
+
.login-container
|
|
2
|
+
%h2= t('carnival_devise.passwords.change_message')
|
|
3
|
+
= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
|
|
4
|
+
= devise_error_messages!
|
|
5
|
+
= f.hidden_field :reset_password_token
|
|
6
|
+
%div
|
|
7
|
+
= f.label :password, t('carnival_devise.passwords.new')
|
|
8
|
+
%br/
|
|
9
|
+
= f.password_field :password, :autofocus => true
|
|
10
|
+
%div
|
|
11
|
+
= f.label :password_confirmation, t('carnival_devise.passwords.confirm')
|
|
12
|
+
%br/
|
|
13
|
+
= f.password_field :password_confirmation
|
|
14
|
+
%div= f.submit t('carnival_devise.passwords.change')
|
|
15
|
+
= render "devise/shared/links"
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
=
|
|
3
|
-
|
|
4
|
-
=
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
%
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
1
|
+
.login-container
|
|
2
|
+
= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
|
|
3
|
+
%h2
|
|
4
|
+
= t('carnival_devise.passwords.forgot')
|
|
5
|
+
?
|
|
6
|
+
= devise_error_messages!
|
|
7
|
+
|
|
8
|
+
%div
|
|
9
|
+
= f.email_field :email, :autofocus => true, :placeholder => 'Email'
|
|
10
|
+
|
|
11
|
+
%div
|
|
12
|
+
= f.submit 'Send Reset Instructions', :class => "button"
|
|
13
|
+
= render "devise/shared/links"
|
|
@@ -1,33 +1,32 @@
|
|
|
1
|
-
|
|
2
|
-
=
|
|
3
|
-
|
|
4
|
-
=
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
= f.label :email
|
|
8
|
-
%br/
|
|
9
|
-
= f.email_field :email, :autofocus => true
|
|
10
|
-
- if devise_mapping.confirmable? && resource.pending_reconfirmation?
|
|
1
|
+
.login-container.edit-user
|
|
2
|
+
= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f|
|
|
3
|
+
%h2
|
|
4
|
+
= t('carnival_devise.registrations.edit')
|
|
5
|
+
= resource_name.to_s.humanize
|
|
6
|
+
= devise_error_messages!
|
|
11
7
|
%div
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
%
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
=
|
|
8
|
+
= f.email_field :email, :autofocus => true, :placeholder => 'Email'
|
|
9
|
+
- if devise_mapping.confirmable? && resource.pending_reconfirmation?
|
|
10
|
+
%div
|
|
11
|
+
Currently waiting confirmation for: #{resource.unconfirmed_email}
|
|
12
|
+
%div
|
|
13
|
+
= f.label :password
|
|
14
|
+
%i
|
|
15
|
+
( #{t('carnival_devise.registrations.blank_message')} )
|
|
16
|
+
%br/
|
|
17
|
+
= f.password_field :password, :autocomplete => "off", :placeholder => 'Password'
|
|
18
|
+
%div
|
|
19
|
+
= f.label :password_confirmation
|
|
20
|
+
%br/
|
|
21
|
+
= f.password_field :password_confirmation, :placeholder => 'Password Confirmation'
|
|
22
|
+
%div
|
|
23
|
+
= f.label :current_password
|
|
24
|
+
%i
|
|
25
|
+
( #{t('carnival_devise.registrations.confirm')} )
|
|
26
|
+
%br/
|
|
27
|
+
= f.password_field :current_password
|
|
28
|
+
%div= f.submit t('carnival_devise.registrations.update'),:class => "button"
|
|
29
|
+
/ %h3= t('carnival_devise.registrations.cancel')
|
|
30
|
+
/ %p
|
|
31
|
+
/ Unhappy? #{button_to t('carnival_devise.registrations.cancel') , registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete}
|
|
32
|
+
/ = link_to t('carnival_devise.back'), :back
|
|
@@ -1,17 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
= f.
|
|
12
|
-
|
|
13
|
-
= f.label :password_confirmation
|
|
14
|
-
%br/
|
|
15
|
-
= f.password_field :password_confirmation
|
|
16
|
-
%div= f.submit t('carnival_devise.sign_up')
|
|
17
|
-
= render "devise/shared/links"
|
|
1
|
+
.login-container
|
|
2
|
+
= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
|
|
3
|
+
%h2= t('carnival_devise.sign_up')
|
|
4
|
+
= devise_error_messages!
|
|
5
|
+
%div
|
|
6
|
+
= f.email_field :email, :autofocus => true, :placeholder => t('carnival_devise.new.email')
|
|
7
|
+
%div
|
|
8
|
+
= f.password_field :password, :placeholder => t('carnival_devise.new.password')
|
|
9
|
+
%div
|
|
10
|
+
= f.password_field :password_confirmation, :placeholder => 'Password Confirmation'
|
|
11
|
+
%div= f.submit t('carnival_devise.sign_up'), :class => "button"
|
|
12
|
+
= render "devise/shared/links"
|
|
@@ -5,7 +5,8 @@
|
|
|
5
5
|
= f.email_field :email, :autofocus => true, :placeholder => t('carnival_devise.new.email')
|
|
6
6
|
%div
|
|
7
7
|
= f.password_field :password, :placeholder => t('carnival_devise.new.password')
|
|
8
|
-
%div
|
|
8
|
+
%div
|
|
9
|
+
= f.submit t('carnival_devise.new.login_btn'), :class => "button"
|
|
9
10
|
- if devise_mapping.rememberable?
|
|
10
11
|
%div
|
|
11
12
|
= f.check_box :remember_me
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: carnival_devise_views
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
hash:
|
|
4
|
+
hash: 25
|
|
5
5
|
prerelease:
|
|
6
6
|
segments:
|
|
7
7
|
- 0
|
|
8
8
|
- 0
|
|
9
|
-
-
|
|
10
|
-
version: 0.0.
|
|
9
|
+
- 3
|
|
10
|
+
version: 0.0.3
|
|
11
11
|
platform: ruby
|
|
12
12
|
authors:
|
|
13
13
|
- Vizir
|
|
@@ -15,7 +15,7 @@ autorequire:
|
|
|
15
15
|
bindir: bin
|
|
16
16
|
cert_chain: []
|
|
17
17
|
|
|
18
|
-
date: 2014-09-
|
|
18
|
+
date: 2014-09-29 00:00:00 +00:00
|
|
19
19
|
default_executable:
|
|
20
20
|
dependencies:
|
|
21
21
|
- !ruby/object:Gem::Dependency
|