diff --git a/server.py b/server.py index 5e9bc695f8df761b59411a7eccae522e81402277..b778cbfe3950a46fbecf20c96465f30558a2fe0a 100644 --- a/server.py +++ b/server.py @@ -190,7 +190,7 @@ def permdescr(perms): return 'l2p', 'Nur für Teilnehmer der Veranstaltung verfügbar' if password: return 'password', 'Nur für Nutzer mit Passwort verfügbar' - return 'public', 'Öffentlich verfügbar' + return 'none', 'Nicht verfügbar' app.jinja_env.globals['navbar'] = [] # iconlib can be 'bootstrap' diff --git a/static/moderator.js b/static/moderator.js index 8c4910d7ad5c9ed58e4bd53df77af9ee50b15c58..ed9cb376f85ca7512b3d98e60bbdfcec5afc1bd6 100644 --- a/static/moderator.js +++ b/static/moderator.js @@ -165,11 +165,14 @@ var moderator = { case 'public': permstring = ''; break; + case 'none': + permstring = '(Kein Zugriff)'; + break; case 'rwth': - permstring = '(rwth intern)' + permstring = '(RWTH-intern)' break; case 'fsmpi': - permstring = '(fsmpi intern)' + permstring = '(FS-intern)' break; case 'l2p': permstring = '(' + perm.param1 + ')' @@ -185,6 +188,7 @@ var moderator = { html += '<option value="rwth">RWTH intern</option>'; html += '<option value="fsmpi">FSMPI intern</option>'; html += '<option value="l2p">L2P Lernraum</option>'; + html += '<option value="none">Kein Zugriff</option>'; html += '</select>'; html += '<input class="col-xs-12 passwordinput authuser" type="text" placeholder="Benutzername">'; html += '<input class="col-xs-12 passwordinput authpassword" type="text" placeholder="Passwort">'; diff --git a/templates/base.html b/templates/base.html index 87fb684621f0234eb49cecad810f304672e178f5..be2177fbb0691cc6c4bbdca3977c6791585fe614 100644 --- a/templates/base.html +++ b/templates/base.html @@ -113,9 +113,11 @@ {% else %} <div class="col-xs-12 col-md-offset-{{ page_border }} col-md-{{ 12-(2*page_border) }}"> {% endif %} + {% block alerts %} {% for msg in get_flashed_messages(category_filter=["message"]) %} <div class="hidden-print alert alert-danger" role="alert">{{ msg|safe }}</div> {% endfor %} + {% endblock %} {% for msg in get_announcements(min_announcement_level) if (not request.cookies['alert-info-'+msg.id|string]) %} <div class="hidden-print alert alert-{{levels.get(msg.level, ('info', ''))[0]}}" role="alert"> <a href="#" class="close" data-dismiss="alert" aria-label="close" onclick="Cookies.set('alert-info-{{msg.id}}', '1');">×</a> diff --git a/templates/embed.html b/templates/embed.html index 8d365ab260a083b3eb45c612b6ef8a139bd58be0..5998bdbb881db90aad623f9b99c1819a109f75fd 100644 --- a/templates/embed.html +++ b/templates/embed.html @@ -5,6 +5,8 @@ {% block title %}- {{ course.title }}: {{ lecture.title}}{% endblock %} {% block navbar %} {% endblock %} +{% block alerts %} +{% endblock %} {% block content %} <div class="row"> <div class="col-xs-12" style="padding: 0px"> diff --git a/templates/macros.html b/templates/macros.html index d9d8f230228a269418a927ccb2443574cf079c6b..63d34cb8cd775980edf318e0d83a597ce1fc9424 100644 --- a/templates/macros.html +++ b/templates/macros.html @@ -277,6 +277,9 @@ $('#embedcodebtn').popover( {% if permdescription[0] == 'public' %} {% set permlogos = '<span class="fa fa-globe" aria-hidden="true"></span>' %} {% endif %} + {% if permdescription[0] == 'none' %} + {% set permlogos = '<span class="fa fa-ban" aria-hidden="true"></span>' %} + {% endif %} {% if permdescription[0] == 'password' %} {% set permlogos = '<span class="fa fa-lock" aria-hidden="true"></span>' %} {% endif %}