more OSQA-377 fixes. We had some extra } lying around in the styles

[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 ec4d2116fbe2a0ab1463eeb30a832e9d85205781..45e4f820bf9403a1917576998e7ecdb7686a4d39 100644 (file)
--- a/forum/skins/default/templates/notifications/feedback.html
+++ b/forum/skins/default/templates/notifications/feedback.html
@@ -12,14 +12,9 @@
     {% subject %}{% blocktrans %}{{ prefix }} Feedback message from {{ app_name }}{% endblocktrans %}{% endsubject %}
 
     {% htmlcontent notifications/base.html %}
     {% 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 %}
+        <p style="{{ p_style }}">
+            {% trans "Sender" %}:{% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}<br />
+            {% trans "email" %}: {{ email }}

             <br/>
                 ip: {{ ip }}
         </p>
             <br/>
                 ip: {{ ip }}
         </p>


@@ -31,13 +26,8 @@
     {% endhtmlcontent %}
 
 {% textcontent notifications/base_text.html %}
     {% 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 %}
 {% trans "Sender" %}: {% if name %}{{ name }}{% else %}{% trans "anonymous" %}{% endif %}

-{% if email %}{% trans "email" %}: {{ email }}{% endif %}
-{% endif %}
+{% trans "email" %}: {{ email }}

 ip: {{ ip }}
 
 {% trans "Message body:" %} {{ message }}
 ip: {{ ip }}
 
 {% trans "Message body:" %} {{ message }}