[snowy: 4/26] Change the "login again" URL to the new OpenID login page Relocate the OpenID URL pattern definition

[Sanford Armstrong <sharm src gnome org>]

commit 491517eec772f93e569914afdff3d49a9b76998f
Author: Leon Handreke <leon handreke gmail com>
Date:   Wed Apr 7 18:37:41 2010 +0200

    Change the "login again" URL to the new OpenID login page
    Relocate the OpenID URL pattern definitions

 accounts/templates/registration/logout.html |    2 +-
 accounts/urls.py                            |    3 ++-
 urls.py                                     |    1 -
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/accounts/templates/registration/logout.html b/accounts/templates/registration/logout.html
index 500bcae..7d830e9 100644
--- a/accounts/templates/registration/logout.html
+++ b/accounts/templates/registration/logout.html
@@ -6,7 +6,7 @@
 <h3>{{ title }}</h3>
 <p>{% blocktrans %}You have been successfully logged out.  You're coming back, right?{% endblocktrans %}</p>
 <p>
-<a href="{% url django.contrib.auth.views.login %}">{% trans "Log in again" %}</a>
+<a href="{% url openid_login %}">{% trans "Log in again" %}</a>
 </p>
 {% endblock %}
 
diff --git a/accounts/urls.py b/accounts/urls.py
index 26c6321..3c0a06b 100644
--- a/accounts/urls.py
+++ b/accounts/urls.py
@@ -36,7 +36,8 @@ urlpatterns = patterns('',
     # OpenID URLs
     url(r'^openid/login/$', django_openid_auth.views.login_begin,
         {'template_name': 'openid/login.html'}, name='openid_login'),
-    
+    url(r'^openid/complete/$', django_openid_auth.views.login_complete),
+
     # Registration URLs
     url(r'^activate/(?P<activation_key>\w+)/$', activate, name='registration_activate'),
     url(r'^password/change/$', auth_views.password_change, name='auth_password_change'),
diff --git a/urls.py b/urls.py
index a995afc..357f867 100644
--- a/urls.py
+++ b/urls.py
@@ -28,7 +28,6 @@ urlpatterns = patterns('',
 
     (r'^api/', include('snowy.api.urls')),
     (r'^accounts/', include('snowy.accounts.urls')),
-    (r'^openid/', include('django_openid_auth.urls')),
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/', include(admin.site.urls)),