From 5a3167df967f982e650faebf9e7de8de9abdfebe Mon Sep 17 00:00:00 2001 From: Adolfo Fitoria Date: Thu, 20 Sep 2012 15:21:53 -0600 Subject: fixing email styles --- askbot/skins/default/templates/email/base_mail.html | 4 ++-- .../default/templates/email/instant_notification.html | 3 ++- askbot/skins/default/templates/email/macros.html | 15 ++++++++------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/askbot/skins/default/templates/email/base_mail.html b/askbot/skins/default/templates/email/base_mail.html index dfd252f2..eacbf87d 100644 --- a/askbot/skins/default/templates/email/base_mail.html +++ b/askbot/skins/default/templates/email/base_mail.html @@ -143,10 +143,10 @@ - +
- +

{%block headline%}{%endblock%}

diff --git a/askbot/skins/default/templates/email/instant_notification.html b/askbot/skins/default/templates/email/instant_notification.html index 3e8533b6..d353450d 100644 --- a/askbot/skins/default/templates/email/instant_notification.html +++ b/askbot/skins/default/templates/email/instant_notification.html @@ -4,7 +4,8 @@ {{ reply_separator }}
{{ content_preview }}
{% trans %} -

Please note - you can easily change +

+Please note - you can easily change how often you receive these notifications or unsubscribe. Thank you for your interest in our forum!

{% endtrans %} {%endblock%} diff --git a/askbot/skins/default/templates/email/macros.html b/askbot/skins/default/templates/email/macros.html index d7817bf9..3c2d1c02 100644 --- a/askbot/skins/default/templates/email/macros.html +++ b/askbot/skins/default/templates/email/macros.html @@ -9,7 +9,7 @@ {{ start_quote(quote_level) }} {% set author = post.author.username|escape %} {% if post.post_type == 'question' %} -

+

{% if format == 'parent_subthread' %} {% if is_leaf_post %} {% trans %}Question by {{ author }}:{% endtrans %} @@ -22,21 +22,22 @@ {% trans %}Question :{% endtrans %} {% endif %} {{ post.thread.title }} -

-

+

+

{% if format != 'parent_subthread' %} {% trans %}Asked by {{ author }}:{% endtrans %} {% endif %} -

+

+

{% set tag_names = post.get_tag_names() %} {% if tag_names %} -

+

{% trans %}Tags:{% endtrans %} {{ tag_names|join(', ') }}.

{% endif %} {% elif post.post_type == 'answer' %} -

+

{% if format == 'parent_subthread' %} {% if is_leaf_post %} {% trans -%} @@ -52,7 +53,7 @@ {% endif %}

{% else %} -

+

{% if format == 'parent_subthread' %} {% if is_leaf_post %} {% trans -%} -- cgit v1.2.3-1-g7c22