From 128b571832cd2f386823f40a7baa212bfad129c8 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 31 Mar 2011 17:33:09 +0200 Subject: [PATCH] complete account registration and password handling --- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 11097 -> 11153 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 4 ++ .../telemeta/registration/logged_out.html | 12 ++++ .../registration/password_change_done.html | 1 + .../registration/password_change_form.html | 1 + .../registration/password_reset_complete.html | 1 + .../registration/password_reset_confirm.html | 1 + .../registration/password_reset_done.html | 1 + .../registration/password_reset_email.html | 1 + .../registration/password_reset_form.html | 1 + .../templates/telemeta_default/login.html | 7 ++- .../telemeta_default/profile_detail.html | 1 + .../telemeta_default/profile_edit.html | 2 +- .../registration/logged_out.html | 12 ++++ .../registration/password_change_done.html | 14 +++++ .../registration/password_change_form.html | 52 ++++++++++++++++++ .../registration/password_reset_complete.html | 16 ++++++ .../registration/password_reset_confirm.html | 32 +++++++++++ .../registration/password_reset_done.html | 14 +++++ .../registration/password_reset_email.html | 15 +++++ .../registration/password_reset_form.html | 19 +++++++ telemeta/urls.py | 12 +++- telemeta/web/base.py | 4 +- 23 files changed, 216 insertions(+), 7 deletions(-) create mode 100644 telemeta/templates/telemeta/registration/logged_out.html create mode 100644 telemeta/templates/telemeta/registration/password_change_done.html create mode 100644 telemeta/templates/telemeta/registration/password_change_form.html create mode 100644 telemeta/templates/telemeta/registration/password_reset_complete.html create mode 100644 telemeta/templates/telemeta/registration/password_reset_confirm.html create mode 100644 telemeta/templates/telemeta/registration/password_reset_done.html create mode 100644 telemeta/templates/telemeta/registration/password_reset_email.html create mode 100644 telemeta/templates/telemeta/registration/password_reset_form.html create mode 100644 telemeta/templates/telemeta_default/registration/logged_out.html create mode 100644 telemeta/templates/telemeta_default/registration/password_change_done.html create mode 100644 telemeta/templates/telemeta_default/registration/password_change_form.html create mode 100644 telemeta/templates/telemeta_default/registration/password_reset_complete.html create mode 100644 telemeta/templates/telemeta_default/registration/password_reset_confirm.html create mode 100644 telemeta/templates/telemeta_default/registration/password_reset_done.html create mode 100644 telemeta/templates/telemeta_default/registration/password_reset_email.html create mode 100644 telemeta/templates/telemeta_default/registration/password_reset_form.html diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 1519873d50ab268abc35f38f505b515cfa133c21..128887082d162df60826fe2e778ed2a992a64ddd 100644 GIT binary patch delta 4449 zcmYk;32;@_0f+GeVKr=F6A8j21|kut*oqWHK?OvhEJ9E!D4HNP!9dv3Hux;2Marfo z2m+-IMFcD~ij>wBl3HvmX$zg!x=`s|*ML@%6(Epci*KLZ(Kn2)V+Azp!tFcZsh zG*-s%>(GH6N5&9-j}Gh%cBlXFFA8=Xx+M*^$H7!Pp$(2g7h?iClbL9Th3I{y*b~dK zJ8r^`xI5NgMpx`OI^c6?yBDw>{fEmG?4S*IdqFpJ=DqMH?2C@L0KM)3Y??8;QswA< zYtR9$M<2mvbmq^YGp|8AK7`)?7N#9(0|jUH9`Y~zlMipWj5gf4M>3=CXoES(qJ?~P zK%>!y??V2C0zPc71h2*l^!jb+L=Ip!9_hjQJCakJaO9`a2G7R&MRbOjqa9dh8^}gZ zg#qXQN1=OS40`>9XaPFlBDDQQ=*q4@2UO9M_4kHNoUq}Y=&s%yFRVj5cn5h(;RHIs zGx7WL(Tg~U^Ow*LbFWM~8jRj|1G=K)aU|Y@U9c)m!4d6_7wkvc2(P09I~Dyq+Rz2; zjjeknk0gcs3q$#EpcBv)os14-HaheB(MP=yeN-#Z0i{<{aOTzM67EEAd_H;rz40(Q z;(BBZ;ZNvFoQvQ82VK&(ET89lqZ7+RH{%d=fWy!M4oBKehq3X*RP;Tc6YF!M3(*^w zq9ZRySEdpjXcaoc?dU{yqXRgI4&b%;{V{X`4QM+bU^n0YvlLv4FVT)Vvc9fFR~&#> zp&i_c{zBe~He7_>R~+lB(CeN+nhNXDUA_lh!8&w+e?TAQ`__H`&r@*ezCd5UOzv`t zQ|OH&qT|sHXQI1*0lHTzV!bNX_n{pfMVbr^n8Hucj@vK`zweD{8_K2NQjSDta2wk3 zB(%eO(HR$`OSlAGq1EV$t&QJrL?2;wJijHn18uhkZD&9F`%v45^|!&JobZ|c5%1uS z&&QZgeE@%P{G&6Ck6bK8m$n*Rse|Z1>d^@_pffxf{WPAxgm&DrU$WBeqS^gee{USh z2^$=aUN{NewbRjo%|fp$L}y%r?&2lrW~#tj@JVz)$K&}%^#1qJmHZ5yz?bNCJ<_S9 z&`KPDgK?hu*jd9e~%nlxxt2oXXnVpMh<$AUY4-Qwz{`%kx-&XHdxrXRsC>Ks9>42JLVUxg5@F29ko6{5=>2&nQS;)Q$_n{p>j=mimu{G{TXHbhaSci7d zh_1xn&_{C#y}#F>WCaGI9S+5IcstrodNPHk-H5(kWoUzI(UsVS{?NRD{ECKSn8J^v zE%N#QAoUz{MaCi9B}_wJ`LF`rOIy(aA4E6htJvQ6|721KAEG1r6us~ZbVXWSmkcNq zeI$L*mFOSM!9P|+sH~CFoI|?m0;qh=nScZ?rva}@! z$rWTi8AyC1c95@;wPY!|nM@_~$Wv9rI$oKcPU$zq!(qHd#t?^6LjM2QO~o~yOlHL| zeu=ANc_QYLLh=APLS82>M-llh`3bq5^dmfIe_!~qCO*V<e(@`0$&;5D?;?|k$Ft-i z@>6n@tRe0|kNe2in@YTU=vK}r&yh^Bi+HprFEy3ohx31ixD#$5ZbgrcWC(eKRFm<< z7kLr!c#-%%xwC#id`f$n|6&`Mwp7$H^UJIcYw8 z7e|tJi0_HVHu7!qJuC63#5>7s@*Q#=xrN+IJe>FvpTG+g?jd{0lcf20mBLE$3o?q# zAvY3_6(onuAU`6_$Ng1VU9#uDO!eC4Q&>#uV|@!g7|YEZqcDxUOIDGE!MWY@&`*Eso!_#Vop)J{{gpnk&gfX delta 4383 zcmYk;4Rlv!0mt!YW4OT@FvbLV8?Z5X8;Picsi+7G2@yn5XvB+XfT%-BFwh$q5D+R1 zNh#bE5R(LS<`feYNkPcsq=M!tOFgM4H1mjfI#l29|2{j%=kWV~o_qiIK5zHA|FQO( zwP&OD9#Gu-EVm|gtH1m=!b)_JJw(sF2Xag0o&tl%*Eeh3w#q> z;oI02-;dvafh{@yPkKHHS={Xfg_wsuu?_Y^FC2>5cu_n*92sL6k2!cPw#F%#kF)SX zoFBh`3LRJz(r4I<4(tea2uTQkreeqcLL2-V2jG9v2KyI<;9^vw108{OcollzR6HGL zVFygG0N2OkN6-~(Lfd~AZTD}ONB`kC6+1W)FK9t4&O8q*u?;%nYV^8sn3*xUQnS#8 z7oY=Lj6Q;8=*(B5Ghd5#ycxZJCnk<`Hx*}g0Qnb=@!<`}(T4wrUYApxHrO6noX{B^ zPzBm>74k1s^I>~6*bV2R6Ig{^a6LMJUB#@wBYvI}Hnbl-K7!8do#@AC11FJxA)EDf zV4cvt&<(x5EIJsS`Eazo(ddd!KnFevy?*ZLtiKH};)J_-S-h|w?O-eNRKnxv0Qbc2 z4@Hk)U(O#zJIv~scGL>JuPwTgrC5dMVmquw2ec%K7py?q2oIto+ZEl5HuO4n#=oPF z;uLnmd_Ej#8M>r>(Se+U&in%O`jO}(nt%>yDmw9G9u=2x5qjg&=qmKab?As2kUqnc z=t>-n-@k<}=?C%rSLn=gSWY)#Yjl8Z&;b^q?RHO(lQ4ja?{{Uqpei~Ny>T2m@~hF6 znT`&$7M(K!|fp**!j}Kvc-~TtM_}YDhF7YY!#$sC0 zQnbTC=Y_x+*&>3Hb?&7iNW}1Y<@OpGWTjKfc=>1LTO1^?l;23({zoTC#R4O>( zgL3x{L~lGFy>T=;fEsiuXQB<=guH2C1-hgS@pu>Z<@g{v;4jdDo6zYFgnpk4 zpyCn@!Xa3Ru0So?!F+US*PsJ>7`?s`ZQ!|hya(NU`_T?xkLTY(_tbl6d!M44Gq+df zElENzDt0goo#~ZmN0ZT|o{R4G1?Z-^2koF9-NoC{nZ1N%_($~qFVR0fxuxj(B-_qnl+XI^qLpLvNv*=O6Jno9A;H$3^Ipcg9@o z9xX?o^+2@Ui_r;;K_Bt>Gg*HJP!qqHjdpl5x`m-8Xdp^wBbLX z1APPS@I!RQpQG*N^hpPL26|t&gbMp6l%XAuLVljZL~Mz-qBB^CHn42Hdh`v=x6%`vCkFLZF^ath^YujL1#PDn`UnO`t1*jX%MIbXY2`M!DXnHcUBV|wYch?L6W@qm zkaNgS$*tr9GL}ps_tsrf&@mZD?RUiDboP*oi9@-Oe6wukz%_OdSH&-ya7nCRhGpbB zGL<|-o+mEHO!6aAPc9`Tga^%jro2pih^xpB@@vvuZl>}b;+m`@_mN8CZrDzqCbNj8 zCMEMTcn|f1|he<#FQsPJfo~(=&Ig30-e&PYe!HppEJ&47Zv5LG(d`~P7k}c%N zq`BNpWfYl6?jZe%|MR$(SneXVZpKHcTtl{z6{NX5N9A_%8*)CGM9w9aACg{VJozPQ zF5j=~*{;j?SYNZEDvg z*+lJU{% trans 'Home' %}{% endblock %} + +{% block content %} + +

{% trans "Thanks for spending some quality time with the Web site today." %}

+ +

{% trans 'Log in again' %}

+ +{% endblock %} diff --git a/telemeta/templates/telemeta/registration/password_change_done.html b/telemeta/templates/telemeta/registration/password_change_done.html new file mode 100644 index 00000000..63bc2191 --- /dev/null +++ b/telemeta/templates/telemeta/registration/password_change_done.html @@ -0,0 +1 @@ +{% extends "telemeta_default/registration/password_change_done.html" %} \ No newline at end of file diff --git a/telemeta/templates/telemeta/registration/password_change_form.html b/telemeta/templates/telemeta/registration/password_change_form.html new file mode 100644 index 00000000..c2f232c2 --- /dev/null +++ b/telemeta/templates/telemeta/registration/password_change_form.html @@ -0,0 +1 @@ +{% extends "telemeta_default/registration/password_change_form.html" %} \ No newline at end of file diff --git a/telemeta/templates/telemeta/registration/password_reset_complete.html b/telemeta/templates/telemeta/registration/password_reset_complete.html new file mode 100644 index 00000000..069712c9 --- /dev/null +++ b/telemeta/templates/telemeta/registration/password_reset_complete.html @@ -0,0 +1 @@ +{% extends "telemeta_default/registration/password_reset_complete.html" %} \ No newline at end of file diff --git a/telemeta/templates/telemeta/registration/password_reset_confirm.html b/telemeta/templates/telemeta/registration/password_reset_confirm.html new file mode 100644 index 00000000..cf76fccf --- /dev/null +++ b/telemeta/templates/telemeta/registration/password_reset_confirm.html @@ -0,0 +1 @@ +{% extends "telemeta_default/registration/password_reset_confirm.html" %} \ No newline at end of file diff --git a/telemeta/templates/telemeta/registration/password_reset_done.html b/telemeta/templates/telemeta/registration/password_reset_done.html new file mode 100644 index 00000000..d32a6dde --- /dev/null +++ b/telemeta/templates/telemeta/registration/password_reset_done.html @@ -0,0 +1 @@ +{% extends "telemeta_default/registration/password_reset_done.html" %} \ No newline at end of file diff --git a/telemeta/templates/telemeta/registration/password_reset_email.html b/telemeta/templates/telemeta/registration/password_reset_email.html new file mode 100644 index 00000000..7c1c2731 --- /dev/null +++ b/telemeta/templates/telemeta/registration/password_reset_email.html @@ -0,0 +1 @@ +{% extends "telemeta_default/registration/password_reset_email.html" %} \ 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 new file mode 100644 index 00000000..f02a94c9 --- /dev/null +++ b/telemeta/templates/telemeta/registration/password_reset_form.html @@ -0,0 +1 @@ +{% extends "telemeta_default/registration/password_reset_form.html" %} \ No newline at end of file diff --git a/telemeta/templates/telemeta_default/login.html b/telemeta/templates/telemeta_default/login.html index 6997ae68..ff3d92a0 100644 --- a/telemeta/templates/telemeta_default/login.html +++ b/telemeta/templates/telemeta_default/login.html @@ -3,7 +3,7 @@ {% block content %}

{% trans "User authentication" %}

- +
{% if form.errors %} {% endif %} @@ -17,10 +17,11 @@ {{ form.password }}

- - +{% trans "Password forgotten" %} ? + {% endblock %} diff --git a/telemeta/templates/telemeta_default/profile_detail.html b/telemeta/templates/telemeta_default/profile_detail.html index 4589484e..437981a1 100644 --- a/telemeta/templates/telemeta_default/profile_detail.html +++ b/telemeta/templates/telemeta_default/profile_detail.html @@ -46,6 +46,7 @@
{% trans "Last login" %}
{{ usr.last_login }}
+ {% endblock %} diff --git a/telemeta/templates/telemeta_default/profile_edit.html b/telemeta/templates/telemeta_default/profile_edit.html index 59c40bfb..936f03b2 100644 --- a/telemeta/templates/telemeta_default/profile_edit.html +++ b/telemeta/templates/telemeta_default/profile_edit.html @@ -14,7 +14,7 @@ {% for form in forms %} {% for field in form %} - {% if not field.html_name in hidden_fields %} + {% if not field.html_name in user_hidden_fields %} diff --git a/telemeta/templates/telemeta_default/registration/logged_out.html b/telemeta/templates/telemeta_default/registration/logged_out.html new file mode 100644 index 00000000..12e792ac --- /dev/null +++ b/telemeta/templates/telemeta_default/registration/logged_out.html @@ -0,0 +1,12 @@ +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block breadcrumbs %}
{% trans 'Home' %}
{% endblock %} + +{% block content %} + +

{% trans "Thanks for spending some quality time with the Web site today." %}

+ +

{% trans 'Log in again' %}

+ +{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_change_done.html b/telemeta/templates/telemeta_default/registration/password_change_done.html new file mode 100644 index 00000000..4037fc11 --- /dev/null +++ b/telemeta/templates/telemeta_default/registration/password_change_done.html @@ -0,0 +1,14 @@ +{% extends "telemeta/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 breadcrumbs %}
{% trans 'Home' %} › {% trans 'Password change' %}
{% endblock %} + +{% block title %}{% trans 'Password change successful' %}{% endblock %} + +{% block content %} + +

{% trans 'Password change successful' %}

+ +

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

+ +{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_change_form.html b/telemeta/templates/telemeta_default/registration/password_change_form.html new file mode 100644 index 00000000..f44fb607 --- /dev/null +++ b/telemeta/templates/telemeta_default/registration/password_change_form.html @@ -0,0 +1,52 @@ +{% 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 breadcrumbs %}
{% trans 'Home' %} › {% trans 'Password change' %}
{% 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 'Password change' %}

+ +

{% 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' %} +
+ + +
+
+ +{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_complete.html b/telemeta/templates/telemeta_default/registration/password_reset_complete.html new file mode 100644 index 00000000..140b8174 --- /dev/null +++ b/telemeta/templates/telemeta_default/registration/password_reset_complete.html @@ -0,0 +1,16 @@ +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block breadcrumbs %}
{% trans 'Home' %} › {% trans 'Password reset' %}
{% endblock %} + +{% block title %}{% trans 'Password reset complete' %}{% endblock %} + +{% block content %} + +

{% trans 'Password reset complete' %}

+ +

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

+ +

{% trans 'Log in' %}

+ +{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_confirm.html b/telemeta/templates/telemeta_default/registration/password_reset_confirm.html new file mode 100644 index 00000000..347df5a0 --- /dev/null +++ b/telemeta/templates/telemeta_default/registration/password_reset_confirm.html @@ -0,0 +1,32 @@ +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block breadcrumbs %}
{% trans 'Home' %} › {% trans 'Password reset confirmation' %}
{% endblock %} + +{% block title %}{% trans 'Password reset' %}{% endblock %} + +{% block content %} + +{% if validlink %} + +

{% trans 'Enter new password' %}

+ +

{% 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' %}

+ + +{% 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_default/registration/password_reset_done.html b/telemeta/templates/telemeta_default/registration/password_reset_done.html new file mode 100644 index 00000000..cc776025 --- /dev/null +++ b/telemeta/templates/telemeta_default/registration/password_reset_done.html @@ -0,0 +1,14 @@ +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block breadcrumbs %}
{% trans 'Home' %} › {% trans 'Password reset' %}
{% endblock %} + +{% block title %}{% trans 'Password reset successful' %}{% endblock %} + +{% block content %} + +

{% trans 'Password reset successful' %}

+ +

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

+ +{% endblock %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_email.html b/telemeta/templates/telemeta_default/registration/password_reset_email.html new file mode 100644 index 00000000..3b786ac4 --- /dev/null +++ b/telemeta/templates/telemeta_default/registration/password_reset_email.html @@ -0,0 +1,15 @@ +{% load i18n %}{% autoescape off %} +{% trans "You're receiving this e-mail because you requested a password reset" %} +{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}. + +{% 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 }} + +{% trans "Thanks for using our site!" %} + +{% blocktrans %}The {{ site_name }} team{% endblocktrans %} + +{% endautoescape %} diff --git a/telemeta/templates/telemeta_default/registration/password_reset_form.html b/telemeta/templates/telemeta_default/registration/password_reset_form.html new file mode 100644 index 00000000..9003af5e --- /dev/null +++ b/telemeta/templates/telemeta_default/registration/password_reset_form.html @@ -0,0 +1,19 @@ +{% extends "telemeta/base.html" %} +{% load i18n %} + +{% block breadcrumbs %}
{% trans 'Home' %} › {% trans 'Password reset' %}
{% endblock %} + +{% block title %}{% trans "Password reset" %}{% endblock %} + +{% block content %} + +

{% trans "Password reset" %}

+ +

{% 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 5b3aefe8..500aa278 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -215,11 +215,21 @@ urlpatterns = patterns('', url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'}, name="telemeta-login"), url(r'^logout/$', web_view.logout, name="telemeta-logout"), - + # Profile url(r'^accounts/(?P[A-Za-z0-9._-]+)/profile/$', web_view.profile_detail, name="telemeta-profile-detail"), url(r'^accounts/(?P[A-Za-z0-9._-]+)/profile/edit/$', web_view.profile_edit, name="telemeta-profile-edit"), + # 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"), + # JSON RPC url(r'^json/browse/', 'jsonrpc.views.browse', name="jsonrpc_browser"), # for the graphical browser/web console only, omissible url(r'^json/$', jsonrpc_site.dispatch, name='jsonrpc_mountpoint'), diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 97274769..90131cca 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -1092,7 +1092,7 @@ class WebView(object): def profile_edit(self, request, username, template='telemeta/profile_edit.html'): if request.user.is_staff: - user_hidden_fields = [] + user_hidden_fields = ['profile-user', 'user-password', 'user-last_login', 'user-date_joined'] else: user_hidden_fields = ['user-username', 'user-is_staff', 'profile-user', 'user-is_active', 'user-password', 'user-last_login', 'user-date_joined', 'user-groups', @@ -1118,5 +1118,5 @@ class WebView(object): user_form = UserChangeForm(instance=user, prefix='user') profile_form = UserProfileForm(instance=profile, prefix='profile') forms = [user_form, profile_form] - return render(request, template, {'forms': forms, 'usr': user, 'hidden_fields': user_hidden_fields}) + return render(request, template, {'forms': forms, 'usr': user, 'user_hidden_fields': user_hidden_fields}) -- 2.39.5
{{ field.errors }}
{% trans field.label_tag %} : {{ field }}