Merge branch 'leon-redesign' of https://gitea.cjvt.si/webapps/portal-oddajanje-solar into leon-redesign

app.py

@@ -26,6 +26,7 @@ config = configparser.ConfigParser()
 config.read('config.ini')
 config = config['DEFAULT']
 
+SERVER_NAME = config['SERVER_NAME'] 
 MAIL_HOST = config['MAIL_HOST'] 
 MAIL_LOGIN = config['MAIL_LOGIN']
 MAIL_PASS = config['MAIL_PASS']
@@ -47,6 +48,8 @@ if not UPLOADS_DIR.exists:
     UPLOADS_DIR.mkdir(parents=True)
 
 # Override configs with environment variables, if set
+if 'PORTALDS4DS1_SERVER_NAME' in os.environ:
+    SERVER_NAME = os.environ['PORTALDS4DS1_SERVER_NAME']
 if 'PORTALDS4DS1_MAIL_HOST' in os.environ:
     MAIL_HOST = os.environ['PORTALDS4DS1_MAIL_HOST']
 if 'PORTALDS4DS1_MAIL_LOGIN' in os.environ:
@@ -80,6 +83,7 @@ if 'PORTALDS4DS1_SQL_CONN_STR' in os.environ:
 app = Flask(__name__)
 
 app.config.update(
+    SERVER_NAME = SERVER_NAME,
     SECRET_KEY = APP_SECRET_KEY,
     UPLOADED_PATH = UPLOADS_DIR,
     MAX_CONTENT_LENGTH = MAX_UPLOAD_SIZE,
@@ -99,6 +103,7 @@ manager.add_command('db', MigrateCommand)
 dropzone = Dropzone(app)
 
 upload_handler_solar = portal.solar.UploadHandlerSolar(
+        SERVER_NAME = SERVER_NAME,
         UPLOADS_DIR=UPLOADS_DIR,
         MAIL_HOST=MAIL_HOST,
         MAIL_LOGIN=MAIL_LOGIN,
@@ -204,7 +209,7 @@ def solar_register_post():
     if not password:
         flash('Prazno polje za geslo.')
         return redirect('/register')
-    if len(password) > 8:
+    if len(password) < 8:
         flash('Geslo mora biti vsaj 8 znakov dolgo.')
         return redirect('/register')
     if len(password) > 100:
@@ -272,7 +277,7 @@ def solar(text):
         return render_template('solar-zgodovina.html', upload_history=upload_items, uploader_names=uploader_names,
                 institution_names=institution_names, is_admin=is_admin, is_institution_coordinator=current_user_institution_coordinator)
     elif text.startswith('pogodbe-institucije/') or text.startswith('pogodbe-ucencistarsi/'):
-        # Check for ownload contract request.
+        # Check for download contract request.
         match = re.match('^pogodbe-(institucije|ucencistarsi)/([a-z0-9_]+\.pdf)$', text)
         if match:
             contract_type = match.group(1)
@@ -423,7 +428,7 @@ def solar_sendresetpass():
 
     portal.solar.send_resetpass_mail(email, upload_handler_solar.config)
 
-    flash('Povezava za ponastavitev gesla je bila poslana na vpisan email naslov.')
+    flash('Povezava za ponastavitev gesla je bila poslana na vpisani e-naslov.')
     return redirect(redirect_url())
 
 
@@ -455,10 +460,22 @@ def solar_resetpass_post(token):
 
 @app.route('/topuploads')
 @login_required
-def solar_topuploads_srednje():
+def solar_topuploads():
     return jsonify(portal.solar.get_top_uploading_institutions())
 
 
+@app.route('/topuploads-institution/<institution_id>')
+@login_required
+def solar_topuploads_institution(institution_id):
+    return jsonify(portal.solar.get_top_uploading_users(institution_id))
+
+
+@app.route('/uploadstats-institution/<institution_id>')
+@login_required
+def solar_uploadstats_institution(institution_id):
+    return jsonify(portal.solar.get_institution_upload_stats(institution_id))
+
+
 @app.route('/deluser', methods=['POST'])
 @login_required
 def solar_del_user():
@@ -741,5 +758,37 @@ def handle_upload():
     return upload_handler_solar.handle_upload(request, current_user.get_id())
 
 
+@app.route('/getuploadfile/<upload_id>/<file_hash>', methods=['GET'])
+@login_required
+def get_upload_file(upload_id, file_hash):
+    is_admin = current_user.role == 'admin'
+    current_user_institution = portal.solar.get_user_institution(current_user.id)
+    upload_obj = portal.solar.get_upload_object(upload_id)
+    
+    if current_user_institution.id != upload_obj.institution:
+        return '', 404
+
+    file_hashes = upload_obj.upload_file_hashes
+    if file_hash not in upload_obj.upload_file_hashes:
+        return '', 404
+
+    prefix = file_hash[:2]
+    suffix = file_hash[2:]
+    safe_path = safe_join(str(upload_handler_solar.get_uploads_subdir('files')), prefix, suffix)
+
+    f_name = os.listdir(safe_path)[0]
+    safe_path = safe_join(safe_path, f_name)
+
+    f_suffix = f_name.split('.')[-1]
+    f_dlname = upload_obj.upload_file_codes[file_hashes.index(file_hash)]
+    if f_suffix in portal.solar.UploadHandlerSolar.ENABLED_FILETYPES:
+        f_dlname += '.' + f_suffix
+
+    try:
+        return send_file(safe_path, attachment_filename=f_dlname, as_attachment=True)
+    except FileNotFoundError:
+        return '', 404
+
+
 if __name__ == '__main__':
     app.run(debug=True)

config.ini

@@ -1,4 +1,5 @@
 [DEFAULT]
+SERVER_NAME=localhost:5000
 SQL_CONN_STR=postgresql://portal:randompass123@localhost/portal
 MAIL_HOST=posta.cjvt.si
 MAIL_LOGIN=oddaja-besedil@cjvt.si
@@ -10,8 +11,6 @@ MAX_UPLOAD_SIZE=1000000000
 MAX_FILES_PER_UPLOAD=30
 UPLOADS_DIR=./uploads
 CONTRACT_CLIENT_CONTACT=Testko Tester
-DESC_PREVODI=<h2 id="subtitle">Prevodi</h2><p>Strojno prevajanje je ena od uporabnih jezikovnih tehnologij, saj omogoča hitro sporazumevanje med ljudmi iz različnih kultur in jezikovnih okolij. Več o razvoju slovenskega strojnega prevajalnika lahko preberete na tej <a href="https://slovenscina.eu/strojno-prevajanje">povezavi</a>. Za kakovosten strojni prevajalnik so ključnega pomena prevodi, iz kateri se algoritmi umetne inteligence naučijo prevajati. S prispevanjem besedil v korpus prevodov boste pomembno prispevali k razvoju slovenskega strojnega prevajalnika med angleščino in slovenščino. Več informacij o prispevanju besedil najdete <a href="https://slovenscina.eu/zbiranje-besedil">tukaj</a>.</p>
-DESC_GIGAFIDA=<h2 id="subtitle">Gigafida</h2><p><a href="https://viri.cjvt.si/gigafida/">Gigafida</a> je referenčni korpus pisne slovenščine. Besedila so izbrana in strojno obdelana z namenom, da bi korpus kot vzorec sodobne standardne slovenščine lahko služil za jezikoslovne in druge humanistične raziskave, izdelavo sodobnih slovarjev, slovnic, učnih gradiv in razvoj jezikovnih tehnologij za slovenščino. S prispevanjem besedil v korpus Gigafida pomembno prispevate k razvoju sodobnih jezikovnih tehnologij za slovenski jezik.</p>
 MAIL_SUBJECT=RSDO: pogodba za oddana besedila ({upload_id})
 MAIL_BODY=Hvala, ker ste prispevali besedila in na ta način pomagali pri razvoju slovenskega jezika v digitalnem okolju. V prilogi vam pošiljamo pogodbo s seznamom naloženih datotek.
    

docker-compose.yml

@@ -4,6 +4,7 @@ services:
     build: .
     restart: always
     environment:
+      - PORTALDS4DS1_SERVER_NAME=localhost:5000
       - PORTALDS4DS1_SQL_CONN_STR=postgresql://portal:randompass123@db/portal
       - PORTALDS4DS1_MAIL_HOST=posta.cjvt.si
       - PORTALDS4DS1_MAIL_LOGIN=oddaja-besedil@cjvt.si

migrations/versions/0d9dd68fd94b_added_upload_file_names_column.py

@@ -0,0 +1,28 @@
+"""Added upload file names column.
+
+Revision ID: 0d9dd68fd94b
+Revises: 44dae32b13af
+Create Date: 2021-12-14 10:52:34.326600
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0d9dd68fd94b'
+down_revision = '44dae32b13af'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('upload_solar', sa.Column('upload_file_names', sa.ARRAY(sa.String()), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('upload_solar', 'upload_file_names')
+    # ### end Alembic commands ###

migrations/versions/c7bb822adf9f_added_upload_file_codes_column.py

@@ -0,0 +1,30 @@
+"""Added upload file codes column.
+
+Revision ID: c7bb822adf9f
+Revises: 0d9dd68fd94b
+Create Date: 2021-12-20 09:00:57.208921
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'c7bb822adf9f'
+down_revision = '0d9dd68fd94b'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('upload_solar', sa.Column('region', sa.String(), nullable=True))
+    op.add_column('upload_solar', sa.Column('upload_file_codes', sa.ARRAY(sa.String()), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('upload_solar', 'upload_file_codes')
+    op.drop_column('upload_solar', 'region')
+    # ### end Alembic commands ###

portal/model.py

@@ -19,6 +19,7 @@ class UploadSolar(db.Model):
     institution = db.Column(db.Integer, sqlalchemy.ForeignKey('institution.id'), nullable=True)
     upload_hash = db.Column(db.String, nullable=False)
     timestamp = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
+    region = db.Column(db.String, nullable=True)
     program = db.Column(db.String, nullable=True)
     subject = db.Column(db.String, nullable=True)
     subject_custom = db.Column(db.String, nullable=True)
@@ -28,6 +29,8 @@ class UploadSolar(db.Model):
     school_year = db.Column(db.String, nullable=True)
     grammar_corrections = db.Column(db.String, nullable=True)
     upload_file_hashes = db.Column(sqlalchemy.types.ARRAY(db.String), nullable=True)
+    upload_file_names = db.Column(sqlalchemy.types.ARRAY(db.String), nullable=True)
+    upload_file_codes = db.Column(sqlalchemy.types.ARRAY(db.String), nullable=True)
 
 
 class ContractsSolar(db.Model):

portal/solar.py

@@ -6,15 +6,10 @@ import traceback
 import ssl
 from datetime import datetime
 from sqlalchemy import desc
-from collections import Counter
 from pathlib import Path
 
-import imaplib
 from smtplib import SMTP_SSL
 
-import email
-from email import encoders
-from email.mime.base import MIMEBase
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.mime.application import MIMEApplication
@@ -30,9 +25,9 @@ from . model import *
 
 
 VALID_PROGRAMS = {'OS', 'SSG', 'MGP', 'ZG', 'NPI', 'SPI', 'SSI', 'PTI'}
-VALID_SUBJECTS = {'slo', 'drug-jez', 'drug-druz', 'drug-narav', 'drug-strok', 'drug-izb'}
-VALID_TEXT_TYPES = {'esej-spis', 'prakticno', 'solski-test', 'delo-v-razredu'}
-VALID_GRAMMAR_CORRECTIONS = {'popr-ne', 'brez-popr', 'popr-da'}
+VALID_SUBJECTS = {'SLO', 'DJP', 'DDP', 'DNP', 'DSP', 'DIP'}
+VALID_TEXT_TYPES = {'E', 'PB', 'T', 'R'}
+VALID_GRAMMAR_CORRECTIONS = {'DD', 'N', 'DN'}
 VALID_REGIONS = {'CE', 'GO', 'KK', 'KP', 'KR', 'LJ', 'MB', 'MS', 'NM', 'PO', 'SG'}
 
 #REGEX_EMAIL = re.compile('^[a-z0-9]+[\._]?[a-z0-9]+[@]\w+[.]\w{2,3}$')
@@ -153,25 +148,49 @@ class UploadHandlerSolar():
         timestamp = datetime.fromtimestamp(upload_metadata['timestamp'])
         form_data = upload_metadata['form_data']
         file_hashes = upload_metadata['file_hashes_dict']
-        sorted_f_hashes = list(file_hashes.values())
-        sorted_f_hashes.sort()
+        sorted_file_items = sorted(file_hashes.items(), key=lambda item: item[1])
 
         institution_id = get_user_institution(user_id).id
 
+        region = form_data['regija']
+        program = form_data['program']
+        subject = form_data['predmet'],
+        subject_custom = form_data['predmet-custom'],
+        grade = form_data['letnik'],
+        text_type = form_data['vrsta'],
+        text_type_custom = form_data['vrsta-custom'],
+        school_year = form_data['solsko-leto'],
+        grammar_corrections = form_data['jezikovni-popravki'],
+        upload_file_codes = []
+        for i in range(len(sorted_file_items)):
+            file_code = '{}_{}_{}_{}_{}_{}_{}_{}'.format(
+                                region,
+                                program,
+                                subject[0],
+                                grade[0],
+                                text_type[0],
+                                school_year[0],
+                                grammar_corrections[0],
+                                i)
+            upload_file_codes.append(file_code)
+
         model_obj = UploadSolar(
                     upload_user = user_id,
                     institution = institution_id,
                     upload_hash=upload_metadata['upload_id'],
                     timestamp=timestamp,
-                    program=form_data['program'],
-                    subject=form_data['predmet'],
-                    subject_custom=form_data['predmet-custom'],
-                    grade=form_data['letnik'],
-                    text_type=form_data['vrsta'],
-                    text_type_custom=form_data['vrsta-custom'],
-                    school_year=form_data['solsko-leto'],
-                    grammar_corrections=form_data['jezikovni-popravki'],
-                    upload_file_hashes=sorted_f_hashes
+                    region=region,
+                    program=program,
+                    subject=subject,
+                    subject_custom=subject_custom,
+                    grade=grade,
+                    text_type=text_type,
+                    text_type_custom=text_type_custom,
+                    school_year=school_year,
+                    grammar_corrections=grammar_corrections,
+                    upload_file_hashes=[x[1] for x in sorted_file_items],
+                    upload_file_names=[x[0] for x in sorted_file_items],
+                    upload_file_codes=upload_file_codes,
                )
         UploadHandlerSolar.store_model(model_obj)
 
@@ -217,7 +236,7 @@ class UploadHandlerSolar():
         # Store to database.
         self.store_metadata(upload_metadata, user_id)
 
-        return 'Uspešno ste oddali datotek(e). Št. datotek: {}'.format(len(request.files))
+        return 'Število uspešno oddanih datotek: {}. Podatki o oddaji so na voljo v zavihku Zgodovina sodelovanja.'.format(len(request.files))
 
     def handle_contract_upload(self, request, user_id):
         contract_type = request.form['tip-pogodbe']
@@ -281,6 +300,8 @@ class UploadHandlerSolar():
 
     @staticmethod
     def check_form(form):
+        logging.info(form)
+        region = form['regija']
         program = form['program']
         predmet = form['predmet']
         letnik = int(form['letnik'])
@@ -288,6 +309,8 @@ class UploadHandlerSolar():
         solsko_leto = form['solsko-leto']
         jezikovni_popravki = form['jezikovni-popravki']
 
+        if region not in VALID_REGIONS:
+            return 'Invalid region "{}"'.format(region)
         if program not in VALID_PROGRAMS:
             return 'Invalid program "{}"'.format(program)
         if predmet not in VALID_SUBJECTS:
@@ -392,6 +415,9 @@ def get_upload_history(user_id, n=20):
 def get_institution_upload_history(institution_id, n=20):
     return UploadSolar.query.filter_by(institution=institution_id).order_by(desc(UploadSolar.timestamp)).limit(n).all()
 
+def get_upload_object(upload_id):
+    return UploadSolar.query.filter_by(id=upload_id).first()
+
 def get_all_upload_history(n=20):
     if n == -1:
         return UploadSolar.query.order_by(desc(UploadSolar.timestamp)).all()
@@ -432,6 +458,41 @@ def get_top_uploading_institutions():
     return dict(sorted(res.items(), key=lambda x:x[1], reverse=True))
 
 
+def get_top_uploading_users(institution_id):
+    res = dict()
+    users = get_all_active_institution_users(institution_id)
+    for user in users:
+        uploads = UploadSolar.query.filter_by(upload_user=user.id).all()
+        for upload in uploads:
+            if user.name not in res:
+                res[user.name] = 0
+            res[user.name] += len(upload.upload_file_hashes)
+    if len(res) >= 5:
+        return dict(sorted(res.items(), key=lambda x:x[1], reverse=True)[:5])
+    return dict(sorted(res.items(), key=lambda x:x[1], reverse=True))
+
+
+def get_institution_upload_stats(institution_id):
+    res = {
+        'region': [],
+        'program': [],
+        }
+
+    # Region
+    for region in VALID_REGIONS:
+        count = UploadSolar.query.filter_by(institution=institution_id, region=region).count()
+        res['region'].append((region, count))
+    res['region'] = sorted(res['region'], key=lambda x:x[1], reverse=True)
+
+    # Program
+    for program in VALID_PROGRAMS:
+        count = UploadSolar.query.filter_by(institution=institution_id, program=program).count()
+        res['program'].append((program, count))
+    res['program'] = sorted(res['program'], key=lambda x:x[1], reverse=True)
+        
+    return res
+
+
 def get_all_active_users():
     # TODO: do filtering purely within an SQL query
     res = []
@@ -441,8 +502,9 @@ def get_all_active_users():
             res.append(user)
     return res
 
-def update_upload_item(item_id, program, subject, subject_custom, grade, text_type, text_type_custom, school_year, grammar_corrections):
+def update_upload_item(item_id, region, program, subject, subject_custom, grade, text_type, text_type_custom, school_year, grammar_corrections):
     rowcount = db.session.query(UploadSolar).filter_by(id=item_id).update({
+        'region': region,
         'program': program,
         'subject': subject,
         'subject_custom': subject_custom,
@@ -467,22 +529,18 @@ def get_institution_contract(institution_id):
 
 
 def get_institution_cooperation_history(institution_id):
-    #return CooperationToken.query.join(UserCooperationTokenMapping, 
-#            UserCooperationTokenMapping.cooperation_token == CooperationToken.id).filter(UserCooperationTokenMapping.user == user_id).all()
-#
-    res = dict()
-
-    uch_rows = UserCooperationHistory.query.filter_by(institution=institution_id).order_by(UserCooperationHistory.school_year.desc()).all()
-    for row in uch_rows:
-        if row.user not in res:
-            res[row.user] = {
-                    'coordinator': [],
-                    'mentor': [],
-                    'other': []
-                    }
-        res[row.user][row.role].append((row.school_year, row.badge_text))
-
-    return res
+    return db.session.query(UserCooperationHistory.role, 
+                UserCooperationHistory.school_year,
+                UserCooperationHistory.badge_text,
+                RegisteredUser.name,
+            ).select_from(
+                UserCooperationHistory,
+            ).join(
+                RegisteredUser, 
+                UserCooperationHistory.user == RegisteredUser.id,
+            ).filter(
+                UserCooperationHistory.institution == institution_id,
+            ).order_by(UserCooperationHistory.school_year.desc()).all()
 
 
 def get_cooperation_history():
@@ -748,8 +806,7 @@ def send_resetpass_mail(email, config):
     body = '''
     Zahtevali ste ponastavitev gesla vašega uporabniškega računa.
 
-    Geslo lahko ponastavite na naslednji povezavi: https://zbiranje.slovenscina.eu/solar/resetpass/{}'''.format(jwt_token)
-
+    Geslo lahko ponastavite na naslednji povezavi: https://{}/resetpass/{}'''.format(config['SERVER_NAME'], jwt_token)
     message = MIMEMultipart()
     message['From'] = config['MAIL_LOGIN']
     message['To'] = email 
@@ -816,3 +873,4 @@ def send_user_activation_mail(user_id, config):
     except Exception:
         traceback.print_exc()
 
+

static/css/contracts.css

@@ -86,6 +86,8 @@ em {
   position: relative;
   color: #8D3D3D;
   margin-bottom: 2rem; }
+  .alert.alert-success {
+    color: #88B52F; }
   .alert img {
     position: relative;
     top: 0.25rem;
@@ -142,8 +144,15 @@ em {
     color: #006CB7;
     text-decoration: none; }
 
-.collaborators-item {
+.team-item {
   background: white;
-  width: 100%; }
+  width: 100%;
+  padding-left: 1rem;
+  position: relative; }
+  .team-item .team-item-name {
+    line-height: 3.25rem; }
+    .team-item .team-item-name .team-item-role {
+      color: #848C90;
+      margin-left: 1rem; }
 
 /*# sourceMappingURL=contracts.css.map */

static/css/contracts.css.map

@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["slovenscina-theme.scss","slovenscina-elements.scss","contracts.scss"],
 "names": [],
 "file": "contracts.css"

static/css/contracts.scss

@@ -35,7 +35,17 @@
   }
 }
 
-.collaborators-item {
+.team-item {
   background:white;
   width:100%;
+  padding-left:1rem;
+  position:relative;
+  .team-item-name {
+    line-height:3.25rem;
+    .team-item-role {
+      color:$grey-dark;
+      margin-left:1rem;
+    }
+  }
+
 }

static/css/form.css

@@ -86,6 +86,8 @@ em {
   position: relative;
   color: #8D3D3D;
   margin-bottom: 2rem; }
+  .alert.alert-success {
+    color: #88B52F; }
   .alert img {
     position: relative;
     top: 0.25rem;
@@ -165,7 +167,7 @@ em {
       position: absolute;
       left: 1rem;
       top: 1rem;
-      background: url("/static/image/file.svg");
+      background: url(/static/image/file.svg);
       background-repeat: no-repeat;
       background-position: center;
       width: 2rem;
@@ -183,7 +185,7 @@ em {
     .form-wrapper .dz-preview.dz-file-preview .dz-details .dz-size {
       position: absolute;
       top: 1.5rem;
-      right: 1rem; }
+      right: 2.5rem; }
     .form-wrapper .dz-preview.dz-file-preview .dz-success-mark, .form-wrapper .dz-preview.dz-file-preview .dz-error-mark {
       display: none; }
     .form-wrapper .dz-preview.dz-file-preview .dz-progress {
@@ -197,5 +199,14 @@ em {
         height: 20px;
         display: inline-block;
         background: #006CB7; }
+    .form-wrapper .dz-preview.dz-file-preview .dz-remove {
+      position: absolute;
+      top: 1.5rem;
+      right: 1rem;
+      width: 1rem;
+      height: 1rem;
+      background: url(/static/image/trash.svg);
+      background-repeat: no-repeat;
+      background-position: center; }
 
 /*# sourceMappingURL=form.css.map */

static/css/form.css.map

@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["slovenscina-theme.scss","slovenscina-elements.scss","form.scss"],
 "names": [],
 "file": "form.css"

static/css/form.scss

@@ -60,7 +60,7 @@
       position:absolute;
       left:1rem;
       top:1rem;
-      background: url("/static/image/file.svg");
+      background: url(/static/image/file.svg);
       background-repeat: no-repeat;
       background-position: center;
       width:2rem;
@@ -82,7 +82,7 @@
       .dz-size {
         position:absolute;
         top:1.5rem;
-        right:1rem;
+        right:2.5rem;
       }
 
     }
@@ -100,5 +100,15 @@
         background:$blue;
       }
     }
+    .dz-remove {
+      position:absolute;
+      top:1.5rem;
+      right:1rem;
+      width:1rem;
+      height:1rem;
+      background: url(/static/image/trash.svg);
+      background-repeat: no-repeat;
+      background-position: center;
+    }
   }
 }

static/css/header.css

@@ -86,6 +86,8 @@ em {
   position: relative;
   color: #8D3D3D;
   margin-bottom: 2rem; }
+  .alert.alert-success {
+    color: #88B52F; }
   .alert img {
     position: relative;
     top: 0.25rem;

static/css/header.css.map

@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["slovenscina-theme.scss","slovenscina-elements.scss","header.scss"],
 "names": [],
 "file": "header.css"

static/css/history.css

@@ -86,6 +86,8 @@ em {
   position: relative;
   color: #8D3D3D;
   margin-bottom: 2rem; }
+  .alert.alert-success {
+    color: #88B52F; }
   .alert img {
     position: relative;
     top: 0.25rem;
@@ -118,7 +120,13 @@ em {
   max-height: 2.875rem;
   padding: 1rem 1.5rem;
   position: relative;
-  transition: max-height 0.3s ease-out; }
+  transition: max-height 1s ease-out;
+  cursor: pointer;
+  overflow: hidden; }
+  .history-item .history-item-chevron {
+    position: absolute;
+    bottom: 1rem;
+    right: 1rem; }
   .history-item .history-item-date {
     text-transform: uppercase;
     display: inline-block;
@@ -136,7 +144,9 @@ em {
     font-weight: 400;
     font-size: 0.875rem; }
   .history-item .history-item-filecount {
-    float: right;
+    position: absolute;
+    top: 1rem;
+    right: 1rem;
     color: #006CB7;
     line-height: 1rem;
     font-weight: 400;
@@ -150,9 +160,31 @@ em {
     line-height: 1.25rem;
     color: #46535B; }
   .history-item .history-item-desc-full {
+    display: none;
+    margin-top: 1rem; }
+  .history-item .history-item-files-full {
     display: none; }
+    .history-item .history-item-files-full .file-item {
+      position: relative;
+      height: 3.125rem;
+      border-bottom: 1px solid #848C90; }
+      .history-item .history-item-files-full .file-item .file-icon {
+        position: absolute;
+        width: 1.5rem;
+        height: 1.5rem;
+        left: 0;
+        top: 1rem; }
+      .history-item .history-item-files-full .file-item .file-name {
+        position: absolute;
+        left: 3rem;
+        top: 1rem;
+        color: #46535B;
+        text-decoration: none;
+        cursor: pointer; }
+        .history-item .history-item-files-full .file-item .file-name:hover {
+          text-decoration: underline; }
   .history-item.open {
-    max-height: 10rem; }
+    max-height: 20rem; }
     .history-item.open .history-item-date {
       display: block; }
     .history-item.open .history-item-uploader {
@@ -164,5 +196,9 @@ em {
       display: none; }
     .history-item.open .history-item-desc-full {
       display: block; }
+    .history-item.open .history-item-files-full {
+      display: block; }
+    .history-item.open .history-item-chevron {
+      transform: rotate(180deg); }
 
 /*# sourceMappingURL=history.css.map */

static/css/history.css.map

@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "AAAQ,+IAAuI;AAa/I,IAAK;EACH,WAAW,EAAE,oBAAoB;EACjC,SAAS,EAAC,IAAI;EACd,KAAK,EAZC,OAAO;;AAef,IAAK;EACH,SAAS,EAAC,IAAI;EACd,OAAO,EAAC,CAAC;EACT,MAAM,EAAC,CAAC;;ACpBV,EAAG;EACD,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,KAAK,EDLA,OAAO;;ACOd,EAAG;EACD,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,SAAS;EACzB,KAAK,EDbA,OAAO;;ACgBd,EAAG;EACD,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;;AAGnB,EAAG;EACD,WAAW,EAAE,GAAG;;AAGlB,IAAK;EACH,MAAM,EAAC,IAAI;EACX,WAAW,EAAE,MAAM;EACnB,OAAO,EAAE,QAAQ;EACjB,KAAK,EAAC,KAAK;EACX,UAAU,EDhCL,OAAO;ECiCZ,aAAa,EAAE,IAAI;EACnB,SAAS,EAAE,QAAQ;EACnB,WAAW,EAAE,GAAG;EAChB,MAAM,EAAE,OAAO;EACf,UAAU,EAAE,qBAAqB;EACjC,UAAQ;IACN,OAAO,EAAE,GAAG;EAEd,aAAW;IACT,MAAM,EAAC,OAAO;IACd,OAAO,EAAC,GAAG;;AAMf,MAAO;EACL,UAAU,ED5CJ,OAAO;EC6Cb,OAAO,EAAE,SAAS;EAClB,aAAa,EAAE,IAAI;EACnB,SAAS,EAAC,KAAK;EACf,kBAAY;IACV,QAAQ,EAAC,QAAQ;IACjB,GAAG,EAAE,KAAK;IACV,IAAI,EAAC,CAAC;IACN,KAAK,EAAC,CAAC;IACP,OAAO,EAAC,KAAK;IACb,MAAM,EAAC,IAAI;IACX,UAAU,EDvDN,OAAO;ICwDX,OAAO,EAAC,SAAS;IACjB,KAAK,EAAE,KAAK;IACZ,aAAa,EAAE,IAAI;IACnB,UAAU,EAAE,MAAM;;AAKtB,KAAM;EACJ,UAAU,EDpEL,OAAO;ECqEZ,MAAM,EAAC,GAAG;EACV,KAAK,EAAC,KAAK;EACX,MAAM,EAAE,IAAI;;AAGd,QAAS;EACP,OAAO,EAAC,KAAK;EACb,UAAU,EAAE,KAAK;EACjB,SAAS,EAAC,IAAI;EACd,eAAe,EAAE,IAAI;EACrB,KAAK,EDlFA,OAAO;ECmFZ,cAAc,EAAE,SAAS;;AAG3B,MAAO;EACL,QAAQ,EAAC,QAAQ;EACjB,KAAK,EDvFD,OAAO;ECwFX,aAAa,EAAC,IAAI;EAClB,UAAI;IACF,QAAQ,EAAC,QAAQ;IACjB,GAAG,EAAC,OAAO;IACX,KAAK,EAAC,MAAM;EAEd,QAAE;IACA,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,MAAM,EAAC,IAAI;IACX,IAAI,EAAC,IAAI;IACT,GAAG,EAAE,CAAC;IACN,MAAM,EAAC,CAAC;IACR,cAAc,EAAE,SAAS;;AAI7B,aAAc;EACZ,UAAU,EAAC,KAAK;EAChB,MAAM,EAAE,iBAAsB;EAC9B,UAAU,EAAE,UAAU;EACtB,aAAa,EAAE,GAAG;EAClB,kBAAK;IACH,UAAU,EAAC,MAAM;IACjB,UAAU,ED5GN,OAAO;IC6GX,aAAa,EAAE,GAAG;;ACrHtB,aAAc;EACZ,UAAU,EAAC,KAAK;EAChB,UAAU,EAAC,QAAQ;EACnB,UAAU,EAAC,QAAQ;EACnB,OAAO,EAAC,WAAW;EACnB,QAAQ,EAAC,QAAQ;EACjB,UAAU,EAAE,wBAAwB;EAEpC,gCAAmB;IACjB,cAAc,EAAE,SAAS;IACzB,OAAO,EAAE,YAAY;IACrB,KAAK,EFPG,OAAO;IEQf,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,GAAG;IAChB,SAAS,EAAC,QAAQ;EAEpB,oCAAuB;IACrB,OAAO,EAAE,YAAY;IACrB,YAAY,EAAC,IAAI;IACjB,WAAW,EAAC,IAAI;IAChB,WAAW,EAAE,iBAAoB;IACjC,KAAK,EFjBG,OAAO;IEkBf,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,GAAG;IAChB,SAAS,EAAC,QAAQ;EAEpB,qCAAwB;IACtB,KAAK,EAAC,KAAK;IACX,KAAK,EF5BF,OAAO;IE6BV,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,GAAG;IAChB,SAAS,EAAC,QAAQ;EAEpB,gCAAmB;IACjB,QAAQ,EAAC,QAAQ;IACjB,MAAM,EAAC,IAAI;IACX,UAAU,EAAE,MAAM;IAClB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,OAAO;IACpB,KAAK,EFtCD,OAAO;EEwCb,qCAAwB;IACtB,OAAO,EAAE,IAAI;EAEf,kBAAO;IACL,UAAU,EAAE,KAAK;IACjB,qCAAmB;MAAC,OAAO,EAAC,KAAK;IACjC,yCAAuB;MACrB,OAAO,EAAC,KAAK;MACb,YAAY,EAAC,CAAC;MACd,WAAW,EAAC,CAAC;MACb,WAAW,EAAE,IAAI;IAEnB,qCAAmB;MACjB,OAAO,EAAE,IAAI;IAEf,0CAAwB;MACtB,OAAO,EAAE,KAAK",
+"mappings": "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",
 "sources": ["slovenscina-theme.scss","slovenscina-elements.scss","history.scss"],
 "names": [],
 "file": "history.css"

static/css/history.scss

@@ -6,8 +6,14 @@
   max-height:2.875rem;
   padding:1rem 1.5rem;
   position:relative;
-  transition: max-height 0.3s ease-out;
-
+  transition: max-height 1s ease-out;
+  cursor:pointer;
+  overflow:hidden;
+  .history-item-chevron {
+    position:absolute;
+    bottom:1rem;
+    right:1rem;
+  }
   .history-item-date {
     text-transform: uppercase;
     display: inline-block;
@@ -27,7 +33,9 @@
     font-size:0.875rem;
   }
   .history-item-filecount {
-    float:right;
+    position:absolute;
+    top:1rem;
+    right:1rem;
     color:$blue;
     line-height: 1rem;
     font-weight: 400;
@@ -44,9 +52,36 @@
   }
   .history-item-desc-full {
     display: none;
+    margin-top:1rem;
+  }
+  .history-item-files-full {
+    display: none;
+    .file-item {
+      position:relative;
+      height:3.125rem;
+      border-bottom: 1px solid $grey-dark;
+      .file-icon {
+        position:absolute;
+        width:1.5rem;
+        height:1.5rem;
+        left:0;
+        top:1rem;
+      }
+      .file-name {
+        position:absolute;
+        left:3rem;
+        top:1rem;
+        color:$black;
+        text-decoration: none;
+        cursor:pointer;
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
   }
   &.open {
-    max-height: 10rem;
+    max-height: 20rem;
     .history-item-date {display:block;}
     .history-item-uploader {
       display:block;
@@ -60,5 +95,11 @@
     .history-item-desc-full {
       display: block;
     }
+    .history-item-files-full {
+      display: block;
+    }
+    .history-item-chevron {
+      transform:rotate(180deg);
+    }
   }
 }

static/css/login-styles.css

@@ -86,6 +86,8 @@ em {
   position: relative;
   color: #8D3D3D;
   margin-bottom: 2rem; }
+  .alert.alert-success {
+    color: #88B52F; }
   .alert img {
     position: relative;
     top: 0.25rem;
@@ -113,7 +115,7 @@ em {
     border-radius: 4px; }
 
 .background {
-  background: url(../image/bg.jpeg) no-repeat center center fixed;
+  background: #848C90;
   -webkit-background-size: cover;
   -moz-background-size: cover;
   -o-background-size: cover;
@@ -126,7 +128,8 @@ em {
   position: absolute;
   width: 50%;
   left: 25%;
-  top: 100px; }
+  top: 100px;
+  box-shadow: 0 0 2.5rem 0 rgba(0, 0, 0, 0.25); }
 
 .register-button {
   position: relative;
@@ -175,5 +178,21 @@ em {
     .input-wrapper .input-floating-label label {
       font-size: 10px;
       color: #46535B; }
+    .input-wrapper .input-floating-label label.input-hint {
+      color: #848C90; }
+
+.back-to-login {
+  position: relative;
+  height: 2rem; }
+  .back-to-login img {
+    position: absolute;
+    top: 0.25rem;
+    left: 0.5rem; }
+  .back-to-login a {
+    position: relative;
+    top: 0;
+    left: 3rem;
+    text-decoration: none;
+    color: #46535B; }
 
 /*# sourceMappingURL=login-styles.css.map */

static/css/login-styles.css.map

@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["slovenscina-theme.scss","slovenscina-elements.scss","login-styles.scss"],
 "names": [],
 "file": "login-styles.css"

static/css/login-styles.scss

@@ -3,7 +3,7 @@
 
 
 .background {
-  background: url(../image/bg.jpeg) no-repeat center center fixed;
+  background: $grey-dark;
   -webkit-background-size: cover;
   -moz-background-size: cover;
   -o-background-size: cover;
@@ -18,6 +18,7 @@
   width:50%;
   left:25%;
   top: 100px;
+  box-shadow: 0 0 2.5rem 0 rgba(0,0,0,0.25);
 }
 
 .register-button {
@@ -76,6 +77,26 @@
       font-size: 10px;
       color: $black;
     }
+    label.input-hint {
+      color:$grey-dark;
+    }
 
   }
 }
+
+.back-to-login {
+  position:relative;
+  height:2rem;
+  img {
+    position:absolute;
+    top:0.25rem;
+    left:0.5rem;
+  }
+  a {
+    position: relative;
+    top:0;
+    left:3rem;
+    text-decoration: none;
+    color:$black;
+  }
+}

static/css/manage-institution.css

@@ -0,0 +1,117 @@
+@import url(https://fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,900,900italic,300italic,300,100italic,100);
+html {
+  font-family: 'Roboto', sans-serif;
+  font-size: 16px;
+  color: #46535B; }
+
+body {
+  font-size: 16px;
+  padding: 0;
+  margin: 0; }
+
+h1 {
+  font-size: 30px;
+  font-style: normal;
+  font-weight: 300;
+  line-height: 35px;
+  color: #006CB7; }
+
+h2 {
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 300;
+  line-height: 21px;
+  text-transform: uppercase;
+  color: #006CB7; }
+
+h3 {
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 300;
+  line-height: 21px; }
+
+em {
+  font-weight: 300; }
+
+.btn {
+  border: none;
+  line-height: 2.5rem;
+  padding: 0 2.5rem;
+  color: white;
+  background: #006CB7;
+  border-radius: 20px;
+  font-size: 1.125rem;
+  font-weight: 400;
+  cursor: pointer;
+  transition: opacity 0.3s ease-out; }
+  .btn:hover {
+    opacity: 0.8; }
+  .btn:disabled {
+    cursor: default;
+    opacity: 0.5; }
+
+.panel {
+  background: #F5F5F5;
+  padding: 40px 60px;
+  border-radius: 20px;
+  max-width: 30rem; }
+  .panel .panel-logo {
+    position: absolute;
+    top: -60px;
+    left: 0;
+    right: 0;
+    display: block;
+    margin: auto;
+    background: #F5F5F5;
+    padding: 20px 30px;
+    width: 100px;
+    border-radius: 100%;
+    text-align: center; }
+
+.line {
+  background: #C4C4C4;
+  height: 2px;
+  width: 200px;
+  margin: auto; }
+
+.a-right {
+  display: block;
+  text-align: right;
+  font-size: 10px;
+  text-decoration: none;
+  color: #006CB7;
+  text-transform: uppercase; }
+
+.alert {
+  position: relative;
+  color: #8D3D3D;
+  margin-bottom: 2rem; }
+  .alert.alert-success {
+    color: #88B52F; }
+  .alert img {
+    position: relative;
+    top: 0.25rem;
+    width: 1.8rem; }
+  .alert p {
+    position: absolute;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    height: 2rem;
+    left: 3rem;
+    top: 0;
+    margin: 0;
+    text-transform: uppercase; }
+
+.submit-alert {
+  background: white;
+  border: 2px solid #B7DB70;
+  box-sizing: border-box;
+  border-radius: 8px; }
+  .submit-alert .btn {
+    margin-top: 0.5rem;
+    background: #88B52F;
+    border-radius: 4px; }
+
+/*# sourceMappingURL=manage-institution.css.map */

static/css/manage-institution.css.map

@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "AAAQ,+IAAuI;AAa/I,IAAK;EACH,WAAW,EAAE,oBAAoB;EACjC,SAAS,EAAC,IAAI;EACd,KAAK,EAZC,OAAO;;AAef,IAAK;EACH,SAAS,EAAC,IAAI;EACd,OAAO,EAAC,CAAC;EACT,MAAM,EAAC,CAAC;;ACpBV,EAAG;EACD,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,KAAK,EDLA,OAAO;;ACOd,EAAG;EACD,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;EACjB,cAAc,EAAE,SAAS;EACzB,KAAK,EDbA,OAAO;;ACgBd,EAAG;EACD,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,MAAM;EAClB,WAAW,EAAE,GAAG;EAChB,WAAW,EAAE,IAAI;;AAGnB,EAAG;EACD,WAAW,EAAE,GAAG;;AAGlB,IAAK;EACH,MAAM,EAAC,IAAI;EACX,WAAW,EAAE,MAAM;EACnB,OAAO,EAAE,QAAQ;EACjB,KAAK,EAAC,KAAK;EACX,UAAU,EDhCL,OAAO;ECiCZ,aAAa,EAAE,IAAI;EACnB,SAAS,EAAE,QAAQ;EACnB,WAAW,EAAE,GAAG;EAChB,MAAM,EAAE,OAAO;EACf,UAAU,EAAE,qBAAqB;EACjC,UAAQ;IACN,OAAO,EAAE,GAAG;EAEd,aAAW;IACT,MAAM,EAAC,OAAO;IACd,OAAO,EAAC,GAAG;;AAMf,MAAO;EACL,UAAU,ED5CJ,OAAO;EC6Cb,OAAO,EAAE,SAAS;EAClB,aAAa,EAAE,IAAI;EACnB,SAAS,EAAC,KAAK;EACf,kBAAY;IACV,QAAQ,EAAC,QAAQ;IACjB,GAAG,EAAE,KAAK;IACV,IAAI,EAAC,CAAC;IACN,KAAK,EAAC,CAAC;IACP,OAAO,EAAC,KAAK;IACb,MAAM,EAAC,IAAI;IACX,UAAU,EDvDN,OAAO;ICwDX,OAAO,EAAC,SAAS;IACjB,KAAK,EAAE,KAAK;IACZ,aAAa,EAAE,IAAI;IACnB,UAAU,EAAE,MAAM;;AAKtB,KAAM;EACJ,UAAU,EDpEL,OAAO;ECqEZ,MAAM,EAAC,GAAG;EACV,KAAK,EAAC,KAAK;EACX,MAAM,EAAE,IAAI;;AAGd,QAAS;EACP,OAAO,EAAC,KAAK;EACb,UAAU,EAAE,KAAK;EACjB,SAAS,EAAC,IAAI;EACd,eAAe,EAAE,IAAI;EACrB,KAAK,EDlFA,OAAO;ECmFZ,cAAc,EAAE,SAAS;;AAG3B,MAAO;EACL,QAAQ,EAAC,QAAQ;EACjB,KAAK,EDvFD,OAAO;ECwFX,aAAa,EAAC,IAAI;EAClB,oBAAgB;IACd,KAAK,EDnFD,OAAO;ECqFb,UAAI;IACF,QAAQ,EAAC,QAAQ;IACjB,GAAG,EAAC,OAAO;IACX,KAAK,EAAC,MAAM;EAEd,QAAE;IACA,QAAQ,EAAE,QAAQ;IAClB,OAAO,EAAE,IAAI;IACb,cAAc,EAAE,MAAM;IACtB,eAAe,EAAE,MAAM;IACvB,WAAW,EAAE,MAAM;IACnB,MAAM,EAAC,IAAI;IACX,IAAI,EAAC,IAAI;IACT,GAAG,EAAE,CAAC;IACN,MAAM,EAAC,CAAC;IACR,cAAc,EAAE,SAAS;;AAI7B,aAAc;EACZ,UAAU,EAAC,KAAK;EAChB,MAAM,EAAE,iBAAsB;EAC9B,UAAU,EAAE,UAAU;EACtB,aAAa,EAAE,GAAG;EAClB,kBAAK;IACH,UAAU,EAAC,MAAM;IACjB,UAAU,ED/GN,OAAO;ICgHX,aAAa,EAAE,GAAG",
+"sources": ["slovenscina-theme.scss","slovenscina-elements.scss"],
+"names": [],
+"file": "manage-institution.css"
+}

static/css/manage-institution.scss

@@ -0,0 +1 @@
+@import "slovenscina-elements.scss";

static/css/slovenscina-elements.scss

@@ -90,6 +90,9 @@ em {
   position:relative;
   color:$red;
   margin-bottom:2rem;
+  &.alert-success {
+    color:$green;
+  }
   img {
     position:relative;
     top:0.25rem;

static/image/chevron-down.svg

@@ -0,0 +1,3 @@
+<svg width="14" height="8" viewBox="0 0 14 8" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M13.7071 0.292893C14.0976 0.683418 14.0976 1.31658 13.7071 1.70711L7.70711 7.70711C7.31658 8.09763 6.68342 8.09763 6.29289 7.70711L0.292893 1.70711C-0.0976315 1.31658 -0.0976315 0.683417 0.292893 0.292893C0.683417 -0.0976317 1.31658 -0.0976317 1.70711 0.292893L7 5.58579L12.2929 0.292893C12.6834 -0.0976312 13.3166 -0.0976311 13.7071 0.292893Z" fill="#848C91"/>
+</svg>

static/image/chevron-left.svg

@@ -0,0 +1,3 @@
+<svg width="8" height="14" viewBox="0 0 8 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M7.70711 0.292893C8.09763 0.683417 8.09763 1.31658 7.70711 1.70711L2.41421 7L7.70711 12.2929C8.09763 12.6834 8.09763 13.3166 7.70711 13.7071C7.31658 14.0976 6.68342 14.0976 6.29289 13.7071L0.292893 7.70711C-0.0976311 7.31658 -0.0976311 6.68342 0.292893 6.29289L6.29289 0.292893C6.68342 -0.0976311 7.31658 -0.0976311 7.70711 0.292893Z" fill="#46535B"/>
+</svg>

static/image/success.svg

@@ -0,0 +1,5 @@
+<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M15 29.6668C6.86671 29.6668 0.333374 23.1335 0.333374 15.0002C0.333374 6.86683 6.86671 0.333496 15 0.333496C23.1334 0.333496 29.6667 6.86683 29.6667 15.0002C29.6667 23.1335 23.1334 29.6668 15 29.6668ZM15 3.00016C8.33337 3.00016 3.00004 8.3335 3.00004 15.0002C3.00004 21.6668 8.33337 27.0002 15 27.0002C21.6667 27.0002 27 21.6668 27 15.0002C27 8.3335 21.6667 3.00016 15 3.00016Z" fill="#88B52F"/>
+    <path d="M15 16.3335C14.2 16.3335 13.6667 15.8002 13.6667 15.0002V9.66683C13.6667 8.86683 14.2 8.3335 15 8.3335C15.8 8.3335 16.3334 8.86683 16.3334 9.66683V15.0002C16.3334 15.8002 15.8 16.3335 15 16.3335Z" fill="#88B52F"/>
+    <path d="M15 21.6668C14.6 21.6668 14.3334 21.5335 14.0667 21.2668C13.8 21.0002 13.6667 20.7335 13.6667 20.3335C13.6667 20.2002 13.6667 19.9335 13.8 19.8002C13.9334 19.6668 13.9334 19.5335 14.0667 19.4002C14.4667 19.0002 15 18.8668 15.5334 19.1335C15.6667 19.1335 15.6667 19.1335 15.8 19.2668C15.8 19.2668 15.9334 19.4002 16.0667 19.4002C16.2 19.5335 16.3334 19.6668 16.3334 19.8002C16.3334 19.9335 16.3334 20.2002 16.3334 20.3335C16.3334 20.4668 16.3334 20.7335 16.2 20.8668C16.0667 21.0002 16.0667 21.1335 15.9334 21.2668C15.6667 21.5335 15.4 21.6668 15 21.6668Z" fill="#88B52F"/>
+</svg>

static/image/trash.svg

@@ -0,0 +1,6 @@
+<svg width="14" height="15" viewBox="0 0 14 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M0.333252 3.49984C0.333252 3.13165 0.631729 2.83317 0.999919 2.83317H12.9999C13.3681 2.83317 13.6666 3.13165 13.6666 3.49984C13.6666 3.86803 13.3681 4.1665 12.9999 4.1665H0.999919C0.631729 4.1665 0.333252 3.86803 0.333252 3.49984Z" fill="#848C91"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M5.66659 1.49984C5.48977 1.49984 5.32021 1.57007 5.19518 1.6951C5.07016 1.82012 4.99992 1.98969 4.99992 2.1665V2.83317H8.99992V2.1665C8.99992 1.98969 8.92968 1.82012 8.80466 1.6951C8.67963 1.57007 8.51006 1.49984 8.33325 1.49984H5.66659ZM10.3333 2.83317V2.1665C10.3333 1.63607 10.1225 1.12736 9.74747 0.75229C9.37239 0.377218 8.86369 0.166504 8.33325 0.166504H5.66659C5.13615 0.166504 4.62744 0.377218 4.25237 0.75229C3.8773 1.12736 3.66659 1.63607 3.66659 2.1665V2.83317H2.33325C1.96506 2.83317 1.66659 3.13165 1.66659 3.49984V12.8332C1.66659 13.3636 1.8773 13.8723 2.25237 14.2474C2.62744 14.6225 3.13615 14.8332 3.66659 14.8332H10.3333C10.8637 14.8332 11.3724 14.6225 11.7475 14.2474C12.1225 13.8723 12.3333 13.3636 12.3333 12.8332V3.49984C12.3333 3.13165 12.0348 2.83317 11.6666 2.83317H10.3333ZM2.99992 4.1665V12.8332C2.99992 13.01 3.07016 13.1795 3.19518 13.3046C3.32021 13.4296 3.48977 13.4998 3.66659 13.4998H10.3333C10.5101 13.4998 10.6796 13.4296 10.8047 13.3046C10.9297 13.1795 10.9999 13.01 10.9999 12.8332V4.1665H2.99992Z" fill="#848C91"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M5.66659 6.1665C6.03478 6.1665 6.33325 6.46498 6.33325 6.83317V10.8332C6.33325 11.2014 6.03478 11.4998 5.66659 11.4998C5.2984 11.4998 4.99992 11.2014 4.99992 10.8332V6.83317C4.99992 6.46498 5.2984 6.1665 5.66659 6.1665Z" fill="#848C91"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M8.33325 6.1665C8.70144 6.1665 8.99992 6.46498 8.99992 6.83317V10.8332C8.99992 11.2014 8.70144 11.4998 8.33325 11.4998C7.96506 11.4998 7.66659 11.2014 7.66659 10.8332V6.83317C7.66659 6.46498 7.96506 6.1665 8.33325 6.1665Z" fill="#848C91"/>
+</svg>

templates/solar-forgotpass.html

@@ -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="../static/css/login-styles.css" type="text/css">
+    <link rel="stylesheet" href="../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="../static/image/logo.svg" alt="logo"/>
             </div>
             <h1 class="m-b-3">Pozabljeno geslo - ŠOLAR</h1>
             <div>
@@ -27,12 +27,17 @@
                 </form>
                 {% with messages = get_flashed_messages() %}
                 {% if messages %}
-                <div class="alert">
-                    <img src="../static/image/alert.svg" alt="alert"/>
+                <div class="alert alert-success">
+                    <img src="../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>
+                </div>
             </div>
         </div>
     </div>

templates/solar-login.html

@@ -3,28 +3,35 @@
 <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="../static/css/login-styles.css" type="text/css">
+    <link rel="stylesheet" href="../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="../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>
+            <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 v pedagoški naziv.</em></div>
 
             <h1 class="m-b-3">Prijava</h1>
             {% with messages = get_flashed_messages() %}
             {% if messages %}
-            <div class="alert">
-                <img src="/static/image/alert.svg" alt="alert"/>
+                {% if "potrditev" in messages[0] or "uspešna" in messages[0] %}
+                <div class="alert alert-success">
+                    <img src="../static/image/success.svg" alt="alert"/>
                     <p>{{ messages[0] }}</p>
                 </div>
+                {% else %}
+                <div class="alert">
+                    <img src="../static/image/alert.svg" alt="alert"/>
+                    <p>{{ messages[0] }}</p>
+                </div>
+                {% endif %}
             {% endif %}
             {% endwith %}
             <div>

templates/solar-manage-institution.html

@@ -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="https://slovenscina.eu/" target="_blank">Več informacij</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>

templates/solar-oddaja.html

@@ -3,14 +3,14 @@
 <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="../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>
     <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">
             <a href="../logout">Odjava</a>
             {% if is_institution_coordinator %}
@@ -19,20 +19,20 @@
             {% if is_admin %}
             <a href="../admin">Administracijski meni</a>
             {% endif %}
-            <a href="mailto:email@example.com">Pomoč</a>
+            <a href="https://slovenscina.eu/" target="_blank">Več informacij</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>
+                <h1 class="title">Korpus Šolar</h1>
+                <p class="subtitle" style="width:60%">Prosimo, določite podatke o besedilih, ki jih želite oddati, in nato naložite besedila. Če oddajate besedila, ki so nastala v različnih razredih, se razlikujejo glede učiteljskih popravkov in podobno, jih oddajte v ločenih paketih.</p>
 
 
                 <div class="tab-nav">
-                    <a href="/oddaja" class="active">Oddaja</a>
-                    <a href="/zgodovina">Zgodovina</a>
-                    <a href="/pogodbe">Pogodbe</a>
+                    <a href="../oddaja" class="active">Oddaja besedil</a>
+                    <a href="../zgodovina">Zgodovina sodelovanja</a>
+                    <a href="../pogodbe">Ekipa</a>
                 </div>
             </div>
         </div>
@@ -43,17 +43,21 @@
             <div class="col-6">
                 {% if not institution %}
                 <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>
                 </div>
                 {% elif not institution_contract %}
-                <div class="alert">
-                    <img src="/static/image/alert.svg" alt="alert"/>
+                <!--<div class="alert">
+                    <img src="../static/image/alert.svg" alt="alert"/>
                     <p>Pogodba s šolo še ni naložena!</p>
-                </div>
+                </div>-->
                 {% endif %}
                 <div class="alert" id="error-message">
-                    <img src="/static/image/alert.svg" alt="alert"/>
+                    <img src="../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"/>
                     <p></p>
                 </div>
             </div>
@@ -64,7 +68,30 @@
             <div class="row">
                 <div class="col-6">
                     <div class="form-wrapper">
-                        <label>Program</label>
+                        <label for="regija">Regija</label>
+                        <select id="regija" name="regija">
+                            <option value="CE" selected="selected">Celje (CE)</option>
+                            <option value="GO">Nova Gorica (GO)</option>
+                            <option value="KK">Krško (KK)</option>
+                            <option value="KP">Koper (KP)</option>
+                            <option value="KR">Kranj (KR)</option>
+                            <option value="LJ">Ljubljana (LJ)</option>
+                            <option value="MB">Maribor (MB)</option>
+                            <option value="MS">Murska Sobota (MS)</option>
+                            <option value="NM">Novo Mesto (NM)</option>
+                            <option value="PO">Postojna (PO)</option>
+                            <option value="SG">Slovenj Gradec (SG)</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="col-6">
+                    <p></p>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-6">
+                    <div class="form-wrapper">
+                        <label for="program">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>
@@ -73,12 +100,12 @@
                             <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>
+                            <option value="PTI">Poklicno-tehniško izobraževanje (PTI)</option>
                         </select>
                     </div>
                 </div>
                 <div class="col-6">
-                    <p>lalala</p>
+                    <p></p>
                 </div>
             </div>
             <div class="row">
@@ -86,17 +113,17 @@
                     <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>
+                            <option value="SLO" selected="selected">Slovenščina (SLO)</option>
+                            <option value="DJP">Drugi jezikoslovni predmeti (vtipkajte ime predmeta) (DJP)</option>
+                            <option value="DDP">Drugi družboslovni predmeti (vtipkajte ime predmeta) (DDP)</option>
+                            <option value="DNP">Drugi naravoslovni predmeti (vtipkajte ime predmeta) (DNP)</option>
+                            <option value="DSP">Drugi strokovni predmeti (vtipkajte ime predmeta) (DSP)</option>
+                            <option value="DIP">Drugi izbirni ali dodatni predmeti (vtipkajte ime predmeta) (DIP)</option>
                         </select>
                     </div>
                 </div>
                 <div class="col-6">
-                    <p>lalala</p>
+                    <p></p>
                 </div>
             </div>
 
@@ -108,7 +135,7 @@
                     </div>
                 </div>
                 <div class="col-6">
-                    <p>lalala</p>
+                    <p></p>
                 </div>
             </div>
 
@@ -130,7 +157,7 @@
                     </div>
                 </div>
                 <div class="col-6">
-                    <p>lalala</p>
+                    <p></p>
                 </div>
             </div>
 
@@ -139,15 +166,15 @@
                     <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>
+                            <option value="E" selected="selected">Esej ali spis (E)</option>
+                            <option value="PB">Praktično besedilo (npr. vabila, prošnje ipd. pri pouku slovenščine), napisano za oceno (PB)</option>
+                            <option value="T">Šolski test (T)</option>
+                            <option value="R">Delo v razredu, ne za oceno (vtipkajte besedilo vrsto) (R)</option>
                         </select>
                     </div>
                 </div>
                 <div class="col-6">
-                    <p>lalala</p>
+                    <p></p>
                 </div>
             </div>
 
@@ -159,7 +186,7 @@
                     </div>
                 </div>
                 <div class="col-6">
-                    <p>lalala</p>
+                    <p></p>
                 </div>
             </div>
 
@@ -174,7 +201,7 @@
                     </div>
                 </div>
                 <div class="col-6">
-                    <p>lalala</p>
+                    <p></p>
                 </div>
             </div>
 
@@ -183,14 +210,14 @@
                     <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>
+                            <option value="DD" selected="selected">Besedilo vsebuje učiteljske popravke in strinjam se z njihovo vključitvijo v korpus. (DD)</option>
+                            <option value="N">Besedilo ne vsebuje učiteljskih popravkov. (N)</option>
+                            <option value="DN">Besedilo vsebuje učiteljske popravke in ne strinjam se z njihovo vključitvijo v korpus. (DN)</option>
                         </select>
                     </div>
                 </div>
                 <div class="col-6">
-                    <p>lalala</p>
+                    <p></p>
                 </div>
             </div>
 
@@ -210,7 +237,7 @@
                     </div>
                 </div>
                 <div class="col-6">
-                    <p>lalala</p>
+                    <p>Oddate lahko eno ali (hkrati) več besedil, ki ustrezajo izbranim podatkom. Sprejemljivi formati so: txt, csv, pdf, doc, docx, xls, xlsx, ppt, pptx, jpg, jpeg, png.</p>
                 </div>
             </div>
 
@@ -219,7 +246,7 @@
             <div class="row">
                 <div class="col-6">
                     <div class="form-wrapper">
-                        <button id="button-submit" type="submit" class="btn">Oddaj</button>
+                        <button id="button-submit" type="button" class="btn">Oddaj</button>
                     </div>
                 </div>
                 <div class="col-6">
@@ -229,10 +256,10 @@
 
             <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>
+                    <button id="button-submit-final" type="button" class="btn">Potrdi in oddaj</button>
                 </div>
                 <div class="col-6">
-                    <p>Prosimo, preverite in potrdite vnešene podatke.</p>
+                    <p>Prosimo, preverite, če so vneseni podatki ustrezni in besedila prava. Naknadno spreminjanje ne bo več mogoče.</p>
                 </div>
             </div>
 
@@ -240,11 +267,11 @@
     </div>
 
 
-
+    <br/><br/><br/><br/><br/><br/><br/>
 
 
     <!--{{ dropzone.load_js() }}-->
-    <script src="/static/dropzone.js"></script>
+    <script src="../static/dropzone.js"></script>
     <script>
         /////////////////////////
         // Dropzone            //
@@ -258,6 +285,7 @@
         var termsScrollbox = document.getElementById("popup-terms-text");
         var dataConfirmNotification = document.getElementById("data-confirm-notification");
         var errorMessage = document.getElementById("error-message");
+        var successMessage = document.getElementById("success-message");
         var form = document.forms["form-oddaja"];
 
         {% if not institution %}
@@ -277,13 +305,20 @@
             });
         }
 
-        const reEmail = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+        function showSuccess(str) {
+            successMessage.querySelector("p").textContent = str;
+            successMessage.style.display = "block";
+            window.scroll({
+                top: 0,
+                behavior: 'smooth'
+            });
+        }
 
 
         //onready
         selectPredmet.addEventListener("change", function(e) {
             var predmetCustomBox = document.getElementById("predmet-custom-box").closest('.row');
-            if (selectPredmet.value.startsWith("drug")) {
+            if (selectPredmet.value.startsWith("D")) {
                 predmetCustomBox.style.maxHeight = "150px";
             } else {
                 predmetCustomBox.style.maxHeight = "0px";
@@ -292,7 +327,7 @@
 
         selectVrsta.addEventListener("change", function(e) {
             var vrstaCustomBox = document.getElementById("vrsta-custom-box").closest('.row');
-            if (selectVrsta.value == "delo-v-razredu") {
+            if (selectVrsta.value == "R") {
                 vrstaCustomBox.style.maxHeight = "150px";
             } else {
                 vrstaCustomBox.style.maxHeight = "0px";
@@ -312,25 +347,26 @@
             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, .mkv",
+            acceptedFiles: ".txt, .csv, .pdf, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .jpg, .jpeg, .png",
             maxFiles: 20,
             previewsContainer: "#dropzone-previews",
-            dictDefaultMessage: "Kliknite ali odložite datoteke sem.",
+            dictDefaultMessage: "Kliknite to polje ali povlecite datoteke vanj.",
             dictFallbackMessage: "Vaš brskalnik ne podpira izbiranje datotek z odlaganjem (\"drag & drop\").",
             dictInvalidFileType: "Datoteka je napačnega formata.",
             dictFileTooBig: "Datoteke je prevelika {{filesize}}. Največja dovoljena velikost: {{maxFilesize}}MiB.",
             dictResponseError: "Napaka strežnika: {{statusCode}}",
             dictMaxFilesExceeded: "Ne morete naložiti več datotek.",
-            dictCancelUpload: "Prekini prenos",
-            dictRemoveFile: "Odstrani datoteko",
+            dictCancelUpload: "",
+            dictRemoveFile: "",
             dictCancelUploadConfirmation: "Ali res želite odstraniti to datoteko?",
             dictUploadCanceled: "Prenos prekinjen",
-
+            addRemoveLinks: true,
             // The setting up of the dropzone
             init: function() {
                 var dz = this;
                 dataConfirmNotification.style.display = "none";
                 errorMessage.style.display = "none";
+                successMessage.style.display = "none";
 
                 btnSubmit.addEventListener("click", function(e) {
                     // Make sure that the form isn't actually being sent.
@@ -338,6 +374,7 @@
                     e.stopPropagation();
 
                     // Check form validity.
+                    var regija = form["regija"].value;
                     var program = form["program"].value;
                     var predmet = form["predmet"].value;
                     var predmetCustom = form["predmet-custom"].value;
@@ -347,9 +384,9 @@
                     var solskoLeto = form["solsko-leto"].value;
                     var jezikovniPopravki = form["jezikovni-popravki"].value;
 
-                    if (predmet.startsWith("drug") && isEmptyOrSpaces(predmetCustom)) {
+                    if (predmet.startsWith("D") && isEmptyOrSpaces(predmetCustom)) {
                         showError("Polje za predmet ne more biti prazno!");
-                    } else if (vrsta === "delo-v-razredu" && isEmptyOrSpaces(vrstaCustom)) {
+                    } else if (vrsta === "R" && isEmptyOrSpaces(vrstaCustom)) {
                         showError("Polje za vrsto besedila ne more biti prazno!");
                     } else if (dataConfirmNotification.style.display == "none") {
                         dataConfirmNotification.style.display = "inherit";
@@ -357,12 +394,12 @@
                     } else {
 
                         // Hand off data to dropzone
-                        dz.processQueue();
+                        //dz.processQueue();
 
                         // Clear fields and hide popup agian
                         dataConfirmNotification.style.display = "none";
                         btnSubmit.textContent = "Oddaj";
-                        form.reset();
+                        //form.reset();
                     }
                 });
 
@@ -380,6 +417,12 @@
                     // Hide the success button or the complete form.
                 });
                 this.on("successmultiple", function(files, response) {
+                    showSuccess(response);
+                    dz.removeAllFiles();
+                    dataConfirmNotification.style.display = "none";
+                    btnSubmit.style.display = "";
+                    return;
+
                     // Gets triggered when the files have successfully been sent.
                     // Redirect user or notify of success.
                 });
@@ -390,6 +433,7 @@
 
 
                 this.on("sending", function(file, xhr, formData) {
+                    formData.append("regija",form["regija"].value);
                     formData.append("program",form["program"].value);
                     formData.append("predmet",form["predmet"].value);
                     formData.append("predmet-custom",form["predmet-custom"].value);
@@ -404,7 +448,7 @@
             },
             uploadprogress: function(file, progress, bytesSent) {
                 if (file.previewElement) {
-                    console.log(progress);
+                    //console.log(progress);
                     var progressElement = file.previewElement.querySelector("[data-dz-uploadprogress]");
                     progressElement.style.width = progress + "%";
                     //progressElement.querySelector(".progress-text").textContent = progress + "%";

templates/solar-pogodbe.html

@@ -3,14 +3,14 @@
 <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="../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">
 </head>
 <body>
     <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">
             <a href="../logout">Odjava</a>
             {% if is_institution_coordinator %}
@@ -19,431 +19,151 @@
             {% if is_admin %}
             <a href="../admin">Administracijski meni</a>
             {% endif %}
-            <a href="mailto:email@example.com">Pomoč</a>
+            <a href="https://slovenscina.eu/" target="_blank">Več informacij</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>
+                <h1 class="title">Korpus Šolar</h1>
+                <p class="subtitle"></p>
 
                 <div class="tab-nav">
-                    <a href="/oddaja">Oddaja</a>
-                    <a href="/zgodovina">Zgodovina</a>
-                    <a href="/pogodbe" class="active">Pogodbe</a>
+                    <a href="../oddaja">Oddaja besedil</a>
+                    <a href="../zgodovina">Zgodovina sodelovanja</a>
+                    <a href="../pogodbe" class="active">Ekipa</a>
                 </div>
             </div>
         </div>
 
-        <div class="row">
-            <div class="col-12">
-                <h2>Oddaj pogodbo</h2>
-            </div>
-        </div>
-        {% if show_upload_form %}
-            <form action="" method="POST" id="form-pogodbe" enctype="multipart/form-data">
-                <div class="row">
-                    <div class="col-6">
-                        <div class="form-wrapper">
-                            <input type="radio" id="sola" name="tip-pogodbe" value="sola"  {% if enable_upload_school_contract %}disabled{%endif%}>
-                            <label for="sola">Pogodba s šolo</label>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-6">
-                        <div class="form-wrapper">
-                            <input type="radio" id="ucenci-starsi" name="tip-pogodbe" value="ucenci-starsi" checked>
-                            <label for="ucenci-starsi">Pogodba z učenci / starši</label>
-                        </div>
-                    </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="my-dropzone">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">
-                        <button class="btn" id="btn-submit" type="submit">Oddaj pogodbo</button>
-                    </div>
-                </div>
-            </form>
-        {% endif %}
 
 
 
-        <div class="row">
-            <div class="col-12">
-                <h2>Oddane pogodbe</h2>
-            </div>
-        </div>
-        {% if contract_school %}
-        <div class="row">
-            <div class="col-6">
-                <div class="contract-item">
-                    <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-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>
-                </div>
-            </div>
-        </div>
 
-        {% endif %}
-        {% for item in contracts_students %}
-        <div class="row">
-            <div class="col-6">
-                <div class="contract-item">
-                    <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-date">DODANO: {{item.timestamp.strftime('%d. %m. %Y')}}</div>
-                    <a href="../pogodbe-ucencistarsi/{{ item.file_contract }}.pdf" class="contract-item-download">Prenesi</a>
-                </div>
-            </div>
-        </div>
-        {% endfor %}
-
-
-
-        <div class="row">
+        <!--<div class="row">
             <div class="col-12">
                 <h2>Sodelujoči</h2>
             </div>
+        </div>-->
+        <div class="row">
+            <div class="col-12">
+                <h2>Število oddaj na uporabnika</h2>
+            </div>
         </div>
         <div class="row">
             <div class="col-6">
-        {% for collaborator in collaborators %}
+                <div id="my_dataviz">
 
-                <div class="collaborators-item">
-                    <div class="collaborators-item-name">{{collaborator.name}}</div>
-                    {% if collaborator.id in cooperation_history %}
-                    {% if cooperation_history[collaborator.id]["coordinator"]|length > 0 %}
-                    <div class="collaborators-item-years"><b>Vodenje:</b> {% for item in cooperation_history[collaborator.id]["coordinator"] %}
-                        {% if loop.index != 1 %}, {% endif %}
-                        {{item[0]}}
-                        {% endfor %}</div>
-                    {% endif %}
-                    {% if cooperation_history[collaborator.id]["mentor"]|length > 0 %}
-                    <div class="collaborators-item-years"><b>Mentorstvo:</b> {% for item in cooperation_history[collaborator.id]["mentor"] %}
-                        {% if loop.index != 1 %}, {% endif %}
-                        {{item[0]}}
-                        {% endfor %}</div>
-                    {% endif %}
-                    {% if cooperation_history[collaborator.id]["other"]|length > 0 %}
-                    <div class="collaborators-item-years"><b>Drugo:</b> {% for item in cooperation_history[collaborator.id]["other"] %}
-                        {% if loop.index != 1 %}, {% endif %}
-                        {{item[0]}}
-                        {% endfor %}</div>
-                    {% endif %}
-                    {% endif %}
+                </div>
+            </div>
+        </div>
+        {% set vars = {'prev_schoolyear': ''} %}
+        {% for item in cooperation_history %}
+            {% if item.school_year != vars.prev_schoolyear %}
+                <div class="row">
+                    <div class="col-12">
+                        <h2>Šolsko leto {{item.school_year}}</h2>
+                    </div>
                 </div>
 
+                {% if vars.update({'prev_schoolyear': item.school_year}) %}  {% endif %}
+            {% endif %}
+            <div class="row">
+                <div class="col-6">
+                    <div class="team-item">
+                        <div class="team-item-name">{{item.name}} <span class="team-item-role">{{item.badge_text}}</span></div>
+                    </div>
+                </div>
+            </div>
         {% endfor %}
-            </div>
-        </div>
-    </div>
 
 
 
+    </div>
+
+
     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
 
 
-
-
-<!--
-    <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">
-
-            {% with messages = get_flashed_messages() %}
-            {% if messages %}
-                <div class="message-notification">
-                    {{ messages[0] }}
-                </div>
-            <div id="contract-container" style="height: 250px;">
-            {% else %}
-            <div id="contract-container">
-            {% endif %}
-            {% endwith %}
-
-                {% if contract_school %}
-                <div class="contract-item">
-                    <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-data">{{contract_school.original_filename}}</div>
-                    <div class="contract-item-data">DODANO: {{contract_school.timestamp}}</div>
-                    <a href="../pogodbe-institucije/{{ contract_school.file_contract }}.pdf" class="contract-item-button">Prenesi</a>
-                </div>
-                </br>
-                {% endif %}
-                {% for item in contracts_students %}
-                    <div class="contract-item">
-                        <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-data">Pogodba o prenosu lastništva</div>
-                        <div class="contract-item-data">DODANO: {{item.timestamp}}</div>
-                        <a href="../pogodbe-ucencistarsi/{{ item.file_contract }}.pdf" class="contract-item-button">Prenesi</a>
-                    </div>
-                    </br>
-                {% endfor %}
-            </div>
-            </br>
-            </br>
-            {% if show_upload_form %}
-            <div style="padding: 20px; position: absolute; top: 500px; width: 89%;">
-                <div class="section-desc">Oddaj pogodbo</div>
-                <form action="../pogodbe" method="post" enctype="multipart/form-data">
-                    {% if enable_upload_school_contract %}
-                    <div style="display:flex; flex-direction: row; justify-content: left; align-items: center">
-                        <label style="width: 80%; text-align: right;" for="sola">Pogodba s šolo</label>
-                        <input style="width: 20%;" type="radio" id="sola" name="tip-pogodbe" value="sola">
-                    </div>
-                    {% else %}
-                    <div style="display:flex; flex-direction: row; justify-content: left; align-items: center">
-                        <label style="width: 80%; text-align: right;" for="sola">Pogodba s šolo</label>
-                        <input style="width: 20%;"type="radio" id="sola" name="tip-pogodbe" value="sola" disabled>
-                    </div>
-                    {% endif %}
-                    <div style="display:flex; flex-direction: row; justify-content: left; align-items: center">
-                        <label style="width: 80%; text-align: right;" for="ucenci-starsi">Pogodba z učenci / starši</label>
-                        <input style="width: 20%;" type="radio" id="ucenci-starsi" name="tip-pogodbe" value="ucenci-starsi" checked>
-                    </div>
-                    <input style="font-size: 10px;" type="file" id="file-contract" name="file[]" multiple="">
-                    <button style="float: right;" type="submit">Oddaj pogodbo</button>
-                </form>
-            </div>
-            {% endif %}
-        </div>
-        <div id="rect2" class="mock-side">
-            <div id="collaborators-container">
-                <div class="container-title">Sodelujoči</div>
-                <div style="overflow-y: auto;">
-                    {% for collaborator in collaborators %}
-                        <div class="collaborators-item">
-                            <div class="collaborators-item-name">{{collaborator.name}}</div>
-                            {% if collaborator.id in cooperation_history %}
-                            {% if cooperation_history[collaborator.id]["coordinator"]|length > 0 %}
-                            <div class="collaborators-item-years"><b>Vodenje:</b> {% for item in cooperation_history[collaborator.id]["coordinator"] %}
-                                {% if loop.index != 1 %}, {% endif %}
-                                {{item[0]}} 
-                                {% endfor %}</div>
-                            {% endif %}
-                            {% if cooperation_history[collaborator.id]["mentor"]|length > 0 %}
-                            <div class="collaborators-item-years"><b>Mentorstvo:</b> {% for item in cooperation_history[collaborator.id]["mentor"] %}
-                                {% if loop.index != 1 %}, {% endif %}
-                                {{item[0]}} 
-                                {% endfor %}</div>
-                            {% endif %}
-                            {% if cooperation_history[collaborator.id]["other"]|length > 0 %}
-                            <div class="collaborators-item-years"><b>Drugo:</b> {% for item in cooperation_history[collaborator.id]["other"] %}
-                                {% if loop.index != 1 %}, {% endif %}
-                                {{item[0]}} 
-                                {% endfor %}</div>
-                            {% endif %}
-                            {% endif %}
-                        </div>
-                    {% endfor %}
-                </div>
-            </div>
-            <div id="awards-container">
-                <div class="container-title">Sodelovanje v letih</div>
-                <div style="overflow-y: auto; margin: auto; width: 100%; height: 200px;">
-                    {% if cooperation_history.keys()|length > 0 %}
-                        {% if user_id in cooperation_history %}
-                        {% for item in cooperation_history[user_id]['coordinator'] %}
-                            <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;"/>
-                                <div class="collaborators-item-name" 
-                                         style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">
-                                    {{item[1]}}
-                                </div>
-                                <div class="collaborators-item-name" 
-                                         style="float: right; width: 250px; text-align: left; margin-left: 20px;">
-                                    {{item[0]}}
-                                </div>
-                            </div>
-                        {% endfor %}
-                        {% for item in cooperation_history[user_id]['mentor'] %}
-                            <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;"/>
-                                <div class="collaborators-item-name" 
-                                         style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">
-                                    {{item[1]}}
-                                </div>
-                                <div class="collaborators-item-name" 
-                                         style="float: right; width: 250px; text-align: left; margin-left: 20px;">
-                                    {{item[0]}}
-                                </div>
-                            </div>
-                        {% endfor %}
-                        {% for item in cooperation_history[user_id]['other'] %}
-                            <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;"/>
-                                <div class="collaborators-item-name" 
-                                         style="float: right; width: 250px; text-align: left; margin-left: 20px;text-overflow: ellipsis; overflow: hidden; white-space: nowrap;">
-                                    {{item[1]}}
-                                </div>
-                                <div class="collaborators-item-name" 
-                                         style="float: right; width: 250px; text-align: left; margin-left: 20px;">
-                                    {{item[0]}}
-                                </div>
-                            </div>
-                        {% endfor %}
-                        {% endif %}
-                    {% endif %}
-                </div>
-            </div>
-        </div>
-    </div>-->
 </body>
-<!--{{ dropzone.load_js() }}-->
-<script src="/static/dropzone.js"></script>
+<script src="https://d3js.org/d3.v6.js"></script>
+<style>
+    #my_dataviz .tick line{
+        visibility:hidden;
+    }
+    #my_dataviz path.domain{
+        visibility:hidden;
+    }
+</style>
 <script>
-    /////////////////////////
-    // Dropzone            //
-    /////////////////////////
-    var btnSubmit = document.getElementById("btn-submit");
-    var errorMessage = document.getElementById("error-message");
-    var form = document.forms["form-pogodbe"];
+    // set the dimensions and margins of the graph
 
 
-    function isEmptyOrSpaces(str){
-        return str == null || str.match(/^ *$/) !== null;
+    // append the svg object to the body of the page
+
+    var data;
+    // Parse the Data
+    d3.json("/topuploads-by-user/").then(function(jsondata) {
+        if(Object.keys(jsondata).length < 1) {
+            return;
         }
-
-    function showError(str) {
-        errorMessage.querySelector("p").textContent = str;
-        errorMessage.style.display = "block";
-        window.scroll({
-            top: 0,
-            behavior: 'smooth'
-        });
+        data = [];
+        console.log(Object.keys(jsondata).length);
+        var margin = {top: 20, right: 0, bottom: 40, left: 0};
+        var width = document.getElementById("my_dataviz").clientWidth - margin.left - margin.right;
+        var height = Object.keys(jsondata).length * 56;
+        var svg = d3.select("#my_dataviz")
+            .append("svg")
+            .attr("width", width + margin.left + margin.right)
+            .attr("height", height + margin.top + margin.bottom)
+            .style("overflow","visible")
+            .append("g")
+            .attr("transform",
+                "translate(" + margin.left + "," + margin.top + ")");
+        for(var key in jsondata) {
+            data.push({'name': key, 'value':jsondata[key]});
         }
 
 
+        console.log(data);
 
+        // Add X axis
+        var x = d3.scaleLinear()
+            .domain([0,d3.max(data, function (d) { return d.value})])
+            .range([ 0, width]);
+        svg.append("g")
+            .attr("transform", "translate(0," + height + ")")
+            .call(d3.axisBottom(x))
+            .selectAll("text")
+            .style("text-anchor", "center");
 
-    Dropzone.options.myDropzone = { // The camelized version of the ID of the form element
-        url: "../pogodbe",
-        autoProcessQueue: false,
-        uploadMultiple: false,
-        parallelUploads: 20,
-        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, .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.",
-        dictFileTooBig: "Datoteke je prevelika {{filesize}}. Največja dovoljena velikost: {{maxFilesize}}MiB.",
-        dictResponseError: "Napaka strežnika: {{statusCode}}",
-        dictMaxFilesExceeded: "Ne morete naložiti več datotek.",
-        dictCancelUpload: "Prekini prenos",
-        dictRemoveFile: "Odstrani datoteko",
-        dictCancelUploadConfirmation: "Ali res želite odstraniti to datoteko?",
-        dictUploadCanceled: "Prenos prekinjen",
+        // Y axis
+        var y = d3.scaleBand()
+            .range([ 0, data.length*56 ])
+            .domain(data.map(function(d) { return d.name; }))
+            .padding(0);
+        svg.append("g")
+            .call(d3.axisLeft(y))
+            .selectAll("text")
+            .style("text-anchor", "start")
+            .style("font-size", "14px")
+            .attr("transform", "translate(8,-36)");
 
-        // The setting up of the dropzone
-        init: function() {
-            var dz = this;
-
-            /*btnSubmit.addEventListener("click", function(e) {
-                // Make sure that the form isn't actually being sent.
-                e.preventDefault();
-                e.stopPropagation();
-
-                // Check form validity.
-                var program = form["program"].value;
-                var predmet = form["predmet"].value;
-                var predmetCustom = form["predmet-custom"].value;
-                var letnik = form["letnik"].value;
-                var vrsta = form["vrsta"].value;
-                var vrstaCustom = form["vrsta-custom"].value;
-                var solskoLeto = form["solsko-leto"].value;
-                var jezikovniPopravki = form["jezikovni-popravki"].value;
-
-                /*if (predmet.startsWith("drug") && isEmptyOrSpaces(predmetCustom)) {
-                    showError("Polje za predmet ne more biti prazno!");
-                } else if (vrsta === "delo-v-razredu" && isEmptyOrSpaces(vrstaCustom)) {
-                    showError("Polje za vrsto besedila ne more biti prazno!");
-                } else if (dataConfirmNotification.style.display == "none") {
-                    dataConfirmNotification.style.display = "inherit";
-                    btnSubmit.style.display = "none";
-                } else {*/
-
-                    // Hand off data to dropzone
-                    /*dz.processQueue();
-
-                    // Clear fields and hide popup agian
-                    dataConfirmNotification.style.display = "none";
-                    btnSubmit.textContent = "Oddaj";
-                    form.reset();*/
-                //}
-            //});
-
-
-            // First change the button to actually tell dropzone to process the queue.
-            btnSubmit.addEventListener("click", function(e) {
-                // Make sure that the form isn't actually being sent.
-                e.preventDefault();
-                e.stopPropagation();
-                // Hand off data to dropzone
-
-                dz.processQueue();
-                console.log(dz.files);
-                console.log(form["tip-pogodbe"].value);
-                //form.submit();
-
-            });
+        //Bars
+        svg.selectAll("myRect")
+            .data(data)
+            .enter()
+            .append("rect")
+            .attr("x", x(0) )
+            .attr("y", function(d) { return y(d.name); })
+            .attr("width", function(d) { return x(d.value); })
+            .attr("height", 32 )
+            .attr("fill", "#006CB7");
 
 
 
 
-            this.on("sending", function(file, xhr, formData) {
-                //alert("lalalala");
-                formData.append("tip-pogodbe", form["tip-pogodbe"].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>
 </html>

templates/solar-register.html

@@ -3,23 +3,31 @@
 <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="../static/css/login-styles.css" type="text/css">
+    <link rel="stylesheet" href="../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="../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>
+        <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 v pedagoški naziv.</em></div>
 
         <h1 class="m-b-3">Registracija</h1>
+        {% 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>
             <form method="POST" action="../register" class="m-b-2">
                 <div class="input-wrapper">
@@ -41,6 +49,7 @@
                     <div class="input-floating-label">
                         <label>Geslo</label>
                         <input type="password" name="password">
+                        <label class="input-hint">Geslo naj bo dolgo vsaj 8 znakov.</label>
                     </div>
                 </div>
                 <div class="input-wrapper">
@@ -64,14 +73,11 @@
                 <button class="btn" style="margin-left: 46px;">REGISTRACIJA</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 class="back-to-login">
+            <img src="../static/image/chevron-left.svg"/>
+            <a href="../login">Nazaj na prijavo</a>
         </div>
-        {% endif %}
-        {% endwith %}
 
 
     </div>

templates/solar-resetpass.html

@@ -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="../static/css/login-styles.css" type="text/css">
+    <link rel="stylesheet" href="../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="../static/image/logo.svg" alt="logo"/>
         </div>
         <h1 class="m-b-3">Ponastavitev gesla - ŠOLAR</h1>
         <div>
@@ -20,6 +20,7 @@
                     <div class="input-floating-label">
                         <label>Novo geslo</label>
                         <input type="password" name="new_password">
+                        <label class="input-hint">Geslo naj bo dolgo vsaj 8 znakov.</label>
                     </div>
                 </div>
 

templates/solar-zgodovina.html

@@ -3,37 +3,47 @@
 <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="../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>
+        <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="https://slovenscina.eu/" target="_blank">Več informacij</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>
+                <h1 class="title">Korpus Šolar</h1>
+                <p class="subtitle"></p>
 
 
                 <div class="tab-nav">
-                    <a href="/oddaja">Oddaja</a>
-                    <a href="/zgodovina" class="active">Zgodovina</a>
-                    <a href="/pogodbe">Pogodbe</a>
+                    <a href="../oddaja">Oddaja besedil</a>
+                    <a href="../zgodovina" class="active">Zgodovina sodelovanja</a>
+                    <a href="../pogodbe">Ekipa</a>
                 </div>
             </div>
         </div>
 
-        <div class="row">
+        <!--<div class="row">
             <div class="col-12">
                 <h2>Zgodovina naloženih datotek</h2>
             </div>
-        </div>
+        </div>-->
         {% set map_program = {
         "OS" : "Osnovna šola (OŠ)",
         "SSG" : "Splošna in strokovna gimnazija (SGG)",
@@ -45,23 +55,36 @@
         "PTI" : "Poklicno-tehnično izobraževanje (PTI)"
         }%}
         {% set map_subject = {
-        "slo" : "Slovenščina",
-        "drug-jez" : "Drugi jezikoslovni predmeti",
-        "drug-druz" : "Drugi družboslovni predmeti",
-        "drug-narav" : "Drugi naravoslovni predmeti",
-        "drug-strok" : "Drugi strokovni predmeti",
-        "drug-izb" : "Drugi izbirni ali dodatni predmeti",
+        "SLO" : "Slovenščina",
+        "DJP" : "Drugi jezikoslovni predmeti",
+        "DDP" : "Drugi družboslovni predmeti",
+        "DNP" : "Drugi naravoslovni predmeti",
+        "DSP" : "Drugi strokovni predmeti",
+        "DIP" : "Drugi izbirni ali dodatni predmeti",
         }%}
         {% set map_text_type = {
-        "esej-spis" : "Esej ali spis",
-        "prakticno" : "Praktično besedilo, napisano za oceno",
-        "solski-test" : "Šolski test",
-        "delo-v-razredu" : "Delo v razredu, ne za oceno",
+        "E" : "Esej ali spis",
+        "PB" : "Praktično besedilo, napisano za oceno",
+        "T" : "Šolski test",
+        "R" : "Delo v razredu, ne za oceno",
         }%}
         {% set map_grammar_corrections = {
-        "popr-ne" : "Besedilo vsebuje učiteljske popravke",
-        "brez-popr" : "Besedilo ne vsebuje učiteljskih popravkov",
-        "popr-da" : "Besedilo vsebuje učiteljske popravke in ne strinjam se z njihovo vključitvijo v korpus",
+        "DD" : "Besedilo vsebuje učiteljske popravke",
+        "N" : "Besedilo ne vsebuje učiteljskih popravkov",
+        "DN" : "Besedilo vsebuje učiteljske popravke in ne strinjam se z njihovo vključitvijo v korpus",
+        }%}
+        {% set map_regions = {
+        "CE" : "Celje",
+        "GO" : "Nova Gorica",
+        "KK" : "Krško",
+        "KP" : "Koper",
+        "KR" : "Kranj",
+        "LJ" : "Ljubljana",
+        "MB" : "Maribor",
+        "MS" : "Murska Sobota",
+        "NM" : "Novo Mesto",
+        "PO" : "Postojna",
+        "SG" : "Slovenj Gradec",
         }%}
 
 
@@ -71,6 +94,9 @@
             {% if institution_names[loop.index - 1] %}
             {% set item_values = item_values + [institution_names[loop.index - 1]] %}
             {% endif %}
+            {% if item.region %}
+            {% set item_values = item_values + [map_regions[item.region]] %}
+            {% endif %}
             {% if item.program %}
             {% set item_values = item_values + [map_program[item.program]] %}
             {% endif %}
@@ -101,146 +127,64 @@
                     <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-desc">
-                        {{ item_values | join(" | ") }}
+                        {{ item_values | join(" | ") |truncate(120) }}
                     </div>
+                    <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>
-        </div>
-        {% endfor %}
-
-
-
-
-
-
-    </div>
-
-
-
-
-
-
-
-
-
-
-    <a href="../logout">Odjavi se</a>
-    {% if is_institution_coordinator %}
-        <br><a href="../manage-institution">Upravljaj z institucijo</a>
+                        <div class="col-6" style="margin:0">
+                            <div class="history-item-files-full">
+                                {% 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>
+                                    <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]}}
+                                        {%else%}
+                                            {{f_name}}
                                         {% 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">
-            <div style="padding: 20px;">
-                <div id="logo-container">
-                    <img src="/static/image/logo.svg" alt="logo"/>
-                </div>
-                <h1 id="title" style="font-size: 25px; position: relative;">Korpus ŠOLAR</h1>
-                <div class="selection-tabs">
-                    <button onclick="window.location.replace('../oddaja');" class="selection-tab-button">ODDAJA</button>
-                    <button onclick="window.location.replace('../zgodovina');" class="selection-tab-button selected">ZGODOVINA</button>
-                    <button onclick="window.location.replace('../pogodbe');" class="selection-tab-button">POGODBE</button>
-                </div>
-            </div>
-            <div id="history-container" style="padding: 20px;">
-                {% for item in upload_history %}
-                    <div class="history-item">
-                        <div class="history-item-date">{{ item.timestamp }}</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>
+                                        </a>
                                     </br>
+                                    {% if item.upload_file_codes != None %}
+                                    <!--<div>{{item.upload_file_codes[loop.index - 1]}}</div>-->
+                                    {% endif %}
+                                </div>
+                                {% endfor %}
+                                {% else %}
+                                {% for f_hash in item.upload_file_hashes %}
+                                <div class="file-item">
+                                    <div class="file-icon"><img src="../static/image/file.svg"/></div>
+                                    <a href="getuploadfile/{{item.id}}/{{f_hash}}" class="file-name">{{f_hash}}</a>
+                                </div>
+                                {% endfor %}
+                                {% endif %}
+                            </div>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
         {% endfor %}
     </div>
-        </div>
-        <div id="rect2" class="mock-side">
-<canvas id="myChart" width="400" height="400"></canvas>
-<script>
-    function drawChart(data) {
-        var ctx = document.getElementById('myChart').getContext('2d');
-        var myChart = new Chart(ctx, {
-            type: 'bar',
-            data: {
-                labels: Object.keys(data),
-                datasets: [{
-                    label: 'št. naloženih datotek',
-                    data: Object.values(data),
-                    backgroundColor: 'rgba(54, 162, 235, 1.0)',
-                    borderWidth: 1
-                }]
-            },
-            options: {
-                plugins: {
-                    title: {
-                        display: true,
-                        text: ''
-                    }
-                },
-                scales: {
-                    y: {
-                        beginAtZero: true
-                    }
-                },
-                indexAxis: 'y'
-            }
-        });
-    }
-    fetch('../topuploads').then(r => r.json()).then(j => drawChart(j));
 
-</script>-->
-        </div>
-    </div>
+
+    <br/><br/><br/><br/><br/><br/><br/>
+
+
+
+
+
+
+
     <script>
 
         var toggleOpen = function() {
@@ -250,6 +194,14 @@
         for (var i = 0; i < elements.length; i++) {
             elements[i].addEventListener('click', toggleOpen, false);
         }
+
+        var files = document.getElementsByClassName("file-item");
+        for (var i = 0; i < files.length; i++) {
+            files[i].addEventListener('click', function(e) {
+                e.stopPropagation();
+            }, false);
+        }
+
     </script>
 </body>
 </html>