From 2f9301eb9734f4758fb2efc9491a50434637d1d8 Mon Sep 17 00:00:00 2001 From: Son Nguyen Kim Date: Mon, 4 Jul 2022 11:52:34 +0200 Subject: [PATCH] add 14 days mention and use same stats design for alias activity page (#1136) * add 14 days mention and use same stats design for alias activity page * djlint --- templates/dashboard/alias_log.html | 267 +++++++++++++---------------- templates/dashboard/index.html | 1 + 2 files changed, 117 insertions(+), 151 deletions(-) diff --git a/templates/dashboard/alias_log.html b/templates/dashboard/alias_log.html index c912ffc0..5e1ad61f 100644 --- a/templates/dashboard/alias_log.html +++ b/templates/dashboard/alias_log.html @@ -1,163 +1,128 @@ {% extends "default.html" %} {% set active_page = "dashboard" %} -{% block head %} - - -{% endblock %} {% block title %}Alias Activity{% endblock %} {% block default_content %} -

{{ alias.email }}

-
-
-
- -{{ total }} -Email Handled -
-
-
-
- -{{ email_forwarded }} -Email Forwarded -
-
-
-
- -{{ email_replied }} -Email Replied -
-
-
-
- -{{ email_blocked }} -Email Blocked -
-
-
-
-{% for log in logs %} +

{{ alias.email }}

+ +
+
+
+
+
+
Total
+
Last 14 days
+
+
{{ total }}
+
+
+
+
+
+
+
+
Forwards
+
Last 14 days
+
+
{{ email_forwarded }}
+
+
+
+
+
+
+
+
Replies/Sent
+
Last 14 days
+
+
{{ email_replied }}
+
+
+
+
+
+
+
+
Blocks
+
Last 14 days
+
+
{{ email_blocked }}
+
+
+
+
+ +
+ {% for log in logs %} -
-
-
-{{ log.when | dt }} -
-{% if log.bounced %} +
+
+
+ {{ log.when | dt }} +
+ {% if log.bounced %} -⚠️ -{% else %} -{% if log.is_reply %} + ⚠️ + {% else %} + {% if log.is_reply %} - -{% elif log.blocked %} - -{% else %} - -{% endif %} -{% endif %} -
-
-{% if log.bounced and not log.is_reply %} + + {% elif log.blocked %} + + {% else %} + + {% endif %} + {% endif %} +
+
+ {% if log.bounced and not log.is_reply %} -
-{{ log.website_email }} - -{{ log.alias }} - -{{ log.email_log.bounced_mailbox() }} -
-{% elif log.bounced and log.is_reply %} -
-{{ log.email_log.bounced_mailbox() }} - -{{ log.alias }} - -{{ log.website_email }} -
-{% else %} -
{{ log.website_email }}
-{% endif %} -
-
-{% endfor %} -
- +
+ {{ log.website_email }} + + {{ log.alias }} + + {{ log.email_log.bounced_mailbox() }} +
+ {% elif log.bounced and log.is_reply %} +
+ {{ log.email_log.bounced_mailbox() }} + + {{ log.alias }} + + {{ log.website_email }} +
+ {% else %} +
{{ log.website_email }}
+ {% endif %} +
+
+ {% endfor %} +
+ {% endblock %} {% block script %}{% endblock %} diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html index abfc8897..df3cded7 100644 --- a/templates/dashboard/index.html +++ b/templates/dashboard/index.html @@ -350,6 +350,7 @@ Alias description {{ alias_info.nb_forward }} forwards, {{ alias_info.nb_blocked }} blocks, {{ alias_info.nb_reply }} sents + in the last 14 days See All  →