diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index a7b3c66..0b6c6b3 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 c252e32..e1e5ed9 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -24,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) SECRET_KEY = '_qv2t2lmsctjxpbb4rrp=op%_20_hxzonv^mvty1o85c)l$s^q' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True ALLOWED_HOSTS = ['digitale-agentur.com', 'www.digitale-agentur.com', 'localhost'] @@ -169,15 +169,16 @@ LOGIN_REDIRECT_URL = 'users-dashboard' #SITE_ROOT = '/var/www/digitale-agentur.com/digitaleagentur/digitaleagentur/../' #STATIC_ROOT = (os.path.join(SITE_ROOT, 'static/')) -if DEBUG: - STATIC_URL = '/static/' -else: - STATIC_URL = 'users/static/' - SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..' - STATIC_ROOT = (os.path.join(SITE_ROOT, 'users/static/')) - STATICFILES_DIRS = ( - os.path.join(SITE_ROOT, 'users/static/'), - ) +#DEV-UMBGEUNG +#STATIC_URL = '/static/' + +#SERVER +STATIC_URL = 'users/static/' +SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..' +STATIC_ROOT = (os.path.join(SITE_ROOT, 'users/static/')) +STATICFILES_DIRS = ( + os.path.join(SITE_ROOT, 'users/static/'), +) # CRISPY CRISPY_TEMPLATE_PACK = 'bootstrap4' diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index c7f4c72..e65735d 100644 Binary files a/users/__pycache__/views.cpython-38.pyc and b/users/__pycache__/views.cpython-38.pyc differ diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index cc52b07..663e1ba 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -4,20 +4,22 @@

Willkommen, {{request.user.first_name}} {{request.user.last_name}}!

Letzter Login: {{ request.user.last_login }}
- Agentur: {{ request.user.profile.agency.name }} -
- -
+

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

+
+
Neueste Standards
+
+
+
{% for item in standards_of_agency %} {% if item.public or item.created_standard_by == user or perms.users.standard_management %} -
+
{% if item.public %} -

{{item.name}}

+
{{item.name}}
{% else %} -

{{item.name}}

+
{{item.name}}
{% endif %}
{% if item.created_standard_by == user or perms.users.standard_management %} @@ -35,14 +37,18 @@ {% endif %}
-
{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}}
Zuletzt bearbeitet von {{ item.last_modified_by.first_name }} {{ item.last_modified_by.last_name }} am {{ item.last_modified_on }}
- -

{{ item.content|truncatechars:250|safe}}

+
{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}} Zuletzt bearbeitet von {{ item.last_modified_by.first_name }} {{ item.last_modified_by.last_name }} am {{ item.last_modified_on }} +
+

{{ item.content|truncatechars:80|safe}}

{% endif %} {% endfor%} +
+
+ +
{% endblock content %} \ No newline at end of file