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 997904ca7dae50eebb47d9014afb6527fcd1a9a5..9d09f597d3a9e72b4ed433358afff01261db77d2 100644 (file)
--- a/forum/skins/default/templates/notifications/base.html
+++ b/forum/skins/default/templates/notifications/base.html
@@ -1,11 +1,11 @@
  {% load extra_filters extra_tags i18n email_tags %}
  
  {% declare %}
-    p_style = "color:#333333;font-family:'helvetica neue', arial, Helvetica, sans-serif;line-height:18px;font-size:14px;margin-top:10px;"
-    a_style = "text-decoration:none;color:#3060a8;font-weight:bold;"
+    p_style = settings.EMAIL_PARAGRAPH_STYLE
+    a_style = settings.EMAIL_ANCHOR_STYLE
      hr_style = "color:#ccc;border:0;height:1px;background-color:#ccc;margin-bottom:20px;"
      small_style = "color:#333333;font-family:'Lucida Grande', Trebuchet, Helvetica, sans-serif;font-size:12px;"
-    table_style = "border:20px #e5ebf8 solid;margin:10px auto 10px auto;width:750px;text-align:left;"
+    table_style = "border:20px %s solid;margin:10px auto 10px auto;width:750px;text-align:left;" % settings.EMAIL_BORDER_COLOR
  {% enddeclare %}
  <html>
  <head>
@@ -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>