fixes OSQA-439. IE should work again. Sorry about that. Thanks for the patches...

[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..32ade899f9fab341036be8d16807bf3b5d0d02d0 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,31 @@
-{% 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
+{% load i18n extra_tags email_tags %}
+
+{% declare %}
+    prefix = settings.EMAIL_SUBJECT_PREFIX
+    app_name = settings.APP_SHORT_NAME
+
+    exclude_finetune = True
+{% enddeclare %}
+
+{% email %}
+    {% subject %}{% blocktrans %}{{ prefix }} Temporary login link{% endblocktrans %}{% endsubject %}
+
+    {% htmlcontent notifications/base.html %}
+        <p style="{{ p_style }}">
+            {% blocktrans %}The following link grants you a one time access to your account at {{ app_name }}.{% endblocktrans %}
+        </p>
+        <p style="{{ p_style }}"><a  style="{{ a_style }}" href="{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}">{% trans "Go to your account" %}</a></p>
+
+        <p style="{{ p_style }}">{% trans "If the above link is not clickable, copy and paste this url into your web browser's address bar:" %}</p>
+
+        <p style="{{ p_style }}">{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}</p>
+    {% endhtmlcontent %}
+
+{% textcontent notifications/base_text.html %}
+{% blocktrans %}The following url grants you a one time access to your account at {{ app_name }}.{% endblocktrans %}
+
+{% fullurl auth_tempsignin user=recipient.id,code=temp_login_code %}
+{% endtextcontent %}
+
+{% endemail %}
+