--- a/pytask/templates/registration/activation_complete.html Sat Jan 08 14:43:40 2011 +0530
+++ b/pytask/templates/registration/activation_complete.html Sat Jan 08 15:04:41 2011 +0530
@@ -1,4 +1,5 @@
{% extends 'base.html' %}
{% block content %}
-Your account has been successfully activated.
+Your account has been successfully activated.<br />
+Please proceed to login.
{% endblock %}
--- a/pytask/templates/registration/activation_email.txt Sat Jan 08 14:43:40 2011 +0530
+++ b/pytask/templates/registration/activation_email.txt Sat Jan 08 15:04:41 2011 +0530
@@ -1,8 +1,10 @@
-Welcome to PyTasks:
+Welcome to PyTasks
+
+You are just a step away from using the website.
Click on the following link
-http://localhost:8000/accounts/activate/{{activation_key}}
-and activate your account.
+http://{site}}/accounts/activate/{{activation_key}} to activate your account.
+
Note that the account has to activated within {{expiration_days}} days
Regards,
--- a/pytask/templates/registration/activation_email_subject.txt Sat Jan 08 14:43:40 2011 +0530
+++ b/pytask/templates/registration/activation_email_subject.txt Sat Jan 08 15:04:41 2011 +0530
@@ -1,1 +1,1 @@
-Welcome to PyTasks!
+Welcome to PyTasks
--- a/pytask/templates/registration/logged_out.html Sat Jan 08 14:43:40 2011 +0530
+++ b/pytask/templates/registration/logged_out.html Sat Jan 08 15:04:41 2011 +0530
@@ -7,6 +7,5 @@
<p>{% trans "Thanks for spending some quality time with the Web site today." %}</p>
-<p><a href="../">{% trans 'Log in again' %}</a></p>
{% endblock %}
--- a/pytask/templates/registration/logout.html Sat Jan 08 14:43:40 2011 +0530
+++ b/pytask/templates/registration/logout.html Sat Jan 08 15:04:41 2011 +0530
@@ -1,5 +1,5 @@
{% extends 'base.html' %}
{% block content %}
-You have successfully logged out of PyTasks.
+You have successfully logged out.
<br><br>
{% endblock %}
--- a/pytask/templates/registration/password_change_done.html Sat Jan 08 14:43:40 2011 +0530
+++ b/pytask/templates/registration/password_change_done.html Sat Jan 08 15:04:41 2011 +0530
@@ -1,7 +1,5 @@
{% extends "base.html" %}
{% load i18n %}
-{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %}{% trans 'Change password' %} / <a href="../../logout/">{% trans 'Log out' %}</a>{% endblock %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> › {% trans 'Password change' %}</div>{% endblock %}
{% block title %}{% trans 'Password change successful' %}{% endblock %}
--- a/pytask/templates/registration/password_change_form.html Sat Jan 08 14:43:40 2011 +0530
+++ b/pytask/templates/registration/password_change_form.html Sat Jan 08 15:04:41 2011 +0530
@@ -1,7 +1,4 @@
{% extends "base.html" %}
-{% load i18n %}
-{% block userlinks %}{% url django-admindocs-docroot as docsroot %}{% if docsroot %}<a href="{{ docsroot }}">{% trans 'Documentation' %}</a> / {% endif %} {% trans 'Change password' %} / <a href="../logout/">{% trans 'Log out' %}</a>{% endblock %}
-{% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> › {% trans 'Password change' %}</div>{% endblock %}
{% block title %}{% trans 'Password change' %}{% endblock %}
--- a/pytask/templates/registration/password_reset_email.html Sat Jan 08 14:43:40 2011 +0530
+++ b/pytask/templates/registration/password_reset_email.html Sat Jan 08 15:04:41 2011 +0530
@@ -8,7 +8,6 @@
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
-{% trans "Thanks for using our site!" %}
{% blocktrans %}The {{ site_name }} team{% endblocktrans %}