made ui for permissions look better

server.py

@@ -119,7 +119,7 @@ def permdescr(perms):
 		elif perm['type'] == 'password':
 			password = True
 		elif perm['type'] == 'l2p':
-			l2p_courses.append(perm['param'])
+			l2p_courses.append(perm['param1'])
 		elif perm['type'] == 'rwth':
 			rwth_intern = True
 	if public or not perms:
@@ -287,6 +287,7 @@ def course(id=None, handle=None):
 	lectures = query('SELECT * FROM lectures WHERE course_id = ? AND (? OR visible) ORDER BY time, duration DESC', course['id'], ismod())
 	for lecture in lectures:
 		lecture['perm'] = []
+		lecture['perm'] += course['perm']
 		lecture['course'] = course
 		for perm in perms:
 			if perm['lecture_id'] == lecture['id']:

templates/macros.html

@@ -186,25 +186,35 @@ $('#embedcodebtn').popover(
 
 {% macro moderator_acleditor(type,id,acl,global_acls) %}
 	{% set tmp = global_acls.extend(acl) %}
-	{% if (not acl) %}
-		{% if ismod() %}
-		<button class="btn btn-default modmoderator_acleditor" data-type="{{ type }}" data-id="{{ id }}">
-			<span class="fa fa-unlock" aria-hidden="true" style="color: green;"></span>
-		</button>
+	{% set permdescription = acl|permdescr %}
+	{% set permlogos = '' %}
+
+	{% if permdescription[0] == 'public' %}
+		{% set permlogos = '<span class="fa fa-globe" aria-hidden="true"></span>' %}
 	{% endif %}
-	{% else %}
-			{% if ismod() %}
-			<button class="btn btn-default modmoderator_acleditor" data-type="{{ type }}" data-id="{{ id }}" onclick="">
-			{% else %}
-			<a>
+	{% if permdescription[0] == 'password' %}
+		{% set permlogos = '<span class="fa fa-lock" aria-hidden="true"></span>' %}
+	{% endif %}
+	{% if permdescription[0] == 'l2p' %}
+		{% set permlogos %}
+		<span class="fa" aria-hidden="true" style="width: 12px; height: 14px; background-size: cover;  background-image: url('/static/l2p-logo.gif');"></span>
+		{% endset %}
 	{% endif %}
-				<span class="fa fa-lock" aria-hidden="true" style="color: red;"></span>
+	{% if permdescription[0] == 'rwth' %}
+		{% set permlogos %}
+		<span class="fa" aria-hidden="true" style="width: 25px; height: 20px; background-size: cover;  background-image: url('/static/rwth.png');"></span>
+		{% endset %}
+	{% endif %}
+
 	{% if ismod() %}
+		<button class="btn btn-default modmoderator_acleditor" data-type="{{ type }}" data-id="{{ id }}">
+			{{ permlogos|safe }}	
 		</button>
 	{% else %}
+		<a>
+			{{ permlogos|safe }}	
 		</a>
 	{% endif %}
-	{% endif %}
 	
 {% endmacro %}