Merge branch 'master' of git.fsmpi.rwth-aachen.de:videoagwebsite/videoagwebsite

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'

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">';

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');">&times;</a>

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">

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 %}