Remove password_reset and own login, redirect to admin/login

Django admin login to be used. Thus we should be able to upgrade to
Django2.0
This commit is contained in:
Aarni Halinen
2018-07-17 20:58:13 +03:00
parent cc3aa66e49
commit 11b6e68fe1
20 changed files with 40 additions and 165 deletions
-30
View File
@@ -1,30 +0,0 @@
{% extends "webapp:base.html" %}
{% load i18n %}
{% load static %}
{% block navigation %}
{% endblock navigation %}
{% block content %}
<h1>SIK Admin</h1>
<form method="POST" class="form-horizontal" action=""> {% csrf_token %}
<div class="form-group">
<label for="input-username" class="col-form-label">{% trans "Username" %}</label>
<input type="text" name="username" id="input-username" class="form-control" placeholder="{% trans "Username" %}"></input>
</div>
<div class="form-group">
<label for="input-password" class="col-form-label">{% trans "Password" %}</label>
<input type="password" name="passwd" id="input-passwd" class="form-control" placeholder="{% trans "Password" %}"></input>
</div>
<div class="form-group">
<a href={% url "password_reset_recover" %}>{% trans "Forgot password?" %}</a>
</div>
<div class="form-group">
<div class="text-danger">{{ error }}</div>
</div>
<div class="form-group" id="login-button">
<button type="submit" class="btn btn-primary">{% trans "Log in" %}</button>
</div>
</form>
</div>
{% endblock content %}
-1
View File
@@ -1 +0,0 @@
{% extends "login.html" %}
@@ -1,8 +0,0 @@
{% extends "password_reset/base.html" %}{% load i18n %}
{% block title %}{% trans "New password set" %}{% endblock %}
{% block content %}
<p>{% trans "Your password has successfully been reset. You can use it right now on the login page." %}</p>
<p><a href="/login">Log in</a></p>
{% endblock %}
@@ -1,12 +0,0 @@
{% extends "password_reset/base.html" %}
{% load i18n %}
{% load bootstrap3 %}
{% block content %}
<h1>{% trans "Password recovery" %}</h1>
<form method="post" action="{{ url }}">
{% csrf_token %}
{% bootstrap_form form %}
<p><input class="btn btn-primary" type="submit" value="{% trans "Send" %}"></p>
</form>
{% endblock %}
-14
View File
@@ -1,14 +0,0 @@
{% extends "password_reset/base.html" %}{% load i18n %}
{% block content %}
{% if invalid %}{% url "password_reset_recover" as recovery_url %}
<p>{% blocktrans %}Sorry, this password reset link is invalid. You can still <a href="{{ recovery_url }}">request a new one</a>.{% endblocktrans %}</p>
{% else %}
<p>{% blocktrans %}Hi, <strong>{{ username }}</strong>. Please choose your new password.{% endblocktrans %}</p>
<form method="post" action="{% url "password_reset_reset" token %}">
{% csrf_token %}
{{ form.as_p }}
<p><input type="submit" value="{% trans "Set new password" %}"></p>
</form>
{% endif %}
{% endblock %}
-15
View File
@@ -1,15 +0,0 @@
{% autoescape off %}
You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.
Please go to the following page and choose a new password:
{% block reset_link %}
{{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid, token=token %}
{% endblock %}
Your username, in case you've forgotten: {{ user.username }}
Thanks for using our site!
The {{ site_name }} team.
{% endautoescape %}
-8
View File
@@ -1,8 +0,0 @@
{% extends "password_reset/base.html" %}
{% load i18n %}
{% block title %}{% trans "Password recovery sent" %}{% endblock %}
{% block content %}
<p>{% blocktrans with ago=timestamp|timesince %}An email was sent to <strong>{{ email }}</strong> {{ ago }} ago. Use the link in it to set a new password.{% endblocktrans %}</p>
{% endblock %}