diff --git a/frappe/email/queue.py b/frappe/email/queue.py index 9fbf01eb60..c06a7fb79b 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -276,10 +276,7 @@ def get_unsubscribe_message(unsubscribe_message, expose_recipients): target="_blank">{0}'''.format(_('Unsubscribe')) unsubscribe_html = _("{0} to stop receiving emails of this type").format(unsubscribe_link) - html = """
- -
-
+ html = """
{0} diff --git a/frappe/public/js/frappe/form/footer/timeline_item.html b/frappe/public/js/frappe/form/footer/timeline_item.html index c25fb696b4..92f039b4e4 100755 --- a/frappe/public/js/frappe/form/footer/timeline_item.html +++ b/frappe/public/js/frappe/form/footer/timeline_item.html @@ -67,7 +67,7 @@ var indicator_class = "green"; } else if (data.delivery_status === "Sending") { var indicator_class = "orange"; - } else if (in_list("Opened", "Read", data.delivery_status)) { + } else if (in_list(["Opened", "Read"], data.delivery_status)) { var indicator_class = "blue"; } else { var indicator_class = "red"; diff --git a/frappe/templates/emails/email_footer.html b/frappe/templates/emails/email_footer.html index 5352d817d5..4ad6cb23b5 100644 --- a/frappe/templates/emails/email_footer.html +++ b/frappe/templates/emails/email_footer.html @@ -17,6 +17,10 @@ + + {% if default_mail_footer %} {% endif %} -
\ No newline at end of file +