From 1463ea1a34c621b01670851a75ec02dd63dfc28b Mon Sep 17 00:00:00 2001 From: Zach Wolfenbarger Date: Thu, 25 Jan 2024 11:10:24 -0600 Subject: [PATCH 1/2] Update confirmation email copy (#4276) * Update confirmation email copy * Update app/views/devise/mailer/confirmation_instructions.html.erb Co-authored-by: Cliff Johnson * Update app/views/devise/mailer/confirmation_instructions.html.erb Co-authored-by: Cliff Johnson --------- Co-authored-by: Cliff Johnson --- .../devise/mailer/confirmation_instructions.html.erb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb index dc55f64f6..b81bba1b6 100644 --- a/app/views/devise/mailer/confirmation_instructions.html.erb +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -1,5 +1,9 @@ -

Welcome <%= @email %>!

- -

You can confirm your account email through the link below:

+

Welcome to the Zooniverse, <%= @email %>!

+

Please confirm your account email by clicking the link below:

<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>

+ +

While you are able to login and classify within projects, you will not be able to post on Talk discussion forums until you verify your email account.

+ +

Thanks!
+The Zooniverse Team

From 93f40f5a0314a05f052e13290d31898e8b1a82ff Mon Sep 17 00:00:00 2001 From: Zach Wolfenbarger Date: Thu, 25 Jan 2024 20:43:01 -0600 Subject: [PATCH 2/2] Fix & update resend confirmation view (#4277) --- app/views/devise/confirmations/new.html.erb | 24 +++++++++++++-------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb index cb4fdbc6c..3171d80e4 100644 --- a/app/views/devise/confirmations/new.html.erb +++ b/app/views/devise/confirmations/new.html.erb @@ -1,14 +1,20 @@ -
-

Resend confirmation instructions

+
+
+

Resend confirmation email

- <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: "form" }) do |f| %> - <%= devise_error_messages! %> + <%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post, class: "form" }) do |f| %> + <%= render "devise/shared/error_messages", resource: resource %> - + -
<%= f.submit "Resend confirmation instructions" %>
- <% end %> +
<%= f.submit "Submit" %>
+ <% end %> +
- <%= render "devise/shared/links" %> +
+ <%= render "devise/shared/links" %> +