Self hosted FLOSS fitness/workout, nutrition and weight tracker
Crispify password reset forms
Roland79180211dc80
diff --git a/wger/core/forms.py b/wger/core/forms.pyindex 756afa07a..96eee3d86 100644--- a/wger/core/forms.py+++ b/wger/core/forms.py@@ -216,12 +216,22 @@ class RegistrationForm(UserCreationForm, UserEmailForm):class RegistrationFormNoCaptcha(UserCreationForm, UserEmailForm):'''Registration form without captcha field-- This is used when registering through an app, in that case there is not- such a spam danger and simplifies the registration process on a mobile- device.'''- pass++ def __init__(self, *args, **kwargs):+ super(RegistrationFormNoCaptcha, self).__init__(*args, **kwargs)+ self.helper = FormHelper()+ self.helper.form_class = 'wger-form'+ self.helper.layout = Layout(+ 'username',+ 'email',+ Row(+ Column('password1', css_class='form-group col-6 mb-0'),+ Column('password2', css_class='form-group col-6 mb-0'),+ css_class='form-row'+ ),+ ButtonHolder(Submit('submit', _("Register"), css_class='btn-success btn-block'))+ )class FeedbackRegisteredForm(forms.Form):diff --git a/wger/core/templates/user/password_reset_complete.html b/wger/core/templates/registration/password_reset_complete.htmlsimilarity index 100%rename from wger/core/templates/user/password_reset_complete.htmlrename to wger/core/templates/registration/password_reset_complete.htmldiff --git a/wger/core/templates/user/password_reset_done.html b/wger/core/templates/registration/password_reset_done.htmlsimilarity index 100%rename from wger/core/templates/user/password_reset_done.htmlrename to wger/core/templates/registration/password_reset_done.htmldiff --git a/wger/core/templates/user/password_reset_email.html b/wger/core/templates/registration/password_reset_email.htmlsimilarity index 100%rename from wger/core/templates/user/password_reset_email.htmlrename to wger/core/templates/registration/password_reset_email.htmldiff --git a/wger/core/templates/user/password_reset_confirm.html b/wger/core/templates/user/password_reset_confirm.htmldeleted file mode 100644index c2ff32cc0..000000000--- a/wger/core/templates/user/password_reset_confirm.html+++ /dev/null@@ -1,28 +0,0 @@-{% extends "base.html" %}-{% load i18n wger_extras %}--{% block title %}{% trans "Password reset confirmation" %}{% endblock %}---{% block content %}--{% if validlink %}-<h4>{% trans 'Enter new password' %}</h4>--<p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>--<form action=""- method="post"- class="wger-form">- {% trans 'Change my password' as submit_text %}- {% render_form_fields form submit_text %}-</form>--{% else %}--<h4>{% trans 'Password reset unsuccessful' %}</h4>--<p>{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}</p>-{% endif %}--{% endblock %}diff --git a/wger/core/templates/user/password_reset_form.html b/wger/core/templates/user/password_reset_form.htmldeleted file mode 100644index 42368421a..000000000--- a/wger/core/templates/user/password_reset_form.html+++ /dev/null@@ -1,14 +0,0 @@-{% extends "base.html" %}-{% load i18n wger_extras %}--{% block title %}{% trans "Password reset" %}{% endblock %}---{% block content %}-<form action=""- method="post"- class="wger-form">- {% trans 'Change my password' as submit_text %}- {% render_form_fields form submit_text %}-</form>-{% endblock %}diff --git a/wger/core/urls.py b/wger/core/urls.pyindex dacc2f6fb..79a52166f 100644--- a/wger/core/urls.py+++ b/wger/core/urls.py@@ -107,23 +107,16 @@ patterns_user = [user.WgerPasswordChangeView.as_view(),name='change-password'),url(r'^password/reset/$',- views.PasswordResetView.as_view(),- {'template_name': 'user/password_reset_form.html',- 'email_template_name': 'user/password_reset_email.html',- 'post_reset_redirect': reverse_lazy('core:user:password_reset_done')},+ user.WgerPasswordResetView.as_view(),name='password_reset'),url(r'^password/reset/done/$',views.PasswordResetDoneView.as_view(),- {'template_name': 'user/password_reset_done.html'},name='password_reset_done'),url(r'^password/reset/check/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',- views.PasswordResetConfirmView.as_view(),- {'template_name': 'user/password_reset_confirm.html',- 'post_reset_redirect': reverse_lazy('core:user:password_reset_complete')},+ user.WgerPasswordResetConfirmView.as_view(),name='password_reset_confirm'),url(r'^password/reset/complete/$',views.PasswordResetCompleteView.as_view(),- {'template_name': 'user/password_reset_complete.html'},name='password_reset_complete'),]diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 333f92958..610feb668 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -33,7 +33,9 @@ from django.contrib.auth.mixins import (from django.contrib.auth.models import Userfrom django.contrib.auth.views import (LoginView,- PasswordChangeView+ PasswordChangeView,+ PasswordResetConfirmView,+ PasswordResetView)from django.http import (HttpResponseForbidden,@@ -294,8 +296,6 @@ def registration(request):template_data['form'] = formtemplate_data['title'] = _('Register')- template_data['form_fields'] = [i for i in form]- template_data['submit_text'] = _('Register')template_data['extend_template'] = 'base.html'return render(request, 'form.html', template_data)@@ -592,3 +592,37 @@ class WgerPasswordChangeView(PasswordChangeView):context = super(WgerPasswordChangeView, self).get_context_data(**kwargs)context['extend_template'] = 'base.html'return context+++class WgerPasswordResetView(PasswordResetView):+ template_name = 'form.html'+ email_template_name = 'registration/password_reset_email.html'+ success_url = reverse_lazy('core:user:password_reset_done')++ def get_form(self, form_class=None):+ form = super(WgerPasswordResetView, self).get_form(form_class)+ form.helper = FormHelper()+ form.helper.form_class = 'wger-form'+ form.helper.add_input(Submit('submit', _("Save"), css_class='btn-success btn-block'))+ return form++ def get_context_data(self, **kwargs):+ context = super(WgerPasswordResetView, self).get_context_data(**kwargs)+ context['extend_template'] = 'base.html'+ return context+++class WgerPasswordResetConfirmView(PasswordResetConfirmView):+ template_name = 'form.html'++ def get_form(self, form_class=None):+ form = super(WgerPasswordResetConfirmView, self).get_form(form_class)+ form.helper = FormHelper()+ form.helper.form_class = 'wger-form'+ form.helper.add_input(Submit('submit', _("Save"), css_class='btn-success btn-block'))+ return form++ def get_context_data(self, **kwargs):+ context = super(WgerPasswordResetConfirmView, self).get_context_data(**kwargs)+ context['extend_template'] = 'base.html'+ return context