Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 52 additions & 35 deletions dojo/templates/notifications/mail/product_type_added.tpl
Original file line number Diff line number Diff line change
@@ -1,40 +1,57 @@
{% load i18n %}
{% load navigation_tags %}
{% load display_tags %}
{% url 'view_product_type' product_type.id as product_type_url %}

<html>
<body>
{% autoescape on %}
<p>
{% trans "Hello" %},
</p>
<p>
{% blocktranslate trimmed prod_url=url|full_url %}
The new product type "{{ title }}" has been added. It can be viewed here: <a href="{{ prod_url }}">{{ title }}</a>
{% endblocktranslate %}
</p>
<br/>
<br/>
{% trans "Kind regards" %},<br/>
<br/>
{% if system_settings.team_name %}
{{ system_settings.team_name }}
{% else %}
Defect Dojo
{% endif %}
<p>
<br/>
<br/>
<p>
{% url 'notifications' as notification_url %}
{% trans "You can manage your notification settings here" %}: <a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
</p>
{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
<br/>
<div style="background-color:#DADCE2; border:1px #003333; padding:.8em; ">
<span style="font-size:16pt; font-family: 'Cambria','times new roman','garamond',serif; color:#ff0000;">{% trans "Disclaimer" %}</span><br/>
<p style="font-size:11pt; line-height:10pt; font-family: 'Cambria','times roman',serif;">{{ system_settings.disclaimer_notifications }}</p>
</div>
{% endif %}
Comment on lines -27 to -37
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason why you're leaving out this part?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for flagging this. There was no specific reason to remove that section, the intent of this PR is only to fix the template rendering issue.
I’ll restore that part to avoid introducing unrelated changes.

{% endautoescape %}
</body>
<body>
{% autoescape on %}
<p>
{% trans "Hello" %},
</p>

<p>
{% blocktranslate trimmed with title=title prod_url=product_type_url|full_url %}
The new product type "{{ title }}" has been added.
It can be viewed here: <a href="{{ prod_url }}">{{ title }}</a>
{% endblocktranslate %}
</p>

<br/>
<br/>

{% trans "Kind regards" %},<br/>
<br/>

{% if system_settings.team_name %}
{{ system_settings.team_name }}
{% else %}
Defect Dojo
{% endif %}

<p>
<br/>
<br/>
</p>

<p>
{% url 'notifications' as notification_url %}
{% trans "You can manage your notification settings here" %}:
<a href="{{ notification_url|full_url }}">{{ notification_url|full_url }}</a>
</p>

{% if system_settings.disclaimer_notifications and system_settings.disclaimer_notifications.strip %}
<br/>
<div style="background-color:#DADCE2; border:1px #003333; padding:.8em;">
<span style="font-size:16pt; font-family:'Cambria','times new roman','garamond',serif; color:#ff0000;">
{% trans "Disclaimer" %}
</span>
<br/>
<p style="font-size:11pt; line-height:10pt; font-family:'Cambria','times roman',serif;">
{{ system_settings.disclaimer_notifications }}
</p>
</div>
{% endif %}
{% endautoescape %}
</body>
</html>