From 33d31dbce7c38138a993ec47873487581475e092 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 19 Feb 2015 11:17:11 +0100 Subject: [PATCH] Fix various registration forms against django 1.6 (fix #30) --- example/sandbox/settings.py | 1 + telemeta/templates/telemeta/login.html | 2 +- .../templates/telemeta/profile_detail.html | 2 +- .../registration/password_change_done.html | 12 ++-- .../registration/password_change_form.html | 65 +++++-------------- .../registration/password_reset_complete.html | 15 ++--- .../registration/password_reset_confirm.html | 32 +++------ .../registration/password_reset_done.html | 11 ++-- .../registration/password_reset_email.html | 24 +++---- .../registration/password_reset_form.html | 25 ++++--- telemeta/urls.py | 14 ++-- 11 files changed, 79 insertions(+), 124 deletions(-) diff --git a/example/sandbox/settings.py b/example/sandbox/settings.py index e9423829..4f469f5a 100644 --- a/example/sandbox/settings.py +++ b/example/sandbox/settings.py @@ -148,6 +148,7 @@ INSTALLED_APPS = ( 'bootstrap3', 'bootstrap_pagination', 'googletools', + 'registration', ) TEMPLATE_CONTEXT_PROCESSORS = ( diff --git a/telemeta/templates/telemeta/login.html b/telemeta/templates/telemeta/login.html index 5fecb133..e3b09896 100644 --- a/telemeta/templates/telemeta/login.html +++ b/telemeta/templates/telemeta/login.html @@ -48,7 +48,7 @@ $(document).ready(function() { -{% trans "Password forgotten" %} ? +{% trans "Password forgotten" %} ?

diff --git a/telemeta/templates/telemeta/profile_detail.html b/telemeta/templates/telemeta/profile_detail.html index 16218314..7a6df49e 100644 --- a/telemeta/templates/telemeta/profile_detail.html +++ b/telemeta/templates/telemeta/profile_detail.html @@ -72,7 +72,7 @@ {% trans "Edit" %} {% endif %} {% if user.is_authenticated and user.username == usr.username %} - {% trans "Change password" %} + {% trans "Change password" %} {% endif %} diff --git a/telemeta/templates/telemeta/registration/password_change_done.html b/telemeta/templates/telemeta/registration/password_change_done.html index fa371374..da277dfc 100644 --- a/telemeta/templates/telemeta/registration/password_change_done.html +++ b/telemeta/templates/telemeta/registration/password_change_done.html @@ -1,11 +1,7 @@ -{% extends "telemeta/base.html" %} +{% extends "telemeta/registration/registration_base.html" %} {% load i18n %} -{% block userlinks %}{% url "django-admindocs-docroot" as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} - -{% block title %}
{% trans 'Password change successful' %}{% endblock %} - +{% block title %}{% trans "Password changed" %}{% endblock %} {% block content %} - -

{% trans 'Your password was changed.' %}

- +{% trans "Password successfully changed!" %} {% endblock %} + diff --git a/telemeta/templates/telemeta/registration/password_change_form.html b/telemeta/templates/telemeta/registration/password_change_form.html index dd9b9259..889bf932 100644 --- a/telemeta/templates/telemeta/registration/password_change_form.html +++ b/telemeta/templates/telemeta/registration/password_change_form.html @@ -1,49 +1,18 @@ -{% extends "telemeta/base.html" %} -{% load i18n adminmedia %} -{% block extrastyle %}{{ block.super }}{% endblock %} -{% block userlinks %}{% url "django-admindocs-docroot" as docsroot %}{% if docsroot %}{% trans 'Documentation' %} / {% endif %} {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} - -{% block title %}
{% trans 'Password change' %}{% endblock %} - -{% block content %}
- -
{% csrf_token %} -
-{% if form.errors %} -

- {% blocktrans count form.errors.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %} -

-{% endif %} - -

{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}

- -
- -
- {{ form.old_password.errors }} - {{ form.old_password }} -
- -
- {{ form.new_password1.errors }} - {{ form.new_password1 }} -
- -
-{{ form.new_password2.errors }} - {{ form.new_password2 }} -
- -
- -
-
- {% trans 'Change my password' %} -
- - -
-
- +{% extends "telemeta/registration/registration_base.html" %} +{% load i18n %} +{% block title %}{% trans "Change password" %}{% endblock %} +{% block content %} +
{% csrf_token %} + + {{ form }} +

+ + + + + +
+
{% endblock %} diff --git a/telemeta/templates/telemeta/registration/password_reset_complete.html b/telemeta/templates/telemeta/registration/password_reset_complete.html index d8b0dd85..4b80c01e 100644 --- a/telemeta/templates/telemeta/registration/password_reset_complete.html +++ b/telemeta/templates/telemeta/registration/password_reset_complete.html @@ -1,11 +1,6 @@ -{% extends "telemeta/base.html" %} +{% extends "telemeta/registration/registration_base.html" %} {% load i18n %} - -{% block title %}
{% trans 'Password reset complete' %}{% endblock %} - -{% block content %} -

{% trans "Your password has been set. You may go ahead and log in now." %}

- -
-

-{% endblock %} +{% block title %}{% trans "Password reset complete" %}{% endblock %} +{% block content %}{% blocktrans %} +Your password has been reset! You may now log in. +{% endblocktrans %}{% endblock %} diff --git a/telemeta/templates/telemeta/registration/password_reset_confirm.html b/telemeta/templates/telemeta/registration/password_reset_confirm.html index c98cb715..dfe4efc7 100644 --- a/telemeta/templates/telemeta/registration/password_reset_confirm.html +++ b/telemeta/templates/telemeta/registration/password_reset_confirm.html @@ -1,28 +1,12 @@ -{% extends "telemeta/base.html" %} +{% extends "telemeta/registration/registration_base.html" %} {% load i18n %} - -{% block title %}
{% trans 'Password reset' %}{% endblock %} - +{% block title %}{% trans "Confirm password reset" %}{% endblock %} {% block content %} -{% if validlink %} -

{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}

- -
- -
{% csrf_token %} - - - -
{{ form.new_password1.errors }}

{{ form.new_password1 }}

{{ form.new_password2.errors }} -

{{ form.new_password2 }}

- -

-

{% trans 'Change my password' %}

+{% trans "Enter your new password below to reset your password:" %} +{% csrf_token %} + + {{ form.as_table }} + +
- -{% else %} -

{% trans 'Password reset unsuccessful' %}

-

{% trans "The password reset link was invalid, possibly because it has already been used. Please request a new password reset." %}

- -{% endif %} {% endblock %} diff --git a/telemeta/templates/telemeta/registration/password_reset_done.html b/telemeta/templates/telemeta/registration/password_reset_done.html index 91ea6a9a..f61b65bc 100644 --- a/telemeta/templates/telemeta/registration/password_reset_done.html +++ b/telemeta/templates/telemeta/registration/password_reset_done.html @@ -1,8 +1,9 @@ -{% extends "telemeta/base.html" %} +{% extends "telemeta/registration/registration_base.html" %} {% load i18n %} - -{% block title %}
{% trans "Password reset successful" %}{% endblock %} - +{% block title %}{% trans "Password reset" %}{% endblock %} {% block content %} -

{% trans "We've e-mailed you instructions for setting your password to the e-mail address you submitted. You should be receiving it shortly." %}

+

+{% blocktrans %}We have sent you an email with a link to reset your password. +Please check your email and click the link to continue.{% endblocktrans %} +

{% endblock %} diff --git a/telemeta/templates/telemeta/registration/password_reset_email.html b/telemeta/templates/telemeta/registration/password_reset_email.html index e7fbaceb..287737fb 100644 --- a/telemeta/templates/telemeta/registration/password_reset_email.html +++ b/telemeta/templates/telemeta/registration/password_reset_email.html @@ -1,15 +1,17 @@ -{% load telemeta_utils %}{% load i18n %}{% autoescape off %}{% trans "Hello" %}, +{% load i18n %}{% trans "Greetings" %} {% if user.get_full_name %}{{ user.get_full_name }}{% else %}{{ user }}{% endif %}, -{% trans "You're receiving this e-mail because you requested a password reset" %} -{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}. +{% blocktrans %}You are receiving this email because you (or someone pretending to be you) +requested that your password be reset on the {{ domain }} site. If you do not +wish to reset your password, please ignore this message. -{% trans "Please go to the following page and choose a new password:" %} -{% block reset_link %} -{{ protocol }}://{{ domain }}{% url "telemeta-password-reset-confirm" uidb36=uid token=token %} -{% endblock %} -{% trans "Your username, in case you've forgotten:" %} {{ user.username }} +To reset your password, please click the following link, or copy and paste it +into your web browser:{% endblocktrans %} -{% trans "Best regards" %}, -{% trans "The site administrator" %} {% trans "of the" %} {% organization %} +{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uid token %} -{% endautoescape %} +{% blocktrans with username=user.username %} +Your username, in case you've forgotten: {{ username }} + +Best regards, +{{ site_name }} Management +{% endblocktrans %} \ No newline at end of file diff --git a/telemeta/templates/telemeta/registration/password_reset_form.html b/telemeta/templates/telemeta/registration/password_reset_form.html index 6da1b847..31c27e79 100644 --- a/telemeta/templates/telemeta/registration/password_reset_form.html +++ b/telemeta/templates/telemeta/registration/password_reset_form.html @@ -1,13 +1,22 @@ -{% extends "telemeta/base.html" %} +{% extends "telemeta/registration/registration_base.html" %} {% load i18n %} +{% block title %}{% trans "Reset password" %}{% endblock %} +{% block content %}{% blocktrans %} +Forgot your password? Enter your email in the form below and we'll send you +instructions for creating a new one.{% endblocktrans %} +

+
{% csrf_token %} + + {{ form }} + +

+ + + -{% block title %}
{% trans "Password reset" %}{% endblock %} -{% block content %} -

{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}

- -{% csrf_token %} -{{ form.email.errors }} -

{{ form.email }} {% trans 'Reset my password' %}

+
{% endblock %} diff --git a/telemeta/urls.py b/telemeta/urls.py index 0ca8eb24..8550588b 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -208,14 +208,12 @@ urlpatterns = patterns('', url(r'^accounts/(?P[A-Za-z0-9._-]+)/rss/$', UserRevisionsFeed(), name="telemeta-user-rss"), # Registration - url(r'^accounts/password_change/$', 'django.contrib.auth.views.password_change', {'template_name': 'telemeta/registration/password_change_form.html'}, name="telemeta-password-change"), - url(r'^accounts/password_change_done/$', 'django.contrib.auth.views.password_change_done', {'template_name': 'telemeta/registration/password_change_done.html'}, name="telemeta-password-change-done"), - - url(r'^accounts/password_reset/$', 'django.contrib.auth.views.password_reset', {'template_name': 'telemeta/registration/password_reset_form.html', 'email_template_name': 'telemeta/registration/password_reset_email.html'}, name="telemeta-password-reset"), - url(r'^accounts/password_reset_done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'telemeta/registration/password_reset_done.html'}, name="telemeta-password-reset-done"), - url(r'^accounts/password_reset_confirm/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'telemeta/registration/password_reset_confirm.html'}, name="telemeta-password-reset-confirm"), - url(r'^accounts/password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'telemeta/registration/password_reset_complete.html'}, name="telemeta-password-reset-complete"), - url(r'^accounts/password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'telemeta/registration/password_reset_complete.html'}, name="telemeta-password-reset-complete"), + url(r'^accounts/password_change/$', 'django.contrib.auth.views.password_change', {'template_name': 'telemeta/registration/password_change_form.html'}, name="password_change"), + url(r'^accounts/password_change_done/$', 'django.contrib.auth.views.password_change_done', {'template_name': 'telemeta/registration/password_change_done.html'}, name="password_change_done"), + url(r'^accounts/password_reset/$', 'django.contrib.auth.views.password_reset', {'template_name': 'telemeta/registration/password_reset_form.html', 'email_template_name': 'registration/password_reset_email.html'}, name="password_reset"), + url(r'^accounts/password_reset_done/$', 'django.contrib.auth.views.password_reset_done', {'template_name': 'telemeta/registration/password_reset_done.html'}, name="password_reset_done"), + url(r'^accounts/password_reset_confirm/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'telemeta/registration/password_reset_confirm.html'}, name="password_reset_confirm"), + url(r'^accounts/password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'telemeta/registration/password_reset_complete.html'}, name="password_reset_complete"), # JSON RPC url(r'json/$', jsonrpc_site.dispatch, name='jsonrpc_mountpoint'), -- 2.39.5