TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch feature-refactor-login

Browse Source
This commit is contained in:
Jan Tuomi
2018-01-10 19:54:08 +02:00
parent 9973057051 935f7a38f1
commit a4367bbc9d
5 changed files with 36 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/login.html
+20 -25
View File
@@ -2,30 +2,25 @@
{% load i18n %}
{% block content %}
<div class="container">
<div class="d-flex justify-content-center">
<h1>SIK Admin</h1>
</div>
<div class="d-flex justify-content-center">
<form method="POST" class="form-horizontal" action=""> {% csrf_token %}
<div class="form-group">
<label for="input-username" class="col-sm-2 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-sm-2 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>
<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 %}
templates/login_base.html
+2 -1
View File
@@ -5,12 +5,13 @@
{% block body %}
{% block header %}
<link rel="stylesheet" href="{% static "css/login.css" %}" />
<div class="header">
{% include "sik_header.html" %}
</div>
{% endblock %}
<div class="page-content">
<div class="login container">
{% block content %}
{% endblock %}
</div>
templates/password_reset/recovery_form.html
+7 -7
View File
@@ -1,12 +1,12 @@
{% extends "password_reset/base.html" %}
{% load i18n %}
{% block title %}{% trans "Password recovery" %}{% endblock %}
{% load bootstrap3 %}
{% block content %}
<form method="post" action="{{ url }}">
{% csrf_token %}
{{ form.as_p }}
<p><input type="submit" value="{% trans "Send" %}"></p>
</form>
<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 %}