From ffff724712c8708dbbc05591637f7d806958da20 Mon Sep 17 00:00:00 2001 From: farhatahmad <35435341+farhatahmad@users.noreply.github.com> Date: Fri, 1 Feb 2019 12:14:51 -0500 Subject: [PATCH] GRN-48: Password reset e-mails getting into SPAM folders (#349) * Changed the way emails look and added an extra string for the user to check their spam folder * Update verify_email.text.erb --- app/views/user_mailer/password_reset.html.erb | 34 ++++++++++----- app/views/user_mailer/password_reset.text.erb | 10 +++-- app/views/user_mailer/verify_email.html.erb | 41 +++++++++++-------- app/views/user_mailer/verify_email.text.erb | 13 +++--- config/locales/en.yml | 2 +- 5 files changed, 60 insertions(+), 40 deletions(-) diff --git a/app/views/user_mailer/password_reset.html.erb b/app/views/user_mailer/password_reset.html.erb index c5ab0da0..5e343e3d 100644 --- a/app/views/user_mailer/password_reset.html.erb +++ b/app/views/user_mailer/password_reset.html.erb @@ -15,18 +15,32 @@ # You should have received a copy of the GNU Lesser General Public License along # with BigBlueButton; if not, see . %> +
+
+ <%= image_tag(Rails.configuration.branding_image.blank? ? "logo_with_text.png" : Rails.configuration.branding_image) %> -

Password reset

+

Password Reset

-

Please click the link below to reset your password:

+

+ It seems like you forgot your password for <%= t('bigbluebutton') %> +

-<%= link_to "Reset password", edit_password_reset_url(@user.reset_token, - email: @user.email, - host: @url) %> +

+ If this is true, please click the link below to reset your password: +

-

This link will expire in two hours.

+ + Reset Password + -

-If you did not request your password to be reset, please ignore this email and -your password will not be changed. -

\ No newline at end of file +

+ This link will expire in two hours. +

+ +

+ You can safely ignore this email if you did not request a password reset. +

+
+
diff --git a/app/views/user_mailer/password_reset.text.erb b/app/views/user_mailer/password_reset.text.erb index 044674bf..6a45a7c0 100644 --- a/app/views/user_mailer/password_reset.text.erb +++ b/app/views/user_mailer/password_reset.text.erb @@ -16,11 +16,13 @@ # with BigBlueButton; if not, see . %> -Please click the link below to reset your password: +Password Reset -<%= edit_password_reset_url(@user.reset_token, email: @user.email, host: @url) %> +It seems like you forgot your password for <%= t('bigbluebutton') %> +If this is true, please click the link below to reset your password: + +<%= edit_password_reset_url(@user.reset_token,email: @user.email, host: @url) %> This link will expire in two hours. -If you did not request your password to be reset, please ignore this email and -your password will not be changed. \ No newline at end of file +You can safely ignore this email if you did not request a password reset. diff --git a/app/views/user_mailer/verify_email.html.erb b/app/views/user_mailer/verify_email.html.erb index ef941681..402163a1 100644 --- a/app/views/user_mailer/verify_email.html.erb +++ b/app/views/user_mailer/verify_email.html.erb @@ -16,20 +16,27 @@ # with BigBlueButton; if not, see . %> - - - - - - -

Welcome to BigBlueButton!, <%= @user.name %>

-

- You have successfully registered your Greenlight account, - your username is: <%= @user.email %>.
-

-

- To verify your account, just follow this link: <%= link_to 'verify your email', @url %>. -

-

Thanks for joining and have a great day!

- - +
+
+ <%= image_tag(Rails.configuration.branding_image.blank? ? "logo_with_text.png" : Rails.configuration.branding_image) %> + +

Welcome to <%= t('bigbluebutton') %>!, + <%= @user[:name] %>

+ +

+ You have successfully registered your <%= t('bigbluebutton') %> account, your username is: + <%= @user[:email] %>. +

+ +

+ To verify your account, just click the button below. +

+ + + Verify Account + + +

Thanks for joining and have a great day!

+ +
+
diff --git a/app/views/user_mailer/verify_email.text.erb b/app/views/user_mailer/verify_email.text.erb index b73122f6..7d7b9e3b 100644 --- a/app/views/user_mailer/verify_email.text.erb +++ b/app/views/user_mailer/verify_email.text.erb @@ -16,13 +16,10 @@ # with BigBlueButton; if not, see . %> +Welcome to <%= t('bigbluebutton') %>!, <%= @user[:name] %> + +You have successfully registered your <%= t('bigbluebutton') %> account, your username is: <%= @user[:email] %>. + +To verify your account, just follow this link: <%= @url %> -Welcome to Greenlight, <%= @user.name %> -=============================================== - -You have successfully registered your Greenlight account, -your username is: <%= @user.email %>. - -To verify your account, just follow this link: <%= link_to 'verify your email', @url %>. - Thanks for joining and have a great day! diff --git a/config/locales/en.yml b/config/locales/en.yml index e5cc21d3..16e581e4 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -29,7 +29,7 @@ en: delivery_error: An error occured during email delivery. Please contact an administrator! docs: Documentation email: Email - email_sent: Email Sent! + email_sent: Email Sent! (Please check your Spam folder if you haven't received it) enter_your_name: Enter your name! errors: internal: