updated to a new base template and new replacements for easy styling

[osqa.git] / 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 b0ee0f045c573caea556b271296cb03f3ef59b1a..6615831806a2702fe70a10bf38a1030831ec0239 100644 (file)
--- 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 %}\r
 \r
     {% htmlcontent notifications/base.html %}\r
     {% subject %}{% blocktrans %}{{ prefix }} New question on {{ app_name }}{% endblocktrans %}{% endsubject %}\r
 \r
     {% htmlcontent notifications/base.html %}\r

-        <p>{% trans "Hello" %} {{ recipient.username }},</p>\r
-\r
-        <p>\r
+        <p style="{{ p_style }}">\r

             {% blocktrans %}\r
             {{ question_author }} has just posted a new question on {{ app_name }}, with title\r
             {% blocktrans %}\r
             {{ question_author }} has just posted a new question on {{ app_name }}, with title\r

-            <a href="{{ app_url }}{{ question_url }}">{{ question_title }}</a> and tagged <em>{{ question_tags }}</em>:\r
+            <a style="{{ a_style }}" href="{{ app_url }}{{ question_url }}">{{ question_title }}</a> and tagged <em>{{ question_tags }}</em>:\r

             {% endblocktrans %}\r
         </p>\r
 \r
             {% endblocktrans %}\r
         </p>\r
 \r


@@ -27,28 +25,18 @@
             {{ question.html|safe }}\r
         </blockquote>\r
 \r
             {{ question.html|safe }}\r
         </blockquote>\r
 \r

-        <p>{% trans "Don't forget to come over and cast your vote." %}</p>\r
-\r
-        <p>{% blocktrans %}Sincerely,<br />\r
-        Forum Administrator{% endblocktrans %}</p>\r
+        <p style="{{ p_style }}">{% trans "Don't forget to come over and cast your vote." %}</p>        \r

     {% endhtmlcontent %}\r
 \r
     {% endhtmlcontent %}\r
 \r

-    {% textcontent %}\r
-        {% trans "Hello" %} {{ recipient.username }}\r
-    \r
-        {% blocktrans %}\r
-        {{ question_author }} has just posted a new question on {{ app_name }}, with title\r
-        "{{ question_title }}" and tagged {{ question_tags }}:\r
-        {% endblocktrans %}\r
-\r
-\r
-        {{ question.body|safe }}\r
-\r
+{% textcontent notifications/base_text.html %}\r
+{% blocktrans %}\r
+{{ question_author }} has just posted a new question on {{ app_name }}, with title\r
+"{{ question_title }}" and tagged {{ question_tags }}:\r
+{% endblocktrans %}\r

 \r
 \r

-        {% trans "Don't forget to come over and cast your vote." %}\r
+{{ question.body|safe }}\r

 \r
 \r

-        {% blocktrans %}Sincerely,\r
-        Forum Administrator{% endblocktrans %}\r
-    {% endtextcontent %}\r
+{% trans "Don't forget to come over and cast your vote." %}\r
+{% endtextcontent %}\r

 {% endemail %}\r
 \r
 {% endemail %}\r
 \r