Converts all instant notifications to the new style emails.

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

diff --git a/forum/skins/default/templates/notifications/newanswer.html b/forum/skins/default/templates/notifications/newanswer.html
index 425f404a5b5fce196ace334afd1fde0365fbc1ae..50fe5040708a9f58e574f6e33e2be95f79b516ec 100644 (file)
--- a/forum/skins/default/templates/notifications/newanswer.html
+++ b/forum/skins/default/templates/notifications/newanswer.html
@@ -1,27 +1,44 @@
-{% extends "email_base.html" %}\r
-{% load i18n %}\r
-{% load extra_tags %}\r
+{% load i18n extra_tags email_tags %}\r

 \r
 \r

-{% block content %}\r
-    <p>{% trans "Hello" %} {% user_var username %},</p>\r
+{% declare %}\r
+    prefix = settings.EMAIL_SUBJECT_PREFIX\r
+    app_name = settings.APP_SHORT_NAME\r
+    app_url = settings.APP_URL\r
+    answer_author = answer.author.username\r
+    question = answer.question\r
+    question_url = question.get_absolute_url()\r
+    question_title = question.title\r
+{% enddeclare %}\r

 \r
 \r

-    <p>\r
-        {% blocktrans with answer.author.username as author_name and settings.APP_SHORT_NAME as app_title and settings.APP_URL as app_url and question.get_absolute_url as question_url and question.title as question_title %}\r
-        {{ author_name }} has just posted a new answer on {{ app_title }} to the question\r
-        <a href="{{ app_url }}{{ question_url }}">{{ question_title }}"</a>:\r
-        {% endblocktrans %}\r
-    </p>\r
+{% email %}\r
+    {% subject %}{% blocktrans %}{{ prefix }} New answer to {{ question_title }}{% endblocktrans %}{% endsubject %}\r
+\r
+    {% htmlcontent notifications/base.html %}\r
+        <p style="{{ p_style }}">\r
+            {% blocktrans %}\r
+            {{ answer_author }} has just posted a new answer on {{ app_name }} to the question\r
+            <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a>:\r
+            {% endblocktrans %}\r
+        </p>\r

 \r
 \r

-    <blockquote>\r
+        <blockquote>\r

         {{ answer.html|safe }}\r
         {{ answer.html|safe }}\r

-    </blockquote>\r
+        </blockquote>\r
+\r
+        <p style="{{ p_style }}">{% trans "Don't forget to come over and cast your vote." %}</p>\r
+    {% endhtmlcontent %}\r
+\r
+    {% textcontent notifications/base_text.html %}\r
+        {% blocktrans %}\r
+        {{ answer_author }} has just posted a new answer on {{ app_name }} to the question\r
+            "{{ question_title }}":\r
+        {% endblocktrans %}\r
+\r
+\r
+        {{ answer.body|safe }}\r
+\r
+        {% trans "Don't forget to come over and cast your vote." %} \r
+    {% endtextcontent %}\r

 \r
 \r

-    <p>\r
-    {% blocktrans %}\r
-        Don't forget to come over and cast your vote.\r
-    {% endblocktrans %}\r
-    </p>\r
+{% endemail %}\r

 \r
 \r

-    <p>{% blocktrans %}Sincerely,<br />\r
-    Forum Administrator{% endblocktrans %}</p>\r
-{% endblock %}\r