Pass len check fix, relative href and src.

This commit is contained in:
msinkec 2021-12-23 08:51:37 +01:00
parent 7c79891983
commit 13a5fdd6f7
8 changed files with 65 additions and 65 deletions

View File

@ -3,14 +3,14 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Portal ŠOLAR</title> <title>Portal ŠOLAR</title>
<link rel="stylesheet" href="/static/css/login-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"> <link rel="stylesheet" href="../static/css/utils.css" type="text/css">
</head> </head>
<body> <body>
<div class="background"> <div class="background">
<div class="panel login-panel"> <div class="panel login-panel">
<div class="panel-logo"> <div class="panel-logo">
<img src="/static/image/logo.svg" alt="logo"/> <img src="../static/image/logo.svg" alt="logo"/>
</div> </div>
<h1 class="m-b-3">Pozabljeno geslo - ŠOLAR</h1> <h1 class="m-b-3">Pozabljeno geslo - ŠOLAR</h1>
<div> <div>
@ -35,8 +35,8 @@
{% endwith %} {% endwith %}
<div class="back-to-login"> <div class="back-to-login">
<img src="/static/image/chevron-left.svg"/> <img src="../static/image/chevron-left.svg"/>
<a href="/login">Nazaj na prijavo</a> <a href="../login">Nazaj na prijavo</a>
</div> </div>
</div> </div>
</div> </div>

View File

@ -3,14 +3,14 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Portal ŠOLAR</title> <title>Portal ŠOLAR</title>
<link rel="stylesheet" href="/static/css/login-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"> <link rel="stylesheet" href="../static/css/utils.css" type="text/css">
</head> </head>
<body> <body>
<div class="background"> <div class="background">
<div class="panel login-panel"> <div class="panel login-panel">
<div class="panel-logo"> <div class="panel-logo">
<img src="/static/image/logo.svg" alt="logo"/> <img src="../static/image/logo.svg" alt="logo"/>
</div> </div>
<h2 class="text-center">Portal za oddajanje besedil</h2> <h2 class="text-center">Portal za oddajanje besedil</h2>
<div class="line"></div> <div class="line"></div>
@ -22,7 +22,7 @@
{% with messages = get_flashed_messages() %} {% with messages = get_flashed_messages() %}
{% if messages %} {% if messages %}
<div class="alert"> <div class="alert">
<img src="/static/image/alert.svg" alt="alert"/> <img src="../static/image/alert.svg" alt="alert"/>
<p>{{ messages[0] }}</p> <p>{{ messages[0] }}</p>
</div> </div>
{% endif %} {% endif %}

View File

@ -3,10 +3,10 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Upravljanje institucije - Šolar</title> <title>Upravljanje institucije - Šolar</title>
<link rel="stylesheet" href="/static/css/header.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/form.css" type="text/css">
<link rel="stylesheet" href="/static/css/simple-grid.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="../static/css/manage-institution.css" type="text/css">
<style> <style>
.tableFixHead { .tableFixHead {
overflow-y: scroll; overflow-y: scroll;
@ -35,7 +35,7 @@
</head> </head>
<body> <body>
<header> <header>
<div class="logo"><a href="/"><img src="/static/image/logo-white.svg"/></a></div> <div class="logo"><a href="../"><img src="../static/image/logo-white.svg"/></a></div>
<div class="menu-items"> <div class="menu-items">
<a href="../logout">Odjava</a> <a href="../logout">Odjava</a>
{% if is_institution_coordinator %} {% if is_institution_coordinator %}

View File

@ -3,14 +3,14 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Portal za oddajanje besedil</title> <title>Portal za oddajanje besedil</title>
<link rel="stylesheet" href="/static/css/header.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/form.css" type="text/css">
<link rel="stylesheet" href="/static/css/simple-grid.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="../static/css/utils.css" type="text/css">
</head> </head>
<body> <body>
<header> <header>
<div class="logo"><a href="/"><img src="/static/image/logo-white.svg"/></a></div> <div class="logo"><a href="../"><img src="../static/image/logo-white.svg"/></a></div>
<div class="menu-items"> <div class="menu-items">
<a href="../logout">Odjava</a> <a href="../logout">Odjava</a>
{% if is_institution_coordinator %} {% if is_institution_coordinator %}
@ -30,9 +30,9 @@
<div class="tab-nav"> <div class="tab-nav">
<a href="/oddaja" class="active">Oddaja besedil</a> <a href="../oddaja" class="active">Oddaja besedil</a>
<a href="/zgodovina">Zgodovina sodelovanja</a> <a href="../zgodovina">Zgodovina sodelovanja</a>
<a href="/pogodbe">Ekipa</a> <a href="../pogodbe">Ekipa</a>
</div> </div>
</div> </div>
</div> </div>
@ -43,21 +43,21 @@
<div class="col-6"> <div class="col-6">
{% if not institution %} {% if not institution %}
<div class="alert"> <div class="alert">
<img src="/static/image/alert.svg" alt="alert"/> <img src="../static/image/alert.svg" alt="alert"/>
<p>Niste član nobene institucije!</p> <p>Niste član nobene institucije!</p>
</div> </div>
{% elif not institution_contract %} {% elif not institution_contract %}
<div class="alert"> <div class="alert">
<img src="/static/image/alert.svg" alt="alert"/> <img src="../static/image/alert.svg" alt="alert"/>
<p>Pogodba s šolo še ni naložena!</p> <p>Pogodba s šolo še ni naložena!</p>
</div> </div>
{% endif %} {% endif %}
<div class="alert" id="error-message"> <div class="alert" id="error-message">
<img src="/static/image/alert.svg" alt="alert"/> <img src="../static/image/alert.svg" alt="alert"/>
<p></p> <p></p>
</div> </div>
<div class="alert alert-success" id="success-message"> <div class="alert alert-success" id="success-message">
<img src="/static/image/success.svg" alt="alert"/> <img src="../static/image/success.svg" alt="alert"/>
<p></p> <p></p>
</div> </div>
</div> </div>
@ -271,7 +271,7 @@
<!--{{ dropzone.load_js() }}--> <!--{{ dropzone.load_js() }}-->
<script src="/static/dropzone.js"></script> <script src="../static/dropzone.js"></script>
<script> <script>
///////////////////////// /////////////////////////
// Dropzone // // Dropzone //

View File

@ -3,14 +3,14 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Portal za oddajanje besedil</title> <title>Portal za oddajanje besedil</title>
<link rel="stylesheet" href="/static/css/header.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/form.css" type="text/css">
<link rel="stylesheet" href="/static/css/simple-grid.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="../static/css/contracts.css" type="text/css">
</head> </head>
<body> <body>
<header> <header>
<div class="logo"><a href="/"><img src="/static/image/logo-white.svg"/></a></div> <div class="logo"><a href="../"><img src="../static/image/logo-white.svg"/></a></div>
<div class="menu-items"> <div class="menu-items">
<a href="../logout">Odjava</a> <a href="../logout">Odjava</a>
{% if is_institution_coordinator %} {% if is_institution_coordinator %}
@ -29,9 +29,9 @@
<p class="subtitle"></p> <p class="subtitle"></p>
<div class="tab-nav"> <div class="tab-nav">
<a href="/oddaja">Oddaja besedil</a> <a href="../oddaja">Oddaja besedil</a>
<a href="/zgodovina">Zgodovina sodelovanja</a> <a href="../zgodovina">Zgodovina sodelovanja</a>
<a href="/pogodbe" class="active">Ekipa</a> <a href="../pogodbe" class="active">Ekipa</a>
</div> </div>
</div> </div>
</div> </div>
@ -98,7 +98,7 @@
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
<div class="contract-item"> <div class="contract-item">
<img src="/static/image/contract.png" alt="contract" class="contract-item-icon"/> <img src="../static/image/contract.png" alt="contract" class="contract-item-icon"/>
<div class="contract-item-title">Pogodba s šolo</div> <div class="contract-item-title">Pogodba s šolo</div>
<div class="contract-item-date">DODANO: {{contract_school.timestamp.strftime('%d. %m. %Y')}}</div> <div class="contract-item-date">DODANO: {{contract_school.timestamp.strftime('%d. %m. %Y')}}</div>
<a href="../pogodbe-institucije/{{ contract_school.file_contract }}.pdf" class="contract-item-download">Prenesi</a> <a href="../pogodbe-institucije/{{ contract_school.file_contract }}.pdf" class="contract-item-download">Prenesi</a>
@ -111,7 +111,7 @@
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
<div class="contract-item"> <div class="contract-item">
<img src="/static/image/contract.svg" alt="contract" class="contract-item-icon"/> <img src="../static/image/contract.svg" alt="contract" class="contract-item-icon"/>
<div class="contract-item-title">Pogodba o prenosu lastništva</div> <div class="contract-item-title">Pogodba o prenosu lastništva</div>
<div class="contract-item-date">DODANO: {{item.timestamp.strftime('%d. %m. %Y')}}</div> <div class="contract-item-date">DODANO: {{item.timestamp.strftime('%d. %m. %Y')}}</div>
<a href="../pogodbe-ucencistarsi/{{ item.file_contract }}.pdf" class="contract-item-download">Prenesi</a> <a href="../pogodbe-ucencistarsi/{{ item.file_contract }}.pdf" class="contract-item-download">Prenesi</a>
@ -194,7 +194,7 @@
{% if contract_school %} {% if contract_school %}
<div class="contract-item"> <div class="contract-item">
<img src="/static/image/contract.png" alt="contract" class="contract-item-icon"/> <img src="../static/image/contract.png" alt="contract" class="contract-item-icon"/>
<div class="contract-item-title">Pogodba s šolo</div> <div class="contract-item-title">Pogodba s šolo</div>
<div class="contract-item-data">{{contract_school.original_filename}}</div> <div class="contract-item-data">{{contract_school.original_filename}}</div>
<div class="contract-item-data">DODANO: {{contract_school.timestamp}}</div> <div class="contract-item-data">DODANO: {{contract_school.timestamp}}</div>
@ -204,7 +204,7 @@
{% endif %} {% endif %}
{% for item in contracts_students %} {% for item in contracts_students %}
<div class="contract-item"> <div class="contract-item">
<img src="/static/image/contract.png" alt="contract" class="contract-item-icon"/> <img src="../static/image/contract.png" alt="contract" class="contract-item-icon"/>
<div class="contract-item-title" style="font-size: 12px;">{{item.original_filename}}</div> <div class="contract-item-title" style="font-size: 12px;">{{item.original_filename}}</div>
<div class="contract-item-data">Pogodba o prenosu lastništva</div> <div class="contract-item-data">Pogodba o prenosu lastništva</div>
<div class="contract-item-data">DODANO: {{item.timestamp}}</div> <div class="contract-item-data">DODANO: {{item.timestamp}}</div>
@ -278,7 +278,7 @@
{% if user_id in cooperation_history %} {% if user_id in cooperation_history %}
{% for item in cooperation_history[user_id]['coordinator'] %} {% for item in cooperation_history[user_id]['coordinator'] %}
<div style="border-bottom: 2px solid #c4c4c4; min-height: 50px; margin-bottom: 10px;"> <div style="border-bottom: 2px solid #c4c4c4; min-height: 50px; margin-bottom: 10px;">
<img src="/static/image/star.png" alt="star" style="float: left; width: 40px;"/> <img src="../static/image/star.png" alt="star" style="float: left; width: 40px;"/>
<div class="collaborators-item-name" <div class="collaborators-item-name"
style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"> style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">
{{item[1]}} {{item[1]}}
@ -291,7 +291,7 @@
{% endfor %} {% endfor %}
{% for item in cooperation_history[user_id]['mentor'] %} {% for item in cooperation_history[user_id]['mentor'] %}
<div style="border-bottom: 2px solid #c4c4c4; min-height: 50px; margin-bottom: 10px;"> <div style="border-bottom: 2px solid #c4c4c4; min-height: 50px; margin-bottom: 10px;">
<img src="/static/image/star.png" alt="star" style="float: left; width: 40px;"/> <img src="../static/image/star.png" alt="star" style="float: left; width: 40px;"/>
<div class="collaborators-item-name" <div class="collaborators-item-name"
style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"> style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">
{{item[1]}} {{item[1]}}
@ -304,7 +304,7 @@
{% endfor %} {% endfor %}
{% for item in cooperation_history[user_id]['other'] %} {% for item in cooperation_history[user_id]['other'] %}
<div style="border-bottom: 2px solid #c4c4c4; min-height: 50px; margin-bottom: 10px;"> <div style="border-bottom: 2px solid #c4c4c4; min-height: 50px; margin-bottom: 10px;">
<img src="/static/image/star.png" alt="star" style="float: left; width: 40px;"/> <img src="../static/image/star.png" alt="star" style="float: left; width: 40px;"/>
<div class="collaborators-item-name" <div class="collaborators-item-name"
style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;"> style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">
{{item[1]}} {{item[1]}}

View File

@ -3,15 +3,15 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Portal ŠOLAR</title> <title>Portal ŠOLAR</title>
<link rel="stylesheet" href="/static/css/login-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"> <link rel="stylesheet" href="../static/css/utils.css" type="text/css">
</head> </head>
<body> <body>
<div class="background"> <div class="background">
<div class="panel login-panel"> <div class="panel login-panel">
<div class="panel-logo"> <div class="panel-logo">
<img src="/static/image/logo.svg" alt="logo"/> <img src="../static/image/logo.svg" alt="logo"/>
</div> </div>
<h2 class="text-center">Portal za oddajanje besedil</h2> <h2 class="text-center">Portal za oddajanje besedil</h2>
<div class="line"></div> <div class="line"></div>
@ -67,14 +67,14 @@
{% with messages = get_flashed_messages() %} {% with messages = get_flashed_messages() %}
{% if messages %} {% if messages %}
<div class="alert"> <div class="alert">
<img src="/static/image/alert.svg" alt="alert"/> <img src="../static/image/alert.svg" alt="alert"/>
<p>{{ messages[0] }}</p> <p>{{ messages[0] }}</p>
</div> </div>
{% endif %} {% endif %}
{% endwith %} {% endwith %}
<div class="back-to-login"> <div class="back-to-login">
<img src="/static/image/chevron-left.svg"/> <img src="../static/image/chevron-left.svg"/>
<a href="/login">Nazaj na prijavo</a> <a href="../login">Nazaj na prijavo</a>
</div> </div>

View File

@ -3,14 +3,14 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Portal ŠOLAR</title> <title>Portal ŠOLAR</title>
<link rel="stylesheet" href="/static/css/login-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"> <link rel="stylesheet" href="../static/css/utils.css" type="text/css">
</head> </head>
<body> <body>
<div class="background"> <div class="background">
<div class="panel login-panel"> <div class="panel login-panel">
<div class="panel-logo"> <div class="panel-logo">
<img src="/static/image/logo.svg" alt="logo"/> <img src="../static/image/logo.svg" alt="logo"/>
</div> </div>
<h1 class="m-b-3">Ponastavitev gesla - ŠOLAR</h1> <h1 class="m-b-3">Ponastavitev gesla - ŠOLAR</h1>
<div> <div>

View File

@ -3,16 +3,16 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Portal za oddajanje besedil</title> <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> <script src="../static/chart.js"></script>
<link rel="stylesheet" href="/static/css/header.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/form.css" type="text/css">
<link rel="stylesheet" href="/static/css/simple-grid.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="../static/css/history.css" type="text/css">
</head> </head>
<body> <body>
<header> <header>
<div class="logo"><a href="/"><img src="/static/image/logo-white.svg"/></a></div> <div class="logo"><a href="../"><img src="../static/image/logo-white.svg"/></a></div>
<div class="menu-items"> <div class="menu-items">
<a href="../logout">Odjava</a> <a href="../logout">Odjava</a>
{% if is_institution_coordinator %} {% if is_institution_coordinator %}
@ -32,9 +32,9 @@
<div class="tab-nav"> <div class="tab-nav">
<a href="/oddaja">Oddaja besedil</a> <a href="../oddaja">Oddaja besedil</a>
<a href="/zgodovina" class="active">Zgodovina sodelovanja</a> <a href="../zgodovina" class="active">Zgodovina sodelovanja</a>
<a href="/pogodbe">Ekipa</a> <a href="../pogodbe">Ekipa</a>
</div> </div>
</div> </div>
</div> </div>
@ -111,7 +111,7 @@
<div class="history-item-date">Dodano {{ item.timestamp.strftime('%d. %m. %Y') }}</div> <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-uploader">{{ uploader_names[loop.index - 1] }}</div>
<div class="history-item-filecount">Št. datotek: {{ item.upload_file_hashes|length }}</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="../static/image/chevron-down.svg"/></div>
<div class="history-item-desc"> <div class="history-item-desc">
{{ item_values | join(" | ") }} {{ item_values | join(" | ") }}
</div> </div>
@ -128,7 +128,7 @@
{% if item.upload_file_names != None %} {% if item.upload_file_names != None %}
{% for f_name in item.upload_file_names %} {% for f_name in item.upload_file_names %}
<div class="file-item"> <div class="file-item">
<div class="file-icon"><img src="/static/image/file.svg"/></div> <div class="file-icon"><img src="../static/image/file.svg"/></div>
<a href="getuploadfile/{{item.id}}/{{item.upload_file_hashes[loop.index - 1]}}" class="file-name">{{f_name}}</a> <a href="getuploadfile/{{item.id}}/{{item.upload_file_hashes[loop.index - 1]}}" class="file-name">{{f_name}}</a>
</br> </br>
{% if item.upload_file_codes != None %} {% if item.upload_file_codes != None %}
@ -139,7 +139,7 @@
{% else %} {% else %}
{% for f_hash in item.upload_file_hashes %} {% for f_hash in item.upload_file_hashes %}
<div class="file-item"> <div class="file-item">
<div class="file-icon"><img src="/static/image/file.svg"/></div> <div class="file-icon"><img src="../static/image/file.svg"/></div>
<a href="getuploadfile/{{item.id}}/{{f_hash}}" class="file-name">{{f_hash}}</a> <a href="getuploadfile/{{item.id}}/{{f_hash}}" class="file-name">{{f_hash}}</a>
</div> </div>
{% endfor %} {% endfor %}
@ -169,7 +169,7 @@
<div id="rect1"> <div id="rect1">
<div style="padding: 20px;"> <div style="padding: 20px;">
<div id="logo-container"> <div id="logo-container">
<img src="/static/image/logo.svg" alt="logo"/> <img src="../static/image/logo.svg" alt="logo"/>
</div> </div>
<h1 id="title" style="font-size: 25px; position: relative;">Korpus ŠOLAR</h1> <h1 id="title" style="font-size: 25px; position: relative;">Korpus ŠOLAR</h1>
<div class="selection-tabs"> <div class="selection-tabs">