Converts the welcome message to the new mail system and makes some changes to the...

[osqa.git] / forum / skins / default / templates / notifications / base.html

diff --git a/forum/skins/default/templates/notifications/base.html b/forum/skins/default/templates/notifications/base.html
index 05de03faad4a980101cd7f5c9c0fde591c93bd47..9d09f597d3a9e72b4ed433358afff01261db77d2 100644 (file)
--- a/forum/skins/default/templates/notifications/base.html
+++ b/forum/skins/default/templates/notifications/base.html
@@ -16,12 +16,15 @@
 <tbody><tr><td style="padding:20px;">
 <img src="{{ settings.APP_URL }}{{ settings.APP_LOGO }}" alt="{{settings.APP_TITLE}}" />
 <hr style="{{ hr_style }}" />
+{% if not exclude_greeting %}
 <p style="{{ p_style }}">{% trans "Hello" %} {{ recipient.username }},</p>
-{% block content %}
-{% endblock%}                    
+{% endif %}
+{% block content %}{% endblock%}
 <p style="{{ p_style }}">Thanks,<br />{{settings.APP_SHORT_NAME}}</p>
+{% if not exclude_finetune %}
 <p style="{{ p_style }}">P.S. You can always fine-tune which notifications you receive
 <a href="{{ settings.APP_URL }}{% url user_subscriptions id=recipient.id %}" style="{{ a_style }}">here</a>.
+{% endif %}
 </p>
 <hr style="{{ hr_style }}" />
 <p style="{{ p_style }}"><small style="{{ small_style }}">{{ settings.EMAIL_FOOTER_TEXT }}</small></p>