Added a temporary verification page informing the user they need

to authenticate.

diff --git a/mediagoblin/auth/routing.py b/mediagoblin/auth/routing.py
index 59762840e44c56e908320f3fa57dc0fa5965c576..9544b1652501264a0946b0ffd4f62d0d6c9dbf71 100644 (file)
--- a/mediagoblin/auth/routing.py
+++ b/mediagoblin/auth/routing.py
@@ -26,4 +26,6 @@ auth_routes = [
     Route('mediagoblin.auth.logout', '/logout/',
           controller='mediagoblin.auth.views:logout'),
     Route('mediagoblin.auth.verify_email', '/verify_email/',
-          controller='mediagoblin.auth.views:verify_email')]
+          controller='mediagoblin.auth.views:verify_email'),
+    Route('mediagoblin.auth.verify_email_notice', '/verification_required/',
+          controller='mediagoblin.auth.views:verify_email_notice')]

diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index 6b5ce88cfdccda7245eac2d68637d203125b144d..edac74a8d88e85dc816296139c499085758c51dd 100644 (file)
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -168,3 +168,18 @@ def verify_email(request):
             {'request': request,
              'user': user,
              'verification_successful': verification_successful}))
+
+def verify_email_notice(request):
+    """
+    Verify warning view.
+
+    When the user tries to do some action that requires their account
+    to be verified beforehand, this view is called upon!
+    """
+
+    template = request.template_env.get_template(
+        'mediagoblin/auth/verification_needed.html')
+    return Response(
+        template.render(
+            {'request': request}))
+

diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index ff3f0b5e67dfe6ec60a6f7308fdd2e3b207ee332..bb625667461a79b60f11f867699c09b3e4328074 100644 (file)
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -41,7 +41,7 @@ def require_active_login(controller):
             # here because an *active* user is required.
             return exc.HTTPFound(
                 location="%s?next=%s" % (
-                    request.urlgen("mediagoblin.auth.login"),
+                    request.urlgen("mediagoblin.auth.verify_email_notice"),
                     request.path_info))
 
         return controller(request, *args, **kwargs)

diff --git a/mediagoblin/templates/mediagoblin/auth/verification_needed.html b/mediagoblin/templates/mediagoblin/auth/verification_needed.html
new file mode 100644 (file)
index 0000000..26ea84d
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/auth/verification_needed.html
@@ -0,0 +1,29 @@
+{#
+# 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>
+    Verfication needed!<br />
+    Please check your email to verify your account.
+  </p>
+
+  <p>
+    Still haven't received an email? <a href="#">Click here to resend it.</a>
+  </p>
+{% endblock %}