This form will blacklist the listed user below. It'll process all entries for the user and blacklist the following:
{% with account.username as username %}
- Thank you for registering!
- From now on, you can login with your username ({{ username }}).
-
- Back
- {% endwith %}
-
Thanks {{ account }}, activation complete! You may now login using the username and password you set at registration.
{% else %} -Either the link was invalid, or you didn't activate your account within {{ expiration_days }} days after the registration. Please register again.
+Oops – it seems that your activation key is invalid. Please check the url again.
{% endif %} - {% endblock %} diff --git a/app/templates/registration/activation_complete.html b/app/templates/registration/activation_complete.html new file mode 100644 index 0000000..e1848f8 --- /dev/null +++ b/app/templates/registration/activation_complete.html @@ -0,0 +1,7 @@ +{% extends "registration/registration_base.html" %} +{% block title %}Activation complete{% endblock %} +{% block content %} +Thanks, activation complete! You may now login using the username and password you set at registration.
+{% endblock %} + + diff --git a/app/templates/registration/activation_email.txt b/app/templates/registration/activation_email.txt index 0bd80f5..617f2a3 100644 --- a/app/templates/registration/activation_email.txt +++ b/app/templates/registration/activation_email.txt @@ -1,13 +1,11 @@ -{% load i18n %} -Hello, +You (or someone pretending to be you) have asked to register an account at +{{ site.name }}. If this wasn't you, please ignore this email +and your address will be removed from our records. -someone registered to {{ site }} and specified this EMail address. If this is correct, please follow this link to activate the account: +To activate this account, please click the following link within the next +{{ expiration_days }} days: -https://{{ site|slice:":-1" }}{% url registration_activate activation_key=activation_key %} +http://{{site.domain}}/activate/{{ activation_key }} -In case you didn't register, please ignore this Mail. The account will be deleted in {{ expiration_days }} days and you will not receive any more mail from us. - -Regards, - -Matalok -Auth Gateway Admin +Sincerely, +{{ site.name }} Management diff --git a/app/templates/registration/activation_email_subject.txt b/app/templates/registration/activation_email_subject.txt index 6044b1c..13912aa 100644 --- a/app/templates/registration/activation_email_subject.txt +++ b/app/templates/registration/activation_email_subject.txt @@ -1 +1 @@ -Dreddit Auth Gateway Account Validation +Account registration for {{ site.name }} diff --git a/app/templates/registration/login.html b/app/templates/registration/login.html index af54457..0594cbf 100644 --- a/app/templates/registration/login.html +++ b/app/templates/registration/login.html @@ -1,37 +1,27 @@ -{% extends "base.html" %} - +{% extends "registration/registration_base.html" %} +{% block title %}Login{% endblock %} {% block content %} -{% load i18n %} -{% block HeadTag %} - -{% endblock %} - -{% block Content %} - -Username or password don't exist or are not correct. Please try again.
+Your username and password didn't match. Please try again.
{% endif %} -Thank you for visiting. -
+Successfully logged out!
{% endblock %} diff --git a/app/templates/registration/password_change_done.html b/app/templates/registration/password_change_done.html new file mode 100644 index 0000000..d010f27 --- /dev/null +++ b/app/templates/registration/password_change_done.html @@ -0,0 +1,6 @@ +{% extends "registration/registration_base.html" %} +{% block title %}Password changed{% endblock %} +{% block content %} +Password successfully changed!
+{% endblock %} + diff --git a/app/templates/registration/password_change_form.html b/app/templates/registration/password_change_form.html new file mode 100644 index 0000000..9a0648a --- /dev/null +++ b/app/templates/registration/password_change_form.html @@ -0,0 +1,11 @@ +{% extends "registration/registration_base.html" %} +{% block title %}Change password{% endblock %} +{% block content %} + +{% endblock %} diff --git a/app/templates/registration/password_reset_complete.html b/app/templates/registration/password_reset_complete.html new file mode 100644 index 0000000..25b40da --- /dev/null +++ b/app/templates/registration/password_reset_complete.html @@ -0,0 +1,5 @@ +{% extends "registration/registration_base.html" %} +{% block title %}Password reset complete{% endblock %} +{% block content %} +Your password has been reset! You may now log in.
+{% endblock %} diff --git a/app/templates/registration/password_reset_confirm.html b/app/templates/registration/password_reset_confirm.html new file mode 100644 index 0000000..071886a --- /dev/null +++ b/app/templates/registration/password_reset_confirm.html @@ -0,0 +1,12 @@ +{% extends "registration/registration_base.html" %} +{% block title %}Confirm password reset{% endblock %} +{% block content %} +Enter your new password below to reset your password:
+ +{% endblock %} diff --git a/app/templates/registration/password_reset_done.html b/app/templates/registration/password_reset_done.html new file mode 100644 index 0000000..47a8c49 --- /dev/null +++ b/app/templates/registration/password_reset_done.html @@ -0,0 +1,8 @@ +{% extends "registration/registration_base.html" %} +{% block title %}Password reset{% endblock %} +{% block content %} ++We have sent you an email with a link to reset your password. Please check +your email and click the link to continue. +
+{% endblock %} diff --git a/app/templates/registration/password_reset_email.html b/app/templates/registration/password_reset_email.html new file mode 100644 index 0000000..16a38d5 --- /dev/null +++ b/app/templates/registration/password_reset_email.html @@ -0,0 +1,13 @@ +Greetings {{ user }}, + +You are receiving this email because you (or someone pretending to be you) +requested that your password be reset on {{ site.name }}. If you do not +wish to reset your password, please ignore this message. + +To reset your password, please click the following link, or copy and paste it +into your web browser: + +{{ protocol }}://{{ domain }}{% url auth_password_reset_confirm uid token %} + +Best regards, +{{ site_name }} Management diff --git a/app/templates/registration/password_reset_form.html b/app/templates/registration/password_reset_form.html new file mode 100644 index 0000000..723f773 --- /dev/null +++ b/app/templates/registration/password_reset_form.html @@ -0,0 +1,13 @@ +{% extends "registration/registration_base.html" %} +{% block title %}Reset password{% endblock %} +{% block content %} +Forgot your password? Enter your email in the form below and we'll send you +instructions for creating a new one.
+ +{% endblock %} diff --git a/app/templates/registration/registration_base.html b/app/templates/registration/registration_base.html new file mode 100644 index 0000000..94d9808 --- /dev/null +++ b/app/templates/registration/registration_base.html @@ -0,0 +1 @@ +{% extends "base.html" %} diff --git a/app/templates/registration/registration_complete.html b/app/templates/registration/registration_complete.html index 59880a9..f026a47 100644 --- a/app/templates/registration/registration_complete.html +++ b/app/templates/registration/registration_complete.html @@ -1,10 +1,6 @@ -{% extends "base.html" %} - -{% load i18n %} - +{% extends "registration/registration_base.html" %} +{% block title %}Activation email sent{% endblock %} {% block content %} -Thank you for registering. -In order to prohibit misuse, you need to activate your account before you can use it. We sent an EMail with further instructions to the address you specified, please follow the link in that email to activate your account. -
+An activation email has been sent. Please check your email and click on the link to activate your account.
{% endblock %} diff --git a/app/templates/registration/registration_form.html b/app/templates/registration/registration_form.html index e7f3632..a20c123 100644 --- a/app/templates/registration/registration_form.html +++ b/app/templates/registration/registration_form.html @@ -1,19 +1,15 @@ -{% extends "base.html" %} - -{% load i18n %} - -{% block title %}Create Account{% endblock %} - +{% extends "registration/registration_base.html" %} +{% block title %}Register for an account{% endblock %} {% block content %} -Please fill in the following form.
- - {% endblock %}