X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/5f47561def34f5a8a807e6e0cca5ccc4ca6a87a2..5cced8510af03eec1438cfefcf9f44e2e7a49087:/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..6615831 100644
--- a/forum/skins/default/templates/notifications/newquestion.html
+++ b/forum/skins/default/templates/notifications/newquestion.html
@@ -14,12 +14,10 @@
     {% subject %}{% blocktrans %}{{ prefix }} New question on {{ app_name }}{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
-        <p>{% trans "Hello" %} {{ recipient.username }},</p>
-
-        <p>
+        <p style="{{ p_style }}">
             {% 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>:
+            <a style="{{ a_style }}" href="{{ app_url }}{{ question_url }}">{{ question_title }}</a> and tagged <em>{{ question_tags }}</em>:
             {% endblocktrans %}
         </p>
 
@@ -27,28 +25,18 @@
             {{ 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>
+        <p style="{{ p_style }}">{% trans "Don't forget to come over and cast your vote." %}</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 }}
-
+{% textcontent notifications/base_text.html %}
+{% blocktrans %}
+{{ question_author }} has just posted a new question on {{ app_name }}, with title
+"{{ question_title }}" and tagged {{ question_tags }}:
+{% endblocktrans %}
 
-        {% trans "Don't forget to come over and cast your vote." %}
+{{ question.body|safe }}
 
-        {% blocktrans %}Sincerely,
-        Forum Administrator{% endblocktrans %}
-    {% endtextcontent %}
+{% trans "Don't forget to come over and cast your vote." %}
+{% endtextcontent %}
 {% endemail %}