From cfdaf659f9a8da3faba798f99b9418fdc41a84ef Mon Sep 17 00:00:00 2001 From: Son NK <> Date: Sun, 5 Apr 2020 19:59:48 +0200 Subject: [PATCH] Make UI more consistent --- .../templates/dashboard/api_key.html | 4 +- .../templates/dashboard/custom_domain.html | 4 +- .../templates/dashboard/directory.html | 4 +- .../templates/dashboard/mailbox.html | 4 +- .../templates/dashboard/refused_email.html | 2 +- .../templates/dashboard/setting.html | 86 ++++++++++--------- app/developer/templates/developer/index.html | 2 +- 7 files changed, 55 insertions(+), 51 deletions(-) diff --git a/app/dashboard/templates/dashboard/api_key.html b/app/dashboard/templates/dashboard/api_key.html index 7748093c..01a3f4ee 100644 --- a/app/dashboard/templates/dashboard/api_key.html +++ b/app/dashboard/templates/dashboard/api_key.html @@ -11,7 +11,7 @@ {% block default_content %}
-
+

API Key

{% for api_key in api_keys %} -
+
{{ api_key.name }}
diff --git a/app/dashboard/templates/dashboard/custom_domain.html b/app/dashboard/templates/dashboard/custom_domain.html index 62f305c8..a296bbb6 100644 --- a/app/dashboard/templates/dashboard/custom_domain.html +++ b/app/dashboard/templates/dashboard/custom_domain.html @@ -10,7 +10,7 @@ {% block default_content %}
-
+

Custom Domains

{% if not current_user.is_premium() %} @@ -26,7 +26,7 @@
{% for custom_domain in custom_domains %} -
+
{{ custom_domain.domain }} diff --git a/app/dashboard/templates/dashboard/directory.html b/app/dashboard/templates/dashboard/directory.html index 9794c387..2b1d1c87 100644 --- a/app/dashboard/templates/dashboard/directory.html +++ b/app/dashboard/templates/dashboard/directory.html @@ -7,7 +7,7 @@ {% block default_content %}
-
+

Directories

{% if not current_user.is_premium() %} @@ -39,7 +39,7 @@
{% for dir in dirs %} -
+
{{ dir.name }} diff --git a/app/dashboard/templates/dashboard/mailbox.html b/app/dashboard/templates/dashboard/mailbox.html index ca32fffc..53c03171 100644 --- a/app/dashboard/templates/dashboard/mailbox.html +++ b/app/dashboard/templates/dashboard/mailbox.html @@ -7,7 +7,7 @@ {% block default_content %}
-
+

Mailboxes

{% if not current_user.is_premium() %} @@ -30,7 +30,7 @@
{% for mailbox in mailboxes %} -
+
{{ mailbox.email }} diff --git a/app/dashboard/templates/dashboard/refused_email.html b/app/dashboard/templates/dashboard/refused_email.html index f4073877..4d273b99 100644 --- a/app/dashboard/templates/dashboard/refused_email.html +++ b/app/dashboard/templates/dashboard/refused_email.html @@ -7,7 +7,7 @@ {% set active_page = "setting" %} {% block default_content %} -
+

Quarantine

diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html index dabfe490..2bea82ed 100644 --- a/app/dashboard/templates/dashboard/setting.html +++ b/app/dashboard/templates/dashboard/setting.html @@ -6,9 +6,19 @@ Settings {% endblock %} +{% block head %} + +{% endblock %} + {% block default_content %} -
+
@@ -75,11 +85,10 @@
-
Multi-Factor Authentication (MFA) -
- Secure your account with Multi-Factor Authentication.
- This requires having applications like Google Authenticator, Authy, FreeOTP, etc. -
+
Multi-Factor Authentication (MFA)
+
+ Secure your account with Multi-Factor Authentication.
+ This requires having applications like Google Authenticator, Authy, FreeOTP, etc.
{% if not current_user.enable_otp %} Enable @@ -93,9 +102,9 @@
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 password.
@@ -106,9 +115,8 @@
-
Random Alias -
Choose how to create your email alias by default
-
+
Random Alias
+
Choose how to create your email alias by default
@@ -204,14 +211,14 @@
-
Deleted Aliases -
- When an alias is deleted, all its activities are deleted and no emails can be sent to it.
- It is moved to another location and only used to check when new alias is created.
- This check is necessary to avoid someone else accidentally taking this alias.
- Because in this case, the other person might receive inadvertently information that belong to you.
-
+
Deleted Aliases
+
+ When an alias is deleted, all its activities are deleted and no emails can be sent to it. + The deleted alias is moved to another location and only used to check when new alias is created.
+ This check is necessary to avoid someone else accidentally taking this alias. + Otherwise the other person might receive inadvertently information that belong to you.
+ See deleted aliases @@ -220,16 +227,15 @@
-
Quarantine -
- When an email sent to your alias is classified as spam or refused by your email provider, - it usually means your alias has been leaked to a spammer.
- In this case SimpleLogin will keep a copy of this email (so it isn't lost) - and notify you so you can take a look at its content and take appropriate actions.
+
Quarantine
+
+ When an email sent to your alias is classified as spam or refused by your email provider, + it usually means your alias has been leaked to a spammer.
+ In this case SimpleLogin will keep a copy of this email (so it isn't lost) + and notify you so you can take a look at its content and take appropriate actions.
- The emails are deleted in 7 days. - This is an exceptional case where SimpleLogin stores the email. -
+ The emails are deleted in 7 days. + This is an exceptional case where SimpleLogin stores the email.
See refused emails @@ -239,10 +245,9 @@
-
Export Data -
- You can download all aliases you have created on SimpleLogin along with other data. -
+
Export Data
+
+ You can download all aliases you have created on SimpleLogin along with other data.
@@ -254,11 +259,10 @@
-
Delete Account -
Please note that this operation is irreversible. -
- +
Delete Account
+
Please note that this operation is irreversible.
+ diff --git a/app/developer/templates/developer/index.html b/app/developer/templates/developer/index.html index d0ec5b2f..d8d33bbf 100644 --- a/app/developer/templates/developer/index.html +++ b/app/developer/templates/developer/index.html @@ -27,7 +27,7 @@
{% for client in clients %} -
+