X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/5f47561def34f5a8a807e6e0cca5ccc4ca6a87a2..03460135dbc5d86b366424da72053a853db4ce34:/forum/skins/default/templates/notifications/newquestion.html

diff --git a/forum/skins/default/templates/notifications/newquestion.html b/forum/skins/default/templates/notifications/newquestion.html
index b0ee0f0..7068bbb 100644
--- a/forum/skins/default/templates/notifications/newquestion.html
+++ b/forum/skins/default/templates/notifications/newquestion.html
@@ -1,54 +1,47 @@
-{% load i18n extra_tags email_tags %}
-
-{% declare %}
-    prefix = settings.EMAIL_SUBJECT_PREFIX
-    app_name = settings.APP_SHORT_NAME
-    question_author = question.author.username
-    app_url = settings.APP_URL
-    question_url = question.get_absolute_url()
-    question_title = question.title
-    question_tags = question.tagnames
-{% enddeclare %}
-
-{% email %}
-    {% subject %}{% blocktrans %}{{ prefix }} New question on {{ app_name }}{% endblocktrans %}{% endsubject %}
-
-    {% htmlcontent notifications/base.html %}
-        <p>{% trans "Hello" %} {{ recipient.username }},</p>
-
-        <p>
-            {% blocktrans %}
-            {{ question_author }} has just posted a new question on {{ app_name }}, with title
-            <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a> and tagged <em>{{ question_tags }}</em>:
-            {% endblocktrans %}
-        </p>
-
-        <blockquote>
-            {{ question.html|safe }}
-        </blockquote>
-
-        <p>{% trans "Don't forget to come over and cast your vote." %}</p>
-
-        <p>{% blocktrans %}Sincerely,<br />
-        Forum Administrator{% endblocktrans %}</p>
-    {% endhtmlcontent %}
-
-    {% textcontent %}
-        {% trans "Hello" %} {{ recipient.username }}
-    
-        {% blocktrans %}
-        {{ question_author }} has just posted a new question on {{ app_name }}, with title
-        "{{ question_title }}" and tagged {{ question_tags }}:
-        {% endblocktrans %}
-
-
-        {{ question.body|safe }}
-
-
-        {% trans "Don't forget to come over and cast your vote." %}
-
-        {% blocktrans %}Sincerely,
-        Forum Administrator{% endblocktrans %}
-    {% endtextcontent %}
-{% endemail %}
-
+{% load i18n extra_tags email_tags %}
+
+{% declare %}
+    prefix = html.mark_safe(settings.EMAIL_SUBJECT_PREFIX)
+    app_name = settings.APP_SHORT_NAME
+    safe_app_name = html.mark_safe(settings.APP_SHORT_NAME)
+    question_author = html.mark_safe(question.author.username)
+    question_url = settings.APP_URL + question.get_absolute_url()
+    question_title = html.mark_safe(question.title)
+    question_tags = html.mark_safe(question.tagnames)
+    safe_body = html.html2text(question.html)
+    author_link = html.objlink(question.author, style=settings.EMAIL_ANCHOR_STYLE)
+    question_link = html.objlink(question, style=settings.EMAIL_ANCHOR_STYLE)
+    tag_links = html.mark_safe(" ".join([html.objlink(t, style=settings.EMAIL_ANCHOR_STYLE) for t in question.tags.all()]))
+{% enddeclare %}
+
+{% email %}
+    {% subject %}{% blocktrans %}{{ prefix }} New question: {{ question_title }} on {{ safe_app_name }}{% endblocktrans %}{% endsubject %}
+
+    {% htmlcontent notifications/base.html %}
+        <p style="{{ p_style }}">
+            {% blocktrans %}
+            {{ author_link }} has just posted a new question on {{ app_name }}, entitled
+            {{ question_link }}
+             and tagged "<em>{{ tag_links }}</em>". Here's what it says:
+            {% endblocktrans %}
+        </p>
+
+        <blockquote>
+            {{ question.html|safe }}
+        </blockquote>
+
+        <p style="{{ p_style }}">{% trans "Don't forget to come over and cast your vote." %}</p>        
+    {% endhtmlcontent %}
+
+{% textcontent notifications/base_text.html %}
+{% blocktrans %}
+{{ question_author }} has just posted a new question on {{ safe_app_name }}, entitled
+"{{ question_title }}" and tagged {{ question_tags }}:
+{% endblocktrans %}
+{{ safe_body }}
+
+{% trans "Don't forget to come over and cast your vote." %}
+{% endtextcontent %}
+
+{% endemail %}
+