From 0344f4d4d5d933c6f291807fffd07d91b8d82d72 Mon Sep 17 00:00:00 2001
From: Julian Rother <julianr@fsmpi.rwth-aachen.de>
Date: Sat, 6 May 2017 02:02:11 +0200
Subject: [PATCH] Added permission type "none"
---
server.py | 2 +-
static/moderator.js | 8 ++++++--
templates/macros.html | 3 +++
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/server.py b/server.py
index 5e9bc69..b778cbf 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 8c4910d..ed9cb37 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/macros.html b/templates/macros.html
index d9d8f23..63d34cb 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 %}
--
GitLab