Redesigned the user interface #23
This commit is contained in:
parent
f7048d1e9f
commit
d93591bcb2
32 changed files with 846 additions and 1297 deletions
|
@ -1,9 +1,6 @@
|
|||
<!DOCTYPE html>
|
||||
|
||||
{% load i18n %}
|
||||
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
|
@ -13,44 +10,27 @@
|
|||
<title>{% block title %}{% endblock %}</title>
|
||||
{% block headAdditional %}{% endblock %}
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<div class="baselayout">
|
||||
|
||||
<div class="baselayout flex flex-column">
|
||||
{% include "globalmessage.html" %}
|
||||
|
||||
{% if user.is_authenticated %}
|
||||
|
||||
{% include "userpanel.html" %}
|
||||
|
||||
{% endif %}
|
||||
|
||||
<main>
|
||||
|
||||
<main class="flex flex-column">
|
||||
{% if user.is_authenticated or "accounts/login/" in request.path or "accounts/logout/" in request.path or "admin/logout/" in request.path %}
|
||||
|
||||
<div class="content">
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
|
||||
<div class="content flex flex-column">
|
||||
{% block content %}{% endblock %}
|
||||
</div>
|
||||
{% else %}
|
||||
|
||||
<div class="centeringflex">
|
||||
{% translate "An error occured. Please log out and log in again." %}
|
||||
<br>
|
||||
<a href="/accounts/logout">log out</a>
|
||||
</div>
|
||||
|
||||
<div class="flex flex-center">
|
||||
{% translate "An error occured. Please log out and log in again." %}
|
||||
<br>
|
||||
<a href="/accounts/logout">log out</a>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
</main>
|
||||
|
||||
{% include "footer.html" %}
|
||||
|
||||
</div>
|
||||
|
||||
<script src="/static/js/main.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
Loading…
Add table
Add a link
Reference in a new issue