diff --git a/notifications_consumer/email_templates/base_email.html b/notifications_consumer/email_templates/base_email.html index c47b8f5885b1e47d647eeeda981c5ebd4f980c15..03a393ef08463110b8dc38ac021fb576f472aabc 100644 --- a/notifications_consumer/email_templates/base_email.html +++ b/notifications_consumer/email_templates/base_email.html @@ -4,10 +4,12 @@ max-width: 100%; height: unset !important; } + #notification-header #title { margin-bottom: 0; padding: 0; } + #notification-header #subtitle { margin-top: 0; margin-bottom: 0; @@ -37,14 +39,14 @@ {% if category_name %} {{category_name}} Notifications </h1> - <h5 id="subtitle"> - POWERED BY {{ service_name }} - </h5> + <h5 id="subtitle"> + POWERED BY {{ service_name }} + </h5> {% else %} {{ service_name }} </h1> {% endif %} - <br/> + <br /> </td> </tr> <tr> @@ -68,6 +70,16 @@ | <a href="{{ base_url }}/unsubscribe/{{ unsubscribe_blob }}/{{ unsubscribe_mail }}">Unsubscribe</a> {% endif %} </p> + <p> + ----------------------------------------------------------------------------------------------------------------- + </p> + <p> + This message is intended only for use of {{recipient_email}} and may contain information that is privileged + and + confidential. If you have received this communication in error, please notify us immediately by + opening an incident + and deleting this message from your system. + </p> </td> </tr> </table> diff --git a/notifications_consumer/processors/email/processor.py b/notifications_consumer/processors/email/processor.py index c42c35cae41a15beb0b4a05e0cfdfead62b36a54..a07a6c7ef71558c062d93d0559cbf3b75d25a287 100644 --- a/notifications_consumer/processors/email/processor.py +++ b/notifications_consumer/processors/email/processor.py @@ -69,6 +69,7 @@ class EmailProcessor(Processor): "notification_priority": NotificationPriority, "priority": kwargs.get("priority", ""), "created_at": created_at, + "recipient_email": recipient_email, } text_template = Config.TEMPLATES.get_template("email/simple_notification.txt") diff --git a/notifications_consumer/processors/email_feed/processor.py b/notifications_consumer/processors/email_feed/processor.py index cdd7f65b5e5067259dd418ba09d60343b4c9bc29..0ccf19c4c40e7c34fe73f0dfaa501eee8569dab7 100644 --- a/notifications_consumer/processors/email_feed/processor.py +++ b/notifications_consumer/processors/email_feed/processor.py @@ -78,6 +78,7 @@ class EmailFeedProcessor(Processor): # Jinja2 Renderer Fix https://stackoverflow.com/questions/6906593/itertools-groupby-in-a-django-template "channel_notifications": [(k, prepare_notifications(list(g))) for k, g in grouped_notifications], "sender": Config.SERVICE_NAME, + "recipient_email": recipient_email, } text_template = Config.TEMPLATES.get_template("email_feed/feed_notification.txt") diff --git a/notifications_consumer/processors/email_gateway_failure/processor.py b/notifications_consumer/processors/email_gateway_failure/processor.py index a3fb6d7583f2fa0f771ee45c3752d5654d71c6e9..dbf2d462f8b0f708a86b88b8fa7ff92071fb7e24 100644 --- a/notifications_consumer/processors/email_gateway_failure/processor.py +++ b/notifications_consumer/processors/email_gateway_failure/processor.py @@ -102,6 +102,7 @@ class EmailGatewayFailureProcessor(Processor): "subject": message["subject"], "to": message["to"], "email_gateway_address": Config.EMAIL_GATEWAY_ADDRESS, + "recipient_email": message["to"], } if channel: context["channel"] = channel