Skip to content

Commit 027ad9c

Browse files
author
Nicholas W. Watson
committed
Merge pull request #22 from nwwatson/master
updated devise views
2 parents 5bd6d63 + 7b51367 commit 027ad9c

File tree

11 files changed

+191
-237
lines changed

11 files changed

+191
-237
lines changed

‎app/views/entropi_social/devise/confirmations/new.html.erb‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1-
<h2>Resend confirmation instructions</h2>
2-
3-
<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
4-
<%= devise_error_messages! %>
5-
6-
<div><%= f.label :email %><br />
7-
<%= f.email_field :email %></div>
8-
9-
<div><%= f.submit "Resend confirmation instructions" %></div>
10-
<% end %>
11-
12-
<%= render :partial => "devise/shared/links" %>
1+
<div>
2+
<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
3+
<fieldset>
4+
<legend>Resend confirmation instructions</legend>
5+
<%= devise_error_messages! %>
6+
<div class="control-group">
7+
<%= f.label :email, class: "control-label" %>
8+
<div class="controls">
9+
<%= f.text_field :email %>
10+
</div>
11+
</div>
12+
<div class="form-actions">
13+
<%= f.submit "Resend confirmation instructions", :class => 'btn btn-primary' %>
14+
</div>
15+
</fieldset>
16+
<% end %>
17+
</div>

‎app/views/entropi_social/devise/invitations/edit.html.erb‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,24 @@
1-
<h2>Set your password</h2>
2-
3-
<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
4-
<%= devise_error_messages! %>
5-
<%= f.hidden_field :invitation_token %>
6-
7-
<p><%= f.label :password %><br />
8-
<%= f.password_field :password %></p>
9-
10-
<p><%= f.label :password_confirmation %><br />
11-
<%= f.password_field :password_confirmation %></p>
12-
13-
<p><%= f.submit "Set my password" %></p>
14-
<% end %>
1+
<div>
2+
<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => { :method => :put } do |f| %>
3+
<fieldset>
4+
<legend>Send invitation</legend>
5+
<%= devise_error_messages! %>
6+
<%= f.hidden_field :invitation_token %>
7+
<div class="control-group">
8+
<%= f.label :password , class: "control-label" %>
9+
<div class="controls">
10+
<%= f.password_field :password %>
11+
</div>
12+
</div>
13+
<div class="control-group">
14+
<%= f.label :password_confirmation, class: "control-label" %>
15+
<div class="controls">
16+
<%= f.password_field :password_confirmation %>
17+
</div>
18+
</div>
19+
<div class="form-actions">
20+
<%= f.submit "Set my password", :class => 'btn btn-primary' %>
21+
</div>
22+
</fieldset>
23+
<% end %>
24+
</div>

‎app/views/entropi_social/devise/invitations/new.html.erb‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
<h2>Send invitation</h2>
2-
3-
<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %>
4-
<%= devise_error_messages! %>
5-
<fieldset>
6-
<div class="clearfix">
7-
<%= f.label :email %>
8-
<div class="input">
9-
<%= f.text_field :email %>
10-
</div>
11-
</div>
12-
<div class="clearfix">
13-
<div class="input"><%= f.submit "Send an invitation", :class => 'btn primary' %></div>
14-
</div>
15-
</fieldset>
16-
<% end %>
17-
18-
<%= link_to "Home", after_sign_in_path_for(resource_name) %><br />
1+
<div>
2+
<%= form_for resource, :as => resource_name, :url => invitation_path(resource_name), :html => {:method => :post} do |f| %>
3+
<fieldset>
4+
<legend>Send invitation</legend>
5+
<%= devise_error_messages! %>
6+
<div class="control-group">
7+
<%= f.label :email, class: "control-label" %>
8+
<div class="controls">
9+
<%= f.text_field :email %>
10+
</div>
11+
</div>
12+
<div class="form-actions">
13+
<%= f.submit "Send an invitation", :class => 'btn btn-primary' %>
14+
</div>
15+
</fieldset>
16+
<% end %>
17+
</div>

‎app/views/entropi_social/devise/passwords/edit.html.erb‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1-
<h2>Change your password</h2>
2-
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-
7-
<div><%= f.label :password, "New password" %><br />
8-
<%= f.password_field :password %></div>
9-
10-
<div><%= f.label :password_confirmation, "Confirm new password" %><br />
11-
<%= f.password_field :password_confirmation %></div>
12-
13-
<div><%= f.submit "Change my password" %></div>
14-
<% end %>
15-
16-
<%= render :partial => "devise/shared/links" %>
1+
<div>
2+
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
3+
<fieldset>
4+
<legend>Change your password<</legend>
5+
<%= devise_error_messages! %>
6+
<%= f.hidden_field :reset_password_token %>
7+
<div class="control-group">
8+
<%= f.label :password, "New password", class: "control-label" %>
9+
<div class="controls">
10+
<%= f.password_field :password %>
11+
</div>
12+
</div>
13+
<div class="control-group">
14+
<%= f.label :password_confirmation, "Confirm new password", class: "control-label" %>
15+
<div class="controls">
16+
<%= f.password_field :password_confirmation %>
17+
</div>
18+
</div>
19+
<div class="form-actions">
20+
<%= f.submit "Change my password", class: "btn btn-primary" %>
21+
<%= render :partial => "devise/shared/links" %>
22+
</div>
23+
</fieldset>
24+
<% end %>
25+
</div>

‎app/views/entropi_social/devise/passwords/new.html.erb‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
<h2>Forgot your password?</h2>
2-
3-
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
4-
<%= devise_error_messages! %>
5-
6-
<div><%= f.label :email %><br />
7-
<%= f.email_field :email %></div>
8-
9-
<div><%= f.submit "Send me reset password instructions" %></div>
10-
<% end %>
11-
12-
<%= render :partial => "devise/shared/links" %>
1+
<div>
2+
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
3+
<fieldset>
4+
<legend>Forgot your password?</legend>
5+
<%= devise_error_messages! %>
6+
<div class="control-group">
7+
<%= f.label :email, class: "control-label" %>
8+
<div class="controls">
9+
<%= f.email_field :email %>
10+
</div>
11+
</div>
12+
<div class="form-actions">
13+
<%= f.submit "Send me reset password instructions", class: "btn btn-primary" %>
14+
<%= render :partial => "devise/shared/links" %>
15+
</div>
16+
</fieldset>
17+
<% end %>
18+
</div>

‎app/views/entropi_social/devise/registrations/edit.html.erb‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎app/views/entropi_social/devise/registrations/new.html.erb‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎app/views/entropi_social/devise/sessions/new.html.erb‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎app/views/entropi_social/devise/unlocks/new.html.erb‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
<h2>Resend unlock instructions</h2>
2-
3-
<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
4-
<%= devise_error_messages! %>
5-
6-
<div><%= f.label :email %><br />
7-
<%= f.email_field :email %></div>
8-
9-
<div><%= f.submit "Resend unlock instructions" %></div>
10-
<% end %>
11-
12-
<%= render :partial => "devise/shared/links" %>
1+
<div>
2+
<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
3+
<fieldset>
4+
<legend>Resend unlock instructions</legend>
5+
<%= devise_error_messages! %>
6+
<div class="control-group">
7+
<%= f.label :email, class: "control-label" %>
8+
<div class="controls">
9+
<%= f.email_field :email %>
10+
</div>
11+
<div class="form-actions">
12+
<%= f.submit "Resend unlock instructions", class: "btn btn-primary" %>
13+
<%= render :partial => "devise/shared/links" %>
14+
</div>
15+
</div>
16+
</fieldset>
17+
<% end %>
18+
</div>

0 commit comments

Comments
 (0)