From 39816a57acece4b0bcff90077372db42e6a31ba0 Mon Sep 17 00:00:00 2001 From: Ben Spoon Date: Tue, 2 Aug 2016 14:57:50 -0700 Subject: [PATCH] emails: change email templates to new design --- emails/base.html | 28 +++++++++++++++---- emails/changeemail.html | 21 +++++++++++--- emails/confirmemail.html | 29 +++++++++++++++---- emails/emailchanged.html | 27 ++++++++++++++---- emails/orgrecovery.html | 51 +++++++++++++++++++++++++--------- emails/passwordchanged.html | 29 +++++++++++++++---- emails/paymentfailure.html | 29 +++++++++++++++---- emails/recovery.html | 34 +++++++++++++++-------- emails/repoauthorizeemail.html | 27 ++++++++++++++---- emails/teaminvite.html | 27 +++++++++++++----- 10 files changed, 234 insertions(+), 68 deletions(-) diff --git a/emails/base.html b/emails/base.html index 00a89e51d..f439b6837 100644 --- a/emails/base.html +++ b/emails/base.html @@ -11,7 +11,7 @@ {% endif %} - - +
-
- +
{{ app_title }}
{{ app_title }}
-
+
+
{% block content %}{% endblock %} + +
+
+ + +
If you have any questions, respond to this email and we’ll be happy to help!
+ + + + +
Quay [ builds, analyzes, distributes ] your container images
+ + + + + + +
Your AccountDocumentationQuay.io
diff --git a/emails/changeemail.html b/emails/changeemail.html index ee9b909fc..77313bf95 100644 --- a/emails/changeemail.html +++ b/emails/changeemail.html @@ -2,12 +2,25 @@ {% block content %} -

E-mail Address Change Requested

+

E-mail Address Change Requested

+
+This email address was added to the Quay account {{username}}. -This email address was recently asked to become the new e-mail address for user {{ username | user_reference }}. + + + + +
Confirm Email
+ + + + +
If you did not add this address to {{username}}, you can safely ignore this message.
+Best Regards, +
+The Quay Team

-To confirm this change, please click the following link:
-{{ app_link('confirm?code=' + token) }} + {% endblock %} diff --git a/emails/confirmemail.html b/emails/confirmemail.html index de94372cd..6e26aab5d 100644 --- a/emails/confirmemail.html +++ b/emails/confirmemail.html @@ -2,12 +2,29 @@ {% block content %} -

Please Confirm E-mail Address

+

Confirm email for new user: {{ username }}

+
-This email address was recently used to register user {{ username | user_reference }}. -
-
-To confirm this email address, please click the following link:
-{{ app_link('confirm?code=' + token) }} + + + + +
This email address was user to register user {{ username }}.
+ + + + + +
Once you confirm this email you’ll be able to access your Quay account.
+ + + + + +
Confirm Email
+ + +Welcome!
+The Quay Team
{% endblock %} diff --git a/emails/emailchanged.html b/emails/emailchanged.html index ce6de5565..47ade4836 100644 --- a/emails/emailchanged.html +++ b/emails/emailchanged.html @@ -2,11 +2,28 @@ {% block content %} -

Account E-mail Address Changed

+

Account password changed: {{ username }}

+
-The email address for user {{ username | user_reference }} has been changed from this e-mail address to {{ new_email }}. -
-
-If this change was not expected, please immediately log into your {{ username | admin_reference }} and reset your email address. + + + + +
The password for user {{ username }} has been changed.
+ + + + + +
No action is required if you made this change.
+ + + + + +
If you did not make this change, please contact support
+ +Best wishes,
+The Quay Team
{% endblock %} diff --git a/emails/orgrecovery.html b/emails/orgrecovery.html index cda1d17e0..3ab95660e 100644 --- a/emails/orgrecovery.html +++ b/emails/orgrecovery.html @@ -2,19 +2,44 @@ {% block content %} -

Organization {{ organization }} recovery

+

Organization recovery: {{ organization }}

+
-A user at {{ app_link() }} has attempted to recover organization {{ organization | user_reference }} via this email address. -
-
-Please login with one of the following user accounts to access this organization: - -
-If you did not make this request, your organization has not been compromised and the user was -not given access. Please disregard this email. + + + + +
A user at {{ app_link() }} has attempted to recover access to organization {{ organization }} via this email address.
+ + + + + +
Please login with one of the following user accounts to access this organization:
+ + + + +
+ + + + + +
Login to Recover
+ + + + + +
If you did not make this request, your organization has not been compromised and the user was not given access. You can safely ignore this message.
+ + +Best Wishes,
+The Quay Team
{% endblock %} diff --git a/emails/passwordchanged.html b/emails/passwordchanged.html index 07c6232cc..6d4330860 100644 --- a/emails/passwordchanged.html +++ b/emails/passwordchanged.html @@ -2,12 +2,29 @@ {% block content %} -

Account Password Changed

+

Account password changed: {{ username }}

+
-The password for user {{ username | user_reference }} has been updated. -
-
-If this change was not expected, please immediately log into your account settings and reset your email address, -or contact support. + + + + +
The password for user {{ username }} has been changed
+ + + + + +
No action is required if you made this change
+ + + + + +
If you did not make this change, please contact support
+ + +Best Wishes,
+The Quay Team
{% endblock %} diff --git a/emails/paymentfailure.html b/emails/paymentfailure.html index 790f590b4..395e574a3 100644 --- a/emails/paymentfailure.html +++ b/emails/paymentfailure.html @@ -2,12 +2,29 @@ {% block content %} -

Subscription Payment Failure

+

Subscription payment failure: {{ username }}

+
-Your recent payment for account {{ username | user_reference }} failed, which usually results in our payments processor canceling -your subscription automatically. If you would like to continue to use {{ app_title }} without interruption, -please add a new card to {{ app_title }} and re-subscribe to your plan.
-
-You can find the card and subscription management features under your {{ username | admin_reference }}
+ + + + +
A recent payment for account {{ username }} failed.
+ + + + + +
If you would like to continue to use the account {{ username }} without interruption, update your payment information.
+ + + + + + +
Log in to update payment info
+ +Thank you,
+The Quay Team
{% endblock %} diff --git a/emails/recovery.html b/emails/recovery.html index 6f0267e39..7c6fe4ccf 100644 --- a/emails/recovery.html +++ b/emails/recovery.html @@ -2,17 +2,29 @@ {% block content %} -

Account recovery

+

Account recovery

+
-A user at {{ app_link() }} has attempted to recover their account -using this email address. -
-
-If you made this request, please click the following link to recover your account and -change your password: -{{ app_link('recovery?code=' + token) }} -

-If you did not make this request, your account has not been compromised and the user was -not given access. Please disregard this email. + + + + +
A user at Quay.io (local) has attempted to recover their access to the account registered to this email address
+ + + + + +
Recover Account
+ + + + + +
If you did not request this password reset, you can safely ignore this message and the account password and access will not change.
+ + +Best Wishes,
+The Quay Team
{% endblock %} diff --git a/emails/repoauthorizeemail.html b/emails/repoauthorizeemail.html index 7ae33975c..3f7b6e391 100644 --- a/emails/repoauthorizeemail.html +++ b/emails/repoauthorizeemail.html @@ -2,12 +2,29 @@ {% block content %} -

Verify e-mail to receive repository notifications

+

Verify e-mail to recieve {{namespace}}/{{repository}} notifications

+
-A request has been made to send notifications to this email address for repository {{ (namespace, repository) | repository_reference }} + + + + +
A request has been made to send notifications to this email address for the repository {{namespace}}/{{repository}}
-

-To verify this email address, please click the following link:
-{{ app_link('authrepoemail?code=' + token) }} + + + + +
Confirm Email
+ + + + + +
If you do not wish to receive notifications for {{namespace}}/{{repository}}, you can ignore this message.
+ + +Thank you,
+The Quay Team
{% endblock %} diff --git a/emails/teaminvite.html b/emails/teaminvite.html index 128bbe00f..ff757f013 100644 --- a/emails/teaminvite.html +++ b/emails/teaminvite.html @@ -2,16 +2,29 @@ {% block content %} -

Invitation to join team: {{ teamname }}

+

Invitation to join team: {{ organization }}/{{ teamname }}

+
-{{ inviter | user_reference }} has invited you to join the team {{ teamname | team_reference }} under organization {{ organization | user_reference }}. + + + + +
You’ve been invited to join the team {{ teamname }} in the organization {{ organization }} by user {{ inviter | user_reference }}.
-

+ + + + +
Join Team
-To join the team, please click the following link:
-{{ app_link('confirminvite?code=' + token) }} + + + + +
If you were not expecting this invitation, you can safely ignore this email.
-

-If you were not expecting this invitation, you can ignore this email. + +Thank you,
+The Quay Team
{% endblock %}