Merge 71a75bb into 4ed6494

config/urls.py

@@ -12,18 +12,27 @@
 
 from config.views import robots_txt
 from seed.api.base.urls import urlpatterns as api
-from seed.landing.views import password_reset_complete
+from seed.landing.views import password_reset_complete, password_reset_confirm, password_reset_done
 from seed.views.main import angular_js_tests
 
 from rest_framework.schemas import get_schema_view
 schema_view = get_schema_view(title='SEED API Schema')
 
 urlpatterns = [
+    url(r'^accounts/password/reset/done/$', password_reset_done, name='password_reset_done'),
     url(
         r'^accounts/password/reset/complete/$',
         password_reset_complete,
         name='password_reset_complete',
     ),
+    url(
+        (
+            r'^accounts/password/reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/'
+            '(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$'
+        ),
+        password_reset_confirm,
+        name='password_reset_confirm'
+    ),
     # Application
     url(r'^', include(('seed.landing.urls', "seed.landing"), namespace="landing")),
     url(r'^app/', include(('seed.urls', "seed"), namespace="seed")),

seed/landing/templates/landing/password_reset_email.html

@@ -4,7 +4,7 @@
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-{{ protocol }}://{{ domain }}{% url "landing:password_reset_confirm" uidb64=uid token=token %}
+{{ protocol }}://{{ domain }}{% url "password_reset_confirm" uidb64=uid token=token %}
 {% endblock %}
 {% trans "Your username, in case you've forgotten:" %} {{ user.email }}
 

seed/landing/urls.py

@@ -12,7 +12,7 @@
 
 from seed.landing.views import (
     landing_page, login_view, password_reset, password_reset_done,
-    password_reset_confirm, password_reset_complete, signup
+    password_reset_complete, signup
 )
 
 urlpatterns = [
@@ -25,14 +25,6 @@
     ),
     url(r'^accounts/password/reset/$', password_reset, name='password_reset'),
     url(r'^accounts/password/reset/done/$', password_reset_done, name='password_reset_done'),
-    url(
-        (
-            r'^accounts/password/reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/'
-            '(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$'
-        ),
-        password_reset_confirm,
-        name='password_reset_confirm'
-    ),
     url(
         r'^accounts/password/reset/complete/$',
         password_reset_complete,