mtdevise 5.0.0 → 5.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (76) hide show
  1. checksums.yaml +4 -4
  2. data/MIT-LICENSE +20 -20
  3. data/README.md +90 -90
  4. data/Rakefile +33 -33
  5. data/app/assets/config/mtdevise_manifest.js +2 -2
  6. data/app/assets/javascripts/mtdevise/application.js +2 -2
  7. data/app/assets/stylesheets/mtdevise/application.scss +2 -2
  8. data/app/controllers/mtdevise/account/dashboard_controller.rb +14 -14
  9. data/app/controllers/mtdevise/account/users_controller.rb +32 -32
  10. data/app/controllers/mtdevise/accounts_controller.rb +63 -63
  11. data/app/controllers/mtdevise/application_controller.rb +63 -63
  12. data/app/controllers/mtdevise/dashboard_controller.rb +14 -14
  13. data/app/controllers/mtdevise/welcome_controller.rb +11 -11
  14. data/app/extenders/controllers/application_controller_extender.rb +8 -8
  15. data/app/extenders/mtdevise/constraints/subdomain_required.rb +11 -11
  16. data/app/helpers/mtdevise/application_helper.rb +24 -24
  17. data/app/jobs/mtdevise/application_job.rb +3 -3
  18. data/app/mailers/mtdevise/application_mailer.rb +7 -7
  19. data/app/models/concerns/mtdevise/user_storage.rb +12 -12
  20. data/app/models/mtdevise/account.rb +47 -47
  21. data/app/models/mtdevise/application_record.rb +4 -4
  22. data/app/models/mtdevise/member.rb +8 -8
  23. data/app/models/mtdevise/user.rb +18 -18
  24. data/app/views/devise/confirmations/new.html.erb +23 -23
  25. data/app/views/devise/mailer/confirmation_instructions.html.erb +2 -2
  26. data/app/views/devise/mailer/reset_password_instructions.html.erb +4 -4
  27. data/app/views/devise/mailer/unlock_instructions.html.erb +3 -3
  28. data/app/views/devise/passwords/edit.html.erb +28 -28
  29. data/app/views/devise/passwords/new.html.erb +23 -23
  30. data/app/views/devise/registrations/edit.html.erb +18 -18
  31. data/app/views/devise/registrations/new.html.erb +31 -31
  32. data/app/views/devise/sessions/new.html.erb +31 -31
  33. data/app/views/devise/shared/_links.html.erb +21 -21
  34. data/app/views/devise/unlocks/new.html.erb +25 -25
  35. data/app/views/layouts/mtdevise/accounts.html.erb +15 -15
  36. data/app/views/layouts/mtdevise/accountsindex.html.erb +15 -15
  37. data/app/views/layouts/mtdevise/application.html.erb +15 -15
  38. data/app/views/layouts/mtdevise/dashboard.html.erb +16 -16
  39. data/app/views/layouts/mtdevise/signin.html.erb +15 -15
  40. data/app/views/layouts/mtdevise/signup.html.erb +15 -15
  41. data/app/views/layouts/mtdevise/useredit.html.erb +15 -15
  42. data/app/views/layouts/mtdevise/welcome.html.erb +15 -15
  43. data/app/views/mtdevise/account/dashboard/index.html.erb +1 -1
  44. data/app/views/mtdevise/account/sessions/new.html.erb +15 -15
  45. data/app/views/mtdevise/account/users/_form.html.erb +11 -11
  46. data/app/views/mtdevise/account/users/new.html.erb +5 -5
  47. data/app/views/mtdevise/accounts/index.html.erb +30 -30
  48. data/app/views/mtdevise/accounts/new.html.erb +80 -80
  49. data/app/views/mtdevise/dashboard/index.html.erb +1 -1
  50. data/app/views/mtdevise/welcome/index.html.erb +18 -18
  51. data/app/views/shared/_flash.html.erb +10 -10
  52. data/app/views/shared/_header.html.erb +19 -19
  53. data/app/views/shared/_validation.html.erb +10 -10
  54. data/config/initializers/assets.rb +2 -2
  55. data/config/initializers/devise.rb +279 -279
  56. data/config/initializers/devise/strategies/subdomain.rb +26 -26
  57. data/config/locales/devise.en.yml +60 -60
  58. data/config/routes.rb +22 -22
  59. data/db/migrate/20150426071228_create_mtdevise_accounts.rb +11 -11
  60. data/db/migrate/20150426115631_add_owner_id_to_mtdevise_accounts.rb +7 -7
  61. data/db/migrate/20150426115910_create_mtdevise_users.rb +12 -12
  62. data/db/migrate/20150426143800_add_devise_to_mtdevise_users.rb +50 -50
  63. data/db/migrate/20150427200506_add_subdomain_to_mtdevise_accounts.rb +8 -8
  64. data/db/migrate/20150428110406_create_mtdevise_members.rb +12 -12
  65. data/db/migrate/20150504181830_add_confirmed_at_to_users.rb +10 -10
  66. data/db/migrate/20150719125100_add_authentication_token_to_mtdevise_users.rb +8 -8
  67. data/db/migrate/20151231043439_add_firstname_to_mtdevise_accounts.rb +9 -9
  68. data/lib/generators/mtdevise/views_generator.rb +60 -60
  69. data/lib/mtdevise.rb +4 -4
  70. data/lib/mtdevise/active_record_extensions.rb +15 -15
  71. data/lib/mtdevise/engine.rb +51 -51
  72. data/lib/mtdevise/scoped_to.rb +9 -9
  73. data/lib/mtdevise/version.rb +3 -3
  74. data/lib/tasks/mtdevise_tasks.rake +4 -4
  75. data/lib/templates/erb/scaffold/_form.html.erb +15 -15
  76. metadata +50 -8
@@ -1,19 +1,19 @@
1
- module Mtdevise
2
- class User < ::User
3
-
4
- # Gravatar Support
5
- include Gravtastic
6
- gravtastic
7
-
8
- # User API Tokens
9
- acts_as_token_authenticatable
10
-
11
-
12
- # Relationship
13
- has_many :accounts, :class_name => "Mtdevise::Account", :foreign_key => "owner_id"
14
-
15
- # Define Devise
16
- devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :confirmable, :omniauthable
17
-
18
- end
1
+ module Mtdevise
2
+ class User < ::User
3
+
4
+ # Gravatar Support
5
+ include Gravtastic
6
+ gravtastic
7
+
8
+ # User API Tokens
9
+ acts_as_token_authenticatable
10
+
11
+
12
+ # Relationship
13
+ has_many :accounts, :class_name => "Mtdevise::Account", :foreign_key => "owner_id"
14
+
15
+ # Define Devise
16
+ devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :confirmable, :omniauthable
17
+
18
+ end
19
19
  end
@@ -1,24 +1,24 @@
1
- <div class="container">
2
- <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
- <div class="panel panel-primary">
4
- <div class="panel-heading">
5
- <div class="panel-title">Send Confirmation Token</div>
6
- </div>
7
- <div style="padding-top:30px" class="panel-body" >
8
- <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post, role: "form" }) do |f| %>
9
- <%= devise_error_messages! %>
10
- <div style="margin-bottom: 25px" class="input-group">
11
- <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
12
- <%= f.email_field :email, required: true, autofocus: true, class: "form-control", :placeholder => "Email" %>
13
- </div>
14
- <div style="margin-top:10px" class="form-group">
15
- <%= f.submit "Resend Token" %>
16
- </div>
17
- <div id="loginborder">
18
- <%= render "devise/shared/links", class: "btn btn-primary" %>
19
- </div>
20
- <% end %>
21
- </div>
22
- </div>
23
- </div>
1
+ <div class="container">
2
+ <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
+ <div class="panel panel-primary">
4
+ <div class="panel-heading">
5
+ <div class="panel-title">Send Confirmation Token</div>
6
+ </div>
7
+ <div style="padding-top:30px" class="panel-body" >
8
+ <%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post, role: "form" }) do |f| %>
9
+ <%= devise_error_messages! %>
10
+ <div style="margin-bottom: 25px" class="input-group">
11
+ <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
12
+ <%= f.email_field :email, required: true, autofocus: true, class: "form-control", :placeholder => "Email" %>
13
+ </div>
14
+ <div style="margin-top:10px" class="form-group">
15
+ <%= f.submit "Resend Token" %>
16
+ </div>
17
+ <div id="loginborder">
18
+ <%= render "devise/shared/links", class: "btn btn-primary" %>
19
+ </div>
20
+ <% end %>
21
+ </div>
22
+ </div>
23
+ </div>
24
24
  </div>
@@ -1,3 +1,3 @@
1
- <p>Welcome <%= @email %>!</p>
2
- <p>You can confirm your account through the link below:</p>
1
+ <p>Welcome <%= @email %>!</p>
2
+ <p>You can confirm your account through the link below:</p>
3
3
  <p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
@@ -1,5 +1,5 @@
1
- <p>Hello <%= @resource.email %>!</p>
2
- <p>Someone has requested a link to change your password. You can do this through the link below.</p>
3
- <p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
4
- <p>If you didn't request this, please ignore this email.</p>
1
+ <p>Hello <%= @resource.email %>!</p>
2
+ <p>Someone has requested a link to change your password. You can do this through the link below.</p>
3
+ <p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
4
+ <p>If you didn't request this, please ignore this email.</p>
5
5
  <p>Your password won't change until you access the link above and create a new one.</p>
@@ -1,4 +1,4 @@
1
- <p>Hello <%= @resource.email %>!</p>
2
- <p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
3
- <p>Click the link below to unlock your account:</p>
1
+ <p>Hello <%= @resource.email %>!</p>
2
+ <p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
3
+ <p>Click the link below to unlock your account:</p>
4
4
  <p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>
@@ -1,29 +1,29 @@
1
- <div class="container">
2
- <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
- <div class="panel panel-primary">
4
- <div class="panel-heading">
5
- <div class="panel-title">Change Your Password</div>
6
- </div>
7
- <div style="padding-top:30px" class="panel-body">
8
- <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, role: "form" }) do |f| %>
9
- <%= devise_error_messages! %>
10
- <%= f.input :reset_password_token, as: :hidden %>
11
- <div style="margin-bottom: 25px" class="input-group">
12
- <span class="input-group-addon"><i class="fa fa-asterisk"></i></span>
13
- <%= f.password_field :password, label: "New password", required: true, autofocus: true, hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length), class: "form-control", :placeholder => "New Password" %>
14
- </div>
15
- <div style="margin-bottom: 25px" class="input-group">
16
- <span class="input-group-addon"><i class="fa fa-asterisk"></i></span>
17
- <%= f.password_field :password_confirmation, label: "Confirm your new password", required: true, class: "form-control", :placeholder => "Confirm Password" %>
18
- </div>
19
- <div style="margin-top:10px" class="form-group">
20
- <%= f.submit "Change my password", class: "btn btn-primary" %>
21
- </div>
22
- <div id="loginborder">
23
- <%= render "devise/shared/links" %>
24
- </div>
25
- <% end %>
26
- </div>
27
- </div>
28
- </div>
1
+ <div class="container">
2
+ <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
+ <div class="panel panel-primary">
4
+ <div class="panel-heading">
5
+ <div class="panel-title">Change Your Password</div>
6
+ </div>
7
+ <div style="padding-top:30px" class="panel-body">
8
+ <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, role: "form" }) do |f| %>
9
+ <%= devise_error_messages! %>
10
+ <%= f.input :reset_password_token, as: :hidden %>
11
+ <div style="margin-bottom: 25px" class="input-group">
12
+ <span class="input-group-addon"><i class="fa fa-asterisk"></i></span>
13
+ <%= f.password_field :password, label: "New password", required: true, autofocus: true, hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length), class: "form-control", :placeholder => "New Password" %>
14
+ </div>
15
+ <div style="margin-bottom: 25px" class="input-group">
16
+ <span class="input-group-addon"><i class="fa fa-asterisk"></i></span>
17
+ <%= f.password_field :password_confirmation, label: "Confirm your new password", required: true, class: "form-control", :placeholder => "Confirm Password" %>
18
+ </div>
19
+ <div style="margin-top:10px" class="form-group">
20
+ <%= f.submit "Change my password", class: "btn btn-primary" %>
21
+ </div>
22
+ <div id="loginborder">
23
+ <%= render "devise/shared/links" %>
24
+ </div>
25
+ <% end %>
26
+ </div>
27
+ </div>
28
+ </div>
29
29
  </div>
@@ -1,24 +1,24 @@
1
- <div class="container">
2
- <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
- <div class="panel panel-primary">
4
- <div class="panel-heading">
5
- <div class="panel-title">Password Reset Confirmation</div>
6
- </div>
7
- <div style="padding-top:30px" class="panel-body" >
8
- <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, role: "form" }) do |f| %>
9
- <%= devise_error_messages! %>
10
- <div style="margin-bottom: 25px" class="input-group">
11
- <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
12
- <%= f.email_field :email, required: true, autofocus: true, class: "form-control", :placeholder => "Email" %>
13
- </div>
14
- <div style="margin-top:10px" class="form-group">
15
- <%= f.submit "Send me Reset Password Instructions", class: "btn btn-primary" %>
16
- </div>
17
- <div id="loginborder">
18
- <%= render "devise/shared/links" %>
19
- </div>
20
- <% end %>
21
- </div>
22
- </div>
23
- </div>
1
+ <div class="container">
2
+ <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
+ <div class="panel panel-primary">
4
+ <div class="panel-heading">
5
+ <div class="panel-title">Password Reset Confirmation</div>
6
+ </div>
7
+ <div style="padding-top:30px" class="panel-body" >
8
+ <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, role: "form" }) do |f| %>
9
+ <%= devise_error_messages! %>
10
+ <div style="margin-bottom: 25px" class="input-group">
11
+ <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
12
+ <%= f.email_field :email, required: true, autofocus: true, class: "form-control", :placeholder => "Email" %>
13
+ </div>
14
+ <div style="margin-top:10px" class="form-group">
15
+ <%= f.submit "Send me Reset Password Instructions", class: "btn btn-primary" %>
16
+ </div>
17
+ <div id="loginborder">
18
+ <%= render "devise/shared/links" %>
19
+ </div>
20
+ <% end %>
21
+ </div>
22
+ </div>
23
+ </div>
24
24
  </div>
@@ -1,19 +1,19 @@
1
- <h2>Edit <%= resource_name.to_s.humanize %></h2>
2
- <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
3
- <%= devise_error_messages! %>
4
- <div class="form-inputs">
5
- <%= f.email_field :email, required: true, autofocus: true %>
6
- <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
7
- <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
8
- <% end %>
9
- <%= f.password_field :password, autocomplete: "off", hint: "leave it blank if you don't want to change it", required: false %>
10
- <%= f.password_field :password_confirmation, required: false %>
11
- <%= f.password_field :current_password, hint: "we need your current password to confirm your changes", required: true %>
12
- </div>
13
- <div class="form-actions">
14
- <%= f.submit "Update", class: "btn btn-primary" %>
15
- </div>
16
- <% end %>
17
- <h3>Cancel my Account</h3>
18
- <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
1
+ <h2>Edit <%= resource_name.to_s.humanize %></h2>
2
+ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
3
+ <%= devise_error_messages! %>
4
+ <div class="form-inputs">
5
+ <%= f.email_field :email, required: true, autofocus: true %>
6
+ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
7
+ <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
8
+ <% end %>
9
+ <%= f.password_field :password, autocomplete: "off", hint: "leave it blank if you don't want to change it", required: false %>
10
+ <%= f.password_field :password_confirmation, required: false %>
11
+ <%= f.password_field :current_password, hint: "we need your current password to confirm your changes", required: true %>
12
+ </div>
13
+ <div class="form-actions">
14
+ <%= f.submit "Update", class: "btn btn-primary" %>
15
+ </div>
16
+ <% end %>
17
+ <h3>Cancel my Account</h3>
18
+ <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
19
19
  <%= link_to "Back", :back, class: "btn btn-primary" %>
@@ -1,32 +1,32 @@
1
- <div class="container">
2
- <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
- <div class="panel panel-primary">
4
- <div class="panel-heading">
5
- <div class="panel-title">Sign-Up</div>
6
- </div>
7
- <div style="padding-top:30px" class="panel-body">
8
- <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: { role: "form" }) do |f| %>
9
- <%= devise_error_messages! %>
10
- <div style="margin-bottom: 25px" class="input-group">
11
- <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
12
- <%= f.email_field :email, required: true, autofocus: true, class: "form-control", :placeholder => "Email" %>
13
- </div>
14
- <div style="margin-bottom: 25px" class="input-group">
15
- <span class="input-group-addon"><i class="fa fa-asterisk"></i></span>
16
- <%= f.password_field :password, required: true, class: "form-control", :placeholder => "Password", hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length) %>
17
- </div>
18
- <div style="margin-bottom: 25px" class="input-group">
19
- <span class="input-group-addon"><i class="fa fa-asterisk"></i></span>
20
- <%= f.password_field :password_confirmation, required: true, class: "form-control", :placeholder => "Confirm Password" %>
21
- </div>
22
- <div style="margin-top:10px" class="form-group">
23
- <%= f.submit "Sign-Up", class: "btn btn-primary" %>
24
- </div>
25
- <div id="loginborder">
26
- <%= render "devise/shared/links" %>
27
- </div>
28
- <% end %>
29
- </div>
30
- </div>
31
- </div>
1
+ <div class="container">
2
+ <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
+ <div class="panel panel-primary">
4
+ <div class="panel-heading">
5
+ <div class="panel-title">Sign-Up</div>
6
+ </div>
7
+ <div style="padding-top:30px" class="panel-body">
8
+ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), html: { role: "form" }) do |f| %>
9
+ <%= devise_error_messages! %>
10
+ <div style="margin-bottom: 25px" class="input-group">
11
+ <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
12
+ <%= f.email_field :email, required: true, autofocus: true, class: "form-control", :placeholder => "Email" %>
13
+ </div>
14
+ <div style="margin-bottom: 25px" class="input-group">
15
+ <span class="input-group-addon"><i class="fa fa-asterisk"></i></span>
16
+ <%= f.password_field :password, required: true, class: "form-control", :placeholder => "Password", hint: ("#{@minimum_password_length} characters minimum" if @minimum_password_length) %>
17
+ </div>
18
+ <div style="margin-bottom: 25px" class="input-group">
19
+ <span class="input-group-addon"><i class="fa fa-asterisk"></i></span>
20
+ <%= f.password_field :password_confirmation, required: true, class: "form-control", :placeholder => "Confirm Password" %>
21
+ </div>
22
+ <div style="margin-top:10px" class="form-group">
23
+ <%= f.submit "Sign-Up", class: "btn btn-primary" %>
24
+ </div>
25
+ <div id="loginborder">
26
+ <%= render "devise/shared/links" %>
27
+ </div>
28
+ <% end %>
29
+ </div>
30
+ </div>
31
+ </div>
32
32
  </div>
@@ -1,32 +1,32 @@
1
- <div class="container">
2
- <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
- <div class="panel panel-primary">
4
- <div class="panel-heading">
5
- <div class="panel-title">User Sign-In</div>
6
- </div>
7
- <div style="padding-top:30px" class="panel-body">
8
- <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { role: "form" }) do |f| %>
9
- <%= devise_error_messages! %>
10
-
11
- <div style="margin-bottom: 25px" class="input-group">
12
- <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
13
- <%= f.email_field :email, required: true, autofocus: true, class: "form-control", :placeholder => "Email" %>
14
- </div>
15
- <div class="input-group">
16
- <span class="input-group-addon"><i class="fa fa-asterisk"></i></span>
17
- <%= f.password_field :password, required: true, autocomplete: "off", class: "form-control", :placeholder => "Password" %>
18
- </div>
19
- <div class="checkbox">
20
- <%= f.check_box :remember_me, as: :boolean, inline_label: 'Remember me' if devise_mapping.rememberable? %>
21
- </div>
22
- <div style="margin-top:10px" class="form-group">
23
- <%= f.submit "Sign-In", class: "btn btn-primary" %>
24
- </div>
25
- <div id="loginborder" >
26
- <%= render "devise/shared/links" %>
27
- </div>
28
- <% end %>
29
- </div>
30
- </div>
31
- </div>
1
+ <div class="container">
2
+ <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
+ <div class="panel panel-primary">
4
+ <div class="panel-heading">
5
+ <div class="panel-title">User Sign-In</div>
6
+ </div>
7
+ <div style="padding-top:30px" class="panel-body">
8
+ <%= form_for(resource, as: resource_name, url: session_path(resource_name), html: { role: "form" }) do |f| %>
9
+ <%= devise_error_messages! %>
10
+
11
+ <div style="margin-bottom: 25px" class="input-group">
12
+ <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
13
+ <%= f.email_field :email, required: true, autofocus: true, class: "form-control", :placeholder => "Email" %>
14
+ </div>
15
+ <div class="input-group">
16
+ <span class="input-group-addon"><i class="fa fa-asterisk"></i></span>
17
+ <%= f.password_field :password, required: true, autocomplete: "off", class: "form-control", :placeholder => "Password" %>
18
+ </div>
19
+ <div class="checkbox">
20
+ <%= f.check_box :remember_me, as: :boolean, inline_label: 'Remember me' if devise_mapping.rememberable? %>
21
+ </div>
22
+ <div style="margin-top:10px" class="form-group">
23
+ <%= f.submit "Sign-In", class: "btn btn-primary" %>
24
+ </div>
25
+ <div id="loginborder" >
26
+ <%= render "devise/shared/links" %>
27
+ </div>
28
+ <% end %>
29
+ </div>
30
+ </div>
31
+ </div>
32
32
  </div>
@@ -1,22 +1,22 @@
1
- <div class="button-group btn-group-xs" role="group">
2
- <%- if controller_name != 'sessions' %>
3
- <%= link_to "Log-In", new_session_path(resource_name), class: "form-control" %>
4
- <% end -%>
5
- <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
6
- <%= link_to "Sign-Up", new_registration_path(resource_name), class: "form-control" %>
7
- <% end -%>
8
- <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
9
- <%= link_to "Forgot your password?", new_password_path(resource_name), class: "form-control" %>
10
- <% end -%>
11
- <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
12
- <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "form-control" %>
13
- <% end -%>
14
- <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
15
- <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: "form-control" %>
16
- <% end -%>
17
- <%- if devise_mapping.omniauthable? %>
18
- <%- resource_class.omniauth_providers.each do |provider| %>
19
- <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: "form-control" %>
20
- <% end -%>
21
- <% end -%>
1
+ <div class="button-group btn-group-xs" role="group">
2
+ <%- if controller_name != 'sessions' %>
3
+ <%= link_to "Log-In", new_session_path(resource_name), class: "form-control" %>
4
+ <% end -%>
5
+ <%- if devise_mapping.registerable? && controller_name != 'registrations' %>
6
+ <%= link_to "Sign-Up", new_registration_path(resource_name), class: "form-control" %>
7
+ <% end -%>
8
+ <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
9
+ <%= link_to "Forgot your password?", new_password_path(resource_name), class: "form-control" %>
10
+ <% end -%>
11
+ <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
12
+ <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name), class: "form-control" %>
13
+ <% end -%>
14
+ <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
15
+ <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name), class: "form-control" %>
16
+ <% end -%>
17
+ <%- if devise_mapping.omniauthable? %>
18
+ <%- resource_class.omniauth_providers.each do |provider| %>
19
+ <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), class: "form-control" %>
20
+ <% end -%>
21
+ <% end -%>
22
22
  </div>
@@ -1,26 +1,26 @@
1
- <div class="container">
2
- <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
- <div class="panel panel-primary">
4
- <div class="panel-heading">
5
- <div class="panel-title">Send Unlock Instructions</div>
6
- </div>
7
- <div style="padding-top:30px" class="panel-body" >
8
- <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post, html: { role: "form" } }) do |f| %>
9
- <%= devise_error_messages! %>
10
- <div style="margin-bottom: 25px" class="input-group">
11
- <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
12
- <%= f.email_field :email, required: true, autofocus: true, class: "form-control", :placeholder => "Email" %>
13
- </div>
14
- <div style="margin-top:10px" class="form-group">
15
- <div class="col-sm-12 controls">
16
- <%= f.submit "Resend Unlock Instructions", class: "btn btn-primary" %>
17
- </div>
18
- </div>
19
- <div id="loginborder">
20
- <%= render "devise/shared/links" %>
21
- </div>
22
- <% end %>
23
- </div>
24
- </div>
25
- </div>
1
+ <div class="container">
2
+ <div id="loginbox" class="mainbox col-md-6 col-md-offset-3 col-sm-8 col-sm-offset-2">
3
+ <div class="panel panel-primary">
4
+ <div class="panel-heading">
5
+ <div class="panel-title">Send Unlock Instructions</div>
6
+ </div>
7
+ <div style="padding-top:30px" class="panel-body" >
8
+ <%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post, html: { role: "form" } }) do |f| %>
9
+ <%= devise_error_messages! %>
10
+ <div style="margin-bottom: 25px" class="input-group">
11
+ <span class="input-group-addon"><i class="fa fa-envelope"></i></span>
12
+ <%= f.email_field :email, required: true, autofocus: true, class: "form-control", :placeholder => "Email" %>
13
+ </div>
14
+ <div style="margin-top:10px" class="form-group">
15
+ <div class="col-sm-12 controls">
16
+ <%= f.submit "Resend Unlock Instructions", class: "btn btn-primary" %>
17
+ </div>
18
+ </div>
19
+ <div id="loginborder">
20
+ <%= render "devise/shared/links" %>
21
+ </div>
22
+ <% end %>
23
+ </div>
24
+ </div>
25
+ </div>
26
26
  </div>