From 299e51cc080e0bbc6a937e17f80e487374a72d90 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 27 May 2020 18:23:33 +0100 Subject: [PATCH 01/16] Reword some sentences. --- .../templates/dashboard/api_key.html | 27 +++++++++---------- .../templates/dashboard/custom_domain.html | 10 +++---- .../templates/dashboard/mfa_cancel.html | 10 +++---- .../templates/dashboard/mfa_setup.html | 2 +- .../templates/dashboard/recovery_code.html | 6 ++--- .../templates/dashboard/setting.html | 9 +++---- templates/footer.html | 6 ++--- templates/header.html | 4 +-- 8 files changed, 34 insertions(+), 40 deletions(-) diff --git a/app/dashboard/templates/dashboard/api_key.html b/app/dashboard/templates/dashboard/api_key.html index c9a03995..2f106156 100644 --- a/app/dashboard/templates/dashboard/api_key.html +++ b/app/dashboard/templates/dashboard/api_key.html @@ -15,25 +15,22 @@

API Key

@@ -93,9 +90,9 @@
{{ new_api_key_form.csrf_token }} -

New Api Key

+

New API Key

- {{ new_api_key_form.name(class="form-control", placeholder="Chrome, Firefox") }} + {{ new_api_key_form.name(class="form-control", placeholder="Chrome") }} {{ render_field_errors(new_api_key_form.name) }}
Name of the api key, e.g. where it will be used.
@@ -153,4 +150,4 @@ }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/dashboard/templates/dashboard/custom_domain.html b/app/dashboard/templates/dashboard/custom_domain.html index 3353570b..9824b1a6 100644 --- a/app/dashboard/templates/dashboard/custom_domain.html +++ b/app/dashboard/templates/dashboard/custom_domain.html @@ -14,21 +14,19 @@

Custom Domains

{% if not current_user.is_premium() %} {% endif %}
diff --git a/app/dashboard/templates/dashboard/mfa_cancel.html b/app/dashboard/templates/dashboard/mfa_cancel.html index 4d3183d1..ebe206ba 100644 --- a/app/dashboard/templates/dashboard/mfa_cancel.html +++ b/app/dashboard/templates/dashboard/mfa_cancel.html @@ -8,21 +8,21 @@ {% block default_content %}
-

Multi Factor Authentication

+

Two Factor Authentication

- To cancel MFA, please enter the 6-digit number in your TOTP application - (Google Authenticator, Authy, MyDigiPassword, etc) here. + To remove 2FA please enter your 2FA code from the authenticator app. + Alternatively you can enter a recovery code here instead.

{{ otp_token_form.csrf_token }}
Token
-
The 6-digit number displayed on your phone.
+
The 6-digit 2FA code or recovery code.
{{ otp_token_form.token(class="form-control", autofocus="true") }} {{ render_field_errors(otp_token_form.token) }} - +
diff --git a/app/dashboard/templates/dashboard/mfa_setup.html b/app/dashboard/templates/dashboard/mfa_setup.html index b0995e8e..147adfec 100644 --- a/app/dashboard/templates/dashboard/mfa_setup.html +++ b/app/dashboard/templates/dashboard/mfa_setup.html @@ -11,7 +11,7 @@ {% block default_content %}
-

Multi Factor Authentication

+

Two Factor Authentication

Please open a TOTP application (Google Authenticator, Authy, MyDigiPassword, etc) on your smartphone and scan the following QR Code:

diff --git a/app/dashboard/templates/dashboard/recovery_code.html b/app/dashboard/templates/dashboard/recovery_code.html index 9fa494cf..b02f2a7e 100644 --- a/app/dashboard/templates/dashboard/recovery_code.html +++ b/app/dashboard/templates/dashboard/recovery_code.html @@ -9,8 +9,8 @@

Recovery codes

- If you lose access to your authentication device, you can use one of these backup codes to login to your - account. Each code may be used only once. Make a copy of these codes, and store it somewhere safe. + In the event you lose access to your authenticator app you can use one of these recovery codes to gain access to your account again. + Each code may be used only once and you will not be able to view these again, make sure to store them in a safe place.

    @@ -32,7 +32,7 @@
    - Beware: Generating new codes invalidates all the previous ones, make sure to write down the new ones! + Warning: Generating new codes will invalidate the older ones.
diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html index 587fed83..85bb0aad 100644 --- a/app/dashboard/templates/dashboard/setting.html +++ b/app/dashboard/templates/dashboard/setting.html @@ -106,10 +106,9 @@
-
One-Time Password (TOTP)
+
Two Factor Authentication
- Secure your account with One-Time Password.
- This requires having applications like Google Authenticator, Authy, MyDigiPassword, etc. + Secure your account with 2FA, you'll be asked for a code generated through an app when you login.
{% if not current_user.enable_otp %} Setup TOTP @@ -149,7 +148,7 @@ {% if current_user.alias_generator == AliasGeneratorEnum.uuid.value %} selected {% endif %} >Based on {{ AliasGeneratorEnum.uuid.name.upper() }} - +
@@ -198,7 +197,7 @@ Upgrade {% endif %} {% elif current_user.in_trial() %} - You are in the trial period. The trial ends {{ current_user.trial_end | dt }}. + Your Premium trial ends {{ current_user.trial_end | dt }}. {% else %} You are on the Free plan. {% endif %} diff --git a/templates/footer.html b/templates/footer.html index ed994c53..a251867b 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -12,10 +12,10 @@ Feature Requests
  • - Dev Documentation + Developer Documentation
  • - Uptime + Status
  • Contact Us
    • @@ -119,4 +119,4 @@ } } }) - \ No newline at end of file + diff --git a/templates/header.html b/templates/header.html index 667ab045..3b50c0ef 100644 --- a/templates/header.html +++ b/templates/header.html @@ -62,9 +62,9 @@ {% if current_user.in_trial() %} - Premium ends {{ current_user.trial_end|dt }} + Premium expires {{ current_user.trial_end|dt }} + title="After you signed up you were given a free 7 day Premium trial, after this period your account will automatically be downgraded to the Free plan."> {% elif current_user.is_premium() %} From fd58557f19ed368c187d815c2ff94b7fbfe6779a Mon Sep 17 00:00:00 2001 From: George Date: Wed, 27 May 2020 18:48:05 +0100 Subject: [PATCH 02/16] Reword the settings page. --- app/dashboard/templates/dashboard/setting.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html index 85bb0aad..d3f16ae4 100644 --- a/app/dashboard/templates/dashboard/setting.html +++ b/app/dashboard/templates/dashboard/setting.html @@ -125,7 +125,7 @@ Change password
    - You will receive an email containing instructions on how to change password. + You will receive an email containing instructions on how to change your password.
    @@ -137,7 +137,7 @@
    Random Alias
    -
    Choose how to create your email alias by default
    +
    Change the way random aliases are generated by default.
    - +
    From 8c6cce90510a36b1c5134294ab73250c6004d64c Mon Sep 17 00:00:00 2001 From: George Date: Wed, 27 May 2020 19:04:16 +0100 Subject: [PATCH 03/16] Change plan wording. --- app/dashboard/templates/dashboard/setting.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html index d3f16ae4..cb203e1a 100644 --- a/app/dashboard/templates/dashboard/setting.html +++ b/app/dashboard/templates/dashboard/setting.html @@ -185,14 +185,14 @@ ({{ manual_sub.end_at.format("YYYY-MM-DD") }}). {% if manual_sub.is_giveaway %}
    - To support SimpleLogin it's possible to change to a paid plan.
    + To gain additional features and support Simple Login you can upgrade to a Premium plan.
    Upgrade {% endif %} {% elif current_user.lifetime %} You have the lifetime licence. {% if not current_user.paid_lifetime %}
    - To support SimpleLogin it's possible to change to a paid plan.
    + To gain additional features and support Simple Login you can upgrade to a Premium plan.
    Upgrade {% endif %} {% elif current_user.in_trial() %} From aa8a8fafffe43e4a705b417abaadafc8d1e09988 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 27 May 2020 19:34:25 +0100 Subject: [PATCH 04/16] Change plan text. --- app/dashboard/templates/dashboard/setting.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html index cb203e1a..bc429669 100644 --- a/app/dashboard/templates/dashboard/setting.html +++ b/app/dashboard/templates/dashboard/setting.html @@ -181,7 +181,7 @@ Manage Subscription {% elif manual_sub %} - You are on the Premium plan. The plan ends {{ manual_sub.end_at | dt }} + You are on the Premium plan which expires {{ manual_sub.end_at | dt }} ({{ manual_sub.end_at.format("YYYY-MM-DD") }}). {% if manual_sub.is_giveaway %}
    @@ -189,14 +189,14 @@ Upgrade {% endif %} {% elif current_user.lifetime %} - You have the lifetime licence. + You have lifetime access to the Premium plan. {% if not current_user.paid_lifetime %}
    To gain additional features and support Simple Login you can upgrade to a Premium plan.
    Upgrade {% endif %} {% elif current_user.in_trial() %} - Your Premium trial ends {{ current_user.trial_end | dt }}. + Your Premium trial expires {{ current_user.trial_end | dt }}. {% else %} You are on the Free plan. {% endif %} From 972f651eca02a5586155aaf8fea1d1e958bd1b8c Mon Sep 17 00:00:00 2001 From: George Date: Wed, 27 May 2020 19:45:29 +0100 Subject: [PATCH 05/16] Reword pricing page. --- app/dashboard/templates/dashboard/pricing.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/dashboard/templates/dashboard/pricing.html b/app/dashboard/templates/dashboard/pricing.html index 644e1635..cf2163fc 100644 --- a/app/dashboard/templates/dashboard/pricing.html +++ b/app/dashboard/templates/dashboard/pricing.html @@ -25,12 +25,12 @@
    Premium
      -
    • Unlimited alias
      • +
    • Unlimited aliases
    • Unlimited custom domains
    • - Catch-all (or wildcard) alias + Catch-all (or wildcard) aliases
    • Up to 50 directories (or usernames) @@ -43,7 +43,7 @@
    -
    More info on our Pricing +
    More information is available on our Pricing Page
    @@ -98,4 +98,4 @@ } -{% endblock %} \ No newline at end of file +{% endblock %} From d9e29cc9892177c6db3ca2a5f41c8140690fc982 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 27 May 2020 19:49:13 +0100 Subject: [PATCH 06/16] Reword 2FA page. --- app/auth/templates/auth/mfa.html | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/app/auth/templates/auth/mfa.html b/app/auth/templates/auth/mfa.html index 07a17d5c..26670eed 100644 --- a/app/auth/templates/auth/mfa.html +++ b/app/auth/templates/auth/mfa.html @@ -11,8 +11,8 @@
    - Your account is protected with multi-factor authentication (MFA).

    - To continue with the sign-in you need to provide the access code from your authenticator. + Your account is protected with Two Factor Authentication.

    + You will need to enter your 2FA authentication code.
    @@ -20,9 +20,7 @@
    Token
    -
    Please enter the 6-digit number displayed in your MFA application - (Google Authenticator, Authy, MyDigiPassword, etc) here -
    +
    Please enter the 2FA code from your 2FA application
    {{ otp_token_form.token(class="form-control", autofocus="true") }} {{ render_field_errors(otp_token_form.token) }} @@ -32,7 +30,7 @@ {{ otp_token_form.remember.description }}
    - + {% if enable_fido %} @@ -45,12 +43,12 @@
    - If you have troubles with your authentication app, you can use the recovery code to login.
    - Use Recovery Codes + If you cannot access your authenticator application you can instead use a recovery code.
    + Use Recovery Code
    -{% endblock %} \ No newline at end of file +{% endblock %} From 6f78802c0ad622dee2e4cf8e9cfbf51d529071e1 Mon Sep 17 00:00:00 2001 From: George Date: Wed, 27 May 2020 21:52:45 +0100 Subject: [PATCH 07/16] Rename text box requirements. --- app/dashboard/templates/dashboard/custom_alias.html | 8 ++++---- app/dashboard/templates/dashboard/directory.html | 4 ++-- app/dashboard/templates/dashboard/pricing.html | 3 ++- app/oauth/templates/oauth/authorize.html | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/dashboard/templates/dashboard/custom_alias.html b/app/dashboard/templates/dashboard/custom_alias.html index 790fc61f..f6113416 100644 --- a/app/dashboard/templates/dashboard/custom_alias.html +++ b/app/dashboard/templates/dashboard/custom_alias.html @@ -32,11 +32,11 @@ id="prefix" type="text" pattern="[0-9a-z-_]{1,}" - title="Only lowercase letter, number, dash (-), underscore (_) can be used in alias prefix." - placeholder="email alias, for example newsletter-123_xyz" + title="Only lowercase letters, numbers, dashes (-) and underscores (_) are currently supported." + placeholder="Email alias, for example newsletter-123_xyz" autofocus required>
    - Only lowercase letter, number, dash (-), underscore (_) can be used. + Only lowercase letters, numbers, dashes (-) and underscores (_) are currently supported.
    @@ -78,7 +78,7 @@ + placeholder="Note, can be anything to help you remember why you created this alias. This field is optional.">
    diff --git a/app/dashboard/templates/dashboard/directory.html b/app/dashboard/templates/dashboard/directory.html index e1faf494..9036063d 100644 --- a/app/dashboard/templates/dashboard/directory.html +++ b/app/dashboard/templates/dashboard/directory.html @@ -102,7 +102,7 @@ {{ render_field_errors(new_dir_form.name) }}
    Directory name must be at least 3 characters. - Only lowercase letter, number, dash (-), underscore (_) can be used. + Only lowercase letters, numbers, dashes (-) and underscores (_) are currently supported.
    @@ -143,4 +143,4 @@ }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/dashboard/templates/dashboard/pricing.html b/app/dashboard/templates/dashboard/pricing.html index cf2163fc..edab4eb7 100644 --- a/app/dashboard/templates/dashboard/pricing.html +++ b/app/dashboard/templates/dashboard/pricing.html @@ -25,7 +25,8 @@
    Premium