Converts all instant notifications to the new style emails.

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

diff --git a/forum/skins/default/templates/notifications/newmember.html b/forum/skins/default/templates/notifications/newmember.html
index 398226f55eb56eb263677b24b2521333f651ec17..528c3ac7b77298040567e9abec06abe58e63884e 100644 (file)
--- a/forum/skins/default/templates/notifications/newmember.html
+++ b/forum/skins/default/templates/notifications/newmember.html
@@ -1,17 +1,31 @@
-{% extends "email_base.html" %}\r
-{% load i18n %}\r
-{% load extra_tags %}\r
+{% load i18n extra_tags email_tags %}\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
+    newmember_name = newmember.username\r
+    newmember_url = newmember.get_profile_url\r
+{% enddeclare %}\r
 \r
-    <p>\r
-        {% blocktrans with newmember.username as newmember_name and settings.APP_SHORT_NAME as app_title and settings.APP_URL as app_url and newmember.get_profile_url as newmember_url %}\r
-        {{ newmember_name }} has just joined {{ app_title }}. You can visit his profile using the following link: <br />\r
-        <a href="{{ app_url }}{{ newmember_url }}">{{ newmember_name }} profile</a>\r
+{% email %}\r
+    {% subject %}{% blocktrans %}{{ newmember_name }} is a new member on {{ app_name }}{% endblocktrans %}{% endsubject %}\r
+\r
+    {% htmlcontent notifications/base.html %}\r
+        <p style="{{ p_style }}">\r
+            {% blocktrans %}\r
+            {{ newmember_name }} has just joined {{ app_name }}. You can visit {{ newmember_name }}'s profile using the following link: <br />\r
+            <a href="{{ app_url }}{{ newmember_url }}">{{ newmember_name }} profile</a>\r
+            {% endblocktrans %}\r
+        </p>\r
+    {% endhtmlcontent %}\r
+\r
+    {% textcontent notifications/base_text.html %}\r
+        {% blocktrans %}\r
+        {{ newmember_name }} has just joined {{ app_name }}. You can visit {{ newmember_name }}'s profile using the following url: <br />\r
+            {{ app_url }}{{ newmember_url }}\r
         {% endblocktrans %}\r
-    </p>\r
+    {% endtextcontent %}\r
+\r
+{% endemail %}\r
 \r
-    <p>{% blocktrans %}Sincerely,<br />\r
-    Forum Administrator{% endblocktrans %}</p>\r
-{% endblock %}\r