Merge remote branch 'remotes/gullydwarf-cfdv/f424_email_verified_messaging'

3 files changed, 13 insertions, 33 deletions

diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 1d00f382..47707ca5 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -18,6 +18,7 @@ import uuid
 
 from webob import exc
 
+from mediagoblin import messages
 from mediagoblin.util import render_to_response, redirect
 from mediagoblin.db.util import ObjectId
 from mediagoblin.auth import lib as auth_lib
@@ -124,16 +125,23 @@ def verify_email(request):
     if user and user['verification_key'] == unicode(request.GET['token']):
         user['status'] = u'active'
         user['email_verified'] = True
-        verification_successful = True
         user.save()
+        verification_successful = True
+        messages.add_message(request, 
+                             messages.SUCCESS, 
+                            'Your email address has been verified. ' \
+                            'You may now login!')
     else:
         verification_successful = False
+        messages.add_message(request, 
+                             messages.ERROR, 
+                            'The verification key or user id is incorrect')   
         
     return render_to_response(
         request,
-        'mediagoblin/auth/verify_email.html',
+        'mediagoblin/user_pages/user.html',
         {'user': user,
-         'verification_successful': verification_successful})
+        'verification_successful' : verification_successful})
 
 
 def resend_activation(request):
diff --git a/mediagoblin/templates/mediagoblin/auth/verify_email.html b/mediagoblin/templates/mediagoblin/auth/verify_email.html
deleted file mode 100644
index b6e6d1f8..00000000
--- a/mediagoblin/templates/mediagoblin/auth/verify_email.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{#
-# GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-{% extends "mediagoblin/base.html" %}
-
-{% block mediagoblin_content %}
-<p>
-  {% if verification_successful %}
-    Your email address has been verified!
-  {% else %}
-    The verification key or user id is incorrect
-  {% endif %}
-</p>
-{% endblock %}
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index 3a13cbb1..ad9dd35b 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -189,7 +189,7 @@ def test_register_views(test_app):
         "/auth/verify_email/?userid=%s&token=total_bs" % unicode(
             new_user['_id']))
     context = util.TEMPLATE_TEST_CONTEXT[
-        'mediagoblin/auth/verify_email.html']
+        'mediagoblin/user_pages/user.html']
     assert context['verification_successful'] == False
     new_user = mg_globals.database.User.find_one(
         {'username': 'happygirl'})
@@ -201,7 +201,7 @@ def test_register_views(test_app):
     util.clear_test_template_context()
     test_app.get("%s?%s" % (path, get_params))
     context = util.TEMPLATE_TEST_CONTEXT[
-        'mediagoblin/auth/verify_email.html']
+        'mediagoblin/user_pages/user.html']
     assert context['verification_successful'] == True
     new_user = mg_globals.database.User.find_one(
         {'username': 'happygirl'})