From 0c6971ff5fbc812ac4acf31e5526f9e5a96a7a46 Mon Sep 17 00:00:00 2001 From: Richard Schreiber Date: Thu, 1 Jul 2021 11:49:30 +0200 Subject: [PATCH] Email: make responsive and show header image in MS Outlook (#2138) --- src/pretix/base/services/mail.py | 5 +- .../pretixbase/email/simple_logo.html | 26 ++-- src/pretix/helpers/thumb.py | 110 +++++++++++++++-- src/tests/helpers/test_thumb.py | 116 ++++++++++++++++++ 4 files changed, 236 insertions(+), 21 deletions(-) create mode 100644 src/tests/helpers/test_thumb.py diff --git a/src/pretix/base/services/mail.py b/src/pretix/base/services/mail.py index 1ce73b47b2..0533f37bfb 100644 --- a/src/pretix/base/services/mail.py +++ b/src/pretix/base/services/mail.py @@ -640,13 +640,14 @@ def convert_image_to_cid(image_src, cid_id, verify_ssl=True): image_src = normalize_image_url(image_src) path = urlparse(image_src).path - guess_subtype = os.path.splitext(path)[1][1:] + image_type = os.path.splitext(path)[1][1:] response = requests.get(image_src, verify=verify_ssl) mime_image = MIMEImage( - response.content, _subtype=guess_subtype) + response.content, _subtype=image_type) mime_image.add_header('Content-ID', '<%s>' % cid_id) + mime_image.add_header('Content-Disposition', 'inline;\n filename="{}.{}"'.format(cid_id, image_type)) return mime_image except: diff --git a/src/pretix/base/templates/pretixbase/email/simple_logo.html b/src/pretix/base/templates/pretixbase/email/simple_logo.html index 2adc87d012..072e7bf7de 100644 --- a/src/pretix/base/templates/pretixbase/email/simple_logo.html +++ b/src/pretix/base/templates/pretixbase/email/simple_logo.html @@ -1,12 +1,18 @@ {% load eventurl %} {% load i18n %} {% load thumb %} - - - + + - - + + +{{subject}} +