initial work for email templates

8 files changed, 73 insertions, 17 deletions

diff --git a/askbot/skins/default/templates/email/ask_for_signature.html b/askbot/skins/default/templates/email/ask_for_signature.html
index 93e2fa4b..ee4a1311 100644
--- a/askbot/skins/default/templates/email/ask_for_signature.html
+++ b/askbot/skins/default/templates/email/ask_for_signature.html
@@ -1,12 +1,19 @@
+{% extends "email/base_mail.html"%}
 {% import "email/macros.html" as macros %}
-<p style="{{ macros.heading_style() }}">
-    {% trans user=username|escape %}{{ user }}, please reply to this message.{% endtrans %}
-</p>
+{%block headline%}
+{% trans user=username|escape %}{{ user }}, please reply to this message.{% endtrans %}
+{% endblock %}
+
+{%block content %}
 <p>
     {% trans %}Your post could not be published, because we could not detect signature in your email.{% endtrans %}<br/>
     {% trans %}This happened either because this is your first post or you have changed your email signature.{% endtrans %}<br/>
     {% trans %}Please make a simple response, without editing this message.{% endtrans %}<br/>
     {% trans %}We will then attempt to detect the signature in your response and you should be able to post.{% endtrans %}
 </p>
+{% endblock %}
+
+{%block footer %}
 {% include "email/footer.html" %}
 <p style="{{ macros.fine_print_style() }}">{{ footer_code }}</p>
+{% endblock %}
diff --git a/askbot/skins/default/templates/email/insufficient_rep_to_post_by_email.html b/askbot/skins/default/templates/email/insufficient_rep_to_post_by_email.html
index 284cc1b0..a7e88b3b 100644
--- a/askbot/skins/default/templates/email/insufficient_rep_to_post_by_email.html
+++ b/askbot/skins/default/templates/email/insufficient_rep_to_post_by_email.html
@@ -1,3 +1,4 @@
+{% extends "email/base_mail.html"%}
 {% import "email/macros.html" as macros %}
 {# parameters:
     * min_upvotes
@@ -5,11 +6,15 @@
     * site_name - for the footer
     * site_link - html for the link
 #}
-<p style="{{ macros.heading_style() }}">
+{%block headline%}
     {% trans user=username|escape %}{{ username }}, your question could not be posted by email just yet.{% endtrans %}
-</p>
+{%endblock%}
+{%block content%}
 <p>
     {% trans %}To make posts by email, you need to receive about {{min_upvotes}} upvotes.{% endtrans %}<br/>
     {% trans link=site_link|safe %}At this time, please post your question at {{link}}{% endtrans %}
 </p>
+{%endblock%}
+{%block footer}
 {% include "email/footer.html" %}
+{%endblock%}
diff --git a/askbot/skins/default/templates/email/notify_admins_about_new_tags.html b/askbot/skins/default/templates/email/notify_admins_about_new_tags.html
index 9aaaffc2..dd37bb34 100644
--- a/askbot/skins/default/templates/email/notify_admins_about_new_tags.html
+++ b/askbot/skins/default/templates/email/notify_admins_about_new_tags.html
@@ -1,8 +1,18 @@
-<p>Hello,</p>
-<p>Please have a look at these new tags {{tags|join(', ')}},
-created by {{user.username}}.</p>
-<p>If you decide not to use the tags, please reply to this email
-to the user<p>
-<p>Otherwise, please <a href="{{ thread_url }}">visit the question</a>
-and apply the tags</p>
-<p>Thank you.</p>
+{% extends "email/base_mail.html"%}
+{%block headline%}
+  {%trans %}Hello{%endtrans%}
+{% endblock %}
+
+{%block content %}
+  <p>{% trans %}Please have a look at these new tags {{tags|join(', ')}},
+  created by {{user.username}}.{% endtrans %}</p>
+  <p>{% trans %}If you decide not to use the tags, please reply to this email
+  to the user {% endtrans %}<p>
+  <p>{%trans%}Otherwise, please <a href="{{ thread_url }}">visit the question</a>
+  and apply the tags{%endtrans%}</p>
+  <p>{%trans%}Thank you.{%endtrans%}</p>
+{% endblock %}
+
+{%block footer %}
+{% include "email/footer.html" %}
+{% endblock %}
diff --git a/askbot/skins/default/templates/email/notify_author_about_approved_post.html b/askbot/skins/default/templates/email/notify_author_about_approved_post.html
index 085141d9..24601775 100644
--- a/askbot/skins/default/templates/email/notify_author_about_approved_post.html
+++ b/askbot/skins/default/templates/email/notify_author_about_approved_post.html
@@ -1,3 +1,5 @@
+{% extends "email/base_mail.html"%}
+
 {#
     parameters:
     * reply_separator_line
@@ -6,6 +8,8 @@
     * post
     * reply_code (comma-separated list of emails to respond to this message)
 #}
+
+{%block content %}
 {{ reply_separator_line }}
 <p>{% trans 
         post_text = post.text|safe_urlquote,
@@ -18,4 +22,9 @@
     <p style="font-size:16px">{{ post.thread.title }}</p>
 {% endif %}
 {{ post.html }}
-<p style="font-size:8px;color:#aaa;">{{ reply_code }}</p>
+{% endblock %}
+
+{%block footer %}
+{% include "email/footer.html" %}
+<p style="{{ macros.fine_print_style() }}">{{ email_code }}</p>{# important #}
+{% endblock %}
diff --git a/askbot/skins/default/templates/email/post_as_subthread.html b/askbot/skins/default/templates/email/post_as_subthread.html
index 9b6eb728..cba5a3fd 100644
--- a/askbot/skins/default/templates/email/post_as_subthread.html
+++ b/askbot/skins/default/templates/email/post_as_subthread.html
@@ -1,4 +1,7 @@
+{% extends "email/base_mail.html"%}
 {% from "email/macros.html" import quoted_post %}
+
+{%block content %}
 {% if post.post_type in ('question', 'answer') %}
     {{ quoted_post(post) }}
     {% set comments = post.get_cached_comments() %}
@@ -15,3 +18,6 @@
         {% endfor %}
     {% endif %}
 {% endif %}
+{% endblock %}
+{% include "email/footer.html" %}
+{% endblock %}
diff --git a/askbot/skins/default/templates/email/quoted_post.html b/askbot/skins/default/templates/email/quoted_post.html
index ecc20ad9..f3015f20 100644
--- a/askbot/skins/default/templates/email/quoted_post.html
+++ b/askbot/skins/default/templates/email/quoted_post.html
@@ -1,5 +1,11 @@
+{% extends "email/base_mail.html"%}
 {% from "email/macros.html" import quoted_post %}
+{%block content %}
 {{ quoted_post(
         post, quote_level, is_leaf_post = is_leaf_post, format = format
     )
 }}
+{% endblock %}
+{%block footer %}
+{% include "email/footer.html" %}
+{% endblock %}
diff --git a/askbot/skins/default/templates/email/re_welcome_lamson_on.html b/askbot/skins/default/templates/email/re_welcome_lamson_on.html
index 412fede8..d2c7884c 100644
--- a/askbot/skins/default/templates/email/re_welcome_lamson_on.html
+++ b/askbot/skins/default/templates/email/re_welcome_lamson_on.html
@@ -1,7 +1,13 @@
-<p style="font-size:16px;font-weight:bold;">
-    {% trans %}Great, you are ready to use {{ site_name }}!{% endtrans %}
-</p>
+{% extends "email/base_mail.html"%}
+{% block headline %}{% trans %}Great, you are ready to use {{ site_name }}!{% endtrans %}{%endblock%}
+{% block title %}{% trans %}Great, you are ready to use {{ site_name }}!{% endtrans %}{%endblock%}
+
+{%block content %}
 <p>{% trans %}You can post questions by emailing them at {{ ask_address }}.{% endtrans %}</p>
 <p>{% trans %}When you receive update notifications, you will be able to respond to them, also by email.{% endtrans %}</p>
 <p>{% trans %}Of course, you can always visit the {{ site_name }} at <a href="{{ site_url }}">{{ site_url }}</a>{% endtrans %}</p>
+{%endblock%}
+
+{%block footer%}
 {% include "email/footer.html" %}
+{%endblock%}
diff --git a/askbot/skins/default/templates/email/reply_by_email_error.html b/askbot/skins/default/templates/email/reply_by_email_error.html
index 53648184..618e061a 100644
--- a/askbot/skins/default/templates/email/reply_by_email_error.html
+++ b/askbot/skins/default/templates/email/reply_by_email_error.html
@@ -1,4 +1,11 @@
+{% extends "email/base_mail.html"%}
+{%block headline%}{% trans %}Oops, there was an error.{% endblock %}
+{%block content %}
 {% trans %}
 <p>The system was unable to process your message successfully, the reason being:<p>
 {% endtrans %}
 {{error}}
+{% endblock %}
+{%block footer %}
+{% include "email/footer.html" %}
+{% endblock %}