diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html index e9a68de..f523d82 100644 --- a/dasettings/templates/dasettings/user_usprof.html +++ b/dasettings/templates/dasettings/user_usprof.html @@ -40,7 +40,7 @@
-

Profil von {{user_fullname}} bearbeiten 

+

Mitarbeiter {{user_fullname}}  

{% if newuser == 1 %}
diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index b48ff62..d447392 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index bbb381b..b795e99 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -15,7 +15,6 @@ import os # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - ############################################## DEV ##################################### BASE_URL = "https://dev01.digitale-agentur.com/" @@ -55,8 +54,6 @@ X_FRAME_OPTIONS = 'SAMEORIGIN' # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q' - - ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost', 'dev01.digitale-agentur.com'] # Application definition diff --git a/organizer/templates/organizer/contacts_content.html b/organizer/templates/organizer/contacts_content.html index da23a44..5575254 100644 --- a/organizer/templates/organizer/contacts_content.html +++ b/organizer/templates/organizer/contacts_content.html @@ -4,10 +4,10 @@
{% if user|usergperm:"moduleorganizer" %} -  Kontakt - + {% endif %} -
+
diff --git a/organizer/templates/organizer/organizer_management.html b/organizer/templates/organizer/organizer_management.html index 32ac8a1..6e3097d 100644 --- a/organizer/templates/organizer/organizer_management.html +++ b/organizer/templates/organizer/organizer_management.html @@ -25,7 +25,9 @@
-
Kontakte{% if request.user.profile.showtooltips %} {% endif %}
+
Kontakte{% if request.user.profile.showtooltips %} {% endif %} + {% if user|usergperm:"moduleorganizer" %} + + +  Kontakt + {% endif %} +
{% block contacts_content %} {% include "organizer/contacts_content.html" %} @@ -41,7 +49,11 @@
-
Passwörter{% if request.user.profile.showtooltips %} {% endif %}
+
Passwörter{% if request.user.profile.showtooltips %} {% endif %} + {% if user|usergperm:"moduleorganizer" %} +  Passwort + {% endif %} +
{% block passwords_content %} {% include "organizer/passwords_content.html" %} diff --git a/organizer/templates/organizer/passwords_content.html b/organizer/templates/organizer/passwords_content.html index 4dc371d..d04a163 100644 --- a/organizer/templates/organizer/passwords_content.html +++ b/organizer/templates/organizer/passwords_content.html @@ -4,11 +4,11 @@
{% if user|usergperm:"moduleorganizer" %} -  Passwort + {% endif %}
-
+
diff --git a/organizer/templates/organizer/quicklinks_content.html b/organizer/templates/organizer/quicklinks_content.html index f8d7331..5e26424 100644 --- a/organizer/templates/organizer/quicklinks_content.html +++ b/organizer/templates/organizer/quicklinks_content.html @@ -2,11 +2,11 @@ {% if user|usergperm:"moduleorganizer" %}
-  Quicklink +
{% endif %} -
+
diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html index 5265a8d..6df3c8d 100644 --- a/standards/templates/standards/standards_add.html +++ b/standards/templates/standards/standards_add.html @@ -36,7 +36,7 @@
@@ -126,7 +126,7 @@ {% if user|usergperm:"filesmanager" %} {% endif %} diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index 0de95d0..acde627 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -13,8 +13,9 @@
+