-
Notifications
You must be signed in to change notification settings - Fork 210
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 #149 from pozorvlak/password-reset
Password reset - make emails friendlier and fix blank page
- Loading branch information
Showing
7 changed files
with
38 additions
and
28 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
21 changes: 14 additions & 7 deletions
21
app/views/devise/mailer/reset_password_instructions.html.haml
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,12 +1,19 @@ | ||
%p | ||
Hello | ||
= @resource.email | ||
! | ||
- site_name = Growstuff::Application.config.site_name | ||
%p Hello #{@resource.login_name}, | ||
|
||
%p Someone has requested a link to change your password, and you can do this through the link below. | ||
%p Someone has requested a link to reset your password on #{site_name}. | ||
We presume this was you, in which case you can do so through this link: | ||
|
||
%p | ||
= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) | ||
|
||
%p If you didn't request this, please ignore this email. | ||
%p Your password won't change until you access the link above and create a new one. | ||
%p If it wasn't you, then someone's made a typo or has been messing | ||
around. In this case, you can safely ignore this email, and your | ||
password will not be changed. | ||
|
||
%p See you soon, | ||
|
||
%p The #{site_name} team. | ||
%br/ | ||
=link_to root_url, root_url | ||
|
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,13 +1,20 @@ | ||
%p | ||
Hello | ||
= @resource.email | ||
! | ||
- site_name = Growstuff::Application.config.site_name | ||
%p Hello #{@resource.login_name}, | ||
|
||
%p | ||
Your account has been locked due to an excessive amount of unsuccessful sign | ||
in attempts. | ||
Your #{site_name} account has been locked due to an excessive number | ||
of unsuccessful sign in attempts. We do this in case someone's trying | ||
to break into your account, but it might also mean you've just | ||
forgotten your password. In either case, use the link below to unlock | ||
your account: | ||
|
||
%p Click the link below to unlock your account: | ||
%p= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) | ||
|
||
%p | ||
= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) | ||
%p If you have actually forgotten your password, you can | ||
= link_to 'reset your password', new_password_url(@resource) | ||
after you've unlocked your account. | ||
|
||
%p See you soon, | ||
%p The #{site_name} team. | ||
%br/ | ||
=link_to root_url, root_url |
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