Converts the welcome message to the new mail system and makes some changes to the...

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

diff --git a/forum/skins/default/templates/auth/email_validation.html b/forum/skins/default/templates/auth/email_validation.html
index 8a2d34fe1ece4c784f4f9c3fa0fb83693f40c38a..8746e5635d368a947062534fe1e1b43edd565571 100644 (file)
--- a/forum/skins/default/templates/auth/email_validation.html
+++ b/forum/skins/default/templates/auth/email_validation.html
@@ -1,21 +1,46 @@
-{% extends "email_base.html" %}
-{% load i18n %}
-{% load extra_tags %}
-{% load email_tags %}
+{% load i18n extra_tags email_tags %}

 
 

-{% block content %}
-    <p>{% trans "Greetings from the Q&A forum" %},</p>
+{% declare %}
+    prefix = settings.EMAIL_SUBJECT_PREFIX
+    app_name = settings.APP_SHORT_NAME

 
 

-    <p>{% trans "To make use of the Forum, please follow the link below:" %}</p>
+    exclude_greeting = True
+    exclude_finetune = True
+{% enddeclare %}

 
 

-    <a href="{% fullurl auth_validate_email user=user.id,code=validation_code %}">{% fullurl auth_validate_email user=user.id,code=validation_code %}</a>
+{% email %}
+    {% subject %}{% blocktrans %}{{ prefix }} Welcome to {{ app_name }}{% endblocktrans %}{% endsubject %}

 
 

-    <p>{% trans "Following the link above will help us verify your email address." %}</p>
+    {% htmlcontent notifications/base.html %}
+        <p style="{{ p_style }}}">
+            {% blocktrans %}Howdy and welcome to {{ app_name }}. We know you're busy, so we'll keep this real simple.{% endblocktrans %} %},
+        </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 style="{{ p_style }}}">{% trans "Here's your login info (store it in a cool dry place):" %}</p>
+
+        <p style="{{ p_style }}}">{% trans "Username: " %} {{ recipient.username }}<br />
+        <b>{% trans "Password: As IF we would send your password in cleartext!" %}</b></p>
+
+        <p style="{{ p_style }}}">{% trans "The following link will help us verify your email address:" %}</p>
+
+        <a  style="{{ a_style }}}" href="{% fullurl auth_validate_email user=recipient.id,code=validation_code %}">{% trans "Validate my email address" %}</a>
+
+        <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_validate_email user=recipient.id,code=validation_code %}</p>
+    {% endhtmlcontent %}
+
+{% textcontent notifications/base_text.html %}
+{% blocktrans %}Howdy and welcome to {{ app_name }}. We know you're busy, so we'll keep this real simple.{% endblocktrans %} %},
+{% trans "Here's your login info (store it in a cool dry place):" %}
+
+{% trans "Username: " %} {{ recipient.username }}
+{% trans "Password: As IF we would send your password in cleartext!" %}
+
+{% trans "Copy and paste this url into your web browser's address bar to help us verify your email address:" %}
+
+{% fullurl auth_validate_email user=recipient.id,code=validation_code %}
+{% endtextcontent %}
+
+{% endemail %}

 
 

-    <p>{% blocktrans %}Sincerely,<br />
-    Forum Administrator{% endblocktrans %}</p>
-{% endblock %}