Added login view (missing template)

Sergio Oliveira
1 parent c9fb4c59
Showing 3 changed files with 10 additions and 5 deletions Show diff stats
colab/accounts/urls.py
colab/accounts/views.py
colab/settings.py
  
-from django.conf.urls import patterns, include, url
+from django.conf.urls import patterns, url
  
-from .views import (UserProfileDetailView, UserProfileUpdateView,
+from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView,
                     ManageUserSubscriptionsView, ChangeXMPPPasswordView)
  
-from . import views
  
 urlpatterns = patterns('',
     url(r'^register/$', 'colab.accounts.views.signup', name='signup'),
@@ -12,6 +11,8 @@ urlpatterns = patterns(&#39;&#39;,
     url(r'^change-password/$',
         ChangeXMPPPasswordView.as_view(), name='change_password'),
  
+    url(r'^login/?$', LoginView.as_view(), name='login'),
+
     url(r'^(?P<username>[\w@+.-]+)/?$',
         UserProfileDetailView.as_view(), name='user_profile'),
  
@@ -13,7 +13,7 @@ from django.utils.translation import ugettext as _
 from django.shortcuts import render, redirect, get_object_or_404
 from django.core.urlresolvers import reverse
 from django.core.exceptions import PermissionDenied
-from django.views.generic import DetailView, UpdateView
+from django.views.generic import DetailView, UpdateView, TemplateView
 from django.utils.decorators import method_decorator
  
 from django.http import HttpResponse
@@ -30,6 +30,10 @@ from .errors import XMPPChangePwdException
 from .utils import mailman
  
  
+class LoginView(TemplateView):
+    template_name = "accounts/login.html"
+
+
 class UserProfileBaseMixin(object):
     model = get_user_model()
     slug_field = 'username'
@@ -257,7 +257,7 @@ SITE_URL = &#39;http://localhost:8000&#39;
 BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')]
  
  
-LOGIN_URL = '/'
+LOGIN_URL = '/user/login'
 LOGIN_REDIRECT_URL = '/'
 LOGIN_REDIRECT_URL_FAILURE = '/'
 LOGOUT_REDIRECT_URL = '/'
1	1
2		-from django.conf.urls import patterns, include, url
	2	+from django.conf.urls import patterns, url
3	3
4		-from .views import (UserProfileDetailView, UserProfileUpdateView,
	4	+from .views import (UserProfileDetailView, UserProfileUpdateView, LoginView,
5	5	ManageUserSubscriptionsView, ChangeXMPPPasswordView)
6	6
7		-from . import views
8	7
9	8	urlpatterns = patterns('',
10	9	url(r'^register/$', 'colab.accounts.views.signup', name='signup'),
...	...	@@ -12,6 +11,8 @@ urlpatterns = patterns('',
12	11	url(r'^change-password/$',
13	12	ChangeXMPPPasswordView.as_view(), name='change_password'),
14	13
	14	+ url(r'^login/?$', LoginView.as_view(), name='login'),
	15	+
15	16	url(r'^(?P<username>[\w@+.-]+)/?$',
16	17	UserProfileDetailView.as_view(), name='user_profile'),
17	18
...	...
...	...	@@ -13,7 +13,7 @@ from django.utils.translation import ugettext as _
13	13	from django.shortcuts import render, redirect, get_object_or_404
14	14	from django.core.urlresolvers import reverse
15	15	from django.core.exceptions import PermissionDenied
16		-from django.views.generic import DetailView, UpdateView
	16	+from django.views.generic import DetailView, UpdateView, TemplateView
17	17	from django.utils.decorators import method_decorator
18	18
19	19	from django.http import HttpResponse
...	...	@@ -30,6 +30,10 @@ from .errors import XMPPChangePwdException
30	30	from .utils import mailman
31	31
32	32
	33	+class LoginView(TemplateView):
	34	+ template_name = "accounts/login.html"
	35	+
	36	+
33	37	class UserProfileBaseMixin(object):
34	38	model = get_user_model()
35	39	slug_field = 'username'
...	...
...	...	@@ -257,7 +257,7 @@ SITE_URL = 'http://localhost:8000'
257	257	BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')]
258	258
259	259
260		-LOGIN_URL = '/'
	260	+LOGIN_URL = '/user/login'
261	261	LOGIN_REDIRECT_URL = '/'
262	262	LOGIN_REDIRECT_URL_FAILURE = '/'
263	263	LOGOUT_REDIRECT_URL = '/'
...	...