From d64a396f1f9c01780062a31ca9fe9165f7d891c7 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Mon, 23 Mar 2020 01:44:57 +0100 Subject: [PATCH] =?UTF-8?q?Erster=20Zwischecommit=20f=C3=BCr=200.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud/forms.py | 3 +- .../__pycache__/0001_initial.cpython-38.pyc | Bin 1074 -> 2213 bytes cloud/templates/cloud/cloud_main.html | 24 +++++--- cloud/views.py | 20 ++++++- dasettings/__pycache__/forms.cpython-38.pyc | Bin 4797 -> 4897 bytes dasettings/__pycache__/views.cpython-38.pyc | Bin 13225 -> 13225 bytes dasettings/forms.py | 8 ++- .../templates/dasettings/agency_content.html | 11 ++-- .../dasettings/structure_content.html | 4 +- .../templates/dasettings/user_content.html | 4 +- .../templates/dasettings/user_usprof.html | 9 +-- .../__pycache__/settings.cpython-38.pyc | Bin 3704 -> 3736 bytes .../__pycache__/urls.cpython-38.pyc | Bin 2169 -> 2222 bytes .../__pycache__/views.cpython-38.pyc | Bin 356 -> 356 bytes digitaleagentur/settings.py | 10 ++++ digitaleagentur/urls.py | 1 + digitaleagentur/views.py | 1 + media/ag_default.jpg | Bin 0 -> 38719 bytes message/__init__.py | 0 message/__pycache__/__init__.cpython-38.pyc | Bin 0 -> 156 bytes message/__pycache__/admin.cpython-38.pyc | Bin 0 -> 197 bytes message/__pycache__/apps.cpython-38.pyc | Bin 0 -> 378 bytes message/__pycache__/forms.cpython-38.pyc | Bin 0 -> 1066 bytes message/__pycache__/models.cpython-38.pyc | Bin 0 -> 194 bytes message/__pycache__/urls.cpython-38.pyc | Bin 0 -> 480 bytes message/__pycache__/views.cpython-38.pyc | Bin 0 -> 1785 bytes message/admin.py | 3 + message/apps.py | 5 ++ message/forms.py | 8 +++ message/migrations/__init__.py | 0 .../__pycache__/__init__.cpython-38.pyc | Bin 0 -> 167 bytes message/models.py | 3 + message/templates/message/message.html | 23 ++++++++ message/templates/message/message_send.html | 15 +++++ message/tests.py | 3 + message/urls.py | 9 +++ message/views.py | 53 ++++++++++++++++++ news/templates/news/news_management.html | 19 +++++-- .../__pycache__/0001_initial.cpython-38.pyc | Bin 1250 -> 1213 bytes ...e_usernotification_fromuser.cpython-38.pyc | Bin 557 -> 0 bytes .../0003_auto_20200209_1620.cpython-38.pyc | Bin 820 -> 0 bytes ..._usernotification_elementid.cpython-38.pyc | Bin 644 -> 0 bytes .../notificsys/notification_mail.html | 1 - notificsys/views.py | 4 +- orga/templates/orga/orga_main.html | 8 +-- standards/__pycache__/views.cpython-38.pyc | Bin 9855 -> 9874 bytes .../standards/standards_management.html | 6 +- standards/views.py | 2 +- users/models.py | 17 ++++-- users/static/users/img/favicon.png | Bin 0 -> 513 bytes users/templates/users/base.html | 23 +++++++- users/templates/users/dashboard.html | 10 ++-- .../users/newusers_email_MJMLPRE.html | 2 +- .../users/password_reset_mail_MJMLPRE.html | 2 +- users/templates/users/publicbase.html | 2 +- .../users/register_mail_MJMLPRE.html | 2 +- users/templates/users/support.html | 4 +- users/usersforms.py | 6 +- 58 files changed, 260 insertions(+), 65 deletions(-) create mode 100644 media/ag_default.jpg create mode 100644 message/__init__.py create mode 100644 message/__pycache__/__init__.cpython-38.pyc create mode 100644 message/__pycache__/admin.cpython-38.pyc create mode 100644 message/__pycache__/apps.cpython-38.pyc create mode 100644 message/__pycache__/forms.cpython-38.pyc create mode 100644 message/__pycache__/models.cpython-38.pyc create mode 100644 message/__pycache__/urls.cpython-38.pyc create mode 100644 message/__pycache__/views.cpython-38.pyc create mode 100644 message/admin.py create mode 100644 message/apps.py create mode 100644 message/forms.py create mode 100644 message/migrations/__init__.py create mode 100644 message/migrations/__pycache__/__init__.cpython-38.pyc create mode 100644 message/models.py create mode 100644 message/templates/message/message.html create mode 100644 message/templates/message/message_send.html create mode 100644 message/tests.py create mode 100644 message/urls.py create mode 100644 message/views.py delete mode 100644 notificsys/migrations/__pycache__/0002_remove_usernotification_fromuser.cpython-38.pyc delete mode 100644 notificsys/migrations/__pycache__/0003_auto_20200209_1620.cpython-38.pyc delete mode 100644 notificsys/migrations/__pycache__/0004_usernotification_elementid.cpython-38.pyc create mode 100644 users/static/users/img/favicon.png diff --git a/cloud/forms.py b/cloud/forms.py index 07e7df0..cf37c63 100644 --- a/cloud/forms.py +++ b/cloud/forms.py @@ -3,8 +3,7 @@ from django.forms import ModelForm from .models import Data, DataFile class CloudAddFileForm(forms.ModelForm): - - + class Meta: model = Data labels = { diff --git a/cloud/migrations/__pycache__/0001_initial.cpython-38.pyc b/cloud/migrations/__pycache__/0001_initial.cpython-38.pyc index d74b78b5ea3ba1caa9c0cb53e687e0d51ea4cdc2..ab1099b0bff447b33aa34dbd0fc53e60205d8dcc 100644 GIT binary patch literal 2213 zcmbtVNps^w6xM1>ww%RTCfj6&Eg%+GhT{}PO~?);Lrt8E%7v=!?kMe%)uts+aISFm ze}E%*egnmkbDyZ&9oU^hP*AcS7XwGlbpz*6!xpx`*RW0O zcIi7aC}I6f^9#?xpLXi&!bwS%(IiTJLzFr+;wYmmNkyTSPx8W5bFn<6xzif^~eYuVzpgtVvCg8Wvs((;{q-YtP2A>pz}cEVnBn-O6T38 ztAMTo>t+TzteX9gGzZcQnQhOt=iAlcjQLx1RnRTKyv25@z0_XD3wUv0fVU;k-+|qi z@g2M}FhR2_XM#o_&t8#i@S4K6{)%-OZ@}8S0~^+E4!zyO_j7NNhu;`LL?8xl{;wFk z1)f&{)!Tq;4LGdhcNCu2;t%V$rg+IHysL1JI8R%1*17#v)+_kE5$nhubM$ZJ_\ zndc8~(d8T`3_n!)cs+(&L=@>SZi!ae^{}MY+pq2l0ORl=OuQE?^nG zCc=A0c$1|hOi+giON|=+t*B|>!fwVWc`AyST%cZ@K@XyD!l3~M_|0>&;& zz*|f*B8-f|mQ?bWBk&L9`?}JKSr6BSQSePZFJX9`#FD(?#y6zOW>*Q}zNIE``M==n za!|%X7jcpRP4GE%?b|nJ-WyMMpV5>yW76!4+2Lo{?1vKl_53u4L(Y0#-{9~Q)kFcf z#yAy@1baYZ2>Jz#&tHOZglj?WA;Af^*Nqv%Va85JP-KK}BClkZG?i{>0@#HmeTzcc zYbps+@c?2n_R4*^m#K0!q3_=nPN+f^hN2Y8y!2uM-(DDg(?hW=4Ume%n&YO#x0qg` zZWlomAVpo0V3|Pr9Th$KqE{9@qDG>%x_}$#u4>F0mkUD(j83 zG6tR0MbHK%)+NJZ=_idJ0S`6&bGrMmaV|Txam3d;{%O3h z<|p8>zjXpWoBYoR+cq=?QhWku6FXvftR;be$w)N*j1GCXxCaSxyWR4IJSJy^y=MTY6ur#!*oYh7tQ~OQ=n13D1ZJkf@Qv6g_Tq=X$=$<~OJGx{3 E3m3O&LI3~& delta 588 zcmZ9IO>5LZ7{@a&NhaBs?yjps=|Mb*>A`xIQq=kaLRZl($Q%rz&ty%QBqhnBw+ecb zASK{g4<5XVAHvTt-=HVKtKj-%dl6@t|IG7yX6E_Nd>MZe!^6SAx3K*vufO=oPKR3u zcQFDBh_*5!3F+2U(~L=$amm*))3$VwGwn*}p#>c5cNW-+rQ$7<0@yPvaL&4GPv2ZU znH_bje_IcO+c>I^D9VxqEJ=Y#ruZjYIjQ@ZEQl0}ryfvX%1?Vhuwxx?8Xi+{k@Z0! z^T2Nyk{*(Q8m1fRC>=w;A;<xlNEP5Skl`ra-hUZJIjki43MFe48m_9_c z3Xe*K69mM#pyFt$Ycp9VbX3)0RzMOb3XEO6%2gRq;}v-bN~>BKS{Dd-9%afnxJyID zX2Iq5m;IhUKp*V~XSVg^>ErqR{kidrV|8w~`f8Os=&;;rZ@JI6z3!_wQ3U18UvZlg zN~dH(rr0-s(?5Jw+L#W!b}aVEwf0b4xp97eeMu)bQH5~x=M6kc2 CCzIU( diff --git a/cloud/templates/cloud/cloud_main.html b/cloud/templates/cloud/cloud_main.html index b5320cf..b7cd6a5 100644 --- a/cloud/templates/cloud/cloud_main.html +++ b/cloud/templates/cloud/cloud_main.html @@ -27,7 +27,14 @@ a.disabled {

Dateien 

+
+ +
+
Aktuelle Quota: {{actquota}} / 2 GB
+
+ +