Removes a redundant piece of text from the tags template.

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

diff --git a/forum/skins/default/templates/notifications/feedback.html b/forum/skins/default/templates/notifications/feedback.html
index 06b8b8411385d22263afbe2069be94f756ef6ebd..ec4d2116fbe2a0ab1463eeb30a832e9d85205781 100644 (file)
--- a/forum/skins/default/templates/notifications/feedback.html
+++ b/forum/skins/default/templates/notifications/feedback.html
@@ -1,28 +1,47 @@
-{% extends "email_base.html" %}
-{% load i18n %}
-{% load extra_tags %}
-
-{% block content %}
-    <p>{% spaceless %}
-    {% blocktrans with settings.APP_SHORT_NAME as site_title %}
-    Hello, this is a {{site_title}} forum feedback message
-    {% endblocktrans %}
-    {% endspaceless %}</p>
-
-    <p>
-        {% trans "Sender" %}:
-        {% if user.is_authenticated %}
-            {{ user.username }} <br /> {% trans "email" %}:{{ user.email }}
-        {% else %}
-            {% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}
-            {% if email %}{% trans "email" %}:{{ email }}{% endif %}
-        {% endif %}
-        <br/>
-            ip: {{request.META.REMOTE_ADDR}}
-    </p>
-
-    <blockquote>
+{% load i18n extra_tags email_tags %}
+
+{% declare %}
+    prefix = settings.EMAIL_SUBJECT_PREFIX
+    app_name = settings.APP_SHORT_NAME
+
+    exclude_greeting = True
+    exclude_finetune = True
+{% enddeclare %}
+
+{% email %}
+    {% subject %}{% blocktrans %}{{ prefix }} Feedback message from {{ app_name }}{% endblocktrans %}{% endsubject %}
+
+    {% htmlcontent notifications/base.html %}
+        <p style="{{ p_style }}}">
+            {% trans "Sender" %}:
+            {% if user.is_authenticated %}
+                {{ user.username }} <br /> {% trans "email" %}:{{ user.email }}
+            {% else %}
+                {% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}
+                {% if email %}{% trans "email" %}:{{ email }}{% endif %}
+            {% endif %}
+            <br/>
+                ip: {{ ip }}
+        </p>
+
+        <blockquote>
         {% trans "Message body:" %} {{ message }}
-    </blockquote>
+        </blockquote>
+
+    {% endhtmlcontent %}
+
+{% textcontent notifications/base_text.html %}
+{% if user.is_authenticated %}
+{% trans "Sender" %}: {{ user.username }}
+{% trans "email" %}: {{ user.email }}
+{% else %}
+{% trans "Sender" %}: {% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}
+{% if email %}{% trans "email" %}: {{ email }}{% endif %}
+{% endif %}
+ip: {{ ip }}
+
+{% trans "Message body:" %} {{ message }}
+{% endtextcontent %}
+
+{% endemail %}
 
-{% endblock %}