diff --git a/app/templates/admin/email_search.html b/app/templates/admin/email_search.html
index caef2c3..72b2674 100644
--- a/app/templates/admin/email_search.html
+++ b/app/templates/admin/email_search.html
@@ -1,286 +1,295 @@
{% extends 'admin/master.html' %}
{% macro show_user(user) -%}
-
User {{ user.email }} with ID {{ user.id }}.
- {% set pu = helper.partner_user(user) %}
-
-
-
- User ID |
- Email |
- Verified |
- Status |
- Paid |
- Premium |
- Subscription |
- Created At |
- Updated At |
- Connected with Proton account |
-
-
-
-
- {{ user.id }} |
- {{ user.email }} |
- {% if user.activated %}
- Activated |
- {% else %}
- Pending |
- {% endif %}
- {% if user.disabled %}
- Disabled |
- {% else %}
- Enabled |
- {% endif %}
- {{ "yes" if user.is_paid() else "No" }} |
- {{ "yes" if user.is_premium() else "No" }} |
- {{ user.get_active_subscription() }} |
- {{ user.created_at }} |
- {{ user.updated_at }} |
- {% if pu %}
+ User {{ user.email }} with ID {{ user.id }}.
+ {% set pu = helper.partner_user(user) %}
+
+
+
+ User ID |
+ Email |
+ Verified |
+ Status |
+ Paid |
+ Premium |
+ Subscription |
+ Created At |
+ Updated At |
+ Connected with Proton account |
+
+
+
+
+ {{ user.id }} |
+
+ {{ user.email }}
+ |
+ {% if user.activated %}
- {{ pu.partner_email }} |
- {% else %}
- No |
- {% endif %}
-
-
-
+ Activated |
+ {% else %}
+ Pending |
+ {% endif %}
+ {% if user.disabled %}
+
+ Disabled |
+ {% else %}
+ Enabled |
+ {% endif %}
+ {{ "yes" if user.is_paid() else "No" }} |
+ {{ "yes" if user.is_premium() else "No" }} |
+ {{ user.get_active_subscription() }} |
+ {{ user.created_at }} |
+ {{ user.updated_at }} |
+ {% if pu %}
+
+
+ {{ pu.partner_email }}
+ |
+ {% else %}
+ No |
+ {% endif %}
+
+
+
{%- endmacro %}
{% macro list_mailboxes(message, mbox_count, mboxes) %}
-
- {{ mbox_count }} {{ message }}.
- {% if mbox_count>10 %}Showing only the last 10.{% endif %}
-
-
-
+
+ {{ mbox_count }} {{ message }}.
+ {% if mbox_count>10 %}Showing only the last 10.{% endif %}
+
+
+
+
+ Mailbox ID |
+ Email |
+ Verified |
+ Created At |
+
+
+
+ {% for mailbox in mboxes %}
- Mailbox ID |
- Email |
- Verified |
- Created At |
+ {{ mailbox.id }} |
+
+ {{ mailbox.email }}
+ |
+ {{ "Yes" if mailbox.verified else "No" }} |
+ {{ mailbox.created_at }} |
-
-
- {% for mailbox in mboxes %}
-
-
- {{ mailbox.id }} |
- {{ mailbox.email }} |
- {{ "Yes" if mailbox.verified else "No" }} |
-
- {{ mailbox.created_at }}
- |
-
- {% endfor %}
-
-
+ {% endfor %}
+
+
{% endmacro %}
{% macro list_alias(alias_count, aliases) %}
-
- {{ alias_count }} Aliases found.
- {% if alias_count>10 %}Showing only the last 10.{% endif %}
-
-
-
+
+ {{ alias_count }} Aliases found.
+ {% if alias_count>10 %}Showing only the last 10.{% endif %}
+
+
+
+
+ Alias ID |
+ Email |
+ Enabled |
+ Created At |
+
+
+
+ {% for alias in aliases %}
+
-
- Alias ID
- |
-
- Email
- |
-
- Enabled
- |
-
- Created At
- |
+ {{ alias.id }} |
+
+ {{ alias.email }}
+ |
+ {{ "Yes" if alias.enabled else "No" }} |
+ {{ alias.created_at }} |
-
-
- {% for alias in aliases %}
-
- {{ alias.id }} |
- {{ alias.email }} |
- {{ "Yes" if alias.enabled else "No" }} |
- {{ alias.created_at }} |
-
- {% endfor %}
-
-
+ {% endfor %}
+
+
{% endmacro %}
{% macro show_deleted_alias(deleted_alias) -%}
- Deleted Alias {{ deleted_alias.email }} with ID {{ deleted_alias.id }}.
-
-
-
- Deleted Alias ID |
- Email |
- Deleted At |
- Reason |
-
-
-
-
- {{ deleted_alias.id }} |
- {{ deleted_alias.email }} |
- {{ deleted_alias.created_at }} |
- {{ deleted_alias.reason }} |
-
-
-
+ Deleted Alias {{ deleted_alias.email }} with ID {{ deleted_alias.id }}.
+
+
+
+ Deleted Alias ID |
+ Email |
+ Deleted At |
+ Reason |
+
+
+
+
+ {{ deleted_alias.id }} |
+ {{ deleted_alias.email }} |
+ {{ deleted_alias.created_at }} |
+ {{ deleted_alias.reason }} |
+
+
+
{%- endmacro %}
{% macro show_domain_deleted_alias(dom_deleted_alias) -%}
-
- Domain Deleted Alias {{ dom_deleted_alias.email }} with ID {{ dom_deleted_alias.id }} for
- domain {{ dom_deleted_alias.domain.domain }}
-
-
-
-
- Deleted Alias ID |
- Email |
- Domain |
- Domain ID |
- Domain owner user ID |
- Domain owner user email |
- Deleted At |
-
-
-
-
- {{ dom_deleted_alias.id }} |
- {{ dom_deleted_alias.email }} |
- {{ dom_deleted_alias.domain.domain }} |
- {{ dom_deleted_alias.domain.id }} |
- {{ dom_deleted_alias.domain.user_id }} |
- {{ dom_deleted_alias.created_at }} |
-
-
-
- {{ show_user(data.domain_deleted_alias.domain.user) }}
+
+ Domain Deleted Alias {{ dom_deleted_alias.email }} with ID {{ dom_deleted_alias.id }} for
+ domain {{ dom_deleted_alias.domain.domain }}
+
+
+
+
+ Deleted Alias ID |
+ Email |
+ Domain |
+ Domain ID |
+ Domain owner user ID |
+ Domain owner user email |
+ Deleted At |
+
+
+
+
+ {{ dom_deleted_alias.id }} |
+ {{ dom_deleted_alias.email }} |
+ {{ dom_deleted_alias.domain.domain }} |
+ {{ dom_deleted_alias.domain.id }} |
+ {{ dom_deleted_alias.domain.user_id }} |
+ {{ dom_deleted_alias.created_at }} |
+
+
+
+ {{ show_user(data.domain_deleted_alias.domain.user) }}
{%- endmacro %}
{% macro list_alias_audit_log(alias_audit_log) %}
- Alias Audit Log
-
-
+ Alias Audit Log
+
+
+
+ User ID |
+ Alias ID |
+ Alias Email |
+ Action |
+ Message |
+ Time |
+
+
+
+ {% for entry in alias_audit_log %}
+
- User ID |
- Alias ID |
- Alias Email |
- Action |
- Message |
- Time |
+ {{ entry.user_id }} |
+ {{ entry.alias_id }} |
+
+ {{ entry.alias_email }}
+ |
+ {{ entry.action }} |
+ {{ entry.message }} |
+ {{ entry.created_at }} |
-
-
- {% for entry in alias_audit_log %}
-
- {{ entry.user_id }} |
- {{ entry.alias_id }} |
- {{ entry.alias_email }} |
- {{ entry.action }} |
- {{ entry.message }} |
- {{ entry.created_at }} |
-
- {% endfor %}
-
-
+ {% endfor %}
+
+
{% endmacro %}
{% macro list_user_audit_log(user_audit_log) %}
- User Audit Log
-
-
+ User Audit Log
+
+
+
+ User email |
+ Action |
+ Message |
+ Time |
+
+
+
+ {% for entry in user_audit_log %}
+
- User email |
- Action |
- Message |
- Time |
+
+ {{ entry.user_email }}
+ |
+ {{ entry.action }} |
+ {{ entry.message }} |
+ {{ entry.created_at }} |
-
-
- {% for entry in user_audit_log %}
-
- {{ entry.user_email }} |
- {{ entry.action }} |
- {{ entry.message }} |
- {{ entry.created_at }} |
-
- {% endfor %}
-
-
+ {% endfor %}
+
+
{% endmacro %}
{% block body %}
+
+ {% if data.no_match and email %}
+
+ No user, alias or mailbox found for {{ email }}
+ {% endif %}
+ {% if data.alias %}
+
-
+
Found Alias {{ data.alias.email }}
+ {{ list_alias(1,[data.alias]) }}
+ {{ list_alias_audit_log(data.alias_audit_log) }}
+ {{ list_mailboxes("Mailboxes for alias", helper.alias_mailbox_count(data.alias) , helper.alias_mailboxes(data.alias)) }}
+ {{ show_user(data.alias.user) }}
- {% if data.no_match and email %}
- No user, alias or mailbox found for {{ email }}
- {% endif %}
+ {% endif %}
+ {% if data.user %}
- {% if data.alias %}
-
-
Found Alias {{ data.alias.email }}
- {{ list_alias(1,[data.alias]) }}
- {{ list_alias_audit_log(data.alias_audit_log) }}
- {{ list_mailboxes("Mailboxes for alias", helper.alias_mailbox_count(data.alias), helper.alias_mailboxes(data.alias)) }}
- {{ show_user(data.alias.user) }}
-
- {% endif %}
+
+
Found User {{ data.user.email }}
+ {{ show_user(data.user) }}
+ {{ list_mailboxes("Mailboxes for user", helper.mailbox_count(data.user) , helper.mailbox_list(data.user) ) }}
+ {{ list_alias(helper.alias_count(data.user) ,helper.alias_list(data.user)) }}
+
+ {% endif %}
+ {% if data.user_audit_log %}
- {% if data.user %}
-
-
Found User {{ data.user.email }}
- {{ show_user(data.user) }}
- {{ list_mailboxes("Mailboxes for user", helper.mailbox_count(data.user) , helper.mailbox_list(data.user) ) }}
- {{ list_alias(helper.alias_count(data.user) ,helper.alias_list(data.user)) }}
-
- {% endif %}
- {% if data.user_audit_log %}
-
-
Audit log entries for user {{ data.query }}
- {{ list_user_audit_log(data.user_audit_log) }}
-
- {% endif %}
- {% if data.mailbox_count > 10 %}
- Found more than 10 mailboxes for {{ email }}. Showing the last 10
- {% elif data.mailbox_count > 0 %}
- Found {{ data.mailbox_count }} mailbox(es) for {{ email }}
- {% endif %}
- {% for mailbox in data.mailbox %}
+
+
Audit log entries for user {{ data.query }}
+ {{ list_user_audit_log(data.user_audit_log) }}
+
+ {% endif %}
+ {% if data.mailbox_count > 10 %}
-
-
Found Mailbox {{ mailbox.email }}
- {{ list_mailboxes("Mailbox found", 1, [mailbox]) }}
- {{ show_user(mailbox.user) }}
-
- {% endfor %}
- {% if data.deleted_alias %}
+ Found more than 10 mailboxes for {{ email }}. Showing the last 10
+ {% elif data.mailbox_count > 0 %}
+ Found {{ data.mailbox_count }} mailbox(es) for {{ email }}
+ {% endif %}
+ {% for mailbox in data.mailbox %}
-
-
Found DeletedAlias {{ data.deleted_alias.email }}
- {{ show_deleted_alias(data.deleted_alias) }}
- {{ list_alias_audit_log(data.deleted_alias_audit_log) }}
-
- {% endif %}
- {% if data.domain_deleted_alias %}
+
+
Found Mailbox {{ mailbox.email }}
+ {{ list_mailboxes("Mailbox found", 1, [mailbox]) }}
+ {{ show_user(mailbox.user) }}
+
+ {% endfor %}
+ {% if data.deleted_alias %}
-
-
Found DomainDeletedAlias {{ data.domain_deleted_alias.email }}
- {{ show_domain_deleted_alias(data.domain_deleted_alias) }}
- {{ list_alias_audit_log(data.domain_deleted_alias_audit_log) }}
-
- {% endif %}
+
+
Found DeletedAlias {{ data.deleted_alias.email }}
+ {{ show_deleted_alias(data.deleted_alias) }}
+ {{ list_alias_audit_log(data.deleted_alias_audit_log) }}
+
+ {% endif %}
+ {% if data.domain_deleted_alias %}
+
+
+
Found DomainDeletedAlias {{ data.domain_deleted_alias.email }}
+ {{ show_domain_deleted_alias(data.domain_deleted_alias) }}
+ {{ list_alias_audit_log(data.domain_deleted_alias_audit_log) }}
+
+ {% endif %}
{% endblock %}
diff --git a/app/templates/dashboard/billing.html b/app/templates/dashboard/billing.html
index 106399d..b5cd80c 100644
--- a/app/templates/dashboard/billing.html
+++ b/app/templates/dashboard/billing.html
@@ -43,7 +43,7 @@
You can change the plan at any moment.
Please note that the new billing cycle starts instantly
- i.e. you will be charged immediately the annual fee ($30) when switching from monthly plan or vice-versa
+ i.e. you will be charged immediately the annual fee ($36) when switching from monthly plan or vice-versa
without pro rata computation .
To change the plan you can also cancel the current one and subscribe a new one by the end of this plan.
diff --git a/app/templates/dashboard/custom_domain.html b/app/templates/dashboard/custom_domain.html
index 2982867..eac4ef6 100644
--- a/app/templates/dashboard/custom_domain.html
+++ b/app/templates/dashboard/custom_domain.html
@@ -94,4 +94,3 @@
{% endblock %}
-
diff --git a/app/templates/dashboard/domain_detail/dns.html b/app/templates/dashboard/domain_detail/dns.html
index e100fee..a7bfdf0 100644
--- a/app/templates/dashboard/domain_detail/dns.html
+++ b/app/templates/dashboard/domain_detail/dns.html
@@ -91,7 +91,6 @@
Some domain registrars (Namecheap, CloudFlare, etc) might also use @ for the root domain.
-
{% for record in expected_mx_records %}
@@ -108,7 +107,6 @@
data-clipboard-text="{{ record.domain }}">{{ record.domain }}
{% endfor %}
-