From 59bcf0b4f468992c062d5e6b78d140807d63ecc9 Mon Sep 17 00:00:00 2001
From: prashantsinalkar
Date: Thu, 21 Sep 2017 16:17:53 +0530
Subject: done minor changes

---
 scipy2017/urls.py          | 15 +++++++++++++--
 website/templates/cfp.html |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/scipy2017/urls.py b/scipy2017/urls.py
index 8ec2e59..057f6e5 100755
--- a/scipy2017/urls.py
+++ b/scipy2017/urls.py
@@ -11,7 +11,18 @@ 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'^', 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'^', 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<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
+        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'),
 )
diff --git a/website/templates/cfp.html b/website/templates/cfp.html
index aa012a5..adbbae8 100755
--- a/website/templates/cfp.html
+++ b/website/templates/cfp.html
@@ -112,7 +112,7 @@
                   <br/><br/>
                   <a style="padding-right : 20px;" href="{% url 'website:userregister' %}" class="btn btn btn-primary">Create an Account
                   </a>
-                  <a href="/forgotpassword/">Forgot Password?</a>
+                  <a href="/2017/forgotpassword/">Forgot Password?</a>
                   {% csrf_token %}
                </form>
                <!-- </div> -->
-- 
cgit