-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #47 from kaishuu0123/master
Release
- Loading branch information
Showing
13 changed files
with
186 additions
and
53 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,41 @@ | ||
| <h2>Change your password</h2> | ||
| <div class="container"> | ||
| <div class="row justify-content-center"> | ||
| <div class="card o-hidden border-0 shadow-lg my-5 col-lg-6"> | ||
| <div class="card-body p-0"> | ||
| <div class="row"> | ||
| <div class="col-lg-12"> | ||
| <div class="p-5"> | ||
| <h2 class="text-center"><%= t('.change_your_password', default: 'Change your password') %></h2> | ||
|
|
||
| <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> | ||
| <%= render "devise/shared/error_messages", resource: resource %> | ||
| <%= f.hidden_field :reset_password_token %> | ||
| <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %> | ||
| <%= render "devise/shared/error_messages", resource: resource %> | ||
| <%= f.hidden_field :reset_password_token %> | ||
|
|
||
| <div class="field"> | ||
| <%= f.label :password, "New password" %><br /> | ||
| <% if @minimum_password_length %> | ||
| <em>(<%= @minimum_password_length %> characters minimum)</em><br /> | ||
| <% end %> | ||
| <%= f.password_field :password, autofocus: true, autocomplete: "new-password" %> | ||
| </div> | ||
| <div class="form-group"> | ||
| <%= f.label :password, t('.new_password', default: 'New password') %><br /> | ||
| <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: 'form-control' %> | ||
| <% if @minimum_password_length %> | ||
| <em><%= t('devise.shared.minimum_password_length', count: @minimum_password_length, default: "(#{@minimum_password_length} characters minimum)") %></em><br /> | ||
| <% end %> | ||
| </div> | ||
|
|
||
| <div class="field"> | ||
| <%= f.label :password_confirmation, "Confirm new password" %><br /> | ||
| <%= f.password_field :password_confirmation, autocomplete: "new-password" %> | ||
| </div> | ||
| <div class="form-group"> | ||
| <%= f.label :password_confirmation, t('.confirm_new_password', default: 'Confirm new password') %><br /> | ||
| <%= f.password_field :password_confirmation, autocomplete: "new-password", class: 'form-control' %> | ||
| </div> | ||
|
|
||
| <div class="actions"> | ||
| <%= f.submit "Change my password" %> | ||
| </div> | ||
| <% end %> | ||
| <div class="actions"> | ||
| <%= f.submit t('.change_my_password', default: 'Change my password'), class: "btn btn-primary btn-user btn-block" %> | ||
| </div> | ||
| <% end %> | ||
|
|
||
| <%= render "devise/shared/links" %> | ||
| <div class="text-center"> | ||
| <%= render "devise/shared/links" %> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> |
Oops, something went wrong.