diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index ce13706..b2e9295 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc index 3f262e9..f438ab3 100644 Binary files a/digitaleagentur/__pycache__/urls.cpython-38.pyc and b/digitaleagentur/__pycache__/urls.cpython-38.pyc differ diff --git a/digitaleagentur/urls.py b/digitaleagentur/urls.py index b0e7cf2..f4547f2 100644 --- a/digitaleagentur/urls.py +++ b/digitaleagentur/urls.py @@ -37,7 +37,7 @@ urlpatterns = [ path('password-reset-confirm///', auth_views.PasswordResetConfirmView.as_view(template_name='users/password_reset_confirm.html'), name='password_reset_confirm'), path('password-reset-complete/', auth_views.PasswordResetCompleteView.as_view(template_name='users/password_reset_complete.html'), name='password_reset_complete'), path('register/', AgencyCreateView.as_view(template_name='users/register.html'), name='register'), - path('register/done', views.registerdone, name='register-done') + path('register/done', views.registerdone, name='register-done'), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/standards/__pycache__/forms.cpython-38.pyc b/standards/__pycache__/forms.cpython-38.pyc index 26a019c..c82b7c4 100644 Binary files a/standards/__pycache__/forms.cpython-38.pyc and b/standards/__pycache__/forms.cpython-38.pyc differ diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc index 27d9c35..285e13c 100644 Binary files a/standards/__pycache__/models.cpython-38.pyc and b/standards/__pycache__/models.cpython-38.pyc differ diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc index 6deb7c0..d43b36b 100644 Binary files a/standards/__pycache__/views.cpython-38.pyc and b/standards/__pycache__/views.cpython-38.pyc differ diff --git a/standards/forms.py b/standards/forms.py index 930a4bc..c5ffbba 100644 --- a/standards/forms.py +++ b/standards/forms.py @@ -51,7 +51,6 @@ class StandardAddStandardEditor(forms.ModelForm): } fields = ['content'] - class StandardUpdateStandard(forms.ModelForm): class Meta: diff --git a/standards/templates/standards/standards_update.html b/standards/templates/standards/standards_update.html index 2ed8b7a..dea388d 100644 --- a/standards/templates/standards/standards_update.html +++ b/standards/templates/standards/standards_update.html @@ -8,8 +8,8 @@ {% csrf_token %} {{normalForm|crispy}} {{editorForm.media}} - {{editorForm}} -

Wenn ein Standard bearbeitet wurde, kann er nur von einer Person mit dem Recht Standards bearbeiten und freischalten wieder veröffentlicht werden. Ein Standard wird nach Bearbeitung als Nicht veröffentlicht gesetzt.

+ {{editorForm}} +

Wenn ein Standard bearbeitet wurde, kann er nur von einer Person mit dem Recht Standards bearbeiten und freischalten wieder veröffentlicht werden. Ein Standard wird nach Bearbeitung als Nicht veröffentlicht gesetzt.

  @@ -39,5 +39,6 @@ $("#id_area").change(function () { } }); }); + {% endblock content %} diff --git a/standards/views.py b/standards/views.py index 8058c91..67b5ae2 100644 --- a/standards/views.py +++ b/standards/views.py @@ -35,6 +35,7 @@ def StandardAdd(request): editorForm = StandardAddStandardEditor(request.POST, instance=request.user) if editorForm.is_valid() and normalForm.is_valid(): + print(request.POST) normalForm.agency = request.user.profile.agency normalForm.created_standard_by = request.user normalForm.created_standard_date = datetime.now() diff --git a/users/static/users/css/custom.css b/users/static/users/css/custom.css index f78b5db..4984842 100644 --- a/users/static/users/css/custom.css +++ b/users/static/users/css/custom.css @@ -30,4 +30,4 @@ html h2 { html h1 { font-family: 'Roboto' !important; font-size: 2em; -} \ No newline at end of file +} diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 3295797..1c5d7e2 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -28,9 +28,6 @@ - - - diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index a4c3382..228b629 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -9,8 +9,8 @@
-
-
+
+
News
@@ -30,14 +30,14 @@
-
+
-
+
Neueste Standards
diff --git a/users/templates/users/login.html b/users/templates/users/login.html index 6f32a0b..4900eb9 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -9,8 +9,7 @@

Digitale Agentur - Login

 - {{ form|crispy }} - + {{ form|crispy }}