From 8366b08c693be64139dc97244332aa9fe3d12325 Mon Sep 17 00:00:00 2001
From: eric <eric@hellman.net>
Date: Wed, 27 Mar 2013 17:57:08 -0400
Subject: [PATCH] get email_change working again

---
 frontend/templates/email_change/base.html     | 17 ++++++++++++++
 .../email_change/email_change_complete.html   | 16 ++++++++++++++
 .../email_change/email_change_form.html       | 22 +++++++++++++++++++
 .../email_change/email_verification_sent.html | 13 +++++++++++
 requirements_versioned.pip                    |  2 ++
 settings/common.py                            |  1 +
 6 files changed, 71 insertions(+)
 create mode 100644 frontend/templates/email_change/base.html
 create mode 100644 frontend/templates/email_change/email_change_complete.html
 create mode 100644 frontend/templates/email_change/email_change_form.html
 create mode 100644 frontend/templates/email_change/email_verification_sent.html

diff --git a/frontend/templates/email_change/base.html b/frontend/templates/email_change/base.html
new file mode 100644
index 00000000..8943e85e
--- /dev/null
+++ b/frontend/templates/email_change/base.html
@@ -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 %}
\ No newline at end of file
diff --git a/frontend/templates/email_change/email_change_complete.html b/frontend/templates/email_change/email_change_complete.html
new file mode 100644
index 00000000..9765384c
--- /dev/null
+++ b/frontend/templates/email_change/email_change_complete.html
@@ -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 %}
+
+
diff --git a/frontend/templates/email_change/email_change_form.html b/frontend/templates/email_change/email_change_form.html
new file mode 100644
index 00000000..e1b5f72b
--- /dev/null
+++ b/frontend/templates/email_change/email_change_form.html
@@ -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 %}
+
diff --git a/frontend/templates/email_change/email_verification_sent.html b/frontend/templates/email_change/email_verification_sent.html
new file mode 100644
index 00000000..2ba18133
--- /dev/null
+++ b/frontend/templates/email_change/email_verification_sent.html
@@ -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 %}
+
diff --git a/requirements_versioned.pip b/requirements_versioned.pip
index e657c6e1..01635133 100644
--- a/requirements_versioned.pip
+++ b/requirements_versioned.pip
@@ -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
diff --git a/settings/common.py b/settings/common.py
index 4410f03c..1d1cabf7 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -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