[cig-commits] r12986 - in cs/portal/trunk/northridge: . SeismoWebPortal SeismoWebPortal/templates/SeismoWebPortal

[leif at geodynamics.org]

Author: leif
Date: 2008-10-02 19:10:56 -0700 (Thu, 02 Oct 2008)
New Revision: 12986

Added:
   cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/cookie.html
   cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/nocookie.html
Modified:
   cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
   cs/portal/trunk/northridge/SeismoWebPortal/urls.py
   cs/portal/trunk/northridge/SeismoWebPortal/views.py
   cs/portal/trunk/northridge/setup.py
Log:
Improved the way the site responds when a visitor has cookies
disabled.


Added: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/cookie.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/cookie.html	                        (rev 0)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/cookie.html	2008-10-03 02:10:56 UTC (rev 12986)
@@ -0,0 +1,12 @@
+
+{% extends "SeismoWebPortal/base.html" %}
+
+{% block content %}
+
+<h2>Cookie</h2>
+
+<p>A cookie has been sent to you.</p>
+
+<p><a href="{{root}}/registration/">Register</a> ~ <a href="{{root}}/login/">Login</a></p>
+
+{% endblock %}

Added: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/nocookie.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/nocookie.html	                        (rev 0)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/nocookie.html	2008-10-03 02:10:56 UTC (rev 12986)
@@ -0,0 +1,10 @@
+
+{% extends "SeismoWebPortal/base.html" %}
+
+{% block content %}
+
+<h2>No Cookie</h2>
+
+<p>Cookies are disabled in your web browser. Enable cookies and <a href="{{root}}/cookie/">try again</a>.</p>
+
+{% endblock %}

Modified: cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html	2008-10-03 00:23:22 UTC (rev 12985)
+++ cs/portal/trunk/northridge/SeismoWebPortal/templates/SeismoWebPortal/splash.html	2008-10-03 02:10:56 UTC (rev 12986)
@@ -7,7 +7,7 @@
 
     <h1><img src="{{root}}/images/cig.gif"> <img src="{{root}}/images/seismogram.gif"><br>CIG Seismology Web Portal</h1>
 
-    <p>Version 3.2.0</p>
+    <p>Version 3.2.1</p>
 
     <hr>
 

Modified: cs/portal/trunk/northridge/SeismoWebPortal/urls.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/urls.py	2008-10-03 00:23:22 UTC (rev 12985)
+++ cs/portal/trunk/northridge/SeismoWebPortal/urls.py	2008-10-03 02:10:56 UTC (rev 12986)
@@ -22,6 +22,9 @@
 
     (r'^(?P<pathname>style.css)$', 'SeismoWebPortal.views.directToTemplate', dict(template = 'SeismoWebPortal/style.css', mimetype='text/css')),
 
+    (r'^(?P<pathname>nocookie/)$', 'SeismoWebPortal.views.directToTemplate', dict(template = 'SeismoWebPortal/nocookie.html')),
+    (r'^(?P<pathname>cookie/)$', 'SeismoWebPortal.views.cookie'),
+
     # cluster status
     (r'^(?P<daemonCode>\w+)/qwt/$', 'SeismoWebPortal.views.daemonPost', dict(modelName='Cluster', action='queueWaitTime')),
 

Modified: cs/portal/trunk/northridge/SeismoWebPortal/views.py
===================================================================
--- cs/portal/trunk/northridge/SeismoWebPortal/views.py	2008-10-03 00:23:22 UTC (rev 12985)
+++ cs/portal/trunk/northridge/SeismoWebPortal/views.py	2008-10-03 02:10:56 UTC (rev 12986)
@@ -26,6 +26,7 @@
     request.root = root
 
     if request.user.is_anonymous():
+        request.session.set_test_cookie()
         if request.GET:
             return login_redirect(request, root)
         return render_to_response('SeismoWebPortal/splash.html', {'root': root},
@@ -182,6 +183,8 @@
     from django.contrib.auth import REDIRECT_FIELD_NAME
     from django.contrib.sites.models import Site
     root = rootURL(request, pathname)
+    if not request.session.test_cookie_worked():
+        return HttpResponseRedirect('%s/nocookie/' % root)
     manipulator = AuthenticationForm(request)
     redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, '')
     if request.POST:
@@ -209,6 +212,7 @@
 def logout_view(request, pathname):
     logout(request)
     root = rootURL(request, pathname)
+    request.session.set_test_cookie()
     return HttpResponseRedirect('%s/login/' % root)
 
 def password_reset(request, pathname):
@@ -249,7 +253,13 @@
         root = root,
         ), context_instance=RequestContext(request))
 
+def cookie(request, pathname):
+    root = rootURL(request, pathname)
+    request.session.set_test_cookie()
+    return render_to_response('SeismoWebPortal/cookie.html', {'root': root},
+                              RequestContext(request, {}))
 
+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # daemon interface
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -625,6 +635,8 @@
     
     isNewUser = request.user.is_anonymous()
     if isNewUser:
+        if not request.session.test_cookie_worked():
+            return HttpResponseRedirect('%s/nocookie/' % root)
         manipulator = RegistrationAddManipulator(request, root)
         template = 'SeismoWebPortal/register.html'
     else:

Modified: cs/portal/trunk/northridge/setup.py
===================================================================
--- cs/portal/trunk/northridge/setup.py	2008-10-03 00:23:22 UTC (rev 12985)
+++ cs/portal/trunk/northridge/setup.py	2008-10-03 02:10:56 UTC (rev 12986)
@@ -3,7 +3,7 @@
 
 setup(
     name = 'SeismoWebPortal', 
-    version = '3.2.0',
+    version = '3.2.1',
     url = 'http://www.geodynamics.org/',
     author = 'Leif Strand',
     author_email = 'leif at geodynamics.org',