design updates

This commit is contained in:
Leon Noe Jovan
2021-12-04 18:49:20 +01:00
parent b927a032f8
commit 5242985df1
12 changed files with 231 additions and 28 deletions

View File

@@ -3,6 +3,10 @@
<head>
<meta charset="UTF-8">
<title>Upravljanje institucije - Šolar</title>
<link rel="stylesheet" href="/static/css/header.css" type="text/css">
<link rel="stylesheet" href="/static/css/form.css" type="text/css">
<link rel="stylesheet" href="/static/css/simple-grid.css" type="text/css">
<link rel="stylesheet" href="/static/css/manage-institution.css" type="text/css">
<style>
.tableFixHead {
overflow-y: scroll;
@@ -30,6 +34,21 @@
</style>
</head>
<body>
<header>
<div class="logo"><a href="/"><img src="/static/image/logo-white.svg"/></a></div>
<div class="menu-items">
<a href="../logout">Odjava</a>
{% if is_institution_coordinator %}
<a href="../manage-institution">Upravljaj z institucijo</a>
{% endif %}
{% if is_admin %}
<a href="../admin">Administracijski meni</a>
{% endif %}
<a href="../oddaja">Oddaja</a>
<a href="mailto:email@example.com">Pomoč</a>
</div>
</header>
<div class="container" style="margin-top:8rem;">
<a href="../oddaja">Nazaj na oddajo</a>
{% with messages = get_flashed_messages() %}
{% if messages %}
@@ -99,4 +118,5 @@
<input type="submit" value="Odstrani">
</form>
<div> </div>
</div>
</body>

View File

@@ -129,7 +129,6 @@
<div class="row">
<div class="col-6">
{% for collaborator in collaborators %}
<div class="collaborators-item">
<div class="collaborators-item-name">{{collaborator.name}}</div>
{% if collaborator.id in cooperation_history %}

View File

@@ -13,6 +13,16 @@
<body>
<header>
<div class="logo"><a href="/"><img src="/static/image/logo-white.svg"/></a></div>
<div class="menu-items">
<a href="../logout">Odjava</a>
{% if is_institution_coordinator %}
<a href="../manage-institution">Upravljaj z institucijo</a>
{% endif %}
{% if is_admin %}
<a href="../admin">Administracijski meni</a>
{% endif %}
<a href="mailto:email@example.com">Pomoč</a>
</div>
</header>
<div class="container" style="margin-top:8rem;">
<div class="row">
@@ -104,21 +114,30 @@
<div class="history-item-desc">
{{ item_values | join(" | ") }}
</div>
<div class="history-item-desc-full">
{% for v in item_values %}
{{v}}<br>
{% endfor %}
<div class="row">
<div class="col-6" style="margin:0">
<div class="history-item-desc-full">
{% for v in item_values %}
{{v}}<br>
{% endfor %}
</div>
</div>
<div class="col-6" style="margin:0">
<div class="history-item-files-full">
{% for f in item.upload_file_hashes %}
<div class="file-item">
<div class="file-icon"><img src="/static/image/file.svg"/></div>
<div class="file-name">Datoteka 1</div>
</div>
{% endfor %}
</div>
</div>
</div>
</div>
</div>
</div>
{% endfor %}
</div>
@@ -130,14 +149,7 @@
<a href="../logout">Odjavi se</a>
{% if is_institution_coordinator %}
<br><a href="../manage-institution">Upravljaj z institucijo</a>
{% endif %}
{% if is_admin %}
<br><a href="../admin">Administracijski meni</a>
{% endif %}
<br><a href="mailto:email@example.com">Pomoč</a>
<!--<div class="bg"></div>
<div id="main-window">
<div id="rect1">