uses nsupdate.login urls and fixed registration url in nsupdate.accounts

This commit is contained in:
Fabian Weisshaar 2013-12-29 22:22:08 +01:00
parent ffaa19abc2
commit 73e37dad14

View File

@ -5,7 +5,6 @@ top-level url dispatching
from django.conf import settings from django.conf import settings
from django.conf.urls import patterns, include, url from django.conf.urls import patterns, include, url
from django.contrib import admin from django.contrib import admin
from django.contrib.auth.forms import AuthenticationForm, PasswordChangeForm
from django.contrib.auth import views as auth_views from django.contrib.auth import views as auth_views
admin.autodiscover() admin.autodiscover()
@ -26,52 +25,11 @@ def remember_me_login(request, *args, **kw):
return auth_views.login(request, *args, **kw) return auth_views.login(request, *args, **kw)
class Html5RegistrationForm(RegistrationForm):
def __init__(self, *args, **kwargs):
super(Html5RegistrationForm, self).__init__(*args, **kwargs)
self.fields['username'].widget.attrs.update(dict(autofocus=None))
class Html5AuthenticationForm(AuthenticationForm):
def __init__(self, *args, **kwargs):
super(Html5AuthenticationForm, self).__init__(*args, **kwargs)
self.fields['username'].widget.attrs.update(dict(autofocus=None))
class Html5PasswordChangeForm(PasswordChangeForm):
def __init__(self, *args, **kwargs):
super(Html5PasswordChangeForm, self).__init__(*args, **kwargs)
self.fields['old_password'].widget.attrs.update(dict(autofocus=None))
urlpatterns = patterns( urlpatterns = patterns(
'', '',
url('', include('social.apps.django_app.urls', namespace='social')), url('', include('social.apps.django_app.urls', namespace='social')),
# registration start url(r'^accounts/', include('nsupdate.login.urls')),
# these are some modified patterns from registration.backends.default.urls: # registration and user settings
url(r'^accounts/register/$',
RegistrationView.as_view(form_class=Html5RegistrationForm),
name='registration_register'),
# from registration.auth_urls:
url(r'^accounts/login/$',
remember_me_login,
{'authentication_form': Html5AuthenticationForm,
'template_name': 'registration/login.html'},
name='auth_login'),
url(r'^accounts/password/change/$',
auth_views.password_change,
{'password_change_form': Html5PasswordChangeForm,
'template_name': 'registration/password_change.html', # own template
'post_change_redirect': '/account/profile'}, # reverse() does not work here
name='auth_password_change'),
#url(r'^accounts/password/reset/$',
# auth_views.password_reset,
# name='auth_password_reset'),
#url(r'^accounts/password/reset/done/$',
# auth_views.password_reset,
# name='password_reset_done'),
url(r'^accounts/', include('registration.backends.default.urls')),
# registration end
url(r'^account/', include('nsupdate.accounts.urls')), url(r'^account/', include('nsupdate.accounts.urls')),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^', include('nsupdate.main.urls')), url(r'^', include('nsupdate.main.urls')),