Converts all instant notifications to the new style emails.

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

diff --git a/forum/skins/default/templates/notifications/answeraccepted.html b/forum/skins/default/templates/notifications/answeraccepted.html
index 6c3404065be5e97016bc41e33a1a3060f7f23312..367a67f2539c6933ae8bf1efada486a1fc2510de 100644 (file)
--- a/forum/skins/default/templates/notifications/answeraccepted.html
+++ b/forum/skins/default/templates/notifications/answeraccepted.html
@@ -1,23 +1,33 @@
-{% extends "email_base.html" %}\r
-{% load i18n %}\r
-{% load extra_tags %}\r
+{% load i18n extra_tags email_tags %}\r
 \r
-{% block content %}\r
-    {% var accepted_by = answer.nstate.accepted.by.username %}\r
-    {% var answer_author = answer.author.username %}\r
-    {% var app_url = settings.APP_URL %}\r
-    {% var question_url = question.get_absolute_url %}\r
-    {% var question_title = question.title %}\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
+    accepted_by = answer.nstate.accepted.by.username\r
+{% enddeclare %}\r
 \r
-    <p>{% trans "Hello" %} {% user_var username %},</p>\r
+{% email %}\r
+    {% subject %}{% blocktrans %}{{ prefix }} New answer to {{ question_title }}{% endblocktrans %}{% endsubject %}\r
 \r
-    <p>\r
+    {% htmlcontent notifications/base.html %}\r
+        <p style="{{ p_style }}">\r
+            {% blocktrans %}\r
+            {{ accepted_by }} has just accepted {{ answer_author }}'s answer on his question\r
+            <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a>.\r
+            {% endblocktrans %}\r
+        </p>\r
+    {% endhtmlcontent %}\r
+\r
+    {% textcontent notifications/base_text.html %}\r
         {% blocktrans %}\r
-        Just to let you know that {{ accepted_by }} has just accepted {{ answer_author }}'s answer on his question\r
-        <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a>:\r
+        {{ accepted_by }} has just accepted {{ answer_author }}'s answer on his question\r
+            "{{ question_title }}".\r
         {% endblocktrans %}\r
-    </p>\r
+    {% endtextcontent %}\r
 \r
-    <p>{% blocktrans %}Sincerely,<br />\r
-    Forum Administrator{% endblocktrans %}</p>\r
-{% endblock %}\r
+{% endemail %}\r