Some more improvements on the notifications, and applied two patches contributed...

[osqa.git] / forum / skins / default / templates / auth / temp_login_email.html

diff --git a/forum/skins/default/templates/auth/temp_login_email.html b/forum/skins/default/templates/auth/temp_login_email.html
index 063608fe1d83c0dd17c84f2af387d35189fbfd7a..8a23f65c4af96a31a762a5bba5f166c27d72f5cb 100644 (file)
--- a/forum/skins/default/templates/auth/temp_login_email.html
+++ b/forum/skins/default/templates/auth/temp_login_email.html
@@ -1,20 +1,21 @@
-{% extends "email_base.html" %}\r
-{% load i18n %}\r
-{% load extra_tags %}\r
-\r
-{% block content %}\r
-    <p>{% trans "Greetings from the Q&A forum" %},</p>\r
-\r
-    <p>{% trans "You're seeing this because someone requested a temporary login link" %}</p>\r
-\r
-    <a href="{% fullurl auth_tempsignin user=user.id,code=temp_login_code %}">{% fullurl auth_tempsignin user=user.id,code=temp_login_code %}</a>\r
-\r
-    <p>{% trans "Following the link above will give you access to your account." %}</p>\r
-\r
-    <p>{% blocktrans %}If you beleive that this message was sent in mistake -\r
-    no further action is needed. Just ingore this email, we apologize\r
-    for any inconvenience{% endblocktrans %}</p>\r
-\r
-    <p>{% blocktrans %}Sincerely,<br />\r
-    Forum Administrator{% endblocktrans %}</p>\r
-{% endblock %}\r
+{% extends "email_base.html" %}
+{% load i18n %}
+{% load extra_tags %}
+{% load email_tags %}
+
+{% block content %}
+    <p>{% trans "Greetings from the Q&A forum" %},</p>
+
+    <p>{% trans "You're seeing this because someone requested a temporary login link" %}</p>
+
+    <a href="{% fullurl auth_tempsignin user=user.id,code=temp_login_code %}">{% fullurl auth_tempsignin user=user.id,code=temp_login_code %}</a>
+
+    <p>{% trans "Following the link above will give you access to your account." %}</p>
+
+    <p>{% blocktrans %}If you beleive that this message was sent in mistake -
+    no further action is needed. Just ingore this email, we apologize
+    for any inconvenience{% endblocktrans %}</p>
+
+    <p>{% blocktrans %}Sincerely,<br />
+    Forum Administrator{% endblocktrans %}</p>
+{% endblock %}