diff --git a/dojo/templates/notifications/engagement_added.tpl b/dojo/templates/notifications/engagement_added.tpl index d44b1af13b..d57797d1e6 100644 --- a/dojo/templates/notifications/engagement_added.tpl +++ b/dojo/templates/notifications/engagement_added.tpl @@ -16,7 +16,7 @@
Kind regards,

- {% if system_settings.team_name and system_settings.team_name %} + {% if system_settings.team_name %} {{ system_settings.team_name }} {% else %} Defect Dojo diff --git a/dojo/templates/notifications/other.tpl b/dojo/templates/notifications/other.tpl index 4486826f9e..2725dc35a8 100644 --- a/dojo/templates/notifications/other.tpl +++ b/dojo/templates/notifications/other.tpl @@ -1,26 +1,44 @@ {% if type == 'mail' %} -{% load navigation_tags %} -{% load display_tags %} - Hello, - - {{ description|safe }}{% if url is not None %} - More information on this event can be found here: {{ url|full_url }} - {% endif %} - - Kind regards, - {% if system_settings.team_name and system_settings.team_name %} - {{ system_settings.team_name }} - {% else %} - Defect Dojo - {% endif %} - - {% if system_settings.disclaimer and system_settings.disclaimer.strip %} -
-
- Disclaimer
-

{{ system_settings.disclaimer }}

-
- {% endif %} + {% load navigation_tags %} + {% load display_tags %} + + + {% autoescape on %} +

+ Hello, +

+

+ {{ description|safe }} +

+ {% if url is not None %} +
+
+ More information on this event can be found here: {{ url|full_url }} + {% endif %} +
+
+ Kind regards,
+ {% if system_settings.team_name %} + {{ system_settings.team_name }} + {% else %} + Defect Dojo + {% endif %} +
+
+

+ {% url 'notifications' as notification_url %} + You can manage your notification settings here: {{ notification_url|full_url }} +

+ {% if system_settings.disclaimer and system_settings.disclaimer.strip %} +
+
+ Disclaimer
+

{{ system_settings.disclaimer }}

+
+ {% endif %} + {% endautoescape %} + + {% elif type == 'alert' %} {{ description|safe }} {% elif type == 'slack' %} diff --git a/dojo/templates/notifications/product_added.tpl b/dojo/templates/notifications/product_added.tpl index 48a3eedc1d..e1f4b2a3b0 100644 --- a/dojo/templates/notifications/product_added.tpl +++ b/dojo/templates/notifications/product_added.tpl @@ -14,7 +14,7 @@
Kind regards,

- {% if system_settings.team_name and system_settings.team_name %} + {% if system_settings.team_name %} {{ system_settings.team_name }} {% else %} Defect Dojo diff --git a/dojo/templates/notifications/product_type_added.tpl b/dojo/templates/notifications/product_type_added.tpl index bc5b6ed483..6261d1655f 100644 --- a/dojo/templates/notifications/product_type_added.tpl +++ b/dojo/templates/notifications/product_type_added.tpl @@ -14,7 +14,7 @@
Kind regards,

- {% if system_settings.team_name and system_settings.team_name %} + {% if system_settings.team_name %} {{ system_settings.team_name }} {% else %} Defect Dojo diff --git a/dojo/templates/notifications/report_created.tpl b/dojo/templates/notifications/report_created.tpl index d40bda63fc..ff3269bc8f 100644 --- a/dojo/templates/notifications/report_created.tpl +++ b/dojo/templates/notifications/report_created.tpl @@ -1,24 +1,37 @@ {% if type == 'mail' %} - Greetings, - - Your report "{{ report.name }}" is ready. It can be downloaded here: {{ url|full_url }} - - Kind regards, - {% if system_settings.team_name and system_settings.team_name %} - {{ system_settings.team_name }} - {% else %} - Defect Dojo - {% endif %} -
-
- - {% if system_settings.disclaimer and system_settings.disclaimer.strip %} -
-
- Disclaimer
-

{{ system_settings.disclaimer }}

-
- {% endif %} + {% load navigation_tags %} + {% load display_tags %} + + + {% autoescape on %} +

+ Greetings, +

+

+ Your report "{{ report.name }}" is ready. It can be downloaded here: {{ url|full_url }} +

+ Kind regards,
+ {% if system_settings.team_name %} + {{ system_settings.team_name }} + {% else %} + Defect Dojo + {% endif %} +
+
+

+ {% url 'notifications' as notification_url %} + You can manage your notification settings here: {{ notification_url|full_url }} +

+ {% if system_settings.disclaimer and system_settings.disclaimer.strip %} +
+
+ Disclaimer
+

{{ system_settings.disclaimer }}

+
+ {% endif %} + {% endautoescape %} + + {% elif type == 'alert' %} Your report "{{ report.name }}" is ready. {% elif type == 'slack' %} diff --git a/dojo/templates/notifications/risk_acceptance_expiration.tpl b/dojo/templates/notifications/risk_acceptance_expiration.tpl index bcbf11e3a8..f9d3a64024 100644 --- a/dojo/templates/notifications/risk_acceptance_expiration.tpl +++ b/dojo/templates/notifications/risk_acceptance_expiration.tpl @@ -41,7 +41,7 @@

Kind regards,

- {% if system_settings.team_name and system_settings.team_name %} + {% if system_settings.team_name %} {{ system_settings.team_name }} {% else %} Defect Dojo diff --git a/dojo/templates/notifications/scan_added.tpl b/dojo/templates/notifications/scan_added.tpl index 649625b5bc..b35b35b9c9 100644 --- a/dojo/templates/notifications/scan_added.tpl +++ b/dojo/templates/notifications/scan_added.tpl @@ -54,7 +54,7 @@

Kind regards,

- {% if system_settings.team_name and system_settings.team_name %} + {% if system_settings.team_name %} {{ system_settings.team_name }} {% else %} Defect Dojo diff --git a/dojo/templates/notifications/sla_breach.tpl b/dojo/templates/notifications/sla_breach.tpl index 727f04c91a..c4b0e81561 100644 --- a/dojo/templates/notifications/sla_breach.tpl +++ b/dojo/templates/notifications/sla_breach.tpl @@ -31,7 +31,7 @@

Kind regards,

- {% if system_settings.team_name and system_settings.team_name %} + {% if system_settings.team_name %} {{ system_settings.team_name }} {% else %} Defect Dojo diff --git a/dojo/templates/notifications/test_added.tpl b/dojo/templates/notifications/test_added.tpl index f1130415a3..dc7579101d 100644 --- a/dojo/templates/notifications/test_added.tpl +++ b/dojo/templates/notifications/test_added.tpl @@ -17,7 +17,7 @@
Kind regards,

- {% if system_settings.team_name and system_settings.team_name %} + {% if system_settings.team_name %} {{ system_settings.team_name }} {% else %} Defect Dojo diff --git a/dojo/templates/notifications/upcoming_engagement.tpl b/dojo/templates/notifications/upcoming_engagement.tpl index 71c7e63c3f..51f3b85f18 100644 --- a/dojo/templates/notifications/upcoming_engagement.tpl +++ b/dojo/templates/notifications/upcoming_engagement.tpl @@ -1,25 +1,42 @@ {% if type == 'mail' %} - Hello, - this is a reminder that the engagement "{{ engagement.product }}" is about to start shortly. - - Project start: {{ engagement.target_start }} - Project end: {{ engagement.target_end }} - - Kind regards, - {% if system_settings.team_name and system_settings.team_name %} - {{ system_settings.team_name }} - {% else %} - Defect Dojo - {% endif %} -
- {% if system_settings.disclaimer and system_settings.disclaimer.strip %} -
-
- Disclaimer
-

{{ system_settings.disclaimer }}

-
- {% endif %} + {% load navigation_tags %} + {% load display_tags %} + + + {% autoescape on %} +

+ Hello, +

+

+ this is a reminder that the engagement "{{ engagement.product }}" is about to start shortly. +

+ Project start: {{ engagement.target_start }}
+ Project end: {{ engagement.target_end }}
+
+
+ Kind regards,
+ {% if system_settings.team_name %} + {{ system_settings.team_name }} + {% else %} + Defect Dojo + {% endif %} +
+
+

+ {% url 'notifications' as notification_url %} + You can manage your notification settings here: {{ notification_url|full_url }} +

+ {% if system_settings.disclaimer and system_settings.disclaimer.strip %} +
+
+ Disclaimer
+

{{ system_settings.disclaimer }}

+
+ {% endif %} + {% endautoescape %} + + {% elif type == 'alert' %} The engagement "{{ engagement.product }}" is starting on {{ engagement.target_start }}. {% elif type == 'slack' %} diff --git a/dojo/templates/notifications/user_mentioned.tpl b/dojo/templates/notifications/user_mentioned.tpl index 6fd83674b8..e2c4699045 100644 --- a/dojo/templates/notifications/user_mentioned.tpl +++ b/dojo/templates/notifications/user_mentioned.tpl @@ -1,26 +1,44 @@ {% if type == 'mail' %} - Hello, + {% load navigation_tags %} + {% load display_tags %} + + + {% autoescape on %} +

+ Hello, +

+

+ User {{ user }} jotted a note on {{ section }}:
+
+ {{ note }}
+
+ It can be reviewed at {{ url }} +

- User {{ user }} jotted a note on {{ section }}: - - {{ note }} - - It can be reviewed at {{ url }} - - Kind regards, - {% if system_settings.team_name and system_settings.team_name %} - {{ system_settings.team_name }} - {% else %} - Defect Dojo - {% endif %} -
- {% if system_settings.disclaimer and system_settings.disclaimer.strip %} -
-
- Disclaimer
-

{{ system_settings.disclaimer }}

-
- {% endif %} +
+
+ Kind regards,
+ {% if system_settings.team_name %} + {{ system_settings.team_name }} + {% else %} + Defect Dojo + {% endif %} +
+
+

+ {% url 'notifications' as notification_url %} + You can manage your notification settings here: {{ notification_url|full_url }} +

+ {% if system_settings.disclaimer and system_settings.disclaimer.strip %} +
+
+ Disclaimer
+

{{ system_settings.disclaimer }}

+
+ {% endif %} + {% endautoescape %} + + {% elif type == 'alert' %} User {{ user }} jotted a note on {{ section }}: