merged and updated urls to point to student and not auth

student/views.py

@@ -241,7 +241,8 @@ def password_reset(request):
         form.save( use_https = request.is_secure(),
                    from_email = settings.DEFAULT_FROM_EMAIL,
                    request = request )
-        return HttpResponse(json.dumps({'success':True})) 
+        return HttpResponse(json.dumps({'success':True,
+                                        'value': render_to_string('registration/password_reset_done.html', {})}))
     else:
         return HttpResponse(json.dumps({'success':False,
                                         'error': 'Invalid e-mail'}))

urls.py

@@ -17,9 +17,9 @@ urlpatterns = ('',
     url(r'^create_account$', 'student.views.create_account'),
     url(r'^activate/(?P<key>[^/]*)$', 'student.views.activate_account'),
     url(r'^$', 'student.views.index'),
-    url(r'^password_reset/$', 'django.contrib.auth.views.password_reset', 
-        dict(from_email='registration@mitx.mit.edu'),name='auth_password_reset'),
-#    url(r'^password_reset/$', 'auth.views.password_reset'),
+#    url(r'^password_reset/$', 'django.contrib.auth.views.password_reset', 
+#        dict(from_email='registration@mitx.mit.edu'),name='auth_password_reset'),
+    url(r'^password_reset/$', 'student.views.password_reset'),
     url(r'^password_change/$',django.contrib.auth.views.password_change,name='auth_password_change'),
     url(r'^password_change_done/$',django.contrib.auth.views.password_change_done,name='auth_password_change_done'),
     url(r'^password_reset_confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',django.contrib.auth.views.password_reset_confirm,