From 65f25a31b0a4f819bbaab733041e5d94addfb967 Mon Sep 17 00:00:00 2001 From: Nikolai Kristiansen Date: Wed, 25 Dec 2013 20:44:03 +0100 Subject: [PATCH] Adds registration templates --- duskenweb/templates/base.html | 6 ++- .../templates/registration/logged_out.html | 11 ++++++ duskenweb/templates/registration/login.html | 6 ++- .../registration/password_change_done.html | 10 +++++ .../registration/password_change_form.html | 36 ++++++++++++++++++ .../registration/password_reset_complete.html | 9 +++++ .../registration/password_reset_confirm.html | 38 +++++++++++++++++++ .../registration/password_reset_done.html | 9 +++++ .../registration/password_reset_email.html | 2 + .../registration/password_reset_form.html | 29 ++++++++++++++ .../registration/password_reset_subject.txt | 1 + duskenweb/views.py | 12 +++--- 12 files changed, 159 insertions(+), 10 deletions(-) create mode 100644 duskenweb/templates/registration/logged_out.html create mode 100644 duskenweb/templates/registration/password_change_done.html create mode 100644 duskenweb/templates/registration/password_change_form.html create mode 100644 duskenweb/templates/registration/password_reset_complete.html create mode 100644 duskenweb/templates/registration/password_reset_confirm.html create mode 100644 duskenweb/templates/registration/password_reset_done.html create mode 100644 duskenweb/templates/registration/password_reset_email.html create mode 100644 duskenweb/templates/registration/password_reset_form.html create mode 100644 duskenweb/templates/registration/password_reset_subject.txt diff --git a/duskenweb/templates/base.html b/duskenweb/templates/base.html index 85d6a02..00ec745 100644 --- a/duskenweb/templates/base.html +++ b/duskenweb/templates/base.html @@ -22,8 +22,10 @@ - {% block content %} - {% endblock %} +
+ {% block content %} + {% endblock %} +
diff --git a/duskenweb/templates/registration/logged_out.html b/duskenweb/templates/registration/logged_out.html new file mode 100644 index 0000000..5445f17 --- /dev/null +++ b/duskenweb/templates/registration/logged_out.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} + +{% block title %}Logget ut{% endblock %} + +{% block content %} +
+
+ Du har blitt logget ut, vil du logge inn igjen? +
+
+{% endblock %} diff --git a/duskenweb/templates/registration/login.html b/duskenweb/templates/registration/login.html index c9b2cfb..f7d78d8 100644 --- a/duskenweb/templates/registration/login.html +++ b/duskenweb/templates/registration/login.html @@ -1,6 +1,8 @@ {% extends "base.html" %} {% block content %} -
- {% include "registration/login_form.html" %} +
+
+ {% include "registration/login_form.html" %} +
{% endblock %} diff --git a/duskenweb/templates/registration/password_change_done.html b/duskenweb/templates/registration/password_change_done.html new file mode 100644 index 0000000..1f38907 --- /dev/null +++ b/duskenweb/templates/registration/password_change_done.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block title %}Passord endret{% endblock %} +{% block content %} +
+
+ Passordet ditt er endret og kan med en gang brukes på våre tjenester.
+ Du kan nå gå tilbake til din profil. +
+
+{% endblock %} diff --git a/duskenweb/templates/registration/password_change_form.html b/duskenweb/templates/registration/password_change_form.html new file mode 100644 index 0000000..ca33a28 --- /dev/null +++ b/duskenweb/templates/registration/password_change_form.html @@ -0,0 +1,36 @@ +{% extends "base.html" %} +{% block title %}Endre passordet ditt{% endblock %} +{%block header%} + {% include "nav.html" with active="password_change" %} +{%endblock%} +{% block content %} +
+
+
+
+ Endre passordet mitt. + {% if form.non_field_errors %} + {{ form.non_field_errors }}
+ {% endif %} + {% csrf_token %} +
+ +
+ {{ form.new_password1 }} {{ form.new_password1.errors }} +
+
+
+ +
+ {{ form.new_password2 }} {{ form.new_password2.errors }} +
+
+
+ Avbryt +
+
+
+
+
+{% endblock %} + diff --git a/duskenweb/templates/registration/password_reset_complete.html b/duskenweb/templates/registration/password_reset_complete.html new file mode 100644 index 0000000..2a2598b --- /dev/null +++ b/duskenweb/templates/registration/password_reset_complete.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} +{% block title %}Passordendring vellykket{% endblock %} +{% block content %} +
+
+ Strålende, passordet ditt har blitt endret! Du kan nå forsøke å logge inn med ditt nye passord. +
+
+{% endblock %} diff --git a/duskenweb/templates/registration/password_reset_confirm.html b/duskenweb/templates/registration/password_reset_confirm.html new file mode 100644 index 0000000..d2c0a0a --- /dev/null +++ b/duskenweb/templates/registration/password_reset_confirm.html @@ -0,0 +1,38 @@ +{% extends "base.html" %} +{% block title %}Bekreft nytt passord{% endblock %} +{% block content %} +
+
+ + {% if validlink %} + Vennligst velg et nytt passord. Ditt nye passord må være på miminum 8 tegn. +
+
+ Endre passordet mitt. + {{ form.non_field_errors }} + {% csrf_token %} +
+ +
+ {{ form.new_password1 }}{{ form.new_password1.errors }} +
+
+
+ +
+ {{ form.new_password2 }}{{ form.new_password2.errors }} +
+
+
+ +
+
+
+ {% else %} + Nytt-passord-lenken er ikke gyldig eller har allerede blitt brukt. + + {% endif %} +
+
+ +{% endblock %} diff --git a/duskenweb/templates/registration/password_reset_done.html b/duskenweb/templates/registration/password_reset_done.html new file mode 100644 index 0000000..1c5fd3e --- /dev/null +++ b/duskenweb/templates/registration/password_reset_done.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} +{% block title %}Passordmail er sent{% endblock %} +{% block content %} +
+
+ Vi har nå sendt deg en epost med informasjon om hvordan du kan velge et nytt passord. Sjekk eposten din. +
+
+{% endblock %} diff --git a/duskenweb/templates/registration/password_reset_email.html b/duskenweb/templates/registration/password_reset_email.html new file mode 100644 index 0000000..48bc121 --- /dev/null +++ b/duskenweb/templates/registration/password_reset_email.html @@ -0,0 +1,2 @@ +Noen har bedt om at passordet for brukeren {{ user.username }} med epostadresse {{ email }} skal endres. Vennligst følg lenken nedenfor for å sette et nytt passord: +{{ protocol }}://{{ site_name }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid token=token %} diff --git a/duskenweb/templates/registration/password_reset_form.html b/duskenweb/templates/registration/password_reset_form.html new file mode 100644 index 0000000..ccea958 --- /dev/null +++ b/duskenweb/templates/registration/password_reset_form.html @@ -0,0 +1,29 @@ +{% extends "base.html" %} +{% block title %}Få nytt passord{% endblock %} +{% block content %} +
+
+ For å få tilsendt passord og brukernavn fyll ut epostadressen din. + +
+
+ Gi meg et nytt passord + {% if form.non_field_errors %} + {{ form.non_field_errors }}
+ {% endif %} + {% csrf_token %} +
+ +
+ {{ form.email }} {{ form.email.errors }} +
+
+
+ Avbryt +
+
+
+
+
+{% endblock %} + diff --git a/duskenweb/templates/registration/password_reset_subject.txt b/duskenweb/templates/registration/password_reset_subject.txt new file mode 100644 index 0000000..4425ca8 --- /dev/null +++ b/duskenweb/templates/registration/password_reset_subject.txt @@ -0,0 +1 @@ +[Duskenweb] Reset password diff --git a/duskenweb/views.py b/duskenweb/views.py index e3e363a..1b9f587 100644 --- a/duskenweb/views.py +++ b/duskenweb/views.py @@ -5,21 +5,21 @@ from django.views import generic from . import user_api_conn # Note: initialized in __init__.py -def home(request): +def home(request, template_name='index.html'): if request.user.is_authenticated(): return redirect('profile') - return render(request, 'index.html') + return render(request, template_name) @login_required -def profile(request): - return render(request, 'profile.html') +def profile(request, template_name='profile.html'): + return render(request, template_name) @login_required -def members_list(request): +def members_list(request, template_name='members_index.html'): # TODO put these two lines somewhere else, on authenticate? if not user_api_conn.is_authenticated() and request.user.duskenaccesstoken: user_api_conn.set_access_token(request.user.duskenaccesstoken.access_token) members_list = user_api_conn.members.get_list() - return render(request, 'members_index.html', locals()) + return render(request, template_name, locals())