init commit of new design
This commit is contained in:
Leon Noe Jovan
@@ -3,38 +3,39 @@
|
||||
<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/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>
|
||||
<a href="../login" class="contract-item-button" style="float: none;">Nazaj na prijavo</a>
|
||||
<h3 id="title" style="font-size: 27px; text-align: left;">Pozabljeno geslo - ŠOLAR</h3>
|
||||
<div>
|
||||
{% with messages = get_flashed_messages() %}
|
||||
{% if messages %}
|
||||
<div>
|
||||
{{ messages[0] }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
<form method="POST" action="../sendresetpass">
|
||||
<div>
|
||||
<div>
|
||||
<input type="email" name="email" placeholder="Email" autofocus="">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<button class="button-general" style="margin-top: 20px;">Pošlji</button>
|
||||
</form>
|
||||
</div>
|
||||
<div class="background">
|
||||
<div class="panel login-panel">
|
||||
<div class="panel-logo">
|
||||
<img src="/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">
|
||||
<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>
|
||||
|
||||
<button class="btn" style="margin-left: 46px;">Pošlji</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 id="rect2" class="mock-side">
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
|
||||
|
||||
@@ -3,63 +3,57 @@
|
||||
<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/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: 25px;">
|
||||
<div id="logo-container">
|
||||
<img src="/static/image/logo.svg" alt="logo"/>
|
||||
</div>
|
||||
<h1 id="title">Portal za oddajanje besedil</h1>
|
||||
<h2 id="subtitle">Korpus Šolar</h2>
|
||||
|
||||
<div class="form-text"><em>Zbiranje besedil za korpus Šolar poteka po naslednjem postopku, ki prinaša tudi točke za napredovanje.</em></div>
|
||||
|
||||
<h3 id="title" style="font-size: 27px; text-align: left;">Prijava</h3>
|
||||
|
||||
<div>
|
||||
{% with messages = get_flashed_messages() %}
|
||||
{% if messages %}
|
||||
<div>
|
||||
{{ messages[0] }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
<form method="POST" action="../login">
|
||||
<div>
|
||||
<div>
|
||||
<img src="../static/image/user.png" alt="user" style="float: left; width: 10%;"/>
|
||||
<input type="email" name="email" placeholder="Email" autofocus=""
|
||||
style="float: right; width: 85%; margin-bottom: 20px; margin-top: 10px;">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div>
|
||||
<img src="/static/image/password.png" alt="user" style="float: left; width: 10%; margin-top: 20px;"/>
|
||||
<input type="password" name="password" placeholder="Geslo"
|
||||
style="float: right; width: 85%; margin-bottom: 20px; margin-top: 10px;">
|
||||
</div>
|
||||
</div>
|
||||
<button class="button-general" style="margin-top: 30px; margin-bottom: 20px;">PRIJAVA</button>
|
||||
</form>
|
||||
<a href="../forgotpass" class="contract-item-button">Pozabljeno geslo</a>
|
||||
<a href="../register" class="contract-item-button"
|
||||
style="-webkit-appearance: button;
|
||||
-moz-appearance: button;
|
||||
appearance: button;
|
||||
margin-top: 80px;
|
||||
text-decoration: none;
|
||||
color: #46535b;
|
||||
width: 100%;"
|
||||
><img src="../static/image/register.png" alt="user" style="float: left; width: 15%; margin-right: 25px;"/>
|
||||
Registracija<br><div style="font-size: 11px; margin-top: 10px;">Še nimate uporabniškega računa? Registrirajte se!</div></a>
|
||||
</div>
|
||||
<div class="background">
|
||||
<div class="panel login-panel">
|
||||
<div class="panel-logo">
|
||||
<img src="/static/image/logo.svg" alt="logo"/>
|
||||
</div>
|
||||
</div>
|
||||
<div id="rect2" class="mock-side">
|
||||
<h2 class="text-center">Portal za oddajanje besedil</h2>
|
||||
<div class="line"></div>
|
||||
<h1 class="text-center">Korpus ŠOLAR</h1>
|
||||
|
||||
<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">
|
||||
<img src="/static/image/alert.svg" alt="alert"/>
|
||||
<p>{{ messages[0] }}</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
<a href="../register" class="register-button">
|
||||
<img src="../static/image/register.svg" alt="register"/>
|
||||
<h3>Registracija</h3>
|
||||
<p>Še nimate uporabniškega računa? Registrirajte se!</p>
|
||||
</a>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
@@ -3,31 +3,246 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Portal za oddajanje besedil</title>
|
||||
<!--{{ dropzone.load_css() }}-->
|
||||
<link rel="stylesheet" href="/static/dropzone.css" type="text/css">
|
||||
{{ dropzone.style('position: absolute;
|
||||
top: -0.5px;
|
||||
width: 388px;
|
||||
height: 732px;
|
||||
left: 385px;
|
||||
background: linear-gradient(198.62deg, rgba(255, 255, 255, 0.49) -1.62%, rgba(255, 255, 255, 0.73) -1.61%, rgba(255, 255, 255, 0.41) 79.34%);
|
||||
box-shadow: 20px 4px 40px rgba(0, 0, 0, 0.25);
|
||||
border: 0px;
|
||||
backdrop-filter: blur(20px);
|
||||
border-radius: 0px 20px 20px 0px;') }}
|
||||
<link rel="stylesheet" href="/static/style.css" type="text/css">
|
||||
<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">
|
||||
</head>
|
||||
<body>
|
||||
<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">
|
||||
<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">
|
||||
<div class="col-12">
|
||||
<h1 class="title">Koprus SOLAR</h1>
|
||||
<p class="subtitle">Zbiranje besedil za korpus Šolar poteka po naslednjem postopku, ki prinaša tudi točke za napredovanje.</p>
|
||||
|
||||
|
||||
<div class="tab-nav">
|
||||
<a href="/oddaja" class="active">Oddaja</a>
|
||||
<a href="/zgodovina">Zgodovina</a>
|
||||
<a href="/pogodbe">Pogodbe</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
{% if not institution %}
|
||||
<div class="alert">
|
||||
<img src="/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"/>
|
||||
<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"/>
|
||||
<p></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<form id="form-oddaja">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper">
|
||||
<label>Program</label>
|
||||
<select id="program" name="program">
|
||||
<option value="OS" selected="selected">Osnovnošolski (OŠ)</option>
|
||||
<option value="SSG">Splošna in strokovna gimnazija (SGG)</option>
|
||||
<option value="MGP">Mednarodni gimnazijski programi (MGP)</option>
|
||||
<option value="ZG">Zasebne gimnazije (ZG)</option>
|
||||
<option value="NPI">Nižje poklicno izobraževanje (NPI)</option>
|
||||
<option value="SPI">Srednje poklicno izobraževanje (SPI)</option>
|
||||
<option value="SSI">Srednje strokovno izobraževanje (SSI)</option>
|
||||
<option value="PTI">Poklicno-tehnično izobraževanje (PTI)</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<p>lalala</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper">
|
||||
<label for="predmet">Predmet</label>
|
||||
<select id="predmet" name="predmet">
|
||||
<option value="slo" selected="selected">Slovenščina</option>
|
||||
<option value="drug-jez">Drugi jezikoslovni predmeti</option>
|
||||
<option value="drug-druz">Drugi družboslovni predmeti</option>
|
||||
<option value="drug-narav">Drugi naravoslovni predmeti</option>
|
||||
<option value="drug-strok">Drugi strokovni predmeti</option>
|
||||
<option value="drug-izb">Drugi izbirni ali dodatni predmeti</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<p>lalala</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row set-open-transition">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper" id="predmet-custom-box">
|
||||
<label for="predmet-custom">Ime predmeta:</label>
|
||||
<input type="text" id="predmet-custom" name="predmet-custom"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<p>lalala</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper">
|
||||
<label for="letnik">Letnik</label>
|
||||
<select id="letnik" name="letnik">
|
||||
<option value="1" selected="selected">1</option>
|
||||
<option value="2">2</option>
|
||||
<option value="3">3</option>
|
||||
<option value="4">4</option>
|
||||
<option value="5">5</option>
|
||||
<option value="6">6</option>
|
||||
<option value="7">7</option>
|
||||
<option value="8">8</option>
|
||||
<option value="9">9</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<p>lalala</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper" >
|
||||
<label for="vrsta">Vrsta besedila</label>
|
||||
<select id="vrsta" name="vrsta">
|
||||
<option value="esej-spis" selected="selected">Esej ali spis</option>
|
||||
<option value="prakticno">Praktično besedilo (npr. vabila, prošnje ipd. pri pouku slovenščine), napisano za oceno</option>
|
||||
<option value="solski-test">Šolski test</option>
|
||||
<option value="delo-v-razredu">Delo v razredu, ne za oceno</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<p>lalala</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row set-open-transition">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper" id="vrsta-custom-box">
|
||||
<label for="vrsta-custom">Vtipkajte besedilno vrsto:</label>
|
||||
<input type="text" id="vrsta-custom" name="vrsta-custom"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<p>lalala</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper">
|
||||
<label for="solsko-leto">Šolsko leto</label>
|
||||
<select id="solsko-leto" name="solsko-leto">
|
||||
<option value="20-21" selected="selected">2020/21</option>
|
||||
<option value="21-22">2021/22</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<p>lalala</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper">
|
||||
<label for="jezikovni-popravki">Jezikovni popravki</label>
|
||||
<select id="jezikovni-popravki" name="jezikovni-popravki">
|
||||
<option value="popr-ne" selected="selected">Besedilo vsebuje učiteljske popravke in strinjam se z njihovo vključitvijo v korpus</option>
|
||||
<option value="brez-popr">Besedilo ne vsebuje učiteljskih popravkov</option>
|
||||
<option value="popr-da">Besedilo vsebuje učiteljske popravke in ne strinjam se z njihovo vključitvijo v korpus</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<p>lalala</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper">
|
||||
<div id="dropzone-previews" class="dropzone-previews"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper">
|
||||
<label for="jezikovni-popravki">Datoteka</label>
|
||||
<div id="my-dropzone" class="dropzone"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<p>lalala</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<div class="form-wrapper">
|
||||
<button id="button-submit" type="submit" class="btn">Oddaj</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row submit-alert" id="data-confirm-notification">
|
||||
<div class="col-6">
|
||||
<button id="button-submit-final" type="submit" class="btn">Potrdi in oddaj</button>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<p>Prosimo, preverite in potrdite vnešene podatke.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
<!--
|
||||
<div id="main-window" style="margin-top:100px;">
|
||||
<div id="rect1">
|
||||
<div id="logo-container">
|
||||
<img src="/static/image/logo.svg" alt="logo"/>
|
||||
@@ -122,14 +337,8 @@
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<div id="popup-terms" style="display: none">
|
||||
<div id="popup-terms-text">
|
||||
</div>
|
||||
<button id="button-submit-cancel" class="button-terms" style="background: #ff2d2d;">Prekliči</button>
|
||||
<button id="button-submit-final" class="button-terms">Oddaj</button>
|
||||
</div>
|
||||
|
||||
<!--{{ dropzone.load_js() }}-->
|
||||
<script src="/static/dropzone.js"></script>
|
||||
@@ -142,13 +351,11 @@
|
||||
var btnSubmit = document.getElementById("button-submit");
|
||||
var btnSubmitFinal = document.getElementById("button-submit-final");
|
||||
var btnSubmitCancel = document.getElementById("button-submit-cancel");
|
||||
var btnZgodovina = document.getElementById("button-zgodovina");
|
||||
var btnPogodbe = document.getElementById("button-pogodbe");
|
||||
var elemTermsPopup = document.getElementById("popup-terms");
|
||||
var termsScrollbox = document.getElementById("popup-terms-text");
|
||||
var dataConfirmNotification = document.getElementById("data-confirm-notification");
|
||||
var scrollboxTriggered = false;
|
||||
var form = document.forms["my-dropzone"];
|
||||
var errorMessage = document.getElementById("error-message");
|
||||
var form = document.forms["form-oddaja"];
|
||||
|
||||
{% if not institution %}
|
||||
btnSubmit.disabled = true;
|
||||
@@ -158,8 +365,42 @@
|
||||
return str == null || str.match(/^ *$/) !== null;
|
||||
}
|
||||
|
||||
function showError(str) {
|
||||
errorMessage.querySelector("p").textContent = str;
|
||||
errorMessage.style.display = "block";
|
||||
window.scroll({
|
||||
top: 0,
|
||||
behavior: 'smooth'
|
||||
});
|
||||
}
|
||||
|
||||
const reEmail = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||
|
||||
|
||||
//onready
|
||||
selectPredmet.addEventListener("change", function(e) {
|
||||
var predmetCustomBox = document.getElementById("predmet-custom-box").closest('.row');
|
||||
if (selectPredmet.value.startsWith("drug")) {
|
||||
predmetCustomBox.style.maxHeight = "150px";
|
||||
} else {
|
||||
predmetCustomBox.style.maxHeight = "0px";
|
||||
}
|
||||
});
|
||||
|
||||
selectVrsta.addEventListener("change", function(e) {
|
||||
var vrstaCustomBox = document.getElementById("vrsta-custom-box").closest('.row');
|
||||
if (selectVrsta.value == "delo-v-razredu") {
|
||||
vrstaCustomBox.style.maxHeight = "150px";
|
||||
} else {
|
||||
vrstaCustomBox.style.maxHeight = "0px";
|
||||
}
|
||||
});
|
||||
var event = new CustomEvent("change");
|
||||
selectPredmet.dispatchEvent(event);
|
||||
selectVrsta.dispatchEvent(event);
|
||||
|
||||
|
||||
|
||||
Dropzone.options.myDropzone = { // The camelized version of the ID of the form element
|
||||
url: "../upload",
|
||||
autoProcessQueue: false,
|
||||
@@ -168,8 +409,9 @@
|
||||
paramName: "file", // The name that will be used to transfer the file
|
||||
maxFilesize: 1000, // MB
|
||||
timeout: 5000000, // milliseconds
|
||||
acceptedFiles: ".txt, .csv, .pdf, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .jpg, .jpeg, .png",
|
||||
acceptedFiles: ".txt, .csv, .pdf, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .jpg, .jpeg, .png, .mkv",
|
||||
maxFiles: 20,
|
||||
previewsContainer: "#dropzone-previews",
|
||||
dictDefaultMessage: `Kliknite ali odložite datoteke sem.`,
|
||||
dictFallbackMessage: "Vaš brskalnik ne podpira izbiranje datotek z odlaganjem (\"drag & drop\").",
|
||||
dictInvalidFileType: "Datoteka je napačnega formata.",
|
||||
@@ -184,24 +426,8 @@
|
||||
// The setting up of the dropzone
|
||||
init: function() {
|
||||
var dz = this;
|
||||
|
||||
selectPredmet.addEventListener("change", function(e) {
|
||||
var predmetCustomBox = document.getElementById("predmet-custom-box");
|
||||
if (selectPredmet.value.startsWith("drug")) {
|
||||
predmetCustomBox.style.display = "inherit";
|
||||
} else {
|
||||
predmetCustomBox.style.display = "none";
|
||||
}
|
||||
});
|
||||
|
||||
selectVrsta.addEventListener("change", function(e) {
|
||||
var vrstaCustomBox = document.getElementById("vrsta-custom-box");
|
||||
if (selectVrsta.value == "delo-v-razredu") {
|
||||
vrstaCustomBox.style.display = "inherit";
|
||||
} else {
|
||||
vrstaCustomBox.style.display = "none";
|
||||
}
|
||||
});
|
||||
dataConfirmNotification.style.display = "none";
|
||||
errorMessage.style.display = "none";
|
||||
|
||||
btnSubmit.addEventListener("click", function(e) {
|
||||
// Make sure that the form isn't actually being sent.
|
||||
@@ -219,18 +445,13 @@
|
||||
var jezikovniPopravki = form["jezikovni-popravki"].value;
|
||||
|
||||
if (predmet.startsWith("drug") && isEmptyOrSpaces(predmetCustom)) {
|
||||
alert("Polje za predmet ne more biti prazno!");
|
||||
showError("Polje za predmet ne more biti prazno!");
|
||||
} else if (vrsta === "delo-v-razredu" && isEmptyOrSpaces(vrstaCustom)) {
|
||||
alert("Polje za vrsto besedila ne more biti prazno!");
|
||||
showError("Polje za vrsto besedila ne more biti prazno!");
|
||||
} else if (dataConfirmNotification.style.display == "none") {
|
||||
dataConfirmNotification.style.display = "inherit";
|
||||
btnSubmit.textContent = "Potrdi";
|
||||
btnSubmit.style.display = "none";
|
||||
} else {
|
||||
// Then make terms popup visible
|
||||
//btnSubmit.disabled = true;
|
||||
//btnSubmitFinal.disabled = true;
|
||||
//elemTermsPopup.style.display = "inline";
|
||||
//scrollboxtriggered = false;
|
||||
|
||||
// Hand off data to dropzone
|
||||
dz.processQueue();
|
||||
@@ -249,32 +470,20 @@
|
||||
dz.processQueue();
|
||||
|
||||
// Clear fields and hide popup agian
|
||||
btnSubmit.disabled = false;
|
||||
elemTermsPopup.style.display = "none";
|
||||
/*btnSubmit.disabled = false;
|
||||
dataConfirmNotification.style.display = "none";
|
||||
btnSubmit.textContent = "Oddaj";
|
||||
form.reset();
|
||||
scrollboxTriggered = false;
|
||||
scrollboxTriggered = false;*/
|
||||
});
|
||||
|
||||
btnSubmitCancel.addEventListener("click", function(e) {
|
||||
/*btnSubmitCancel.addEventListener("click", function(e) {
|
||||
btnSubmit.disabled = false;
|
||||
scrollboxTriggered = false;
|
||||
elemTermsPopup.style.display = "none";
|
||||
});
|
||||
|
||||
btnZgodovina.addEventListener("click", function(e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
window.location.replace("../zgodovina");
|
||||
});
|
||||
|
||||
btnPogodbe.addEventListener("click", function(e) {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
window.location.replace("../pogodbe");
|
||||
});
|
||||
});*/
|
||||
|
||||
/*
|
||||
// Enable final submit button only if user scrolls to the end of the terms.
|
||||
function checkScrollboxTrigger(event) {
|
||||
var element = event.target;
|
||||
@@ -292,11 +501,11 @@
|
||||
|
||||
termsScrollbox.addEventListener("mouseenter", function(event) {
|
||||
checkScrollboxTrigger(event);
|
||||
});
|
||||
});*/
|
||||
|
||||
// Listen to the sendingmultiple event. In this case, it's the sendingmultiple event instead
|
||||
// of the sending event because uploadMultiple is set to true.
|
||||
this.on("sendingmultiple", function() {
|
||||
/*this.on("sendingmultiple", function() {
|
||||
// Gets triggered when the form is actually being sent.
|
||||
// Hide the success button or the complete form.
|
||||
});
|
||||
@@ -311,9 +520,33 @@
|
||||
this.on("errormultiple", function(files, response) {
|
||||
// Gets triggered when there was an error sending the files.
|
||||
// Maybe show form again, and notify user of error
|
||||
});*/
|
||||
this.on("sending", function(file, xhr, formData) {
|
||||
formData.append("program",form["program"].value);
|
||||
formData.append("predmet",form["predmet"].value);
|
||||
formData.append("predmet-custom",form["predmet-custom"].value);
|
||||
formData.append("letnik",form["letnik"].value);
|
||||
formData.append("vrsta",form["vrsta"].value);
|
||||
formData.append("vrsta-custom",form["vrsta-custom"].value);
|
||||
formData.append("solsko-leto",form["solsko-leto"].value);
|
||||
formData.append("jezikovni-popravki",form["jezikovni-popravki"].value);
|
||||
|
||||
});
|
||||
|
||||
|
||||
},
|
||||
uploadprogress: function(file, progress, bytesSent) {
|
||||
if (file.previewElement) {
|
||||
console.log(progress);
|
||||
var progressElement = file.previewElement.querySelector("[data-dz-uploadprogress]");
|
||||
progressElement.style.width = progress + "%";
|
||||
//progressElement.querySelector(".progress-text").textContent = progress + "%";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
|
||||
@@ -3,67 +3,78 @@
|
||||
<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/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 class="background">
|
||||
<div class="panel login-panel">
|
||||
<div class="panel-logo">
|
||||
<img src="/static/image/logo.svg" alt="logo"/>
|
||||
</div>
|
||||
<h2 class="text-center">Portal za oddajanje besedil</h2>
|
||||
<div class="line"></div>
|
||||
<h1 class="text-center">Korpus ŠOLAR</h1>
|
||||
|
||||
<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">Registracija</h1>
|
||||
<div>
|
||||
<form method="POST" action="../register" 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="name" name="name" autofocus="">
|
||||
<span class="floating-label">Ime in priimek</span>
|
||||
</div>
|
||||
</div>
|
||||
<h1 id="title">Portal za oddajanje besedil</h1>
|
||||
<h2 id="subtitle">Korpus Šolar</h2>
|
||||
|
||||
<div class="form-text"><em>Zbiranje besedil za korpus Šolar poteka po naslednjem postopku, ki prinaša tudi točke za napredovanje.</em></div>
|
||||
|
||||
<a href="../login" class="contract-item-button" style="float: none;">Nazaj na prijavo</a>
|
||||
<h3 id="title" style="font-size: 27px; text-align: left;">Registracija</h3>
|
||||
<div>
|
||||
{% with messages = get_flashed_messages() %}
|
||||
{% if messages %}
|
||||
<div>
|
||||
{{ messages[0] }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
<form method="POST" action="../register">
|
||||
<div>
|
||||
<div>
|
||||
<input type="name" name="name" placeholder="Ime in priimek" autofocus="">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div>
|
||||
<input type="email" name="email" placeholder="Email" autofocus="">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div>
|
||||
<input type="password" name="password" placeholder="Geslo">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div>
|
||||
<input type="institution" name="institution" placeholder="Naziv institucije" autofocus="">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<label for="role">Vloga v instituciji</label>
|
||||
<div class="input-wrapper">
|
||||
<img src="../static/image/user.svg" alt="user" class="input-icon"/>
|
||||
<div class="input-floating-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">
|
||||
<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">
|
||||
<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">
|
||||
<select id="role" name="role" >
|
||||
<option value="coordinator">Koordinator/-ka</option>
|
||||
<option value="mentor">Mentor/-ica</option>
|
||||
<option value="other">Druga vloga</option>
|
||||
</select>
|
||||
<button class="button-general" style="margin-top: 20px;">REGISTRACIJA</button>
|
||||
</form>
|
||||
<span class="floating-label">Vloga v instituciji</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button class="btn" style="margin-left: 46px;">REGISTRACIJA</button>
|
||||
</form>
|
||||
</div>
|
||||
<div id="rect2" class="mock-side">
|
||||
{% 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>
|
||||
|
||||
</body>
|
||||
|
||||
@@ -3,10 +3,106 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Portal za oddajanje besedil</title>
|
||||
<link rel="stylesheet" href="/static/style.css" type="text/css">
|
||||
<!--<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">
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<div class="logo"><a href="/"><img src="/static/image/logo-white.svg"/></a></div>
|
||||
</header>
|
||||
<div class="container" style="margin-top:8rem;">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<h1 class="title">Koprus SOLAR</h1>
|
||||
<p class="subtitle">Zbiranje besedil za korpus Šolar poteka po naslednjem postopku, ki prinaša tudi točke za napredovanje.</p>
|
||||
|
||||
|
||||
<div class="tab-nav">
|
||||
<a href="/oddaja">Oddaja</a>
|
||||
<a href="/zgodovina" class="active">Zgodovina</a>
|
||||
<a href="/pogodbe">Pogodbe</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<h2>Zgodovina naloženih datotek</h2>
|
||||
</div>
|
||||
</div>
|
||||
{% for item in upload_history %}
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="history-item">
|
||||
<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-desc">
|
||||
|
||||
{% set began = False %}
|
||||
{% if institution_names[loop.index - 1] %}
|
||||
{% if began %}, {% endif %} {{ institution_names[loop.index - 1] }}
|
||||
{% set began = True %}
|
||||
{% endif %}
|
||||
{% if item.program %}
|
||||
{% if began %}, {% endif %} {{ item.program }}
|
||||
{% set began = True %}
|
||||
{% endif %}
|
||||
{% if item.subject %}
|
||||
{% if began %}, {% endif %} {{ item.subject }}
|
||||
{% set began = True %}
|
||||
{% endif %}
|
||||
{% if item.subject_custom %}
|
||||
{% if began %}, {% endif %} {{ item.subject_custom }}
|
||||
{% set began = True %}
|
||||
{% endif %}
|
||||
{% if item.grade %}
|
||||
{% if began %}, {% endif %} {{ item.grade }}
|
||||
{% set began = True %}
|
||||
{% endif %}
|
||||
{% if item.text_type %}
|
||||
{% if began %}, {% endif %} {{ item.text_type }}
|
||||
{% set began = True %}
|
||||
{% endif %}
|
||||
{% if item.text_type_custom %}
|
||||
{% if began %}, {% endif %} {{ item.text_type_custom }}
|
||||
{% set began = True %}
|
||||
{% endif %}
|
||||
{% if item.school_year %}
|
||||
{% if began %}, {% endif %} {{ item.school_year }}
|
||||
{% set began = True %}
|
||||
{% endif %}
|
||||
{% if item.grammar_corrections %}
|
||||
{% if began %}, {% endif %} {{ item.grammar_corrections }}
|
||||
{% set began = True %}
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<a href="../logout">Odjavi se</a>
|
||||
{% if is_institution_coordinator %}
|
||||
<br><a href="../manage-institution">Upravljaj z institucijo</a>
|
||||
|
||||
Reference in New Issue
Block a user