Move back password reset & registration templates

src/newsreader/accounts/views.py

@@ -27,33 +27,33 @@ class LogoutView(django_views.LogoutView):
 # RegistrationClosedView shows when registration is disabled
 class RegistrationView(registration_views.RegistrationView):
     disallowed_url = reverse_lazy("accounts:register-closed")
-    template_name = "accounts/registration/registration_form.html"
+    template_name = "registration/registration_form.html"
     success_url = reverse_lazy("accounts:register-complete")
 
 
 class RegistrationCompleteView(TemplateView):
-    template_name = "accounts/registration/registration_complete.html"
+    template_name = "registration/registration_complete.html"
 
 
 class RegistrationClosedView(TemplateView):
-    template_name = "accounts/registration/registration_closed.html"
+    template_name = "registration/registration_closed.html"
 
 
 # Redirects or renders failed activation template
 class ActivationView(registration_views.ActivationView):
-    template_name = "accounts/registration/activation_failure.html"
+    template_name = "registration/activation_failure.html"
 
     def get_success_url(self, user):
         return ("accounts:activate-complete", (), {})
 
 
 class ActivationCompleteView(TemplateView):
-    template_name = "accounts/registration/activation_complete.html"
+    template_name = "registration/activation_complete.html"
 
 
 # Renders activation form resend or resend_activation_complete
 class ActivationResendView(registration_views.ResendActivationView):
-    template_name = "accounts/registration/activation_resend_form.html"
+    template_name = "registration/activation_resend_form.html"
 
     def render_form_submitted_template(self, form):
         """
@@ -74,23 +74,23 @@ class ActivationResendView(registration_views.ResendActivationView):
 # prompts for a new password
 # PasswordResetCompleteView shows a success message for the above
 class PasswordResetView(django_views.PasswordResetView):
-    template_name = "accounts/password-reset/password_reset_form.html"
+    template_name = "password-reset/password_reset_form.html"
     subject_template_name = "password-reset/password_reset_subject.txt"
     email_template_name = "password-reset/password_reset_email.html"
     success_url = reverse_lazy("accounts:password-reset-done")
 
 
 class PasswordResetDoneView(django_views.PasswordResetDoneView):
-    template_name = "accounts/password-reset/password_reset_done.html"
+    template_name = "password-reset/password_reset_done.html"
 
 
 class PasswordResetConfirmView(django_views.PasswordResetConfirmView):
-    template_name = "accounts/password-reset/password_reset_confirm.html"
+    template_name = "password-reset/password_reset_confirm.html"
     success_url = reverse_lazy("accounts:password-reset-complete")
 
 
 class PasswordResetCompleteView(django_views.PasswordResetCompleteView):
-    template_name = "accounts/password-reset/password_reset_complete.html"
+    template_name = "password-reset/password_reset_complete.html"
 
 
 class PasswordChangeView(django_views.PasswordChangeView):

src/newsreader/templates/registration/activation_email.html

@@ -68,5 +68,5 @@ following context:
     ``HttpRequest`` instance for better flexibility.
     For example it can be used to compute absolute register URL:
 
-        {{ request.scheme }}://{{ request.get_host }}{% url 'registration_activate' activation_key %}
+        {{ request.scheme }}://{{ request.get_host }}{% url 'accounts:activate' activation_key %}
 {% endcomment %}

src/newsreader/templates/registration/activation_email.txt

@@ -48,5 +48,5 @@ following context:
     ``HttpRequest`` instance for better flexibility.
     For example it can be used to compute absolute register URL:
 
-        {{ request.scheme }}://{{ request.get_host }}{% url 'registration_activate' activation_key %}
+        {{ request.scheme }}://{{ request.get_host }}{% url 'accounts:activate' activation_key %}
 {% endcomment %}