Added route prefix support.

This commit is contained in:
mihasinkec
2022-11-06 13:51:12 +01:00
parent f671c365a3
commit 10e8116d83
12 changed files with 227 additions and 218 deletions

View File

@@ -3,10 +3,10 @@
<head>
<meta charset="UTF-8">
<title>Admin panel - Š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">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/header.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/form.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/simple-grid.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/manage-institution.css" type="text/css">
<style>
.tableFixHead {
overflow-y: scroll;
@@ -35,16 +35,16 @@
</head>
<body>
<header>
<div class="logo"><a href="../"><img src="../static/image/logo-white.svg"/></a></div>
<div class="logo"><a href="{{ROUTE_PREFIX}}/"><img src="{{ROUTE_PREFIX}}/static/image/logo-white.svg"/></a></div>
<div class="menu-items">
{% if is_institution_coordinator %}
<a href="../manage-institution">Upravljaj z institucijo</a>
<a href="{{ROUTE_PREFIX}}/manage-institution">Upravljaj z institucijo</a>
{% endif %}
{% if is_admin %}
<a href="../admin">Administracijski meni</a>
<a href="{{ROUTE_PREFIX}}/admin">Administracijski meni</a>
{% endif %}
<a href="https://slovenscina.eu/" target="_blank">Več informacij</a>
<a href="../logout">Odjava</a>
<a href="{{ROUTE_PREFIX}}/logout">Odjava</a>
</div>
</header>
<div class="container" style="margin-top:8rem;">
@@ -82,7 +82,7 @@
</table>
</div>
<h3>Dodaj uporabnika</h3>
<form action="../adduser" method="post">
<form action="{{ROUTE_PREFIX}}/adduser" method="post">
<label for="name">Ime in priimek:</label><br>
<input type="text" id="name" name="name"><br>
<label for="email">Email:</label><br>
@@ -92,7 +92,7 @@
<input type="submit" value="Dodaj">
</form>
<h3>Spremeni email uporabnika</h3>
<form action="../changeuseremail" method="post">
<form action="{{ROUTE_PREFIX}}/changeuseremail" method="post">
<label for="user-id">ID uporabnika:</label><br>
<input type="text" id="user-id" name="user-id"><br>
<label for="email">Nov email:</label><br>
@@ -100,7 +100,7 @@
<input type="submit" value="Spremeni">
</form>
<h3>Spremeni ime in priimek uporabnika</h3>
<form action="../changeusername" method="post">
<form action="{{ROUTE_PREFIX}}/changeusername" method="post">
<label for="user-id">ID uporabnika:</label><br>
<input type="text" id="user-id" name="user-id"><br>
<label for="name">Ime in priimek:</label><br>
@@ -108,13 +108,13 @@
<input type="submit" value="Spremeni">
</form>
<h3>Odstrani uporabnika</h3>
<form action="../deluser" method="post">
<form action="{{ROUTE_PREFIX}}/deluser" method="post">
<label for="user_id">ID uporabnika:</label><br>
<input type="text" id="user_id" name="user_id"><br>
<input type="submit" value="Odstrani">
</form>
<h3>Dodeli uporabnika instituciji</h3>
<form action="../addusertoinstitution" method="post">
<form action="{{ROUTE_PREFIX}}/addusertoinstitution" method="post">
<label for="user_id">ID uporabnika:</label>
<input type="text" id="user_id" name="user_id"><br>
<label for="institution_id">ID institucije:</label>
@@ -128,13 +128,13 @@
<input type="submit" value="Dodeli">
</form>
<h3>Odstrani uporabnika iz institucije</h3>
<form action="../deluserfrominstitution" method="post">
<form action="{{ROUTE_PREFIX}}/deluserfrominstitution" method="post">
<label for="user_id">ID uporabnika:</label>
<input type="text" id="user_id" name="user_id"><br>
<input type="submit" value="Odstrani">
</form>
<h3>Spremeni vlogo uporabniškega računa</h3>
<form action="../changeuserrole" method="post">
<form action="{{ROUTE_PREFIX}}/changeuserrole" method="post">
<label for="user-id">ID uporabnika:</label>
<input type="text" id="user-id" name="user-id"><br>
<label for="role">Vloga:</label>
@@ -166,7 +166,7 @@
<td>{{item[1].institution}}</td>
<td>{{item[1].role}}</td>
<td>
<form action="../activateuser" method="post">
<form action="{{ROUTE_PREFIX}}/activateuser" method="post">
<input type="hidden" id="id" name="id" value="{{item[0].id}}">
<input type="submit" value="Aktiviraj">
</form>
@@ -179,7 +179,7 @@
<div> </div>
<h2>Institucije</h2>
<h3>Dodaj institucijo</h3>
<form action="../addinstitution" method="post">
<form action="{{ROUTE_PREFIX}}/addinstitution" method="post">
<label for="name">Naziv:</label>
<input type="text" id="name" name="name"><br>
<label for="region">Regija:</label>
@@ -219,7 +219,7 @@
</table>
</div>
<h3>Združi instituciji</h3>
<form action="../mergeinstitutions" method="post">
<form action="{{ROUTE_PREFIX}}/mergeinstitutions" method="post">
<label for="id-from">Institucijo z ID</label>
<input type="text" id="id-from" name="id-from">
<label for="id-to">združi v institucijo z ID</label>
@@ -227,7 +227,7 @@
<input type="submit" value="Združi">
</form>
<h3>Spremeni podatke institucije</h3>
<form action="../changeinstitutiondata" method="post">
<form action="{{ROUTE_PREFIX}}/changeinstitutiondata" method="post">
<label for="id">ID institucije</label>
<input type="text" id="id" name="id"><br>
<label for="name">Nov naziv:</label>
@@ -249,7 +249,7 @@
<input type="submit" value="Spremeni">
</form>
<h3>Odstrani vnos</h3>
<form action="../delcooperationhistoryitem" method="post">
<form action="{{ROUTE_PREFIX}}/delcooperationhistoryitem" method="post">
<label for="entry-id">ID vnosa</label>
<input type="text" id="entry-id" name="entry-id"><br>
<input type="submit" value="Odstrani">
@@ -295,7 +295,7 @@
</table>
</div>
<h3>Posodobi podatke nalaganja</h3>
<form action="../updateuploaditem" method="post">
<form action="{{ROUTE_PREFIX}}/updateuploaditem" method="post">
<label for="item-id">ID nalaganja</label>
<input type="text" id="item-id" name="item-id"/><br>
<label for="program">Program</label>

View File

@@ -3,20 +3,20 @@
<head>
<meta charset="UTF-8">
<title>Portal ŠOLAR</title>
<link rel="stylesheet" href="../static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="../static/css/utils.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/utils.css" type="text/css">
</head>
<body>
<div class="background">
<div class="panel login-panel">
<div class="panel-logo">
<img src="../static/image/logo.svg" alt="logo"/>
<img src="{{ROUTE_PREFIX}}/static/image/logo.svg" alt="logo"/>
</div>
<h1 class="m-b-3">Pozabljeno geslo - ŠOLAR</h1>
<div>
<form method="POST" action="../sendresetpass" class="m-b-2">
<form method="POST" action="{{ROUTE_PREFIX}}/sendresetpass" class="m-b-2">
<div class="input-wrapper">
<img src="../static/image/user.svg" alt="user" class="input-icon"/>
<img src="{{ROUTE_PREFIX}}/static/image/user.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>E-mail</label>
<input type="text" name="email">
@@ -28,15 +28,15 @@
{% with messages = get_flashed_messages() %}
{% if messages %}
<div class="alert alert-success">
<img src="../static/image/success.svg" alt="alert"/>
<img src="{{ROUTE_PREFIX}}/static/image/success.svg" alt="alert"/>
<p>{{ messages[0] }}</p>
</div>
{% endif %}
{% endwith %}
<div class="back-to-login">
<img src="../static/image/chevron-left.svg"/>
<a href="../login">Nazaj na prijavo</a>
<img src="{{ROUTE_PREFIX}}/static/image/chevron-left.svg"/>
<a href="{{ROUTE_PREFIX}}/login">Nazaj na prijavo</a>
</div>
</div>
</div>

View File

@@ -3,14 +3,14 @@
<head>
<meta charset="UTF-8">
<title>Portal ŠOLAR</title>
<link rel="stylesheet" href="../static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="../static/css/utils.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/utils.css" type="text/css">
</head>
<body>
<div class="background">
<div class="panel login-panel">
<div class="panel-logo">
<img src="../static/image/logo.svg" alt="logo"/>
<img src="{{ROUTE_PREFIX}}/static/image/logo.svg" alt="logo"/>
</div>
<h2 class="text-center">Portal za oddajanje besedil</h2>
<div class="line"></div>
@@ -23,41 +23,41 @@
{% if messages %}
{% if "potrditev" in messages[0] or "uspešna" in messages[0] %}
<div class="alert alert-success">
<img src="../static/image/success.svg" alt="alert"/>
<img src="{{ROUTE_PREFIX}}/static/image/success.svg" alt="alert"/>
<p>{{ messages[0] }}</p>
</div>
{% else %}
<div class="alert">
<img src="../static/image/alert.svg" alt="alert"/>
<img src="{{ROUTE_PREFIX}}/static/image/alert.svg" alt="alert"/>
<p>{{ messages[0] }}</p>
</div>
{% endif %}
{% endif %}
{% endwith %}
<div>
<form method="POST" action="../login" class="m-b-2">
<form method="POST" action="{{ROUTE_PREFIX}}/login" class="m-b-2">
<div class="input-wrapper">
<img src="../static/image/user.svg" alt="user" class="input-icon"/>
<img src="{{ROUTE_PREFIX}}/static/image/user.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>E-mail</label>
<input type="text" name="email">
</div>
</div>
<div class="input-wrapper">
<img src="../static/image/password.svg" alt="user" class="input-icon"/>
<img src="{{ROUTE_PREFIX}}/static/image/password.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Geslo</label>
<input type="password" name="password">
</div>
</div>
<a href="../forgotpass" class="a-right m-b-1">Pozabljeno geslo</a>
<a href="{{ROUTE_PREFIX}}/forgotpass" class="a-right m-b-1">Pozabljeno geslo</a>
<button class="btn" style="margin-left: 46px;">PRIJAVA</button>
</form>
</div>
<a href="../register" class="register-button">
<img src="../static/image/register.svg" alt="register"/>
<a href="{{ROUTE_PREFIX}}/register" class="register-button">
<img src="{{ROUTE_PREFIX}}/static/image/register.svg" alt="register"/>
<h3>Registracija</h3>
<p>Še nimate uporabniškega računa? Registrirajte se!</p>
</a>

View File

@@ -3,26 +3,26 @@
<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/slovenscina-admin.css" type="text/css">
<link rel="stylesheet" href="../static/css/manage-institution.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/header.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/form.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/simple-grid.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/slovenscina-admin.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/manage-institution.css" type="text/css">
</head>
<body>
<header>
<div class="logo"><a href="../"><img src="../static/image/logo-white.svg"/></a></div>
<div class="logo"><a href="{{ROUTE_PREFIX}}/"><img src="{{ROUTE_PREFIX}}/static/image/logo-white.svg"/></a></div>
<div class="menu-items">
{% if is_institution_coordinator %}
<a href="../manage-institution">Upravljaj z institucijo</a>
<a href="{{ROUTE_PREFIX}}/manage-institution">Upravljaj z institucijo</a>
{% endif %}
{% if is_admin %}
<a href="../admin">Administracijski meni</a>
<a href="{{ROUTE_PREFIX}}/admin">Administracijski meni</a>
{% endif %}
<a href="https://slovenscina.eu/" target="_blank">Več informacij</a>
<a href="../logout">Odjava</a>
<a href="{{ROUTE_PREFIX}}/logout">Odjava</a>
</div>
</header>
<div class="container" style="margin-top:8rem;">
@@ -55,7 +55,7 @@
<a href="javascript:void(0);" onclick="toggleEditForm(this)" class="toggle-edit-role">Spremeni</a>
{{role_map[item.id]}}
</div>
<form action="../changeuserrole-institution" method="post" style="display:none;">
<form action="{{ROUTE_PREFIX}}/changeuserrole-institution" method="post" style="display:none;">
<input type="hidden" id="user-id" name="user-id" value="{{item.id}}"/>
<select class="role" name="role">
<option value="coordinator">Koordinator/-ka</option>
@@ -66,7 +66,7 @@
</form>
</td>
<td>
<form action="../deluserfrominstitution" method="post">
<form action="{{ROUTE_PREFIX}}/deluserfrominstitution" method="post">
<input type="hidden" id="user_id" name="user_id" value="{{item.id}}">
<input type="submit" value="Odstrani uporabnika">
</form>

View File

@@ -3,23 +3,23 @@
<head>
<meta charset="UTF-8">
<title>Portal za oddajanje besedil</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/utils.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/header.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/form.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/simple-grid.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/utils.css" type="text/css">
</head>
<body>
<header>
<div class="logo"><a href="../"><img src="../static/image/logo-white.svg"/></a></div>
<div class="logo"><a href="{{ROUTE_PREFIX}}/"><img src="{{ROUTE_PREFIX}}/static/image/logo-white.svg"/></a></div>
<div class="menu-items">
{% if is_institution_coordinator %}
<a href="../manage-institution">Upravljaj z institucijo</a>
<a href="{{ROUTE_PREFIX}}/manage-institution">Upravljaj z institucijo</a>
{% endif %}
{% if is_admin %}
<a href="../admin">Administracijski meni</a>
<a href="{{ROUTE_PREFIX}}/admin">Administracijski meni</a>
{% endif %}
<a href="https://slovenscina.eu/" target="_blank">Več informacij</a>
<a href="../logout">Odjava</a>
<a href="{{ROUTE_PREFIX}}/logout">Odjava</a>
</div>
</header>
<div class="container" style="margin-top:8rem;">
@@ -30,9 +30,9 @@
<div class="tab-nav">
<a href="../oddaja" class="active">Oddaja besedil</a>
<a href="../zgodovina">Zgodovina sodelovanja</a>
<a href="../pogodbe">Ekipa</a>
<a href="{{ROUTE_PREFIX}}/oddaja" class="active">Oddaja besedil</a>
<a href="{{ROUTE_PREFIX}}/zgodovina">Zgodovina sodelovanja</a>
<a href="{{ROUTE_PREFIX}}/pogodbe">Ekipa</a>
</div>
</div>
</div>
@@ -43,21 +43,21 @@
<div class="col-6">
{% if not institution %}
<div class="alert">
<img src="../static/image/alert.svg" alt="alert"/>
<img src="{{ROUTE_PREFIX}}/static/image/alert.svg" alt="alert"/>
<p>Niste član nobene institucije!</p>
</div>
{% elif not institution_contract %}
<!--<div class="alert">
<img src="../static/image/alert.svg" alt="alert"/>
<img src="{{ROUTE_PREFIX}}/static/image/alert.svg" alt="alert"/>
<p>Pogodba s šolo še ni naložena!</p>
</div>-->
{% endif %}
<div class="alert" id="error-message">
<img src="../static/image/alert.svg" alt="alert"/>
<img src="{{ROUTE_PREFIX}}/static/image/alert.svg" alt="alert"/>
<p></p>
</div>
<div class="alert alert-success" id="success-message">
<img src="../static/image/success.svg" alt="alert"/>
<img src="{{ROUTE_PREFIX}}/static/image/success.svg" alt="alert"/>
<p></p>
</div>
</div>
@@ -271,7 +271,7 @@
<!--{{ dropzone.load_js() }}-->
<script src="../static/dropzone.js"></script>
<script src="{{ROUTE_PREFIX}}/static/dropzone.js"></script>
<script>
/////////////////////////
// Dropzone //
@@ -340,7 +340,7 @@
Dropzone.options.myDropzone = { // The camelized version of the ID of the form element
url: "../upload",
url: "{{ROUTE_PREFIX}}/upload",
autoProcessQueue: false,
uploadMultiple: true,
parallelUploads: 20,

View File

@@ -3,23 +3,23 @@
<head>
<meta charset="UTF-8">
<title>Portal za oddajanje besedil</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/contracts.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/header.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/form.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/simple-grid.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/contracts.css" type="text/css">
</head>
<body>
<header>
<div class="logo"><a href="../"><img src="../static/image/logo-white.svg"/></a></div>
<div class="logo"><a href="{{ROUTE_PREFIX}}/"><img src="{{ROUTE_PREFIX}}/static/image/logo-white.svg"/></a></div>
<div class="menu-items">
{% if is_institution_coordinator %}
<a href="../manage-institution">Upravljaj z institucijo</a>
<a href="{{ROUTE_PREFIX}}/manage-institution">Upravljaj z institucijo</a>
{% endif %}
{% if is_admin %}
<a href="../admin">Administracijski meni</a>
<a href="{{ROUTE_PREFIX}}/admin">Administracijski meni</a>
{% endif %}
<a href="https://slovenscina.eu/" target="_blank">Več informacij</a>
<a href="../logout">Odjava</a>
<a href="{{ROUTE_PREFIX}}/logout">Odjava</a>
</div>
</header>
<div class="container" style="margin-top:8rem;">
@@ -29,9 +29,9 @@
<p class="subtitle"></p>
<div class="tab-nav">
<a href="../oddaja">Oddaja besedil</a>
<a href="../zgodovina">Zgodovina sodelovanja</a>
<a href="../pogodbe" class="active">Ekipa</a>
<a href="{{ROUTE_PREFIX}}/oddaja">Oddaja besedil</a>
<a href="{{ROUTE_PREFIX}}/zgodovina">Zgodovina sodelovanja</a>
<a href="{{ROUTE_PREFIX}}/pogodbe" class="active">Ekipa</a>
</div>
</div>
</div>

View File

@@ -3,15 +3,15 @@
<head>
<meta charset="UTF-8">
<title>Portal ŠOLAR</title>
<link rel="stylesheet" href="../static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="../static/css/utils.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/utils.css" type="text/css">
</head>
<body>
<div class="background">
<div class="panel login-panel">
<div class="panel-logo">
<img src="../static/image/logo.svg" alt="logo"/>
<img src="{{ROUTE_PREFIX}}/static/image/logo.svg" alt="logo"/>
</div>
<h2 class="text-center">Portal za oddajanje besedil</h2>
<div class="line"></div>
@@ -23,29 +23,29 @@
{% with messages = get_flashed_messages() %}
{% if messages %}
<div class="alert">
<img src="../static/image/alert.svg" alt="alert"/>
<img src="{{ROUTE_PREFIX}}/static/image/alert.svg" alt="alert"/>
<p>{{ messages[0] }}</p>
</div>
{% endif %}
{% endwith %}
<div>
<form method="POST" action="../register" class="m-b-2">
<form method="POST" action="{{ROUTE_PREFIX}}/register" class="m-b-2">
<div class="input-wrapper">
<img src="../static/image/user.svg" alt="user" class="input-icon"/>
<img src="{{ROUTE_PREFIX}}/static/image/user.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Ime in priimek</label>
<input type="name" name="name" autofocus="">
</div>
</div>
<div class="input-wrapper">
<img src="../static/image/user.svg" alt="user" class="input-icon"/>
<img src="{{ROUTE_PREFIX}}/static/image/user.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Email</label>
<input type="email" name="email">
</div>
</div>
<div class="input-wrapper">
<img src="../static/image/password.svg" alt="user" class="input-icon"/>
<img src="{{ROUTE_PREFIX}}/static/image/password.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Geslo</label>
<input type="password" name="password">
@@ -53,14 +53,14 @@
</div>
</div>
<div class="input-wrapper">
<img src="../static/image/user.svg" alt="user" class="input-icon"/>
<img src="{{ROUTE_PREFIX}}/static/image/user.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Naziv institucije</label>
<input type="institution" name="institution">
</div>
</div>
<div class="input-wrapper">
<img src="../static/image/password.svg" alt="user" class="input-icon"/>
<img src="{{ROUTE_PREFIX}}/static/image/password.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Vloga v instituciji</label>
<select id="role" name="role" >
@@ -75,8 +75,8 @@
</div>
<div class="back-to-login">
<img src="../static/image/chevron-left.svg"/>
<a href="../login">Nazaj na prijavo</a>
<img src="{{ROUTE_PREFIX}}/static/image/chevron-left.svg"/>
<a href="{{ROUTE_PREFIX}}/login">Nazaj na prijavo</a>
</div>

View File

@@ -3,20 +3,20 @@
<head>
<meta charset="UTF-8">
<title>Portal ŠOLAR</title>
<link rel="stylesheet" href="../static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="../static/css/utils.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/utils.css" type="text/css">
</head>
<body>
<div class="background">
<div class="panel login-panel">
<div class="panel-logo">
<img src="../static/image/logo.svg" alt="logo"/>
<img src="{{ROUTE_PREFIX}}/static/image/logo.svg" alt="logo"/>
</div>
<h1 class="m-b-3">Ponastavitev gesla - ŠOLAR</h1>
<div>
<form method="POST" action="" class="m-b-2">
<div class="input-wrapper">
<img src="../static/image/password.svg" alt="user" class="input-icon"/>
<img src="{{ROUTE_PREFIX}}/static/image/password.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Novo geslo</label>
<input type="password" name="new_password">
@@ -29,7 +29,7 @@
{% with messages = get_flashed_messages() %}
{% if messages %}
<div class="alert">
<img src="../static/image/alert.svg" alt="alert"/>
<img src="{{ROUTE_PREFIX}}/static/image/alert.svg" alt="alert"/>
<p>{{ messages[0] }}</p>
</div>
{% endif %}

View File

@@ -3,25 +3,25 @@
<head>
<meta charset="UTF-8">
<title>Portal za oddajanje besedil</title>
<!--<link rel="stylesheet" href="../static/style.css" type="text/css">-->
<script src="../static/chart.js"></script>
<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/history.css" type="text/css">
<!--<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/style.css" type="text/css">-->
<script src="{{ROUTE_PREFIX}}/static/chart.js"></script>
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/header.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/form.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/simple-grid.css" type="text/css">
<link rel="stylesheet" href="{{ROUTE_PREFIX}}/static/css/history.css" type="text/css">
</head>
<body>
<header>
<div class="logo"><a href="../"><img src="../static/image/logo-white.svg"/></a></div>
<div class="logo"><a href="{{ROUTE_PREFIX}}/"><img src="{{ROUTE_PREFIX}}/static/image/logo-white.svg"/></a></div>
<div class="menu-items">
{% if is_institution_coordinator %}
<a href="../manage-institution">Upravljaj z institucijo</a>
<a href="{{ROUTE_PREFIX}}/manage-institution">Upravljaj z institucijo</a>
{% endif %}
{% if is_admin %}
<a href="../admin">Administracijski meni</a>
<a href="{{ROUTE_PREFIX}}/admin">Administracijski meni</a>
{% endif %}
<a href="https://slovenscina.eu/" target="_blank">Več informacij</a>
<a href="../logout">Odjava</a>
<a href="{{ROUTE_PREFIX}}/logout">Odjava</a>
</div>
</header>
<div class="container" style="margin-top:8rem;">
@@ -32,9 +32,9 @@
<div class="tab-nav">
<a href="../oddaja">Oddaja besedil</a>
<a href="../zgodovina" class="active">Zgodovina sodelovanja</a>
<a href="../pogodbe">Ekipa</a>
<a href="{{ROUTE_PREFIX}}/oddaja">Oddaja besedil</a>
<a href="{{ROUTE_PREFIX}}/zgodovina" class="active">Zgodovina sodelovanja</a>
<a href="{{ROUTE_PREFIX}}/pogodbe">Ekipa</a>
</div>
</div>
</div>
@@ -133,7 +133,7 @@
<div class="history-item-date">Dodano {{ item.timestamp.strftime('%d. %m. %Y') }}</div>
<div class="history-item-uploader">{{ uploader_names[loop.index - 1] }}</div>
<div class="history-item-filecount">Št. datotek: {{ item.upload_file_hashes|length }}</div>
<div class="history-item-chevron"><img src="../static/image/chevron-down.svg"/></div>
<div class="history-item-chevron"><img src="{{ROUTE_PREFIX}}/static/image/chevron-down.svg"/></div>
<div class="history-item-desc">
{{ item_values | join(" | ") |truncate(120) }}
</div>
@@ -150,7 +150,7 @@
{% if item.upload_file_names != None %}
{% for f_name in item.upload_file_names %}
<div class="file-item">
<div class="file-icon"><img src="../static/image/file.svg"/></div>
<div class="file-icon"><img src="{{ROUTE_PREFIX}}/static/image/file.svg"/></div>
<a href="getuploadfile/{{item.id}}/{{item.upload_file_hashes[loop.index - 1]}}" class="file-name" {% if item.upload_file_codes != None %}download="{{item.upload_file_codes[loop.index - 1]}}.{{f_name.split('.')[1]}}"{%endif%}>
{% if item.upload_file_codes != None %}
{{item.upload_file_codes[loop.index - 1]}}.{{f_name.split('.')[1]}}
@@ -167,7 +167,7 @@
{% else %}
{% for f_hash in item.upload_file_hashes %}
<div class="file-item">
<div class="file-icon"><img src="../static/image/file.svg"/></div>
<div class="file-icon"><img src="{{ROUTE_PREFIX}}/static/image/file.svg"/></div>
<a href="getuploadfile/{{item.id}}/{{f_hash}}" class="file-name">{{f_hash}}</a>
</div>
{% endfor %}