From 96410e298563536e790c620ca3842c98dba66e35 Mon Sep 17 00:00:00 2001 From: Sashi20 Date: Tue, 19 Sep 2017 15:16:48 +0530 Subject: Forgot Password url fixed --- scipy2017/urls.py | 15 +---- website/templates/navbar.html | 125 ++++++++++++++++++++--------------------- website/urls_password_reset.py | 21 +++++++ 3 files changed, 85 insertions(+), 76 deletions(-) create mode 100644 website/urls_password_reset.py diff --git a/scipy2017/urls.py b/scipy2017/urls.py index 057f6e5..2f4adc9 100755 --- a/scipy2017/urls.py +++ b/scipy2017/urls.py @@ -11,18 +11,7 @@ urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), url(r'^', include('website.urls', namespace='website')), url(r'^2017/', include('website.urls', namespace='website')), + url(r'^2017/', include('website.urls_password_reset')), url(r'^', include('social.apps.django_app.urls', namespace='social')), - url(r'^', include('django.contrib.auth.urls', namespace='auth')), - - url(r'^forgotpassword/$', password_reset, {'template_name': 'register/password_reset_form.html'}, name="password_reset"), - url(r'^password_reset/(?P[0-9A-Za-z]+)-(?P.+)/$', - password_reset_confirm, {'template_name': 'register/password_reset_confirm.html'}, name='password_reset_confirm'), - url(r'^password_reset/mail_sent/$', password_reset_done, {'template_name': 'register/password_reset_done.html'}, - name='password_reset_done'), - url(r'^password_reset/complete/$', password_reset_complete, {'template_name': 'register/password_reset_complete.html'}, - name='password_reset_complete'), - url(r'^changepassword/$', password_change, {'template_name': 'register/password_change_form.html'}, - name='password_change'), - url(r'^password_change/done/$', password_change_done, {'template_name': 'register/password_change_done.html'}, - name='password_change_done'), + url(r'^', include('django.contrib.auth.urls', namespace='auth')) ) diff --git a/website/templates/navbar.html b/website/templates/navbar.html index ba19708..03d4f36 100644 --- a/website/templates/navbar.html +++ b/website/templates/navbar.html @@ -5,69 +5,68 @@ {% block nav %}
{% endblock %} - diff --git a/website/urls_password_reset.py b/website/urls_password_reset.py new file mode 100644 index 0000000..a2fc134 --- /dev/null +++ b/website/urls_password_reset.py @@ -0,0 +1,21 @@ +from django.conf.urls import patterns, url +from django.contrib.auth.views import password_reset, password_reset_confirm,\ + password_reset_done, password_reset_complete, password_change,\ + password_change_done + +urlpatterns = [ + url(r'^forgotpassword/$', password_reset, + name="password_reset"), + url(r'^password_reset/(?P[0-9A-Za-z]+)-(?P.+)/$', + password_reset_confirm, + name='password_reset_confirm'), + url(r'^password_reset/mail_sent/$', password_reset_done, + name='password_reset_done'), + url(r'^password_reset/complete/$', password_reset_complete, + name='password_reset_complete'), + url(r'^changepassword/$', password_change, + name='password_change'), + url(r'^password_change/done/$', password_change_done, + name='password_change_done'), +] + -- cgit