Resolves OSQA-721, adding the ViewBox images in a separate directory in the media...

[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..5157bd0addbac8e92d2aa775bac33d8ae50f7992 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
-\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
-\r
-    <p>{% trans "Hello" %} {% user_var username %},</p>\r
-\r
-    <p>\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
-        {% endblocktrans %}\r
-    </p>\r
-\r
-    <p>{% blocktrans %}Sincerely,<br />\r
-    Forum Administrator{% endblocktrans %}</p>\r
-{% endblock %}\r
+{% load i18n extra_tags email_tags %}
+
+{% declare %}
+    prefix = html.mark_safe(smart_str(settings.EMAIL_SUBJECT_PREFIX))
+    answer_author = html.mark_safe(smart_str(answer.author.username))
+    question = answer.question
+    question_title = html.mark_safe(smart_str(question.title))
+    accepted_by = html.mark_safe(smart_str(answer.nstate.accepted.by.username))
+    accepted_by_link = html.objlink(answer.nstate.accepted.by, style=settings.EMAIL_ANCHOR_STYLE)
+    answer_author_link = html.objlink(answer.author, style=settings.EMAIL_ANCHOR_STYLE)
+    question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
+{% enddeclare %}
+
+{% email %}
+    {% subject %}{% blocktrans %}{{ prefix }} An answer to: {{ question_title }} has been accepted{% endblocktrans %}{% endsubject %}
+
+    {% htmlcontent notifications/base.html %}
+        <p style="{{ p_style }}">
+            {% blocktrans %}
+            {{ accepted_by_link }} has just accepted {{ answer_author_link }}'s answer on his question
+            {{ question_link }}.
+            {% endblocktrans %}
+        </p>
+    {% endhtmlcontent %}
+
+{% textcontent notifications/base_text.html %}
+{% blocktrans %}
+{{ accepted_by }} has just accepted {{ answer_author }}'s answer on his question
+"{{ question_title }}".
+{% endblocktrans %}
+{% endtextcontent %}
+
+{% endemail %}