commit 5866338de44bfd2f5fd8e0266f9520774e97892f parent 07099df41a6e4ac1c35afb636465b259b3d6073d Author: Daniel García <dani-garcia@users.noreply.github.com> Date: Mon, 17 Apr 2023 20:25:36 +0200 Merge pull request #3439 from kennymc-c/main Fixed missing footer_text and a few inconsistencies in email templates Diffstat:
7 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/static/templates/email/admin_reset_password.hbs b/src/static/templates/email/admin_reset_password.hbs @@ -1,6 +1,4 @@ Master Password Has Been Changed <!----------------> The master password for {{user_name}} has been changed by an administrator in your {{org_name}} organization. If you did not initiate this request, please reach out to your administrator immediately. - -=== -Github: https://github.com/dani-garcia/vaultwarden +{{> email/email_footer_text }} diff --git a/src/static/templates/email/change_email.hbs b/src/static/templates/email/change_email.hbs @@ -3,6 +3,4 @@ Your Email Change To finalize changing your email address enter the following code in web vault: {{token}} If you did not try to change an email address, you can safely ignore this email. - -=== -Github: https://github.com/dani-garcia/vaultwarden +{{> email/email_footer_text }} diff --git a/src/static/templates/email/delete_account.html.hbs b/src/static/templates/email/delete_account.html.hbs @@ -4,7 +4,7 @@ Delete Your Account <table width="100%" cellpadding="0" cellspacing="0" style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;"> <tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;"> <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none; text-align: center;" valign="top" align="center"> - click the link below to delete your account. + Click the link below to delete your account. </td> </tr> <tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;"> diff --git a/src/static/templates/email/invite_accepted.hbs b/src/static/templates/email/invite_accepted.hbs @@ -1,5 +1,5 @@ Invitation to {{{org_name}}} accepted <!----------------> -Your invitation for *{{email}}* to join *{{org_name}}* was accepted. +This email is to notify you that {{email}} has accepted your invitation to join {{org_name}}. Please log in via {{url}} to the vaultwarden server and confirm them from the organization management page. {{> email/email_footer_text }} \ No newline at end of file diff --git a/src/static/templates/email/invite_confirmed.hbs b/src/static/templates/email/invite_confirmed.hbs @@ -1,5 +1,5 @@ Invitation to {{{org_name}}} confirmed <!----------------> -Your invitation to join *{{org_name}}* was confirmed. -It will now appear under the Organizations the next time you log in to the web vault at {{url}}. +This email is to notify you that you have been confirmed as a user of {{org_name}}. +Any collections and logins being shared with you by this organization will now appear in your Vaultwarden vault at {{url}}. {{> email/email_footer_text }} \ No newline at end of file diff --git a/src/static/templates/email/send_2fa_removed_from_org.hbs b/src/static/templates/email/send_2fa_removed_from_org.hbs @@ -4,6 +4,4 @@ You have been removed from organization *{{org_name}}* because your account does You can enable Two-step Login in your account settings. - -=== -Github: https://github.com/dani-garcia/vaultwarden +{{> email/email_footer_text }} diff --git a/src/static/templates/email/send_single_org_removed_from_org.hbs b/src/static/templates/email/send_single_org_removed_from_org.hbs @@ -1,5 +1,4 @@ You have been removed from {{{org_name}}} <!----------------> Your user account has been removed from the *{{org_name}}* organization because you are a part of another organization. The {{org_name}} organization has enabled a policy that prevents users from being a part of multiple organizations. Before you can re-join this organization you need to leave all other organizations or join with a different account. -=== -Github: https://github.com/dani-garcia/vaultwarden +{{> email/email_footer_text }}