From 03abe4abeb71dfe117f5dd4b1a810edf830b9af8 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 13 Jan 2021 14:03:54 +0530 Subject: [PATCH] fix: Get brand logo from app --- frappe/email/email_body.py | 3 +++ frappe/public/scss/email.scss | 9 +++++++++ frappe/templates/emails/standard.html | 8 ++++---- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index 8ac071fa61..59a504b40d 100755 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -13,6 +13,7 @@ from email.mime.multipart import MIMEMultipart from email.header import Header from email import policy +from frappe.core.doctype.navbar_settings.navbar_settings import get_app_logo def get_email(recipients, sender='', msg='', subject='[No Subject]', text_content = None, footer=None, print_html=None, formatted=None, attachments=None, @@ -254,6 +255,8 @@ def get_formatted_html(subject, message, footer=None, print_html=None, email_account = get_outgoing_email_account(False, sender=sender) rendered_email = frappe.get_template("templates/emails/standard.html").render({ + "brand_logo": get_app_logo(), + "site_url": get_url(), "header": get_header(header), "content": message, "signature": get_signature(email_account), diff --git a/frappe/public/scss/email.scss b/frappe/public/scss/email.scss index 5d22057398..f773d7fe52 100644 --- a/frappe/public/scss/email.scss +++ b/frappe/public/scss/email.scss @@ -67,6 +67,15 @@ hr { border-collapse: collapse; border-bottom: none; } + .brand-logo { + margin: auto; + text-align: center; + border: 0; + outline: none; + text-decoration: none; + max-height: 40px; + width: auto; + } } .email-header, .email-body, .email-footer { diff --git a/frappe/templates/emails/standard.html b/frappe/templates/emails/standard.html index 40664ddb0c..7f80997a96 100644 --- a/frappe/templates/emails/standard.html +++ b/frappe/templates/emails/standard.html @@ -15,11 +15,11 @@ width="{% if header %}600{% else %}100%{% endif %}"> - + ERPNext + src="{{ brand_logo or '/assets/frappe/images/frappe-framework-logo.png' }}" + class="brand-logo" + />