From 20b22736239cf3f6a4be4f7708fabda128c2ca2e Mon Sep 17 00:00:00 2001 From: Leon Noe Jovan Date: Sun, 23 Jan 2022 22:15:56 +0100 Subject: [PATCH 1/3] added region to uploads history --- templates/solar-zgodovina.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/templates/solar-zgodovina.html b/templates/solar-zgodovina.html index 5585e87..664e9ec 100644 --- a/templates/solar-zgodovina.html +++ b/templates/solar-zgodovina.html @@ -73,6 +73,19 @@ "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", + }%} @@ -81,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 %} From 30f96d4fdcb8b3f30082fbea1ef56e905c3de24b Mon Sep 17 00:00:00 2001 From: Leon Noe Jovan Date: Sun, 23 Jan 2022 22:28:21 +0100 Subject: [PATCH 2/3] nicer admin menu --- templates/solar-admin.html | 21 ++++++++++++++++++++- templates/solar-manage-institution.html | 1 - templates/solar-zgodovina.html | 16 ++++++++-------- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/templates/solar-admin.html b/templates/solar-admin.html index 3692817..c7ed7ac 100644 --- a/templates/solar-admin.html +++ b/templates/solar-admin.html @@ -3,6 +3,10 @@ Admin panel - Šolar + + + + - Nazaj na oddajo +
+ +
+ Odjava + {% if is_institution_coordinator %} + Upravljaj z institucijo + {% endif %} + {% if is_admin %} + Administracijski meni + {% endif %} + Oddaja + Več informacij +
+
+
{% with messages = get_flashed_messages() %} {% if messages %}
@@ -389,6 +407,7 @@ +