From f6f4b8f578d6e7e6c6a1e30824820f044649eeb3 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 19 Jan 2020 22:41:23 +0100 Subject: [PATCH] =?UTF-8?q?Cropper=20bei=20Profilen=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/settings.cpython-38.pyc | Bin 4495 -> 4495 bytes digitaleagentur/settings.py | 2 +- orga/__pycache__/views.cpython-38.pyc | Bin 1699 -> 1892 bytes orga/templates/orga/orga_main.html | 30 +- orga/views.py | 28 +- users/__pycache__/models.cpython-38.pyc | Bin 3899 -> 3401 bytes users/__pycache__/usersforms.cpython-38.pyc | Bin 4818 -> 5525 bytes users/__pycache__/views.cpython-38.pyc | Bin 15560 -> 15624 bytes users/models.py | 11 +- users/static/users/css/cropper.min.css | 9 + users/static/users/js/cropper.min.js | 3616 +++++++++++++++++ users/static/users/js/jquery-cropper.js | 73 + users/templates/users/base.html | 7 +- users/templates/users/profile_update.html | 118 +- users/usersforms.py | 26 +- users/views.py | 19 +- 16 files changed, 3880 insertions(+), 59 deletions(-) create mode 100644 users/static/users/css/cropper.min.css create mode 100644 users/static/users/js/cropper.min.js create mode 100644 users/static/users/js/jquery-cropper.js diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index f1f33de10fd8e1cb2237b719ef5fdb8e52d2be03..12cc5b78222aacf3d32f82b18e19c11a9c7ed0fd 100644 GIT binary patch delta 32 mcmeBI?pNjx<>lpK0D{M@DjT_*1sItp_X{j%l$~rY7y$r$^9S+( delta 32 mcmeBI?pNjx<>lpK00O2bf*ZM;1sGW-_X{j%l$mTU7y$rru?JlM 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 ff84c9d7a20031c4e5e2e8f0898e86c7e85e1886..81e76217bca66a22d833c00df34e2d6c44db4770 100644 GIT binary patch delta 622 zcmYL_&ui2`6vy*2`L#(lt<|p7cI&TJH;N02xHmx*uOcc)LAUE>x@0#d-IsK+GQmSH zdhoCWJPB=4P|qIy5A;8nix)5c4Wc+t)Mj{}dEYlP-0CNuU>aG^}YJC@~~Z- z244ePDO1ID75UrgkMq-C3*3y@OW1QFV;^>))FZ28LcgIsxKtVf)Z8jfVGhkD?2Z_QyfL{RVfPLM{1gI>s_*XtMYgm;rT9Z9!0;Aww*E9WR@;`Hy?F6q3Q zLIeEjJzTpjt<4_tw2&6^$JvCVt{g*K+Q`RSJTI`W^jeT+{~X8w1G<*+gs(AWEbV@l z7W_%^LBplW({G(Prq(sqf|hPD2OO9K7ks9J8b2)ymp=~mCcu34oLvr(`i-7K=%ZhK zX7AdwN=P=~1sVU#@cEX#Q%y$K~ai`gCI^i=%6lw#L%8Kv`yIW5J{dJy%3@&omFo(D`&ktsgqFU9l_%vM|1u7SCRAB%+K4D=5 zNtp|ySPvq07CkGF=dW}t)7svgGAN-xx&?hNGwJ{#S-!3n>`x-EfQfTbVDTI6X*P{R z)G~`8gYUYKEYgYSh>hfs6hG*wT#aEkj!Yo9mPi0A`M`>ilZ0-pwr7lBI)F{Y7n%pm zgF!3}A;U-ylK-byM#2jHpj>76C-5ubqC}x~Do^-^K2H{StltkgvIc#~0@5DQihB97 JF{$=b@(VkJYU2O^ 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 %} +