From 184105ef7125e8a61ad470fe075c8a5563d8f039 Mon Sep 17 00:00:00 2001 From: drummer83 Date: Sun, 18 Feb 2024 20:23:30 +0100 Subject: [PATCH] Improve enterprise mails Make messages with required user action callouts (light blue boxes), i.e. 'How to find the admin area' and 'Contact Enterprise XYZ if you don't know why you are invited to be a manager'. Extend the 'How to find the admin area' text to small screens but recommend using large screens at the same time. --- app/views/enterprise_mailer/manager_invitation.html.haml | 6 ++++-- app/views/enterprise_mailer/welcome.html.haml | 3 +-- config/locales/en.yml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/views/enterprise_mailer/manager_invitation.html.haml b/app/views/enterprise_mailer/manager_invitation.html.haml index 9ce92c63b4..501633145e 100644 --- a/app/views/enterprise_mailer/manager_invitation.html.haml +++ b/app/views/enterprise_mailer/manager_invitation.html.haml @@ -13,8 +13,10 @@ = t('.confirm_your_email_html', enterprise: @enterprise.name) %p = t('.set_a_password') -%p - = t('.mistakenly_sent', owner_email: @enterprise.owner.email) +%p.callout + = t('.mistakenly_sent', enterprise: @enterprise.name) + %a{:href => "mailto:#{@enterprise.owner.email}", :target => "_blank"} + = @enterprise.owner.email = render 'shared/mailers/signoff_instance' diff --git a/app/views/enterprise_mailer/welcome.html.haml b/app/views/enterprise_mailer/welcome.html.haml index 79a3e10061..195a504646 100644 --- a/app/views/enterprise_mailer/welcome.html.haml +++ b/app/views/enterprise_mailer/welcome.html.haml @@ -7,9 +7,8 @@ %p = t(".userguide_html", link: link_to(t(".userguide"), ContentConfig.user_guide_link)) -%p +%p.callout = t(".admin_html", link: link_to(t(".admin_panel"), spree.admin_dashboard_url)) - %p = t(".community_html", link: link_to(t(".join_community"), ContentConfig.community_forum_url)) diff --git a/config/locales/en.yml b/config/locales/en.yml index 689e24bcd2..7206aa073e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -392,7 +392,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using registered: "%{enterprise} is now part of %{sitename}!" userguide_html: "The User Guide with detailed support for setting up your Producer or Hub is here: %{link}" userguide: "Open Food Network User Guide" - admin_html: "You can manage your account by logging into the %{link} or by clicking on the cog in the top right hand side of the homepage, and selecting Administration." + admin_html: "You can manage your account by logging into the %{link} or by clicking on the user icon in the top right hand side of the homepage, and selecting Administration. On small screens you can find the administration link in the main menu, which is located in the top left corner of the screen. However it is recommended to use a laptop or computer for best usability of the administration area." admin_panel: "Admin Panel" community_html: "We also have an online forum for community discussion related to OFN software and the unique challenges of running a food enterprise. You are encouraged to join in. We are constantly evolving and your input into this forum will shape what happens next. %{link}" join_community: "Join the community" @@ -401,7 +401,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using invited_to_manage_html: "You have been invited to manage %{enterprise} on %{instance}." confirm_your_email_html: "You should have received or will soon receive an email with a confirmation link. You won’t be able to access %{enterprise}'s profile until you have confirmed your email." set_a_password: "You will then be prompted to set a password before you are able to administer the enterprise." - mistakenly_sent: "Not sure why you have received this email? Please contact %{owner_email} for more information." + mistakenly_sent: "Not sure why you have received this email? Please contact %{enterprise} for more information by clicking the following link:" payment_mailer: authorize_payment: subject: "Please authorize your payment for order %{number} at %{distributor}"