Override all registration templates

website/templates/registration/logged_out.html

+{% extends "base.html" %}
+{% load i18n %}
+
+{% comment %}This page is automatically used by django.contrib.auth.views{% endcomment %}
+
+{% block title %}{% trans "Logout" %}{% endblock %}
+
+{% block body %}
+
+<h1>{% trans "Logout" %}</h1>
+
+<p class="text-center">{% trans "You've been logged out successfully." %}</p>
+
+<p class="text-center"><a href="{% url 'login' %}">{% trans 'Log in again' %}</a></p>
+
+{% endblock %}
\ No newline at end of file

website/templates/registration/password_change_done.html

+{% extends "base.html" %}
+{% load i18n %}
+
+{% comment %}This page is automatically used by django.contrib.auth.views{% endcomment %}
+
+{% block title %}{% trans "Password change" %}{% endblock %}
+
+{% block body %}
+
+<h1>{% trans "Password change" %}</h1>
+
+<p class="text-center">{% trans 'Your password was changed.' %}</p>
+
+{% endblock %}
\ No newline at end of file

website/templates/registration/password_change_form.html

+{% extends "base.html" %}
+{% load i18n %}
+
+{% comment %}This page is automatically used by django.contrib.auth.views{% endcomment %}
+
+{% block title %}{% trans "Password change" %}{% endblock %}
+
+{% block body %}
+
+<h1>{% trans "Password change" %}</h1>
+
+{% for error in form.errors.items %}
+        {% for message in error.1 %}
+            <div class="alert alert-error">
+                {{ message }}
+                <button type="button" class="close"><span class="alert-icon-close"></span></button>
+            </div>
+    {% endfor %}
+{% endfor %}
+
+<p class="text-center">{% 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." %}</p>
+
+<form method="post" class="span6 offset3 form-horizontal">
+    {% csrf_token %}
+
+    <div class="control-group">
+        <input name="{{ form.old_password.name }}" type="password" autofocus class="form-control" placeholder="{% trans "Old password" %}">
+    </div>
+
+    <div class="control-group">
+        <input name="{{ form.new_password1.name }}" type="password" autofocus class="form-control" placeholder="{% trans "New password" %}">
+        {% if form.new_password1.help_text %}
+        <span class="help-block">{{ form.new_password1.help_text|safe }}</span>
+        {% endif %}
+    </div>
+
+    <div class="control-group">
+        <input name="{{ form.new_password2.name }}" type="password" autofocus class="form-control" placeholder="{% trans "Confirm new password" %}">
+        {% if form.new_password2.help_text %}
+        <span class="help-block">{{ form.new_password2.help_text|safe }}</span>
+        {% endif %}
+    </div>
+
+    <input type="submit" value="{% trans 'Change my password' %}" class="btn btn-primary btn-style1 pull-right login" />
+
+</form>
+
+{% endblock %}
\ No newline at end of file

website/templates/registration/password_reset_complete.html

+{% extends "base.html" %}
+{% load i18n %}
+
+{% comment %}This page is automatically used by django.contrib.auth.views{% endcomment %}
+
+{% block title %}{% trans "Forgot password" %}{% endblock %}
+
+{% block body %}
+
+<h1>{% trans "Forgot password" %}</h1>
+
+<p class="text-center">{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
+
+<p class="text-center"><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
+
+{% endblock %}
\ No newline at end of file

website/templates/registration/password_reset_confirm.html

+{% extends "base.html" %}
+{% load i18n %}
+
+{% comment %}This page is automatically used by django.contrib.auth.views{% endcomment %}
+
+{% block title %}{% trans "Forgot password" %}{% endblock %}
+
+{% block body %}
+
+<h1>{% trans "Forgot password" %}</h1>
+
+{% if validlink %}
+
+{% for error in form.errors.items %}
+        {% for message in error.1 %}
+            <div class="alert alert-error">
+                {{ message }}
+                <button type="button" class="close"><span class="alert-icon-close"></span></button>
+            </div>
+    {% endfor %}
+{% endfor %}
+
+<p class="text-center">{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
+
+<div class="row">
+    <form method="post" class="span6 offset3 form-horizontal">
+        {% csrf_token %}
+
+        <div class="control-group">
+            <input name="{{ form.new_password1.name }}" autofocus type="password" class="form-control" placeholder="{% trans "New password" %}">
+        </div>
+
+        <div class="control-group">
+            <input name="{{ form.new_password2.name }}" type="password" class="form-control" placeholder="{% trans "Confirm password" %}">
+        </div>
+
+        <input type="submit" value="{% trans 'Change my password' %}" class="btn btn-primary btn-style1 pull-right login" />
+    </form>
+</div>
+
+{% else %}
+
+<p class="text-center">{% trans "The password reset link was invalid, possibly because it has already been used.  Please request a new password reset." %}</p>
+
+{% endif %}
+
+{% endblock %}
\ No newline at end of file

website/templates/registration/password_reset_done.html

+{% extends "base.html" %}
+{% load i18n %}
+
+{% comment %}This page is automatically used by django.contrib.auth.views{% endcomment %}
+
+{% block title %}{% trans "Forgot password" %}{% endblock %}
+
+{% block body %}
+
+<h1>{% trans "Forgot password" %}</h1>
+
+<p class="text-center">{% trans "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly." %}</p>
+
+<p class="text-center">{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}</p>
+
+{% endblock %}
\ No newline at end of file

website/templates/registration/password_reset_email.html

+{% load i18n %}{% autoescape off %}
+{% blocktrans %}You're receiving this email because you requested a password reset for your Thalia-account.{% endblocktrans %}
+
+{% trans "Please go to the following page and choose a new password:" %}
+{% block reset_link %}
+{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
+{% endblock %}
+{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
+{% endautoescape %}
\ No newline at end of file

website/templates/registration/password_reset_form.html

+{% extends "base.html" %}
+{% load i18n %}
+
+{% comment %}This page is automatically used by django.contrib.auth.views{% endcomment %}
+
+{% block title %}{% trans "Forgot password" %}{% endblock %}
+
+{% block body %}
+<h1>{% trans "Forgot password" %}</h1>
+
+{% for error in form.errors.items %}
+        {% for message in error.1 %}
+            <div class="alert alert-error">
+                {{ message }}
+                <button type="button" class="close"><span class="alert-icon-close"></span></button>
+            </div>
+    {% endfor %}
+{% endfor %}
+
+<p class="text-center">{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}</p>
+
+<div class="row">
+    <form method="post" action="{% url 'password_reset' %}" class="span6 offset3 form-horizontal">
+        {% csrf_token %}
+
+        <div class="control-group">
+            <input name="{{ form.email.name }}" autofocus class="form-control" placeholder="{% trans "Email address" %}">
+        </div>
+
+        <div class="control-group">
+            <input type="submit" value="{% trans 'Reset my password' %}" class="btn btn-primary btn-style1 pull-right login" />
+        </div>
+    </form>
+</div>
+{% endblock %}
\ No newline at end of file

website/templates/registration/password_reset_subject.txt

+{% load i18n %}{% autoescape off %}
+{% blocktrans %}[THALIA] Password reset request{% endblocktrans %}
+{% endautoescape %}
\ No newline at end of file

website/thaliawebsite/locale/nl/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-12 17:08+0200\n"
-"PO-Revision-Date: 2016-09-12 17:08+0200\n"
+"POT-Creation-Date: 2016-09-14 21:07+0200\n"
+"PO-Revision-Date: 2016-09-14 21:10+0200\n"
 "Last-Translator: Joost Rijneveld <joost@joostrijneveld.nl>\n"
 "Language-Team: \n"
 "Language: nl\n"
@@ -180,7 +180,21 @@ msgstr "Fout"
 msgid "An error occurred."
 msgstr "Er is een fout opgetreden."
 
+#: templates/registration/logged_out.html:7
+#: templates/registration/logged_out.html:11
+msgid "Logout"
+msgstr "Uitloggen"
+
+#: templates/registration/logged_out.html:13
+msgid "You've been logged out successfully."
+msgstr "Je bent succesvol uitgelogd."
+
+#: templates/registration/logged_out.html:15
+msgid "Log in again"
+msgstr "Opnieuw inloggen"
+
 #: templates/registration/login.html:10
+#: templates/registration/password_reset_complete.html:15
 msgid "Log in"
 msgstr "Inloggen"
 
@@ -209,9 +223,118 @@ msgid "Password"
 msgstr "Wachtwoord"
 
 #: templates/registration/login.html:47
+#: templates/registration/password_reset_complete.html:7
+#: templates/registration/password_reset_complete.html:11
+#: templates/registration/password_reset_confirm.html:7
+#: templates/registration/password_reset_confirm.html:11
+#: templates/registration/password_reset_done.html:7
+#: templates/registration/password_reset_done.html:11
+#: templates/registration/password_reset_form.html:7
+#: templates/registration/password_reset_form.html:10
 msgid "Forgot password"
 msgstr "Wachtwoord vergeten"
 
+#: templates/registration/password_change_done.html:7
+#: templates/registration/password_change_done.html:11
+#: templates/registration/password_change_form.html:7
+#: templates/registration/password_change_form.html:11
+msgid "Password change"
+msgstr "Wachtwoord aanpassen"
+
+#: templates/registration/password_change_done.html:13
+msgid "Your password was changed."
+msgstr "Je wachtwoord is aangepast."
+
+#: templates/registration/password_change_form.html:22
+msgid ""
+"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."
+msgstr ""
+
+#: templates/registration/password_change_form.html:28
+msgid "Old password"
+msgstr "Oud wachtwoord"
+
+#: templates/registration/password_change_form.html:32
+#: templates/registration/password_reset_confirm.html:31
+msgid "New password"
+msgstr "Nieuw wachtwoord"
+
+#: templates/registration/password_change_form.html:39
+msgid "Confirm new password"
+msgstr "Bevestig nieuw wachtwoord"
+
+#: templates/registration/password_change_form.html:45
+#: templates/registration/password_reset_confirm.html:38
+msgid "Change my password"
+msgstr "Wijzig mijn wachtwoord"
+
+#: templates/registration/password_reset_complete.html:13
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:24
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+
+#: templates/registration/password_reset_confirm.html:35
+msgid "Confirm password"
+msgstr "Bevestig wachtwoord"
+
+#: templates/registration/password_reset_confirm.html:44
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+
+#: templates/registration/password_reset_done.html:13
+msgid ""
+"We've emailed you instructions for setting your password, if an account "
+"exists with the email you entered. You should receive them shortly."
+msgstr ""
+
+#: templates/registration/password_reset_done.html:15
+msgid ""
+"If you don't receive an email, please make sure you've entered the address "
+"you registered with, and check your spam folder."
+msgstr ""
+
+#: templates/registration/password_reset_email.html:2
+msgid ""
+"You're receiving this email because you requested a password reset for your "
+"Thalia-account."
+msgstr ""
+"Je ontvangt deze e-mail omdat je een nieuw wachtwoord hebt aangevraagd voor "
+"je Thalia-account."
+
+#: templates/registration/password_reset_email.html:4
+msgid "Please go to the following page and choose a new password:"
+msgstr ""
+
+#: templates/registration/password_reset_email.html:8
+msgid "Your username, in case you've forgotten:"
+msgstr ""
+
+#: templates/registration/password_reset_form.html:21
+msgid ""
+"Forgotten your password? Enter your email address below, and we'll email "
+"instructions for setting a new one."
+msgstr ""
+
+#: templates/registration/password_reset_form.html:28
+msgid "Email address"
+msgstr "E-mailadres"
+
+#: templates/registration/password_reset_form.html:32
+msgid "Reset my password"
+msgstr "Wachtwoord vergeten"
+
+#: templates/registration/password_reset_subject.txt:2
+msgid "[THALIA] Password reset request"
+msgstr "[THALIA] Verzoek tot wachtwoord herstel"
+
 #: templates/singlepages/become_a_member.html:7
 msgid ""
 "Thalia is the study association for Computing Science and Information "

website/thaliawebsite/static/css/skin.less

@@ -227,6 +227,14 @@ body {
         }
     }
 
+    .help-block {
+
+        ul {
+            margin: 0px;
+        }
+
+    }
+
     /* -------------------------------------------------------------------------------- /
         [8.1] CONTENT COMMON
     / -------------------------------------------------------------------------------- */