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

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

diff --git a/forum/skins/default/templates/notifications/base_text.html b/forum/skins/default/templates/notifications/base_text.html
index 8d31c302f484b9e8df41603889dfb32f2bb215c1..113e5fdf6535eba325254da26be2e49557b681cd 100644 (file)
--- a/forum/skins/default/templates/notifications/base_text.html
+++ b/forum/skins/default/templates/notifications/base_text.html
@@ -3,16 +3,18 @@
 {% declare %}
     postal_address = "DZone, Inc. 140 Preston Executive Drive, Cary NC 27513, USA"
 {% enddeclare %}
-
+{% if not exclude_greeting %}
 {% trans "Hello" %} {{ recipient.username }},
+{% endif %}
 
-{% block content %}
-{% endblock%}       
+{% block content %}{% endblock%}
 
 {% trans "Thanks" %},
 {{settings.APP_SHORT_NAME}}
 
+{% if not exclude_finetune %}
 {% trans "P.S. You can always fine-tune which notifications you receive here:" %}
 {{ settings.APP_URL }}{% url user_subscriptions id=recipient.id %}
+{% endif %}
 
 {{ postal_address }}
\ No newline at end of file