diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 63e1eb6..4001639 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 7a5bd52..9b28b17 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/" CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html index db5490c..3a272ca 100644 --- a/orga/templates/orga/orga_main.html +++ b/orga/templates/orga/orga_main.html @@ -2,6 +2,7 @@ {% load static %} {% block content %} +

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


diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html index 7dd668e..96cdff7 100644 --- a/orga/templates/orga/orga_single.html +++ b/orga/templates/orga/orga_single.html @@ -1,6 +1,10 @@ {% extends "users/base.html" %} {% load counter_tag %} +{% load static %} {% block content %} + + +

Bereiche und Aufgaben von {{user_first_name}} {{user_last_name}} {% if user|usergperm:"usermanager" %} diff --git a/users/static/users/css/custom.css b/users/static/users/css/custom.css index 26230ea..0523e77 100644 --- a/users/static/users/css/custom.css +++ b/users/static/users/css/custom.css @@ -89,7 +89,7 @@ body{ max-width: 50px; } -* {margin: 0; padding: 0;} +.sidebar {margin: 0; padding: 0;} diff --git a/users/static/users/css/jsLists.css b/users/static/users/css/jsLists.css index 10ba2ee..e54b16f 100644 --- a/users/static/users/css/jsLists.css +++ b/users/static/users/css/jsLists.css @@ -1,6 +1,4 @@ -*, *:before, *:after {box-sizing: border-box;} -ul, ol {margin: 0; padding: 0;} -li {list-style: none; line-height: 1.6rem;} + /* List styling */ .jslists{ diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 496fda9..10390f2 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -36,15 +36,12 @@ + - - - - - + @@ -54,10 +51,12 @@ - - - + + + + + @@ -349,6 +348,7 @@ + @@ -361,7 +361,7 @@ - +