From f832ad0ed3a2b939ce84c00052f32e2f361fc15b Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 6 Aug 2018 14:04:13 -0400 Subject: [PATCH] html email template formatting updates --- .../MailTemplates/Handlebars/ChangeEmail.html.hbs | 2 +- .../Handlebars/ChangeEmailAlreadyExists.html.hbs | 4 ++-- .../Handlebars/InvoiceUpcoming.html.hbs | 13 +++++-------- .../Handlebars/NoMasterPasswordHint.html.hbs | 4 ++-- .../Handlebars/OrganizationUserAccepted.html.hbs | 4 ++-- .../Handlebars/OrganizationUserConfirmed.html.hbs | 2 +- .../Handlebars/OrganizationUserInvited.html.hbs | 4 ++-- .../Handlebars/TwoFactorEmail.html.hbs | 2 +- .../MailTemplates/Handlebars/VerifyDelete.html.hbs | 4 ++-- .../MailTemplates/Handlebars/VerifyEmail.html.hbs | 4 ++-- 10 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/Core/MailTemplates/Handlebars/ChangeEmail.html.hbs b/src/Core/MailTemplates/Handlebars/ChangeEmail.html.hbs index c762c2789..74f5de47e 100644 --- a/src/Core/MailTemplates/Handlebars/ChangeEmail.html.hbs +++ b/src/Core/MailTemplates/Handlebars/ChangeEmail.html.hbs @@ -1,5 +1,5 @@ {{#>FullHtmlLayout}}

- To finalize changing your email address enter the following code in the pop-up window: {{Token}} + To finalize changing your email address enter the following code in the pop-up window: {{Token}}

{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/ChangeEmailAlreadyExists.html.hbs b/src/Core/MailTemplates/Handlebars/ChangeEmailAlreadyExists.html.hbs index 2a51bc071..a913793a8 100644 --- a/src/Core/MailTemplates/Handlebars/ChangeEmailAlreadyExists.html.hbs +++ b/src/Core/MailTemplates/Handlebars/ChangeEmailAlreadyExists.html.hbs @@ -1,7 +1,7 @@ {{#>FullHtmlLayout}}

- A user ({{FromEmail}}) recently tried to change their account to use this - email address ({{ToEmail}}). An account already exists with this email ({{ToEmail}}). + A user ({{FromEmail}}) recently tried to change their account to use this email address ({{ToEmail}}). + An account already exists with this email ({{ToEmail}}).

If you did not try to change an email address, you can safely ignore this email. diff --git a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs index 63120574b..15214375c 100644 --- a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs +++ b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs @@ -1,8 +1,7 @@ {{#>FullHtmlLayout}}

- This is a reminder that your Bitwarden subscription is due for renewal soon. - Your payment method on file will be charged for {{usd AmountDue}} on - {{date DueDate 'MMM dd, yyyy'}}. + This is a reminder that your Bitwarden subscription is due for renewal soon. Your payment method on file will + be charged for {{usd AmountDue}} on {{date DueDate 'MMM dd, yyyy'}}.

{{#if Items}}

@@ -13,9 +12,8 @@

{{/if}}

- To avoid any interruption in service, please ensure that your payment method - on file is up to date and can be charged for the above amount. You can manage your - subscription and payment method by logging into the web vault at + To avoid any interruption in service, please ensure that your payment method on file is up to date and can be + charged for the above amount. You can manage your subscription and payment method by logging into the web vault at {{{link WebVaultUrl}}}. Once logged in, navigate to the Billing page for your account.

{{#if MentionInvoices}} @@ -24,7 +22,6 @@

{{/if}}

- If you have any questions or problems, please feel free to email us at - hello@bitwarden.com. + If you have any questions or problems, please feel free to email us at hello@bitwarden.com.

{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/NoMasterPasswordHint.html.hbs b/src/Core/MailTemplates/Handlebars/NoMasterPasswordHint.html.hbs index 2fdc10562..a4cd81c77 100644 --- a/src/Core/MailTemplates/Handlebars/NoMasterPasswordHint.html.hbs +++ b/src/Core/MailTemplates/Handlebars/NoMasterPasswordHint.html.hbs @@ -1,7 +1,7 @@ {{#>FullHtmlLayout}}

- You (or someone) recently requested your master password hint. - Unfortunately, your account does not have a master password hint. + You (or someone) recently requested your master password hint. Unfortunately, your account does not have a + master password hint.

If you did not request your master password hint you can safely ignore this email.

{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.html.hbs b/src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.html.hbs index d81c2f199..16a7eced4 100644 --- a/src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.html.hbs +++ b/src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.html.hbs @@ -1,5 +1,5 @@ {{#>FullHtmlLayout}} -

This email is to notify you that {{UserEmail}} has accepted your invitation to join {{OrganizationName}}.

-

To confirm this user, log into the Bitwarden web vault, manage your organization "People, and confirm the user.

+

This email is to notify you that {{UserEmail}} has accepted your invitation to join {{OrganizationName}}.

+

To confirm this user, log into the Bitwarden web vault, manage your organization "People", and confirm the user.

If you do not wish to confirm this user, you can also remove them from the organization on the same page.

{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/OrganizationUserConfirmed.html.hbs b/src/Core/MailTemplates/Handlebars/OrganizationUserConfirmed.html.hbs index 29bb36af3..11117bab0 100644 --- a/src/Core/MailTemplates/Handlebars/OrganizationUserConfirmed.html.hbs +++ b/src/Core/MailTemplates/Handlebars/OrganizationUserConfirmed.html.hbs @@ -1,4 +1,4 @@ {{#>FullHtmlLayout}} -

This email is to notify you that you have been confirmed as a user of {{OrganizationName}}.

+

This email is to notify you that you have been confirmed as a user of {{OrganizationName}}.

Any collections and logins being shared with you by this organization will now appear in your Bitwarden vault.

{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/OrganizationUserInvited.html.hbs b/src/Core/MailTemplates/Handlebars/OrganizationUserInvited.html.hbs index 0c5beed40..2a096c946 100644 --- a/src/Core/MailTemplates/Handlebars/OrganizationUserInvited.html.hbs +++ b/src/Core/MailTemplates/Handlebars/OrganizationUserInvited.html.hbs @@ -1,7 +1,7 @@ {{#>FullHtmlLayout}}

- You have been invited to join the {{OrganizationName}} organization. - To accept this invite, click the following link: + You have been invited to join the {{OrganizationName}} organization. To accept this invite, click the following + link:

{{{link Url 'true'}}}

diff --git a/src/Core/MailTemplates/Handlebars/TwoFactorEmail.html.hbs b/src/Core/MailTemplates/Handlebars/TwoFactorEmail.html.hbs index 113333d05..fe14a0f1a 100644 --- a/src/Core/MailTemplates/Handlebars/TwoFactorEmail.html.hbs +++ b/src/Core/MailTemplates/Handlebars/TwoFactorEmail.html.hbs @@ -1,6 +1,6 @@ {{#>FullHtmlLayout}}

- Your two-step verification code is: {{Token}} + Your two-step verification code is: {{Token}}

Use this code to complete logging in with Bitwarden. diff --git a/src/Core/MailTemplates/Handlebars/VerifyDelete.html.hbs b/src/Core/MailTemplates/Handlebars/VerifyDelete.html.hbs index 15add9035..10a7597ff 100644 --- a/src/Core/MailTemplates/Handlebars/VerifyDelete.html.hbs +++ b/src/Core/MailTemplates/Handlebars/VerifyDelete.html.hbs @@ -1,7 +1,7 @@ {{#>FullHtmlLayout}}

- Click the link below to delete your Bitwarden account ({{Email}}). - If you did not request this email to delete your Bitwarden account, you can safely ignore it. + Click the link below to delete your Bitwarden account ({{Email}}). If you did not request this email to delete + your Bitwarden account, you can safely ignore it.

{{{link Url 'true'}}}

{{/FullHtmlLayout}} diff --git a/src/Core/MailTemplates/Handlebars/VerifyEmail.html.hbs b/src/Core/MailTemplates/Handlebars/VerifyEmail.html.hbs index 9f837f371..160c84d6e 100644 --- a/src/Core/MailTemplates/Handlebars/VerifyEmail.html.hbs +++ b/src/Core/MailTemplates/Handlebars/VerifyEmail.html.hbs @@ -1,7 +1,7 @@ {{#>FullHtmlLayout}}

- Verify this email address for your Bitwarden account by clicking the following link. - If you did not request this email to verify a Bitwarden account, you can safely ignore it. + Verify this email address for your Bitwarden account by clicking the following link. If you did not request this + email to verify a Bitwarden account, you can safely ignore it.

{{{link Url 'true'}}}

{{/FullHtmlLayout}}