diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index f1f33de..12cc5b7 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 820c706..a048ad8 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -12,7 +12,6 @@ https://docs.djangoproject.com/en/2.2/ref/settings/ 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__))) @@ -120,6 +119,7 @@ CKEDITOR_CONFIGS = { } # Database # https://docs.djangoproject.com/en/2.2/ref/settings/#databases + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', diff --git a/orga/__pycache__/views.cpython-38.pyc b/orga/__pycache__/views.cpython-38.pyc index ff84c9d..81e7621 100644 Binary files a/orga/__pycache__/views.cpython-38.pyc and b/orga/__pycache__/views.cpython-38.pyc differ diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html index 83753a9..7b73020 100644 --- a/orga/templates/orga/orga_main.html +++ b/orga/templates/orga/orga_main.html @@ -5,16 +5,14 @@

{{request.user.profile.agency.name}}


-

Organigramm

+

Organigramm

+ {% if invisible_users > 0%} + + {% endif %}
-
-
- -
@@ -22,9 +20,6 @@ margin-right:auto;"> + @@ -32,6 +32,9 @@ + + + @@ -331,6 +334,8 @@ + + diff --git a/users/templates/users/profile_update.html b/users/templates/users/profile_update.html index e6e074d..0ce2075 100644 --- a/users/templates/users/profile_update.html +++ b/users/templates/users/profile_update.html @@ -1,11 +1,14 @@ {% extends "users/base.html" %} {% load crispy_forms_tags %} +{% load static %} {% block content %} + +
- +
- +
@@ -41,13 +44,13 @@
-
+ {% csrf_token %}
Profil bearbeiten - + {{ profileform_form|crispy }}   
@@ -63,7 +66,7 @@ {% endfor %} - +

@@ -73,6 +76,111 @@
+ + + +{% block javascript %} + +{% endblock %} +