get email_change working again

pull/1/head
eric 2013-03-27 17:57:08 -04:00
parent 11390f6f41
commit 8366b08c69
6 changed files with 71 additions and 0 deletions

View File

@ -0,0 +1,17 @@
{% extends "registration/registration_base.html" %}
{% block doccontent %}
{% block ce_content %}{% endblock %}
<div>
<h2>Other Account Tools</h2>
<ul>
<li>Want to <a href="{% url auth_password_change %}">change your password</a>?</li>
<li>... or <a href="{% url manage_account %}">manage your pledges and payment info</a>?</li>
<li>... or <a href="{% url regluit.frontend.views.edit_user %}"">change your username</a>?</li>
<li>... or <a href="{% url notification_notice_settings %}">manage your contact preferences</a>?</li>
</ul>
</div>
{% endblock %}

View File

@ -0,0 +1,16 @@
{% extends "email_change/base.html" %}
{% load i18n %}
{% block title %}{% trans "Email change complete" %}{% endblock %}
{% block ce_content %}
<h2>{% trans "Email change complete" %}</h2>
<div id="content-main">
<p>{% trans "Your email address has been changed successfully." %}</p>
<p>{% trans "Your new email address is:" %}</p>
<blockquote>{{ user.email }}</blockquote>
</div>
{% endblock %}

View File

@ -0,0 +1,22 @@
{% extends "email_change/base.html" %}
{% load i18n %}
{% block title %}{% trans "Change email address" %}{% endblock %}
{% block ce_content %}
<h2>{% trans "Change email address" %}</h2>
<div id="content-main">
<p>{% trans "Your current email address is:" %}</p>
<blockquote>{{ user.email }}</blockquote>
<p>{% trans "To associate a new email address with your account, please enter the new address in the box below." %}</p>
<form method="post">{% csrf_token %}
{{ form.as_p }}
<p><label>&nbsp;</label><input type="submit" value="{% trans "Change email address" %}" /></p>
</form>
<script type="text/javascript">
document.getElementById('id_email').focus()
</script>
</div>
{% endblock %}

View File

@ -0,0 +1,13 @@
{% extends "email_change/base.html" %}
{% load i18n %}
{% block title %}{% trans "Verification email sent" %}{% endblock %}
{% block ce_content %}
<h2>{% trans "Verification email sent" %}</h2>
<div id="content-main">
<p>{% trans "An email containing a verification link has been sent to your new email address." %}</p>
<p>{% trans "Follow the instructions in this email in order to successfully change your current email address." %}</p>
{% endblock %}

View File

@ -16,6 +16,8 @@ distribute==0.6.28
django-celery==3.0.9
#django-ckeditor==3.6.2.1
git+ssh://git@github.com/Gluejar/django-ckeditor.git@24350a6fba78e38682008e468741661a75483591
#django-email-change==0.2.3
git+git://github.com/novagile/django-email-change.git@0d7cb91b987a0505a9c4bde126d452233dea266d
django-endless-pagination==2.0
django-extensions==0.9
django-kombu==0.9.4

View File

@ -193,6 +193,7 @@ LOGGING = {
EMAIL_HOST = 'smtp.gluejar.com'
DEFAULT_FROM_EMAIL = 'notices@gluejar.com'
SERVER_EMAIL = 'notices@gluejar.com'
SUPPORT_EMAIL = 'support@gluejar.com'
ACCOUNT_ACTIVATION_DAYS = 30
SESSION_COOKIE_AGE = 3628800 # 6 weeks