This commit is contained in:
Leon Noe Jovan
2021-11-17 20:18:28 +01:00
parent 32fa0ad3a9
commit 37e227138a
16 changed files with 278 additions and 241 deletions

View File

@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Portal ŠOLAR</title>
<link rel="stylesheet" href="/static/css/styles.css" type="text/css">
<link rel="stylesheet" href="/static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="/static/css/utils.css" type="text/css">
</head>
<body>
@@ -18,8 +18,8 @@
<div class="input-wrapper">
<img src="../static/image/user.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>E-mail</label>
<input type="text" name="email">
<span class="floating-label">E-mail</span>
</div>
</div>

View File

@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Portal ŠOLAR</title>
<link rel="stylesheet" href="/static/css/styles.css" type="text/css">
<link rel="stylesheet" href="/static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="/static/css/utils.css" type="text/css">
</head>
<body>
@@ -19,27 +19,6 @@
<div class="text-center m-b-3"><em>Zbiranje besedil za korpus Šolar poteka po naslednjem postopku, ki prinaša tudi točke za napredovanje.</em></div>
<h1 class="m-b-3">Prijava</h1>
<div>
<form method="POST" action="../login" class="m-b-2">
<div class="input-wrapper">
<img src="../static/image/user.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<input type="text" name="email">
<span class="floating-label">E-mail</span>
</div>
</div>
<div class="input-wrapper">
<img src="../static/image/password.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<input type="password" name="password">
<span class="floating-label">Geslo</span>
</div>
</div>
<a href="../forgotpass" class="a-right m-b-1">Pozabljeno geslo</a>
<button class="btn" style="margin-left: 46px;">PRIJAVA</button>
</form>
</div>
{% with messages = get_flashed_messages() %}
{% if messages %}
<div class="alert">
@@ -48,6 +27,28 @@
</div>
{% endif %}
{% endwith %}
<div>
<form method="POST" action="../login" class="m-b-2">
<div class="input-wrapper">
<img src="../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"/>
<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>
<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"/>
<h3>Registracija</h3>

View File

@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>Portal ŠOLAR</title>
<link rel="stylesheet" href="/static/css/styles.css" type="text/css">
<link rel="stylesheet" href="/static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="/static/css/utils.css" type="text/css">
</head>
<body>
@@ -25,40 +25,40 @@
<div class="input-wrapper">
<img src="../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="">
<span class="floating-label">Ime in priimek</span>
</div>
</div>
<div class="input-wrapper">
<img src="../static/image/user.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Email</label>
<input type="email" name="email">
<span class="floating-label">Email</span>
</div>
</div>
<div class="input-wrapper">
<img src="../static/image/password.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Geslo</label>
<input type="password" name="password">
<span class="floating-label">Geslo</span>
</div>
</div>
<div class="input-wrapper">
<img src="../static/image/user.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Naziv institucije</label>
<input type="institution" name="institution">
<span class="floating-label">Naziv institucije</span>
</div>
</div>
<div class="input-wrapper">
<img src="../static/image/password.svg" alt="user" class="input-icon"/>
<div class="input-floating-label">
<label>Vloga v instituciji</label>
<select id="role" name="role" >
<option value="coordinator">Koordinator/-ka</option>
<option value="mentor">Mentor/-ica</option>
<option value="other">Druga vloga</option>
</select>
<span class="floating-label">Vloga v instituciji</span>
</div>
</div>
<button class="btn" style="margin-left: 46px;">REGISTRACIJA</button>

View File

@@ -3,36 +3,37 @@
<head>
<meta charset="UTF-8">
<title>Portal ŠOLAR</title>
<link rel="stylesheet" href="/static/style.css" type="text/css">
<link rel="stylesheet" href="/static/css/login-styles.css" type="text/css">
<link rel="stylesheet" href="/static/css/utils.css" type="text/css">
</head>
<body>
<div id="main-window">
<div id="rect1">
<div style="padding: 50px;">
<div id="logo-container">
<img src="/static/image/logo.svg" alt="logo"/>
</div>
<h3 id="title" style="font-size: 27px; text-align: left;">Ponastavitev gesla - ŠOLAR</h3>
<div>
{% with messages = get_flashed_messages() %}
{% if messages %}
<div>
{{ messages[0] }}
</div>
{% endif %}
{% endwith %}
<form method="POST" action="">
<div>
<div>
<input type="password" name="new_password" placeholder="Novo geslo">
</div>
</div>
<button class="button-general" style="margin-top: 20px;">PONASTAVI</button>
</form>
</div>
</div>
<div class="background">
<div class="panel login-panel">
<div class="panel-logo">
<img src="/static/image/logo.svg" alt="logo"/>
</div>
<div id="rect2" class="mock-side">
<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"/>
<div class="input-floating-label">
<label>Novo geslo</label>
<input type="password" name="new_password">
</div>
</div>
<button class="btn" style="margin-left: 46px;">Ponastavi</button>
</form>
{% with messages = get_flashed_messages() %}
{% if messages %}
<div class="alert">
<img src="../static/image/alert.svg" alt="alert"/>
<p>{{ messages[0] }}</p>
</div>
{% endif %}
{% endwith %}
</div>
</div>
</div>
</body>