From c94d0a2f0f815fcc1cb8ab3ee30c8451de062f54 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Mon, 16 Dec 2019 08:55:51 +0100 Subject: [PATCH] =?UTF-8?q?Dashboard=20IE11=20l=C3=A4uft?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/settings.cpython-38.pyc | Bin 4399 -> 4399 bytes .../__pycache__/urls.cpython-38.pyc | Bin 2055 -> 2055 bytes digitaleagentur/urls.py | 2 +- standards/__pycache__/forms.cpython-38.pyc | Bin 3023 -> 3023 bytes standards/__pycache__/models.cpython-38.pyc | Bin 1698 -> 1698 bytes standards/__pycache__/views.cpython-38.pyc | Bin 6170 -> 6189 bytes standards/forms.py | 1 - .../templates/standards/standards_update.html | 5 +++-- standards/views.py | 1 + users/static/users/css/custom.css | 2 +- users/templates/users/base.html | 3 --- users/templates/users/dashboard.html | 8 ++++---- users/templates/users/login.html | 3 +-- 13 files changed, 11 insertions(+), 14 deletions(-) diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index ce13706476b41c41b2f5f2e86569c178d7deb832..b2e92953e709ea846f39b53721a6e1082ac5d1c2 100644 GIT binary patch delta 20 acmZ3lv|fojl$V!_0SMd;zi;GL5d;7+fCPsC delta 20 acmZ3lv|fojl$V!_0SJz6{kD-?MGycu1qFxz diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc index 3f262e9cde6fcbf9d26dac548ab8b1ff0f559339..f438ab364b383e5b5295e4cbdd7f3342342b06bf 100644 GIT binary patch delta 40 scmZn{XcyoO<>lpK0D>aJ@3GPwdHq=#Z*7icWoKej1_>%p&SIYn0JKsGF#rGn delta 40 tcmZn{XcyoO<>lpK00I&5kFjzadHq=#qc+E~vNN$M0R@YcCTFqF1puDp2s8iy 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 26a019c22ec7cbcda0173028b2b24a36f95075c2..c82b7c4abe888d6346d94d9b73dc13885abb0e82 100644 GIT binary patch delta 57 zcmX>veqNk6l$V!_0SFcveUH7ek++7O(PDEK`#VNPugR61iHv5GZ*zWTOqhJ0%ZxE* MG8^|XW^N%h0R6}jZ2$lO delta 57 zcmX>veqNk6l$V!_0SNTgyokNFk++7O(QYC&77X{iL%jc5d))Yd*|nigybwUgGQC6wEdf=pW> z8#ki#xR6RA*(eAirJx`PUAT3rU^e~$!Ho++K|E&?1m|+U^WF3K&f(tK&AiHlWnPj-eFv>7SfOVgV7lKCOCLNmE+TGi$<;AAHu^_AE>arX`D|iP+@ni5Z z%wlI~52o;SC=GM?CDdm+RI{!Ta8ncHEn>JYx^XZ(0h4$yybBW;iwtF_C?NY7<_Vgb zRa!0CC7ESUn1Q>ebvexZ1VPiYAeYzWDL&_ME7I>R5Pg6zB3m$z1I92s!kn=J1w1s4 zr&zQ`d!7FvA9#3)pf2a}w^5@Jwma{ibw`+{c&lNKncJUR%Mk{ZAg#LnIO|eU$Tr>~&KJ@USC}-=fKc+e2{F^PfsMp2YV-f6p{s>1wG?3GSqd z2nzw?kLHmU=DW6N(obE3Ft=mo>6&NFtMC%{%oHr)Tk|OeCu8TeIVzSV+=-1*%GX%# z*c(=h6DXn=!VqOeTJ9bE(tNUfkc(e}{&B9GW#C70pFu7%vlx~b%J?pEJvAgCkfE(b LI|(~z`&;%ef~?3b delta 814 zcmX|;Pe>GT6vuz>H?uoC?#%A&?994bnU?lv6+_8OksTEAPpe6_3TjR2inex$aiK$_ zMIM5nsNSJ4B=-_@2omWMbcs$u5Ck1MbqP9jsUSK<@69gF@cX>)yuUx*Jn!1*GK;3! zAn56R`1^eCw)rVy6+nnUltl@aOB-M7FH-;ty1x~Scem7fF*Qj76O5hO=_*2-DxD2Q9PGSSb@NlvtK29;e zl`)MMl9{Fg$-L%wvgZ)tvpVZ9uJ}jzyNLIbZIKz0xA0YR4W{v!)d_cT(OQNX{AlgZ zO;hY9ofZD!F;MxHhDN;;sdbw8Aa$cToOp)feu8n9agxEK{UPkOT`1xYGmTTE5U2_LI+L@r$m7M{2hA*5PEZ{rm5k=?S6Z#}KED^B9aq+d=LzzF_bMO)e uGtIEHvzY0Fwoy)+U`#Q175*G!p0U7K!uO4XxpoN+U38*$iWsM(*X%!WVz5g9 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 }}