From a1ddc55206b10c1505ce59d8dad601b655b573e1 Mon Sep 17 00:00:00 2001
From: "holger.trampe" <htrampe@gmail.com>
Date: Thu, 26 Mar 2020 00:08:57 +0100
Subject: [PATCH] 0.8.2 READY FOR QS!

---
 cloud/templates/cloud/cloud_main.html         |   1 +
 dasettings/__pycache__/forms.cpython-38.pyc   | Bin 4897 -> 4789 bytes
 dasettings/forms.py                           |   9 +-
 .../templates/dasettings/groups_content.html  |   6 +-
 .../__pycache__/settings.cpython-38.pyc       | Bin 3825 -> 3823 bytes
 .../__pycache__/urls.cpython-38.pyc           | Bin 2222 -> 2228 bytes
 digitaleagentur/settings.py                   |   2 +-
 digitaleagentur/urls.py                       |   2 +-
 .../notificsys/allnotifications.html          |   4 +
 notificsys/views.py                           |   8 +-
 orga/templates/orga/orga_main.html            |  12 +-
 {quicklinks => organizer}/__init__.py         |   0
 .../__pycache__/__init__.cpython-38.pyc       | Bin
 .../__pycache__/admin.cpython-38.pyc          | Bin
 organizer/__pycache__/apps.cpython-38.pyc     | Bin 0 -> 384 bytes
 organizer/__pycache__/forms.cpython-38.pyc    | Bin 0 -> 3002 bytes
 organizer/__pycache__/models.cpython-38.pyc   | Bin 0 -> 2818 bytes
 organizer/__pycache__/urls.cpython-38.pyc     | Bin 0 -> 1491 bytes
 organizer/__pycache__/views.cpython-38.pyc    | Bin 0 -> 8033 bytes
 {quicklinks => organizer}/admin.py            |   0
 organizer/apps.py                             |   4 +
 organizer/forms.py                            |  93 +++++++++
 organizer/migrations/0001_initial.py          |  26 +++
 organizer/migrations/0002_agcontacts.py       |  31 +++
 organizer/migrations/0003_agpassword.py       |  26 +++
 .../migrations/0004_agpassword_usernname.py   |  18 ++
 .../migrations/0005_auto_20200325_2305.py     |  18 ++
 .../migrations/__init__.py                    |   0
 .../__pycache__/0001_initial.cpython-38.pyc   | Bin 0 -> 971 bytes
 .../0002_agcontacts.cpython-38.pyc            | Bin 0 -> 1151 bytes
 .../0003_agpassword.cpython-38.pyc            | Bin 0 -> 1017 bytes
 .../0004_agpassword_usernname.cpython-38.pyc  | Bin 0 -> 622 bytes
 .../0005_auto_20200325_2305.cpython-38.pyc    | Bin 0 -> 584 bytes
 .../__pycache__/__init__.cpython-38.pyc       | Bin 0 -> 170 bytes
 organizer/models.py                           |  72 +++++++
 organizer/templates/organizer/agpass_add.html |  19 ++
 .../templates/organizer/agpass_delete.html    |  24 +++
 .../templates/organizer/agpass_update.html    |  21 ++
 .../templates/organizer/contact_add.html      |  28 +++
 .../templates/organizer/contact_delete.html   |  24 +++
 .../templates/organizer/contact_update.html   |  29 +++
 .../templates/organizer/contacts_content.html | 103 +++++++++
 .../organizer/organizer_management.html       | 107 ++++++++++
 .../organizer/passwords_content.html          | 107 ++++++++++
 .../templates/organizer}/ql_add.html          |   4 +-
 .../organizer}/ql_confirm_delete.html         |   6 +-
 .../templates/organizer}/ql_update.html       |   6 +-
 .../organizer/quicklinks_content.html         |  34 ++-
 {quicklinks => organizer}/tests.py            |   0
 organizer/urls.py                             |  21 ++
 organizer/views.py                            | 196 ++++++++++++++++++
 quicklinks/__pycache__/apps.cpython-38.pyc    | Bin 387 -> 0 bytes
 quicklinks/__pycache__/forms.cpython-38.pyc   | Bin 707 -> 0 bytes
 quicklinks/__pycache__/models.cpython-38.pyc  | Bin 1375 -> 0 bytes
 quicklinks/__pycache__/urls.cpython-38.pyc    | Bin 863 -> 0 bytes
 quicklinks/__pycache__/views.cpython-38.pyc   | Bin 4043 -> 0 bytes
 quicklinks/apps.py                            |   4 -
 quicklinks/forms.py                           |  15 --
 quicklinks/models.py                          |  38 ----
 quicklinks/urls.py                            |  15 --
 quicklinks/views.py                           |  89 --------
 standards/__pycache__/forms.cpython-38.pyc    | Bin 3953 -> 3941 bytes
 standards/__pycache__/models.cpython-38.pyc   | Bin 2103 -> 2103 bytes
 standards/forms.py                            |   8 +-
 standards/models.py                           |   2 +-
 .../templates/standards/standards_add.html    |  94 ++++++++-
 .../standards/standards_management.html       |  34 ++-
 .../templates/standards/standards_update.html |  82 +++++++-
 users/models.py                               |   4 +-
 users/signals.py                              |  42 +++-
 users/static/users/css/custom.css             |   6 +-
 users/templates/users/base.html               |  62 +-----
 users/templates/users/publicbase.html         |   2 +-
 users/views.py                                |   8 +-
 74 files changed, 1276 insertions(+), 290 deletions(-)
 rename {quicklinks => organizer}/__init__.py (100%)
 rename {quicklinks => organizer}/__pycache__/__init__.cpython-38.pyc (100%)
 rename {quicklinks => organizer}/__pycache__/admin.cpython-38.pyc (100%)
 create mode 100644 organizer/__pycache__/apps.cpython-38.pyc
 create mode 100644 organizer/__pycache__/forms.cpython-38.pyc
 create mode 100644 organizer/__pycache__/models.cpython-38.pyc
 create mode 100644 organizer/__pycache__/urls.cpython-38.pyc
 create mode 100644 organizer/__pycache__/views.cpython-38.pyc
 rename {quicklinks => organizer}/admin.py (100%)
 create mode 100644 organizer/apps.py
 create mode 100644 organizer/forms.py
 create mode 100644 organizer/migrations/0001_initial.py
 create mode 100644 organizer/migrations/0002_agcontacts.py
 create mode 100644 organizer/migrations/0003_agpassword.py
 create mode 100644 organizer/migrations/0004_agpassword_usernname.py
 create mode 100644 organizer/migrations/0005_auto_20200325_2305.py
 rename {quicklinks => organizer}/migrations/__init__.py (100%)
 create mode 100644 organizer/migrations/__pycache__/0001_initial.cpython-38.pyc
 create mode 100644 organizer/migrations/__pycache__/0002_agcontacts.cpython-38.pyc
 create mode 100644 organizer/migrations/__pycache__/0003_agpassword.cpython-38.pyc
 create mode 100644 organizer/migrations/__pycache__/0004_agpassword_usernname.cpython-38.pyc
 create mode 100644 organizer/migrations/__pycache__/0005_auto_20200325_2305.cpython-38.pyc
 create mode 100644 organizer/migrations/__pycache__/__init__.cpython-38.pyc
 create mode 100644 organizer/models.py
 create mode 100644 organizer/templates/organizer/agpass_add.html
 create mode 100644 organizer/templates/organizer/agpass_delete.html
 create mode 100644 organizer/templates/organizer/agpass_update.html
 create mode 100644 organizer/templates/organizer/contact_add.html
 create mode 100644 organizer/templates/organizer/contact_delete.html
 create mode 100644 organizer/templates/organizer/contact_update.html
 create mode 100644 organizer/templates/organizer/contacts_content.html
 create mode 100644 organizer/templates/organizer/organizer_management.html
 create mode 100644 organizer/templates/organizer/passwords_content.html
 rename {quicklinks/templates/quicklinks => organizer/templates/organizer}/ql_add.html (83%)
 rename {quicklinks/templates/quicklinks => organizer/templates/organizer}/ql_confirm_delete.html (71%)
 rename {quicklinks/templates/quicklinks => organizer/templates/organizer}/ql_update.html (74%)
 rename quicklinks/templates/quicklinks/ql_management.html => organizer/templates/organizer/quicklinks_content.html (68%)
 rename {quicklinks => organizer}/tests.py (100%)
 create mode 100644 organizer/urls.py
 create mode 100644 organizer/views.py
 delete mode 100644 quicklinks/__pycache__/apps.cpython-38.pyc
 delete mode 100644 quicklinks/__pycache__/forms.cpython-38.pyc
 delete mode 100644 quicklinks/__pycache__/models.cpython-38.pyc
 delete mode 100644 quicklinks/__pycache__/urls.cpython-38.pyc
 delete mode 100644 quicklinks/__pycache__/views.cpython-38.pyc
 delete mode 100644 quicklinks/apps.py
 delete mode 100644 quicklinks/forms.py
 delete mode 100644 quicklinks/models.py
 delete mode 100644 quicklinks/urls.py
 delete mode 100644 quicklinks/views.py

diff --git a/cloud/templates/cloud/cloud_main.html b/cloud/templates/cloud/cloud_main.html
index e7ff9ad..208efbf 100644
--- a/cloud/templates/cloud/cloud_main.html
+++ b/cloud/templates/cloud/cloud_main.html
@@ -358,6 +358,7 @@ a.disabled {
   </div>
 </div>
 
+<!-- UPLOADING PROCESS -->
 <div class="modal fade" id="uploadModalProgress" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
diff --git a/dasettings/__pycache__/forms.cpython-38.pyc b/dasettings/__pycache__/forms.cpython-38.pyc
index b665614b54c8cc4c8edec22f50ed6996782b6616..4bdb3e3b9f622b52b9ab366a4ba32a1dcec1caba 100644
GIT binary patch
delta 733
zcmZ9J--{Aa6vw^ltj@HKGqc)SW)7K=Nk1$hE0Z;7U0Z5{C~L`;p(`5MjNDO{te4o=
z-p)%91U*C$^bpc>|A!An5Y*HD0sGWB*JU5N!~Jm1`QGojmopzueaq|jV=*m&tNP{T
zR>1hGS3(-)E4cj%+zqASy{aGPi#*149_L0++g#x0y+Fa590fa+gwLTR_#J9Rl$q*w
zw|!`b2Wu&(*L9z~=wPAaj~tgff_H{vzc13*cV;=9ORXoo@o+92BOyk@$nl@eYZ)jh
zTL}Y|C<_O1G5PH+sMC+iZcr(rQiQkBRaS(b(M+a{xmY6P5jJi=j6ky{^6)EIgO>VA
zQ#VA<ai31Q0)D7P(|GRj@u1uB4ytLboV<cQag}h5P$gUkuG!%nhA>c$vod_rvg{<d
zO3JKY@gi<Nh=>M7Mc#Jq(7WUfs_wsni3DbM#N1QEc!kt`PYpe(X?F1s%ihAWSSPF!
z)(8#4O+pj$y3KO1s#n<t?C7s!biSa8Go%*5jMsDLDZD@^5#(enisX1`aP8?heu*tV
z#&8mKJ$u;qMqWXmH>tyS<1}l+U!#12TFn$GiwD%AMFqA!V|}qnc@t`8De>PGZB!iC
zF+1zG>CAyqJf!pyL7HhIg5D#@Aubc-LnUNW`Q$nZ4LEBZVRdL&Zw&gwg2parj-rmg
PVHx%;J7QRtrCX7I;scwG

delta 828
zcmZvZO-vI}5XX7#wrscTw!5Vi1nCCDr(#5i9~7aa34Wj`AsR%&TKg8-ux#;d8xn$v
z+>Mtx%Ed&_#x#<6R8L+#t|t={Pk1(-oLPt_hTXhhX68RLZ!+&)@5?^zuBs|c_#J%T
zS{X>Z)h>mV7IgD?yh*qd?i}LHd(ou`mwAjUJkDFV$~B(gNv?B)r`B4QqP%sXX)wKg
z0?cq4UWHSA^&Tw0XNyn!tE;wKb1J2B-CZ*`?22m(bD>src~NlK4=?sd{g`WSdDcd;
z;`kkP&lZ+<q+6TyM_3w2@KkDpbJBd*@hO{iuPi#@iPX)yU{7jKpTq%twaB?uD|+kL
z3H5IHEUmN|sK`tTh1lQ!cT{fVB0ocsVbq4;tUQw=%U3O{<P<%xWIK*!393BA1+r3v
zenb|JCn2z{BKqN5Xc7+OowzbzuawrEio5QC7dvg}8&zI+Z0qsA@SE6JI!Apb2v-P`
zgemwHGo!s^>M$MeVxy2#vaAp7c6}VfBY3<JLJo=X;Kq;2i}W-_k0xQF6}>reSd&M4
ziqxZ;Jl3=~8u1@2dlSRr7U3G<2H`s4Dq$Aht0wCOU!7ockkNKk${$q38B&MgwKjc<
zh7sopql92P!LouC(JGf4vBW6Ltf09qyH#_uT&-0HwZkR_SV#`AS=dRA^-wE663Aka
zn%$=W+wxgiER#PAUy>uO|6O6B@(?n*#cso{p1SyeGJ|y5fuIQl<%r9K<KD4=!VG-S
gJ6Hj}>d%t&u7VaV@`M5|J_FAUvpHcHhGsPX0VBY^<NyEw

diff --git a/dasettings/forms.py b/dasettings/forms.py
index e661b96..eb9c025 100644
--- a/dasettings/forms.py
+++ b/dasettings/forms.py
@@ -19,13 +19,14 @@ class UsersNotificationForm(forms.ModelForm):
 		model = Profile
 		labels = {
 			"news_mail" : "Agentur-News",
-			"user_standard_public_mail" : "Veröffentlichung meiner Standards",
+			#"user_standard_public_mail" : "Veröffentlichung meiner Standards",
 			"agency_new_standard_mail" : "Neue Agentur-Standards",
 			'add_new_group_mail' : "Gruppenmitgliedschaften",
 			'add_task_mail' : "Tätigkeitsbereich",	
 			'user_messages_mail' : "Mitteilungen"
 		}
-		fields = ['news_mail', 'news_push', 'user_standard_public_mail', 'user_standard_public_push', 'agency_new_standard_mail', 'agency_new_standard_push', 'add_new_group_mail', 'add_new_group_push', 'add_task_mail', 'add_task_push', 'user_messages_mail', 'user_messages_push']
+		#fields = ['news_mail', 'news_push', 'user_standard_public_mail', 'user_standard_public_push', 'agency_new_standard_mail', 'agency_new_standard_push', 'add_new_group_mail', 'add_new_group_push', 'add_task_mail', 'add_task_push', 'user_messages_mail', 'user_messages_push']
+		fields = ['news_mail', 'news_push', 'agency_new_standard_mail', 'agency_new_standard_push', 'add_new_group_mail', 'add_new_group_push', 'add_task_mail', 'add_task_push', 'user_messages_mail', 'user_messages_push']
 
 # PERMISSION GROUPS FORM
 class AgencyGroupPerms(forms.Form):
@@ -52,12 +53,12 @@ class AgencyModulsForm(forms.ModelForm):
 		model = Agency
 		labels = {
 			'module_news' : "Agentur-News",
-			'module_quicklinks' : "Quicklinks",
+			'module_organizer' : "Organizer",
 			'module_files' : "Dateien",
 			'module_organigramm' : "Organigramm",
 			'module_messages' : "Mitteilungen",
 		}
-		fields = ['module_news','module_quicklinks','module_files','module_organigramm', 'module_messages']
+		fields = ['module_news','module_organizer','module_files','module_organigramm', 'module_messages']
 
 # NEW USER FORM
 class UserNewUserForm(forms.ModelForm):
diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html
index 66615c4..09ea0c1 100644
--- a/dasettings/templates/dasettings/groups_content.html
+++ b/dasettings/templates/dasettings/groups_content.html
@@ -117,12 +117,12 @@
 
 /* CHECK FOR ACTIVATED MODULS */
 module_news = '{{request.user.profile.agency.module_news}}'
-module_quicklinks = '{{request.user.profile.agency.module_quicklinks}}'
+module_organizer = '{{request.user.profile.agency.module_organizer}}'
 //module_files = '{{request.user.profile.agency.module_files}}'
 //module_organigramm = '{{request.user.profile.agency.module_organigramm}}'
 
-if(module_quicklinks == "False"){
-  $(".modulequicklinks").remove();
+if(module_organizer == "False"){
+  $(".moduleorganizer").remove();
 }
 
 if(module_news == "False"){
diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc
index 369918088638cdc716afbbcea581337d207d1035..f71f0cdcfaea26b7639c870173fa7beb45c46b5c 100644
GIT binary patch
delta 53
zcmew;`(Bnel$V!_0SIQ+RL8Mx<V|6bl*=zlPt41#N-fe$EGQ_}^M`Ra_pqdL0RXMd
B5jFq-

delta 55
zcmaDa`%#uRl$V!_0SI<$RmO2_<V|6bRwyjZOwP{9%*!s;ODrfT)(eF5H+Qk5asdF$
C77^kA

diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc
index c48eef7c8dbd673663c2863199c6883ce669ee2c..915411fbbf5c8d64cd6d7f377c96643acd0bde47 100644
GIT binary patch
delta 91
zcmZ1{xJ8gRl$V!_0SHdlRL5~`<Xyll#+6@`o|u<em0F}<#Rq3k-pd@ocxy5rOFQGO
i&C^)UGXgnjY_>ph3EM;<X~uq;O&MrTk@94Ij`;vOHXZf=

delta 85
zcmdlYxK5Bal$V!_0SH>3m&dVe<Xyllz+9N4U&UWonwgxPlbM%YJozwl0Ati-5teqw
jsLgX&&NBizIc&B-auwS|AZf#XnN1F8LXq5LQI7clHM<!e

diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py
index 2ca1528..dd02cdf 100644
--- a/digitaleagentur/settings.py
+++ b/digitaleagentur/settings.py
@@ -46,7 +46,7 @@ INSTALLED_APPS = [
     'message.apps.MessageConfig',
     'cloud.apps.CloudConfig',
     'tasks.apps.TasksConfig',
-    'quicklinks.apps.QuicklinksConfig',
+    'organizer.apps.OrganizerConfig',
     'standards.apps.StandardsConfig',
     'news.apps.NewsConfig',
     'crispy_forms',
diff --git a/digitaleagentur/urls.py b/digitaleagentur/urls.py
index c299e42..9f0a7e2 100644
--- a/digitaleagentur/urls.py
+++ b/digitaleagentur/urls.py
@@ -30,7 +30,7 @@ urlpatterns = [
     path('dashboard/', include('users.urls'), name="dashboard"),
     path('areas/', include('areas.urls'), name="areas-management"),
     path('tasks/', include('tasks.urls'), name="tasks-management"),
-    path('ql/', include('quicklinks.urls'), name="ql-management"),
+    path('organizer/', include('organizer.urls'), name="ql-management"),
     path('cloud/', include('cloud.urls'), name="cloud-main"),
     path('standards/', include('standards.urls'), name="standards"),
     path('news/', include('news.urls'), name="dashboard"),
diff --git a/notificsys/templates/notificsys/allnotifications.html b/notificsys/templates/notificsys/allnotifications.html
index ba031bd..113e2e2 100644
--- a/notificsys/templates/notificsys/allnotifications.html
+++ b/notificsys/templates/notificsys/allnotifications.html
@@ -14,6 +14,10 @@
           <a href="/news/news/{{notification.elementid}}/single" class="" style="text-decoration: none; color: #000000">
             {{notification.notificationtext}}
           </a><br />
+          {% elif notification.notificationtype == "newstandard" %}
+          <a href="/standards/standard/{{notification.elementid}}/single" class="" style="text-decoration: none; color: #000000">
+            {{notification.notificationtext}}
+          </a><br />
           {% elif notification.notificationtype == "messagereceived" %}
           <a href="/messages/sl/{{notification.elementid}}" class="" style="text-decoration: none; color: #000000">
             {{notification.notificationtext}}
diff --git a/notificsys/views.py b/notificsys/views.py
index 709a8b3..85b4a70 100644
--- a/notificsys/views.py
+++ b/notificsys/views.py
@@ -20,7 +20,9 @@ def CheckNotifications(request):
 				if notify.notificationtype == "agencynews":
 					elelink = "news/news/" + str(notify.elementid) + "/single"
 				elif notify.notificationtype == "messagereceived":
-					elelink = "messages/sl/" + str(notify.elementid)					
+					elelink = "messages/sl/" + str(notify.elementid)
+				elif notify.notificationtype == "newstandard":
+					elelink = "standards/standard/" + str(notify.elementid) + "/single"
 				else:
 					elelink = "notifications/showallnotificaions/"
 
@@ -55,7 +57,9 @@ def GetBasicNotifications(request):
 				if notify.notificationtype == "agencynews":
 					elelink = "news/news/" + str(notify.elementid) + "/single"
 				elif notify.notificationtype == "messagereceived":
-					elelink = "messages/sl/" + str(notify.elementid)					
+					elelink = "messages/sl/" + str(notify.elementid)	
+				elif notify.notificationtype == "newstandard":
+					elelink = "standards/standard/" + str(notify.elementid) + "/single"				
 				else:
 					elelink = "notifications/showallnotificaions/"
 
diff --git a/orga/templates/orga/orga_main.html b/orga/templates/orga/orga_main.html
index 360c144..6117ffd 100644
--- a/orga/templates/orga/orga_main.html
+++ b/orga/templates/orga/orga_main.html
@@ -11,11 +11,16 @@
         Achtung! {{invisible_users}} Mitarbeiter sind anderen Mitarbeitern untergeordnet, die nicht im Organigramm sichtbar sein sollen. Bitte prüfen sie die Zuordnung der übergeordneten Mitarbeiter!
       </div>
     {% endif %}
-  <div class="d-flex justify-content-center">
-    <div id="diagram"></div>     
+  <div class="d-flex justify-content-center">    
+    <div id="diagram" class="diagram_class"></div>     
   </div>  
 </div>
 
+<style type="text/css">
+  div.diagram_class {
+  }
+</style>
+
 <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.9.1/underscore-min.js"></script>
 
 <script type="text/javascript">
@@ -53,7 +58,6 @@ for(i = 0; i < data.length; i++){
 
 //Creates nested array from data
 function unflatten(arr) {
-  console.log(arr);
       var tree = [],
           mappedArr = {},
           arrElem,
@@ -117,5 +121,7 @@ function goToUser(id){
 }
 
 $('#diagram').append(html.join(''));
+
+
 </script>
 {% endblock content %}
\ No newline at end of file
diff --git a/quicklinks/__init__.py b/organizer/__init__.py
similarity index 100%
rename from quicklinks/__init__.py
rename to organizer/__init__.py
diff --git a/quicklinks/__pycache__/__init__.cpython-38.pyc b/organizer/__pycache__/__init__.cpython-38.pyc
similarity index 100%
rename from quicklinks/__pycache__/__init__.cpython-38.pyc
rename to organizer/__pycache__/__init__.cpython-38.pyc
diff --git a/quicklinks/__pycache__/admin.cpython-38.pyc b/organizer/__pycache__/admin.cpython-38.pyc
similarity index 100%
rename from quicklinks/__pycache__/admin.cpython-38.pyc
rename to organizer/__pycache__/admin.cpython-38.pyc
diff --git a/organizer/__pycache__/apps.cpython-38.pyc b/organizer/__pycache__/apps.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2ce1e1b580da15e23988935a4bef6ba69841ac23
GIT binary patch
literal 384
zcmYjN%}&EG40f6#wPO=J0@q&l00_a*kOr4=fL*GH5X~VfYMYX*2YznwGQ3i+oOlIJ
zI4wW3<j?;6IkuJ6WHJJ><mLJ1mf}Ys+ZGd<k^2Jz1Y{*tEN2WBfD!UHK(5&<&m)Yl
zAlvz*F34Dyo;J<g)^~+jhsw4wA~SNoPoN=Z2=toe93z^*yS+<iR9!r2Hw?&A`&(FM
zahFJ0t4d4RjijtBwq?l2Qa-e*{88c%-@zrcp@*-N`Jq^O?Yua*rO{5D*>zj#dgI07
z;#y!~ij69@GE{1v_}eH{)A(ug=s1lE?jwSP^?XU!?&7_wjh%)*7qnja-#la~30-nD
NoO>L8pr132z5!uPTA%;`

literal 0
HcmV?d00001

diff --git a/organizer/__pycache__/forms.cpython-38.pyc b/organizer/__pycache__/forms.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d65347d80b2db08010eb7c2d3e05c58fccce35eb
GIT binary patch
literal 3002
zcmc&$TW=dh6yE#Vj_oAQrA?bsbH_*xBoBZ}sGJs>f)djz4M;1C)z&k1*V&6Zv#U^(
zw^ZsIzaSFN{vG^_d4-q!0E84F)N{sm?A(+hA=qd?pE<KRXJ*cK&YA5(A*aCO{r=Mr
zpJo;1Hyn&V1`Mk3@*e?+LexMBRYz4()&ecm9UWwy7=aO*ju~2x721xiD(ea{iS<Gu
z7FFB&zV2i|W0MSMG6PK(G+B}ZO>Uscfo6i_L6aY7CP-mRsT2>vyHZhw*^F7pLC9{#
zga-Fvbg1H#E^?1jzp=C7M>|~P*4FREQQ|ccDL?c$-;Eh*pq24Qhd~uyehq*sj!G0q
zgEgo`gEeUTnxhjP{2QY5Eo*s^-=%DgkVn$-#n#>$vqp8tKzl?#&>WK(#B6DfMJ%vt
zcdwkay0l3XPZ%{Xq>lYPeG<TiDw;4NPzVD@3?s%S0BRLmWLy`gTvy~=H;hRdpqzKz
zXQ>zTXP61!3KJ%2AgsW9LIW<WrcVRHdkQO|IfSF?z1#I|P8qL1h=Ueo^)KT_8qz4?
z_4ThG*NNZq6EC1%3sfnq$HOD3%cv}Mo(lt4p8;DO7nxBFO;feMEsM><uvRfx9)4K?
zp@@L$(E|F?4C>H^1uxeCGMXHpd*Cpw@DBmb58q3rsUkgJWE|tAVknLY2XBg*@q-^w
z<&1gULKV&588bhMC&rRk$Z2HpK^CG5+$9B4B$H%{Op_9sX=NeSv*2>Bd-WWb{b1YQ
z#Y~1bQ}Y^6Q93Gob!*e}1CKDuIX%igrU7lnQF(bJuKY0%%i2nq_v<gToJOSlz)N|Q
zh9PCb+)6x>2>s!PBPP}&Q0=4<gsqnqxu(x}B1t2%fj1P55c~<N^E8g=^5AzxSUh2r
zCc<d=$#bE1g03(K<qcK_-|S5UBs+T>;T?o`5#C3558(rVTF*WmcML6?M3_RDMmXl-
z7!8mgxJ`Z)U_d7oC^h=~)5=R0HLwf}9~}gI(F3mnBub+0Df?Pm+f(<npRs<yxUCay
zL2)5JrL0TYkg~a;w9Pi;=_*vZEv0AI?vFNkh*eQ;O&BcR<&cIZPdk*cIheqd^dmoU
zUAZrjVf0z*GfITD>ys9ors*XK<2_v%oCZx{c&r5pxwDJEJ*aK2+kn7uFd)xFCd3k0
z#$)A}8H!rc@@ih~E}loKq5Gb7`q*W<p(Rlm_-N1|82XXUK7m;#J>p*QA2{wdqZOy+
z?#^Tho-;oGJPGHI7r)&hUPAwyJiLCsSDA_oxyG&_AmP{o0`>-W9bpmS2ErQ%HxbGR
zubT+0f?r=m^c9%=zlqMUlvZqZ3m1AD0qN3D(2r317-1O!m&+tw<c5w}dKdI3S$gw=
zBOel#eTJq+$1>s|t^hp_IXETP^e=L-0PTEj{lW_ZcFrpLAMY?HTfl(<g@4cnS_YK+
z9F+TsZs~+!$*yjx2DQCRC@Zf;yEGzDlDjwV(kM;fUV(ML>_?}j7Y0j9&Q8q@ZU^OV
zI%W`hEcPui>9smoLsIDHvboreI7E%SImmC=DtySkKp5O6PS*<?=U%f+Z@{-4oBCLp
z{>!p2DbCnEE-B7Xek(eZUtD9w>@)LokWVx7B0f6st>h0@&F=ikxLi&_boI^91eC!d
zLrtxc7Zz!IQ7dK|jGcUcuq3ZS42z<$<c*8V>lc$9Po5_ha9K+G`6ah9;{I_iiOg#M
WI(G*<8^?<imi$@0R4gr)uDt?>k!)B1

literal 0
HcmV?d00001

diff --git a/organizer/__pycache__/models.cpython-38.pyc b/organizer/__pycache__/models.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4d86cb4eee0c93d2c3628e0a24a476718866865a
GIT binary patch
literal 2818
zcmcIm&2HO95aypKk`g6ZNt4v>U-~bgQIG%y`iCN}TRTA;HBFQY;g+DaYnt|wRF=ym
zQhREA^}Rr!z;96W3Hl6s%_*;tQ)iZPtjI2cASj8Qo!K3d-|T#|%e%hsX>k4g_}5?l
z0PQgv^Opt2HE6}}Ac#hErloqI>!=&dNX@`Zt-w;Y$!e(`*h;rpJ#_*{={4r2Uf?O+
zW{se+p^-Xq_BG;AeYg3@415@Ii3cOzY@`Jv4bp^>=4_-*>^oY|e*!qPo-XY)CzKUE
zL)xn`%|;X1sQL|_mt%0Kb9$fhf`aPb-uPxMXE|R_C?han-7P2|jPO<SR}GA7&<X;A
zYJpC)z@X-?MQb2!q8}JR9W;j+#3UA2?sJw0R)f@tjo}@bL9+@f@T*XQ7Ht!swDz?}
zde9+l2&W^xpUPyk_d}BH6^FWX^DKn0sGv{&0SxPhhV;_tVaR9}iyc|pVo|m?U5-@5
zX_RD_89Yhoc2qLaA7^pk9nTGWrmWBAq+5<z9+6PwyajI_=^&0S)UmBWD;yBNX}j8=
z+8yms9{?yTi&BbxLD}}9#?OJr)77;vHgOe;&FeXfDc}4yAC)Q1M6tPXW4K9@I1v$}
zh(?rrGv{%XB~$RL^41?uWIYTE!NYI`KWl){^lA5aIr_8d6Ht+p3ThV=0h}ZT0M-+o
zm<I+dsx_Fp_t>R!Od>(0G2R30_TGbt$Hk$+G0FUO6lYOjFqJqDn(V|>gwa-!vr^Eo
z<m@dNJp#8f2X4{t1WFSgR4CsC1s9Yr3mto+KQj0-YP*1zV1uRZnFDFU_of#wr<5eo
z<>Ndq<`~jyu{_RYeJ3g+Avi~nr-tJr%<)bxa*X97#$toejIQn&(+dmnJaZiMmZTGg
znD;Q0UKm2sN``tf4DXc@t7bSRO?vA&r%9ZBPbVCMmi1e=e;j_dHk5W1gLKz+qN?`z
z8Fa9aw9>ng!n`U;{x%Hr3n<=12WQOlG38>y5%OG)RJJft9BGO#D>@(?v!l1*?ih~g
zn1-%qM=<f+^{l-AhT#{NH>p7h&lR|`vBYQPuk6Nx-CVH!XSS{UTMKr3X4hfU!0&ay
zULp=yE^IGd;*rL_7MvkX;zNIyw16pX>8)<8<(Y^^qTntBBQ@TDZvD{YZRoj=0?T~(
z1cOfgf?3`K?F36PgNmhCOBFlMW3QiA8$iz(Jk{TUP1f5^cp(%cq|2h2dK%|c8b5`%
z9aT;D80@Q*bYlb&&x*RL-(~m+e*?uSm8^*L*&K|OIT(w@JLtW}u}t}UDBeeb3&TG^
zft=<aqWB2K$0)9#xC%mAunV)mhSJICm05pP+OV-vDx@_^#6+57HkIy>J`{@W(jv4N
z9n<|(et!Zl??EfDDjdCY;%))gIePs!&!;f^Kl0qCEj;Rgr)^-Y3;gWN__{=zz*8T2
zdMhf52RSE-r~DEis;J8QpbmTbOPof037<xyo|<r6C`DyV9UdjeAAc3zwW2s4Ll7@X
zy>-BFQ~^M}qh;uyq+a*ssE3<g(2f+Qu!IvB_u`;F%2Pziku$P=Gs-5z9A&k?;*lxc
z`$>^(F}gK*0rx%!?=PWMd+QwY6z6ajeq3C#8)b3cCtIpkf+k`q`qlAX6^;68W9A3v
zPoWN9*&gA)*mlYK+xS0La6FRa^2`s*oF`lTs1!R#Z>yt&gU7i@QYvdV@!wBv@~Q$j
eLOQLAr1MpEa(#`zH!7Sagws^F<9E+>yZ-_SAa8mA

literal 0
HcmV?d00001

diff --git a/organizer/__pycache__/urls.cpython-38.pyc b/organizer/__pycache__/urls.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..89d18b4037f4705194e5f0b426be0fe764574313
GIT binary patch
literal 1491
zcmZvc%W~5&6o##&X)eAbX_5k^K%s21Xu`U~a2YxSEV#@-S!gn3L?m1n$#!I$f>^TV
z9bm}|@G#zX)dyh1iX%sLG8B7!EPdxcM>>+_L)UFtaBZD_dHbtwS*N<QdbOeR0G>o5
z%c2%V+!6>Qq}vr<5mmfaw5z-(*73Ti<2v-$XpL7z12;qyH$@A#gpF<CU`M#v6(06P
z8@ELVcSIL=3w?!eK&~pX7^3T}aonSI+W3ZOleWH9f!VB1ov(;B!Q*PrS42JIYa5>f
zzK-#Ajc>#FTHkv=EQskD-Z$Jed|>#d;T^*-8GhMt+wd!fZyD|xe%0`8!@GuGGyJ;Y
zZJ6r~GuIvCyUD7@eR@mxd>aqw?kj6}`%Le~5anwzNsr)N`xvm3WLU{P9{E8ym292`
zlF_^uGbw^338E!DgH5xBt-SX_`Xme#lg~&<d?r|!=1vJ8QV1`52aL0ny@6p?;9*S3
z1qgAEqA(@1bVUi_=Ww&kxd=b!{gOk5mn2C}B1!Wlg%l;dRB9JFN{6L(qw}i9Wos(R
z0!K%w;ILwD%0$dz_S29EruwCJZ>iM_TzJ<BrE@-3gDhb(8HtEyoRtx3P&UVNJ_T(t
zh-%FFUJ<Blc+D1TGFDqlwP9rlZY_msP{fY!24T7%f4DcM#SW+@WHrr!WMURwP}n-{
zswO5EH8Cvkxu*TkNW~agvA4?0;?*J4BDryPvRLO?W>+5Z{UWtdG$3^$QCF5_lR{Ef
zt#s9U3#e+GNq?+7y>`ds6OX{h-aj91<~BVhp&yMh$rD+DPdM)xqU)8xyAjFKBU#m+
zmTpdqLy=$qk7`8OERrORWFprfK-RQ@U!5fz+BCJ%|3GPL<7ne*<7uORf3l-Z7ffC!
zNih_5&1^}=(>c#=m?@mkl*uspX~``epv|BAkM<{r`b(NTiMY??<RF@5`t&7}$4_5R
zXy6Aa;S7#sm}YWPF5E<yK8io*jk}9a@SZ-&$qpC?IjDo~Ag9(x+i+iAxwnz``!9c3
B(c1t3

literal 0
HcmV?d00001

diff --git a/organizer/__pycache__/views.cpython-38.pyc b/organizer/__pycache__/views.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..8476342a2de7a6c1e01668acf19e332f8bc6daa7
GIT binary patch
literal 8033
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

literal 0
HcmV?d00001

diff --git a/quicklinks/admin.py b/organizer/admin.py
similarity index 100%
rename from quicklinks/admin.py
rename to organizer/admin.py
diff --git a/organizer/apps.py b/organizer/apps.py
new file mode 100644
index 0000000..73820dc
--- /dev/null
+++ b/organizer/apps.py
@@ -0,0 +1,4 @@
+from django.apps import AppConfig
+
+class OrganizerConfig(AppConfig):
+    name = 'organizer'
diff --git a/organizer/forms.py b/organizer/forms.py
new file mode 100644
index 0000000..e335dab
--- /dev/null
+++ b/organizer/forms.py
@@ -0,0 +1,93 @@
+from django import forms
+from django.forms import ModelForm
+from .models import QuickLinks, AGContacts, AGPassword
+
+
+class OrganizerAddQlForm(forms.ModelForm):
+
+	class Meta:
+		model =QuickLinks
+		labels = {
+			"name" : "Name",
+			"link" : "Weblink",
+			#"logo" : "Logo",				
+			}
+		#fields = ['name', 'link', 'logo']		
+		fields = ['name', 'link']		
+
+
+# CONTACTS
+class OrganizerAddContact(forms.ModelForm):
+
+	class Meta:
+		model = AGContacts
+		labels = {
+			'first_name' : "Vorname",
+			'last_name' : "Nachname",
+			'mail' : "E-Mailadresse",
+			'phone1' : "Telefon 1",
+			'phone2' : "Telefon 2",
+			'street' : "Straße und Hausnummer",
+			'city' : "Stadt",
+			'plz' : "PLZ",
+			'desc' : "Anmerkungen"
+		}
+		
+		fields = ['first_name', 'last_name', 'mail', 'phone1', 'phone2', 'street',  'plz', 'city', 'desc']
+
+
+	def __init__(self, *args, **kwargs):
+		super(OrganizerAddContact, self).__init__(*args, **kwargs)
+		
+		self.fields['phone1'].required = False
+		self.fields['phone2'].required = False
+		self.fields['desc'].widget.attrs['rows'] = 4	
+
+
+
+class OrganizerUpdateContact(forms.ModelForm):
+
+	class Meta:
+		model = AGContacts
+		labels = {
+			'first_name' : "Vorname",
+			'last_name' : "Nachname",
+			'mail' : "E-Mailadresse",
+			'phone1' : "Telefon 1",
+			'phone2' : "Telefon 2",
+			'street' : "Straße und Hausnummer",
+			'city' : "Stadt",
+			'plz' : "PLZ",
+			'desc' : "Anmerkungen"
+		}
+		
+		fields = ['first_name', 'last_name', 'mail', 'phone1', 'phone2', 'street',  'plz', 'city', 'desc']
+
+	def __init__(self, *args, **kwargs):
+		super(OrganizerUpdateContact, self).__init__(*args, **kwargs)
+		
+		self.fields['phone1'].required = False
+		self.fields['phone2'].required = False
+		self.fields['desc'].widget.attrs['rows'] = 4	
+
+# PASSWORDS
+class AddAGPassword(forms.ModelForm):
+
+	class Meta:
+		model = AGPassword
+		labels = {
+			'name' : "Name der Anwendung",
+			'agpass_username' : "Benutzername in der Anwendung",
+			'compass' : "Passwort in der Anwendung",						
+			'link' : "Weblink zur Anwendung"
+		}
+		
+		fields = ['name', 'agpass_username', 'compass', 'link']
+		#widgets = {
+		#	'compass': forms.PasswordInput()
+		#	}
+
+	def __init__(self, *args, **kwargs):
+		super(AddAGPassword, self).__init__(*args, **kwargs)
+		
+		self.fields['link'].required = False		
diff --git a/organizer/migrations/0001_initial.py b/organizer/migrations/0001_initial.py
new file mode 100644
index 0000000..7d151cc
--- /dev/null
+++ b/organizer/migrations/0001_initial.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.0.4 on 2020-03-22 19:57
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='QuickLinks',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=200)),
+                ('link', models.CharField(max_length=200)),
+                ('logo', models.ImageField(blank=True, default='agencymain/linkdefault.png', upload_to='agencymain')),
+                ('agency', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency')),
+            ],
+        ),
+    ]
diff --git a/organizer/migrations/0002_agcontacts.py b/organizer/migrations/0002_agcontacts.py
new file mode 100644
index 0000000..fe5f8d3
--- /dev/null
+++ b/organizer/migrations/0002_agcontacts.py
@@ -0,0 +1,31 @@
+# Generated by Django 3.0.4 on 2020-03-25 19:04
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0006_auto_20200325_1655'),
+        ('organizer', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AGContacts',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('first_name', models.CharField(default='', max_length=200)),
+                ('last_name', models.CharField(default='', max_length=200)),
+                ('mail', models.CharField(default='', max_length=200)),
+                ('phone1', models.CharField(default='', max_length=200)),
+                ('phone2', models.CharField(default='', max_length=200)),
+                ('street', models.CharField(blank=True, default='', max_length=200)),
+                ('city', models.CharField(blank=True, default='', max_length=200)),
+                ('plz', models.CharField(blank=True, default='', max_length=5)),
+                ('desc', models.TextField(blank=True, max_length=3000)),
+                ('agency', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency')),
+            ],
+        ),
+    ]
diff --git a/organizer/migrations/0003_agpassword.py b/organizer/migrations/0003_agpassword.py
new file mode 100644
index 0000000..46e40d4
--- /dev/null
+++ b/organizer/migrations/0003_agpassword.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.0.4 on 2020-03-25 23:00
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0006_auto_20200325_1655'),
+        ('organizer', '0002_agcontacts'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AGPassword',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(default='', max_length=200)),
+                ('compass', models.CharField(default='', max_length=200)),
+                ('link', models.CharField(default='', max_length=200)),
+                ('agency', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='users.Agency')),
+                ('visibleby', models.ManyToManyField(blank=True, to='users.AgencyGroup')),
+            ],
+        ),
+    ]
diff --git a/organizer/migrations/0004_agpassword_usernname.py b/organizer/migrations/0004_agpassword_usernname.py
new file mode 100644
index 0000000..042da81
--- /dev/null
+++ b/organizer/migrations/0004_agpassword_usernname.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-03-25 23:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organizer', '0003_agpassword'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='agpassword',
+            name='usernname',
+            field=models.CharField(default='', max_length=200),
+        ),
+    ]
diff --git a/organizer/migrations/0005_auto_20200325_2305.py b/organizer/migrations/0005_auto_20200325_2305.py
new file mode 100644
index 0000000..5683f02
--- /dev/null
+++ b/organizer/migrations/0005_auto_20200325_2305.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-03-25 23:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organizer', '0004_agpassword_usernname'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='agpassword',
+            old_name='usernname',
+            new_name='agpass_username',
+        ),
+    ]
diff --git a/quicklinks/migrations/__init__.py b/organizer/migrations/__init__.py
similarity index 100%
rename from quicklinks/migrations/__init__.py
rename to organizer/migrations/__init__.py
diff --git a/organizer/migrations/__pycache__/0001_initial.cpython-38.pyc b/organizer/migrations/__pycache__/0001_initial.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..4bc005e32c0cc1d5c5da13ee203353a4bc17e4e7
GIT binary patch
literal 971
zcmY*Y&2H2%5Kf$Av&m++KNJMLa|lRFxgvyGZE2~X<)_<A6cKrMys6XtY@Gzyo{-?W
z55fcR4m^XeocanNQO4Pp7F!;9#^dof-;9sCU01_#=ljR^iJ@sfm2z{KsBGdY`zSyI
zJ=HQj&@&PcUFjq>0&`ab1I(`)m`qQsFGgSiIn;dX9Pem8k#5FgK`UP5rEFydu(UiF
ztFxP<gUTkZ@-qsi1v+Q}0X;B)#Cl*dD`}}$n4Ppi$7w+e?72B1&_<gB4!Cn2wa$N<
zhnkDtUFgBm+`#i?v~-x4bQ3%2B}=dZt8+3Tu?4s0>ZN5^L+rPuvwsD8h$&cg$wVo=
zjg5`R5zl$WX)4{fH6Ne6;`vD_35Oj?_O^XfdbF;JXe=157|704@QjLCbi!uR!6<l>
zpE2ouU}991EXrxdq^acj4@}+HkuUlwN?9IP$I?tOJjx<2&emzn^6@OAJb$Fjz$Ua#
ztNt{PrF(tm8`2u36tCHr9@43&X+a^X3fWpXo_S41{jDY>X6O`ogq2|xlcXwqB6<i$
zwkDjVP#*XzvK=*0qe!|@gjK9lhI=oHPHUPf_^8=e)Of(AEC+<kSt*DL)fqI5?5p|<
z>@`g~TS(N7dO$jZV=5L~cP~STm;0SUFdpYGk-HWoG>;2OU?kfOQfw$`zj^n1_<S&w
zZZTz-P4-O_4={csejN^;gh#4);fo@TnFzOwah<WeD#P8qVF*0t6-}99rK&}Es!FQJ
zEyL@s4R4mcKb;BnEo@xnI*K+i4RT>xrcTJ3-ov@7-~CPgm=}$o-;&M(dLKp&6^rce
n{WJC#f1-btl(?_Zt2eImSnM96O}3vd*ng%-ES1}`-ZuUM@*g1K

literal 0
HcmV?d00001

diff --git a/organizer/migrations/__pycache__/0002_agcontacts.cpython-38.pyc b/organizer/migrations/__pycache__/0002_agcontacts.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d7c0d4acb88f0f2f86e8adc34b6e204236717585
GIT binary patch
literal 1151
zcmZWo&2AGh5Z?9vB)dsz3Wc`(9g%V%N`uM)Aw(5uL8t{mdLW8eIhpC!VY3^&4kG0U
z*FFLdz#H%gJcF-DNPPe<9Dwnr4XD`KS%2g4{CpnoEi8l<jnz-@U%m7!>ze`p4wt}v
z`tk+|u)t2Nk=?aNtjlbJS>klvZ3`T5KU(0TJ@h^}T@Tm`tL`1s8LQ58I1;hsN@QuS
z{ZR&(<huj2_wQIDaG$>XI|;P9HdtK-Hn5m=9dw7DiGlvG1RhNvN>Dy>_ZbAFD?<ns
zs2(xG3uo}TGkEa~uARY41@;P$=Z_rnc;P?I@?3KfW;T~d6Hs0&uv%oXMmWUEusZaI
z3&V488Lk+8T!E`cEVjFgaE%zcu7jOZYKSLqlB3M^O0(I#9r20EqE@rjY~E^ZMC-RV
zHpn8#WXw}>h*DR{YCRIEP=Y5q+}v(wsp12bYbKzxrP<>LbyrslHv@@WA?V6jiV>I7
z=rvAtK*8uJIn&j*DEnECQOZZC!+jxhHCtQ9U+Fq1atUysPZC9!$=^i@rm;HELBdZB
z-4Pdw_QwZVit8u;miBWc5mnvMUO(aKYk7gZ$z>AS9SAkm&Nw+drp6--m=DC4iisvK
z&&_-uV>*}~Rts(#n*}PENF!<_RH&KCNZ}T_`}+bD$am{CU5<(pqDY5PL|r#Ykk-{G
zdNbjPF*XQrj44nAfw^QRk4n2BYsa*ybc`n0q^sC6es$13;PPbI!FOu547W0gB2J$W
zt3C{Q8fTh8UzdvnsqJ;?+4HBJhwY9IvoW4Lh0m63nKF&|x!1na+cUS{dz2+H%HD%)
zFd1R0^4|92P7g#Z6i?8Qp(e67Z-d_7r`4l|Xhl38ob*9sJeB78mgviGkSIIMX1`qD
zwHaHsYx8;DHnV20{-E98#hJRVgIOUB=oh@qs92jT8?$%ZI4x1$qzJ{?zg5jvw`fC`
R@6K-Eo?$dMY1Qnq^9KttNyz{J

literal 0
HcmV?d00001

diff --git a/organizer/migrations/__pycache__/0003_agpassword.cpython-38.pyc b/organizer/migrations/__pycache__/0003_agpassword.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..cb10d981aa75d4a8fad4134b89be3c76defd1f38
GIT binary patch
literal 1017
zcmZ8gO>fgc5Vbds6X%1ZP-u}jatTOLNYx$?LakC7D%4Uzda*35O=j!bwY_22E~Fgc
zT8Y2GKjDlx?UhsiLJz>K(=T<c9q${@?(BOr-fuQ*29D|PFCTuD4C9XmH;08_9jEM~
z0Rzm~NKDsEh)Yb3NnCQRp#deZz8PRKGb(>Axn&^ljZXOt_ZS_bYDpLfnuR=-%1$`2
zSnf{rx0|DZU>&FYj)obo35H9+1QHOp#H^^Sb1*xqKp7t!Do{PO4hT5tt3nOx&^RTC
zo44?tTeyYTVYR3p*-;~ELK_x}eRt7+2T#5Siy8+u+&?9O>9*hja#>Q&&Ls(CRL&(6
zQZ4m*y)~ca8Tb3Wey_LEU-h4@t*&B(!$m;T@PrAsg;9N<1{0oUbdpI`+ZgUqDL-)m
zii9xQQe=CxW2r`Q(nK(tF;MlX2oox1{t=rg2lItA#`9F;n29l$%ui{;lvP;c>?f**
zX)C}EXdY*%IsNR%EDf?lRhjT)iV2k!hv|{BX~5FS?4(hU=x!9KxN_=aZCJ(>$+&Wk
zLm7@^HlCd<+>9Iwo=>#~<CvyLV!22xTKH1-LC9i|yPdYG`o;ZxU)6jcYo5mp*A3tQ
znA2F_StDRmmI7WTWKs})LVZxM-_cDXuptfQY@obb`dsA<4yl+gYg=5fFi78^Ha0{w
z4Y(pOR@H(4cABc}y?Z-)H5jSZ4oznxuI<HMK4ll}_`?uSFiBy~_Xp3teO*`YHID-(
zyiGpI6P9Mu8*Yz02!k-AG1Ka0x$v$E>|M9FhoxS@Qfsw!dArk@(7#Xxr+kE_S|TR-
zYuT1b$fDUUo@KLrj=q0IWXD#{oKF|Vg(h<u9$q=S^FOG2$y7Yn40M)jF7wq>^r`BL
Px%w})no@_g&1&gCCq*k#

literal 0
HcmV?d00001

diff --git a/organizer/migrations/__pycache__/0004_agpassword_usernname.cpython-38.pyc b/organizer/migrations/__pycache__/0004_agpassword_usernname.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..387a291c322401aa516cf785900087b2c0ad9e49
GIT binary patch
literal 622
zcmYjO&2H2%5cW^9n?$YX4W0mLFRPW{gb*q!qHv&>wwEZvGCNZ@tNbi>qVjWuYu|w@
zZ^8rg<SVDXLM60}U1)cr8O`UJ_?!8By1QF2vdz`k_dhsezXRB|gup(zdrScs@P@U#
z<gF+LXNL>~$nOj!@|FB1O9{y_o2A#(%VxqCZEdU`>b`S+()NIjTZYoMO$qFiyEz49
zB?ndt;D(nHlT{iBaI%_00x3)`1xzm`)iTJ4DEIlh{|rQz_txmH{({y&SS%J#ls0Sa
z+(mD}7h8EgI<#G<TlDPu7tzwcQ@}GlHUrJ9KdA;gGn~&Pp)j?Iy-AGeS&a=G5qGBI
zxl+DRiu%R|Dc@1*<EWd^8xY_cJHT#PqqBmzeD)IHb-2UI0P}-$Z6o$Yzs7%Z{bcqb
zRb#kO2hXZg8rfBE`o^HGUiHhd#cpub;oFl6YEuuoL2c-0wAGyo)xG=`>G5<+4|ONO
zeEr#mN1l+oJqno=n<P!Rpl|0-vWeBBS>kh8>CW_X_z)L~<HzFtsJGc8y2WSDZzXvV
Kwsc|hJ^2@?AFa^<

literal 0
HcmV?d00001

diff --git a/organizer/migrations/__pycache__/0005_auto_20200325_2305.cpython-38.pyc b/organizer/migrations/__pycache__/0005_auto_20200325_2305.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c372d91a01c5371dba47b47be881c5d9f6d88249
GIT binary patch
literal 584
zcmYjNy^hmB5Z?9LAu)-7lJ-QCCbAOJAcP`;E>Mu-AdTg_)sh)mj-1`F8!O_jJX#7~
zfsO~FaeEc7fOHD8P9T}pj=uTkf9Abj%t(Ixy1Dw!8N2hwsf1)q=({sgz<`%*#Z%7N
zltBRED+7Ui8Qh9AfbawBN53hK^?4nyirlJAVYFL#>Qo{!CiLAiQpi#cjM90|Q-R?!
z@`WLU=$jy>1uZK3pzgf?SFaz`9b<E)i)*y$(<DirOO>ycb6aCURt~M!YK3)tWYf-(
zezd3effUylG^_zEWs}u5B^;2(ZG&dizbzXmWgSaN;Z=!*yHb9xROu7F1-M2Hs22q~
z8_;s~!wdAz^8!n#W3$G?O@1=_nEZ|UbNTv3Hm9*&_STd++U$*4R4ddQmrdV&%%I4N
zjVe*)L{&EXzkGJQaYkntOI2-*945mg84bsBI7-HY^%pCsQH#Fw9or(<g;B@@|L((G
m<DJnBI<QnaHv{<8Oy2Ov8TaT36{y=U_v^p%b)Da`EB*pq^Pubi

literal 0
HcmV?d00001

diff --git a/organizer/migrations/__pycache__/__init__.cpython-38.pyc b/organizer/migrations/__pycache__/__init__.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c97986fda6c91767373764ec5a9ce1aee5e5ca4b
GIT binary patch
literal 170
zcmWIL<>g`kf*7_Ru^{>}h(HF6K#l_t7qb9~6oz01O-8?!3`HPe1o6w?*(xTqIJKxa
z#v?x`J+&ytB|o_|H#M)MIL6&GBqk*@J+mY+Cp9r0C{$V$Q&^groSl=Imt7o_o0(pe
mSdy8aR~!=`pP83g5+AQuP<e~PCO1E&G$+*#WYK3JW&i-7e=L0f

literal 0
HcmV?d00001

diff --git a/organizer/models.py b/organizer/models.py
new file mode 100644
index 0000000..1e5b067
--- /dev/null
+++ b/organizer/models.py
@@ -0,0 +1,72 @@
+from django.db import models
+from users.models import Agency, AgencyGroup
+from django.urls import reverse
+from colorful.fields import RGBColorField
+from django.contrib.auth.models import User
+import datetime
+
+'''
+
+Model Quicklinks
+
+Verwaltet alle gespeicherten Bereiche für die Agentur. Wird eine neue erstellt,
+wird dieser die Agency zugewiesen. Das Farb-Feld ist für später, damit im 
+Ogranigramm eine Farbe für den jeweiligen Bereich festgelegt wird.
+
+users speichert alle primary-Keys der User, welche diesem Bereich zugeordnet sind!
+
+'''
+class QuickLinks(models.Model):
+
+	# Wenn die Area gelöscht wird, wird NICHT die Agency gelöscht
+	agency = models.ForeignKey(Agency, on_delete=models.PROTECT)
+	name = models.CharField(max_length=200, blank=False)
+	link = models.CharField(max_length=200, blank=False)
+	logo = models.ImageField(default='agencymain/linkdefault.png', upload_to='agencymain', blank=True)
+	
+	def __str__(self):
+		return f'{self.name}'
+
+	def get_absolute_url(self):
+		return reverse('ql-update', kwargs={'pk':self.pk})
+
+	@property
+	def get_photo_url(self):
+	    if self.logo and hasattr(self.logo, 'url'):
+	        return self.logo.url
+	    else:
+	        return "/media/agencymain/linkdefault.png"
+
+
+class AGContacts(models.Model):
+	agency = models.ForeignKey(Agency, on_delete=models.PROTECT)
+	first_name = models.CharField(default="", max_length=200, blank=False)
+	last_name = models.CharField(default="", max_length=200, blank=False)
+	mail = models.CharField(default="", max_length=200, blank=False)
+	phone1 = models.CharField(default="", max_length=200, blank=False)
+	phone2 = models.CharField(default="", max_length=200, blank=False)
+	street = models.CharField(default="", max_length=200, blank=True)
+	city = models.CharField(default="", max_length=200, blank=True)
+	plz = models.CharField(default="", max_length=5, blank=True)
+	desc = models.TextField(max_length=3000, blank=True)
+
+	def __str__(self):
+		return f'{self.first_name + " " + self.last_name}'
+
+	def get_absolute_url(self):
+		return reverse('cont-update', kwargs={'pk':self.pk})
+
+class AGPassword(models.Model):
+	agency = models.ForeignKey(Agency, on_delete=models.PROTECT)
+	name = models.CharField(default="", max_length=200, blank=False)
+	agpass_username = models.CharField(default="", max_length=200, blank=False)
+	compass = models.CharField(default="", max_length=200, blank=False)
+	link = models.CharField(default="", max_length=200, blank=False)
+	visibleby = models.ManyToManyField(AgencyGroup, blank=True)
+
+	def __str__(self):
+		return f'{self.name}'
+
+	def get_absolute_url(self):
+		return reverse('aggpass-update', kwargs={'pk':self.pk})
+
diff --git a/organizer/templates/organizer/agpass_add.html b/organizer/templates/organizer/agpass_add.html
new file mode 100644
index 0000000..e3991d2
--- /dev/null
+++ b/organizer/templates/organizer/agpass_add.html
@@ -0,0 +1,19 @@
+{% extends "users/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+{% if request.user.profile.agency.module_organizer %}
+<div class="content-section col-6">
+  <h3>Passwort anlegen</h3>
+  <hr>  
+  <form method="POST"  enctype="multipart/form-data">
+	  	{% csrf_token %}
+	  	{{form|crispy}}
+	  <hr>	 	  
+	  	<button type="submit" class="btn btn-success">Passwort speichern</button>&nbsp;
+	  	<a class="btn" href="{% url 'organizer-management' %} ">Abbrechen</a>
+  </form>
+</div>
+{% else %}
+<h3>Das Modul Organizer wurden in ihrer Agentur deaktiviert.</h3>  
+{% endif %}
+{% endblock content %}
diff --git a/organizer/templates/organizer/agpass_delete.html b/organizer/templates/organizer/agpass_delete.html
new file mode 100644
index 0000000..8864c60
--- /dev/null
+++ b/organizer/templates/organizer/agpass_delete.html
@@ -0,0 +1,24 @@
+{% extends "users/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+{% if request.user.profile.agency.module_organizer %}
+    <div class="content-section">
+      <div class="media">        
+        <div class="media-body">
+          <h2 class="account-heading">Passwort {{ object.name }} löschen?</h2>
+          <hr>
+      </div>
+    </div>
+      <!-- Für das Speichern der Bilder enctype -->
+      <form method="POST">
+        {% csrf_token %}        
+        <div class="form-group">
+          <button type="submit" class="btn btn-danger">Passwort löschen</button>&nbsp;
+          <a href="{% url 'organizer-management' %}" class="btn btn-success">Abbrechen</a>
+        </div>
+      </form>
+    </div>
+{% else %}
+<h3>Das Modul Organizer wurden in ihrer Agentur deaktiviert.</h3>  
+{% endif %}
+{% endblock content %}
\ No newline at end of file
diff --git a/organizer/templates/organizer/agpass_update.html b/organizer/templates/organizer/agpass_update.html
new file mode 100644
index 0000000..25ce6c2
--- /dev/null
+++ b/organizer/templates/organizer/agpass_update.html
@@ -0,0 +1,21 @@
+{% extends "users/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+{% if request.user.profile.agency.module_organizer %}
+<div class="content-section col-12">
+  <h3>Passwort aktualisieren</h3>
+  <hr>  
+  <form method="POST" enctype="multipart/form-data">
+	  	{% csrf_token %}	  	
+	  	<div class="row"><div class="col-4">
+      {{form|crispy}}
+	<hr>
+	
+  	<button type="submit" class="btn btn-success">Passwort aktualisieren</button>&nbsp;
+  	<a class="btn" href="{% url 'organizer-management' %}">Abbrechen</a>
+  </form>
+</div>
+{% else %}
+<h3>Das Modul Organizer wurden in ihrer Agentur deaktiviert.</h3>  
+{% endif %}
+{% endblock content %}
diff --git a/organizer/templates/organizer/contact_add.html b/organizer/templates/organizer/contact_add.html
new file mode 100644
index 0000000..522c32f
--- /dev/null
+++ b/organizer/templates/organizer/contact_add.html
@@ -0,0 +1,28 @@
+{% extends "users/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+{% if request.user.profile.agency.module_organizer %}
+<div class="content-section col-9">
+  <h3>Kontakt anlegen</h3>
+  <hr>  
+  <form method="POST"  enctype="multipart/form-data">
+	  	{% csrf_token %}
+	  	<div class="row"><div class="col-4">
+	  	{% for field in form %}      
+        	{% if forloop.counter|divisibleby:6 %}
+        		</div><div class="col-4">
+        		{{field|as_crispy_field }}                    	   
+        	{% else %}
+            {{field|as_crispy_field }}                  
+      		{% endif %}
+      	{% endfor %}
+      	</div></div>
+	  <hr>	 	  
+	  	<button type="submit" class="btn btn-success">Kontakt speichern</button>&nbsp;
+	  	<a class="btn" href="{% url 'organizer-management' %} ">Abbrechen</a>
+  </form>
+</div>
+{% else %}
+<h3>Das Modul Organizer wurden in ihrer Agentur deaktiviert.</h3>  
+{% endif %}
+{% endblock content %}
diff --git a/organizer/templates/organizer/contact_delete.html b/organizer/templates/organizer/contact_delete.html
new file mode 100644
index 0000000..bb3ebda
--- /dev/null
+++ b/organizer/templates/organizer/contact_delete.html
@@ -0,0 +1,24 @@
+{% extends "users/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+{% if request.user.profile.agency.module_organizer %}
+    <div class="content-section">
+      <div class="media">        
+        <div class="media-body">
+          <h2 class="account-heading">Kontakt {{ object.first_name }} {{ object.last_name }} löschen?</h2>
+          <hr>
+      </div>
+    </div>
+      <!-- Für das Speichern der Bilder enctype -->
+      <form method="POST">
+        {% csrf_token %}        
+        <div class="form-group">
+          <button type="submit" class="btn btn-danger">Kontakt löschen</button>&nbsp;
+          <a href="{% url 'organizer-management' %}" class="btn btn-success">Abbrechen</a>
+        </div>
+      </form>
+    </div>
+{% else %}
+<h3>Das Modul Organizer wurden in ihrer Agentur deaktiviert.</h3>  
+{% endif %}
+{% endblock content %}
\ No newline at end of file
diff --git a/organizer/templates/organizer/contact_update.html b/organizer/templates/organizer/contact_update.html
new file mode 100644
index 0000000..313364b
--- /dev/null
+++ b/organizer/templates/organizer/contact_update.html
@@ -0,0 +1,29 @@
+{% extends "users/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+{% if request.user.profile.agency.module_organizer %}
+<div class="content-section col-12">
+  <h3>Kontakt aktualisieren</h3>
+  <hr>  
+  <form method="POST" enctype="multipart/form-data">
+	  	{% csrf_token %}	  	
+	  	<div class="row"><div class="col-4">
+      {% for field in form %}      
+          {% if forloop.counter|divisibleby:6 %}
+            </div><div class="col-4">
+            {{field|as_crispy_field }}                         
+          {% else %}
+            {{field|as_crispy_field }}                  
+          {% endif %}
+        {% endfor %}
+        </div></div>
+	<hr>
+	
+  	<button type="submit" class="btn btn-success">Kontakt aktualisieren</button>&nbsp;
+  	<a class="btn" href="{% url 'organizer-management' %}">Abbrechen</a>
+  </form>
+</div>
+{% else %}
+<h3>Das Modul Organizer wurden in ihrer Agentur deaktiviert.</h3>  
+{% endif %}
+{% endblock content %}
diff --git a/organizer/templates/organizer/contacts_content.html b/organizer/templates/organizer/contacts_content.html
new file mode 100644
index 0000000..5d1b872
--- /dev/null
+++ b/organizer/templates/organizer/contacts_content.html
@@ -0,0 +1,103 @@
+{% load counter_tag %}
+
+<div class="row">
+<div class="content-section col-12">
+	<div class="row"><div class="content-section col-12">
+	{% if user|usergperm:"moduleorganizer" %} 
+  		<a class="btn btn-primary mb-3" href="{% url 'addcontact' %}"><i class="fas fa-plus"></i>&nbsp;Kontakt</a>
+  	{% endif %}    
+  	<div class="form-group mb-2">      
+      <input class="form-control" id="contacts_search" style="max-width: 400px;" size="20" type="text" onkeyup="javascript:checkSearchContactCards()" placeholder="Suche nach Kontakt...">
+    </div>
+    <hr>
+   </div></div>
+
+  	{% for agc in contacts %}
+  	
+  	<div class="card col-3 mr-1 mb-2 contactscards" style="float: left;" id="card_{{agc.pk}}" name="{{agc.first_name}} {{agc.last_name}}">  
+      <div class="card-body">
+        <h5 class="card-title" data-toggle="modal" data-target="#infos_{{agc.pk}}"><a href="#">{{agc.first_name}} {{agc.last_name}}
+        	</a>
+        </h5>
+          <p class="card-text">
+            {% if agc.mail|length > 0 %}
+            	E-Mailadresse: <a href="mailto:{{agc.mail}}">{{agc.mail}}</a><br/>
+            {% endif %}
+            {% if agc.phone1|length > 0 %}
+            	Telefon 1: <a href="tel::{{agc.phone1}}">{{agc.phone1}}</a>
+            {% endif %}            
+          </p>
+          <span style="float: right">
+        {% if user|usergperm:"moduleorganizer" %}           
+  			<a style="float: right" class="btn btn-secondary btn-sm ml-2" href="{% url 'cont-delete' agc.pk %}"><small><i class="fas fa-trash"></i></small></a>
+  			<a style="float: right" class="btn btn-secondary btn-sm " href="{% url 'cont-update' agc.pk %}"><small><i class="fas fa-pen"></i></small></a>
+        {% endif %}
+      </span>
+      </div>
+    </div>
+    {% endfor %}
+
+</div>
+</div>
+{% for agc in contacts %}
+<div class="modal fade " id="infos_{{agc.pk}}"  tabindex="-1" role="dialog" data-backdrop="static" aria-hidden="true">
+  <div class="modal-dialog " role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLongTitle">{{agc.first_name}} {{agc.last_name}}</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Schließen">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">        
+        {% if agc.mail|length > 0 %}
+            	E-Mailadresse: <a href="mailto:{{agc.mail}}">{{agc.mail}}</a><br />
+            {% endif %}
+            {% if agc.phone1|length > 0 %}
+            	Telefon 1: <a href="tel::{{agc.phone1}}">{{agc.phone1}}</a><br />
+            {% endif %}
+            {% if agc.phone2|length > 0 %}
+            	Telefon 1: <a href="tel::{{agc.phone2}}">{{agc.phone2}}</a><br />
+            {% endif %}
+            {% if agc.street|length > 0 %}
+            	Adresse: {{agc.street}} {{agc.plz}} {{agc.city}} <br />
+            {% endif %}
+            {% if agc.desc|length > 0 %}
+            	Anmerkungen: {{agc.desc}}<br />
+            {% endif %}
+      </div>
+      <div class="modal-footer">        
+        <button type="button" class="btn btn-success" data-dismiss="modal">Schließen</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}
+
+<script>
+	//SEARCH CONTACTS
+	var contactscards = $(".contactscards");	
+	function checkSearchContactCards(){
+		if($("#contacts_search").val().length > 0)
+		{
+			for(i = 0; i < contactscards.length; i++){
+				var cardname = contactscards[i].getAttribute("name").toLowerCase();			
+				var value = $("#contacts_search").val().toLowerCase();
+				if(cardname.indexOf(value) == -1){
+					$("#" + contactscards[i].getAttribute("id")).hide();
+				}
+				else{
+					$("#" + contactscards[i].getAttribute("id")).show();	
+				}
+			}
+		}else{
+			for(i = 0; i < contactscards.length; i++){
+				$("#" + contactscards[i].getAttribute("id")).show();
+			}
+		}
+	}
+
+	
+
+</script>
+
diff --git a/organizer/templates/organizer/organizer_management.html b/organizer/templates/organizer/organizer_management.html
new file mode 100644
index 0000000..b586b04
--- /dev/null
+++ b/organizer/templates/organizer/organizer_management.html
@@ -0,0 +1,107 @@
+{% extends "users/base.html" %}
+{% load counter_tag %}
+{% block content %}
+{% if request.user.profile.agency.module_organizer %}
+<div class="content-section col-12">
+  <h3>Organizer{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Verwalten Sie hier Quicklinks, Kontakte und Passwörter." class="far fa-question-circle"></i></small>{% endif %}</h3>  
+  <hr>
+  
+
+  <ul class="nav nav-tabs" id="organizerTabs" role="tablist">
+    <li class="nav-item">
+      <a class="nav-link active" id="quicklinks-tab" data-toggle="tab" href="#quicklinks" role="tab" aria-controls="quicklinks" aria-selected="false" >Quicklinks</a>
+    </li>
+
+    <li class="nav-item">
+      <a class="nav-link" id="contacts-tab" data-toggle="tab" href="#contacts" role="tab" aria-controls="contacts" aria-selected="false" >Kontakte</a>
+    </li>
+
+    <li class="nav-item">
+      <a class="nav-link" id="passwords-tab" data-toggle="tab" href="#passwords" role="tab" aria-controls="passwords" aria-selected="false" >Passwörter</a>
+    </li>
+  </ul>
+
+  <div class="tab-content" id="organizerTabscontent">
+
+
+    <div class="tab-pane fade show" id="quicklinks" role="tabpanel" aria-labelledby="quicklinks-tab">     
+        <h5 class="mt-3">Quicklinks{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Verwalten Sie hier Links auf andere Webseiten." class="far fa-question-circle"></i></small>{% endif %}</h5>
+        <hr>        
+        {% block quicklinks_content %}
+           {% include "organizer/quicklinks_content.html" %}
+        {% endblock %}        
+    </div>
+
+    <div class="tab-pane fade show" id="contacts" role="tabpanel" aria-labelledby="contacts-tab">     
+        <h5 class="mt-3">Kontakte{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier wichtige Kontakte." class="far fa-question-circle"></i></small>{% endif %}</h5>
+        <hr>
+        {% block contacts_content %}
+           {% include "organizer/contacts_content.html" %}
+        {% endblock %} 
+    </div>
+
+    <div class="tab-pane fade show" id="passwords" role="tabpanel" aria-labelledby="passwords-tab">     
+        <h5 class="mt-3">Passwörter{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Speichern Sie hier Passwörter für andere Portale, die für ihre gessamte Agentur zugreifbar sein sollen. Sie können die Einsicht der Passwörter mit entsprechenden Gruppen einschränken." class="far fa-question-circle"></i></small>{% endif %}</h5>
+        <hr>
+        {% block passwords_content %}
+           {% include "organizer/passwords_content.html" %}
+        {% endblock %} 
+    </div>
+  </div>
+
+
+
+</div>
+<script>
+  $('#organizerTabs a').on('click', function (e) {
+      e.preventDefault();
+      $(this).tab('show');         
+      lastview_name = $(this)[0]['hash'].substring(1);
+      localStorage.setItem('activeTab', lastview_name);      
+
+    });    
+
+
+
+$(document).ready(function(){
+
+  var activeTab = localStorage.getItem('activeTab');
+       
+        if(activeTab){          
+          if($('#' + activeTab).find().prevObject.length != 0){
+            $('#' + activeTab).tab('show');         
+            $(".nav-link").removeClass("active");         
+            $("#" + activeTab + "-tab").addClass("active");
+          }
+          else{
+            $("#quicklinks-tab").addClass("active");
+            $('#quicklinks').tab('show');
+          }
+        }
+        else{
+          $("#quicklinks-tab").addClass("active");
+           $('#quicklinks').tab('show');
+        }
+
+ 
+});
+
+function saveDefQL(){
+  $.ajax(
+      {
+          type: "GET",
+          url: "lerg/",
+          data:{
+            action: "adddefql"
+          },
+          success: function( data ) 
+          {
+            location.reload();
+        }
+       });
+}
+</script>
+{% else %}
+<h3>Das Modul Organizer wurden in ihrer Agentur deaktiviert.</h3>  
+{% endif %}
+{% endblock content %}
diff --git a/organizer/templates/organizer/passwords_content.html b/organizer/templates/organizer/passwords_content.html
new file mode 100644
index 0000000..ed302dd
--- /dev/null
+++ b/organizer/templates/organizer/passwords_content.html
@@ -0,0 +1,107 @@
+{% load counter_tag %}
+
+<div class="row">
+<div class="content-section col-10">
+	<div class="row"><div class="content-section col-9">
+	{% if user|usergperm:"moduleorganizer" %} 
+  		<a class="btn btn-primary mb-3" href="{% url 'add-agpass' %}"><i class="fas fa-plus"></i>&nbsp;Passwort</a>
+  	{% endif %}    
+  	<div class="form-group mb-2">      
+      <input class="form-control" id="passwords_search" style="max-width: 400px;" size="20" type="text" onkeyup="" placeholder="Suche nach Passwort...">
+    </div>    
+   </div></div>
+   <div class="table-responsive">
+    <table class="table table-hover">
+          <thead>
+          <tr>
+            <th scope="col">Name</th>
+            <th scope="col">Link</th>
+            <th scope="col">Benutzername</th>
+            
+            <th scope="col">Passwort</th>
+            
+
+            {% if user|usergperm:"moduleorganizer" %}      
+            <th scope="col">&nbsp;</th>
+            {% endif %}
+          </tr>
+        </thead>
+        <tbody id="table_passwords">
+        {% for ap in agpass %}
+          <tr>
+              <td>{{ap.name }}</td>
+              <td><a href="{{ap.link }}" target="_blank">{{ap.link}}</a></td>
+              <td>
+                <span id="uname_cl_{{ap.pk}}">{{ap.agpass_username }}</span>
+                <a href="#" onclick="javascript:copyUsernameToCB({{ap.pk}})"><i class="far fa-copy"></i></a>
+                <span id="uname_cl_cop_{{ap.pk}}" style="display: none;">Kopiert!</span>
+
+              </td>
+              <td><span id="pass_cl_{{ap.pk}}" style="display: none;">{{ap.compass}}</span><span id="pass_{{ap.pk}}">*********</span>
+              
+                <a href="#" onclick="javascript:showAgPass({{ap.pk}})"><i class="far fa-eye"></i></a>&nbsp;&nbsp;&nbsp;
+                <a href="#" onclick="javascript:copyPassToCB({{ap.pk}})"><i class="far fa-copy"></i></a>
+                <span id="pass_cl_cop_{{ap.pk}}" style="display: none;">Kopiert!</span>
+              </td>
+              <td>
+              {% if user|usergperm:"moduleorganizer" %} 
+                <div class="dropdown no-arrow">
+                  <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                      <i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
+                    </a>
+                    <div class="dropdown-menu dropdown-menu-right shadow animated--fade-in" aria-labelledby="dropdownMenuLink">
+                      <a class="dropdown-item" href="{% url 'aggpass-update' ap.pk %}">Bearbeiten</a>  
+                      <div class="dropdown-divider"></div>                  
+                      <a class="dropdown-item text-danger" href="{% url 'pass-delete' ap.pk %}" >Löschen</a>
+                    </div>
+                  </div>
+                  {% endif %}
+                </div>
+              </td>
+          </tr>
+        {% endfor %}   
+        </tbody>  
+      </table>
+    </div>
+  	
+
+</div>
+</div>
+
+<script>
+	function showAgPass(id){    
+    $("#pass_" + id).toggle();
+    $("#pass_cl_" + id).toggle();
+  }
+
+  function copyPassToCB(id){
+    var val = $("#pass_cl_" + id).html();    
+    var $temp = $("<input>");
+    $("body").append($temp);
+    $temp.val(val).select();
+    document.execCommand("copy");
+    $temp.remove();
+    $("#pass_cl_cop_" + id).show();
+  } 
+
+  function copyUsernameToCB(id){
+    var val = $("#uname_cl_" + id).html();    
+    var $temp = $("<input>");
+    $("body").append($temp);
+    $temp.val(val).select();
+    document.execCommand("copy");
+    $temp.remove();
+    $("#uname_cl_cop_" + id).show();
+  } 
+
+  $(document).ready(function(){
+  $("#passwords_search").on("keyup", function() {
+    var value = $(this).val().toLowerCase();
+    $("#table_passwords tr").filter(function() {
+      $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
+    });
+  });
+  
+});
+
+</script>
\ No newline at end of file
diff --git a/quicklinks/templates/quicklinks/ql_add.html b/organizer/templates/organizer/ql_add.html
similarity index 83%
rename from quicklinks/templates/quicklinks/ql_add.html
rename to organizer/templates/organizer/ql_add.html
index e5caa0d..ad5740e 100644
--- a/quicklinks/templates/quicklinks/ql_add.html
+++ b/organizer/templates/organizer/ql_add.html
@@ -1,7 +1,7 @@
 {% extends "users/base.html" %}
 {% load crispy_forms_tags %}
 {% block content %}
-{% if request.user.profile.agency.module_quicklinks %}
+{% if request.user.profile.agency.module_organizer %}
 <div class="content-section col-6">
   <h3>Quicklink anlegen</h3>
   <hr>  
@@ -11,7 +11,7 @@
 	  <hr>	 
 	  <p><small>Hinweis zum Weblink: Bitte setzen Sie den vollständigen Link in das Formular!<br/>Z.B. <i>https://digitale-agentur.com</i></small></p>
 	  	<button type="submit" class="btn btn-success">Quicklink speichern</button>&nbsp;
-	  	<a class="btn" href="{% url 'ql-management' %} ">Abbrechen</a>
+	  	<a class="btn" href="{% url 'organizer-management' %} ">Abbrechen</a>
   </form>
 </div>
 {% else %}
diff --git a/quicklinks/templates/quicklinks/ql_confirm_delete.html b/organizer/templates/organizer/ql_confirm_delete.html
similarity index 71%
rename from quicklinks/templates/quicklinks/ql_confirm_delete.html
rename to organizer/templates/organizer/ql_confirm_delete.html
index cda46f5..7d6ba54 100644
--- a/quicklinks/templates/quicklinks/ql_confirm_delete.html
+++ b/organizer/templates/organizer/ql_confirm_delete.html
@@ -1,7 +1,7 @@
 {% extends "users/base.html" %}
 {% load crispy_forms_tags %}
 {% block content %}
-{% if request.user.profile.agency.module_quicklinks %}
+{% if request.user.profile.agency.module_organizer %}
     <div class="content-section">
       <div class="media">        
         <div class="media-body">
@@ -14,11 +14,11 @@
         {% csrf_token %}        
         <div class="form-group">
           <button type="submit" class="btn btn-danger">Quicklink löschen</button>&nbsp;
-          <a href="{% url 'ql-management' %}" class="btn btn-success">Abbrechen</a>
+          <a href="{% url 'organizer-management' %}" class="btn btn-success">Abbrechen</a>
         </div>
       </form>
     </div>
 {% else %}
-<h3>Das Modul Quicklinks wurden in ihrer Agentur deaktiviert.</h3>  
+<h3>Das Modul Organizer wurden in ihrer Agentur deaktiviert.</h3>  
 {% endif %}
 {% endblock content %}
\ No newline at end of file
diff --git a/quicklinks/templates/quicklinks/ql_update.html b/organizer/templates/organizer/ql_update.html
similarity index 74%
rename from quicklinks/templates/quicklinks/ql_update.html
rename to organizer/templates/organizer/ql_update.html
index 7188b02..e687c49 100644
--- a/quicklinks/templates/quicklinks/ql_update.html
+++ b/organizer/templates/organizer/ql_update.html
@@ -1,7 +1,7 @@
 {% extends "users/base.html" %}
 {% load crispy_forms_tags %}
 {% block content %}
-{% if request.user.profile.agency.module_quicklinks %}
+{% if request.user.profile.agency.module_organizer %}
 <div class="content-section col-6">
   <h3>Quicklink aktualisieren</h3>
   <hr>  
@@ -13,10 +13,10 @@
 	</small> </p>
 
   	<button type="submit" class="btn btn-success">Quicklink aktualisieren</button>&nbsp;
-  	<a class="btn" href="{% url 'ql-management' %} ">Abbrechen</a>
+  	<a class="btn" href="{% url 'organizer-management' %} ">Abbrechen</a>
   </form>
 </div>
 {% else %}
-<h3>Das Modul Quicklinks wurden in ihrer Agentur deaktiviert.</h3>  
+<h3>Das Modul Organizer wurden in ihrer Agentur deaktiviert.</h3>  
 {% endif %}
 {% endblock content %}
diff --git a/quicklinks/templates/quicklinks/ql_management.html b/organizer/templates/organizer/quicklinks_content.html
similarity index 68%
rename from quicklinks/templates/quicklinks/ql_management.html
rename to organizer/templates/organizer/quicklinks_content.html
index e23b351..af2353a 100644
--- a/quicklinks/templates/quicklinks/ql_management.html
+++ b/organizer/templates/organizer/quicklinks_content.html
@@ -1,11 +1,5 @@
-{% extends "users/base.html" %}
-{% load counter_tag %}
-{% block content %}
-{% if request.user.profile.agency.module_quicklinks %}
-<div class="content-section col-12">
-  <h3>Quicklinks&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Quicklinks helfen zur schnellen Verlinkung von oft genutzten Diensten." class="far fa-question-circle"></i></small></h3>  
-  <hr>
-  {% if user|usergperm:"modulequicklinks" %} 
+  {% load counter_tag %}
+  {% if user|usergperm:"moduleorganizer" %} 
   <div class="row">
     <div class="content-section col-4">
       <a class="btn btn-primary" href="{% url 'ql-addql' %}"><i class="fas fa-plus"></i>&nbsp;Quicklink</a>
@@ -14,7 +8,7 @@
   {% endif %}
   <div class="row mt-3">
     <div class="form-group mb-2">      
-      <input class="form-control" id="tableSearch" size="50" type="text" placeholder="Suche in Tabelle...">
+      <input class="form-control" id="quicklinks_search" size="50" type="text" placeholder="Suche in Tabelle...">
     </div>
    </div>
    <div class="row mt-3 col-9" >
@@ -24,20 +18,20 @@
           <tr>
             <th scope="col">Name</th>
             <th scope="col">Link</th>
-            <th scope="col">Logo</th>  
-            {% if perms.users.ql_management %}          
+            <!--<th scope="col">Logo</th>  -->
+            {% if user|usergperm:"moduleorganizer" %}      
             <th scope="col">&nbsp;</th>
             {% endif %}
           </tr>
         </thead>
-        <tbody id="tableresults">
+        <tbody id="table_quicklinks">
         {% for ql in quicklinks %}
           <tr>
               <td>{{ql.name }}</td>
               <td><a href="{{ ql.link }}" target="_blank">{{ ql.link }}</a></td>              
-              <td><img src="{{ ql.get_photo_url }}" width="15%"></td>              
+              <!--<td><img src="{{ ql.get_photo_url }}" width="15%"></td>              -->
               <td>
-              	{% if perms.users.ql_management %}
+              	{% if user|usergperm:"moduleorganizer" %} 
                 <div class="dropdown no-arrow">
                   <a class="dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                       <i class="fas fa-ellipsis-v fa-sm fa-fw text-gray-400"></i>
@@ -55,19 +49,21 @@
         {% endfor %}   
         </tbody>  
       </table>
-      {% if perms.users.ql_management %}
+      {% if user|usergperm:"moduleorganizer" %} 
         <a class="btn btn-primary" href="#" onclick="saveDefQL()">ERGO-Quicklinks laden</a>
       {% endif %}
     </div>
 </div>
 <script>
+
 $(document).ready(function(){
-  $("#tableSearch").on("keyup", function() {
+  $("#quicklinks_search").on("keyup", function() {
     var value = $(this).val().toLowerCase();
-    $("#tableresults tr").filter(function() {
+    $("#table_quicklinks tr").filter(function() {
       $(this).toggle($(this).text().toLowerCase().indexOf(value) > -1)
     });
   });
+  
 });
 
 function saveDefQL(){
@@ -85,7 +81,3 @@ function saveDefQL(){
        });
 }
 </script>
-{% else %}
-<h3>Das Modul Quicklinks wurden in ihrer Agentur deaktiviert.</h3>  
-{% endif %}
-{% endblock content %}
diff --git a/quicklinks/tests.py b/organizer/tests.py
similarity index 100%
rename from quicklinks/tests.py
rename to organizer/tests.py
diff --git a/organizer/urls.py b/organizer/urls.py
new file mode 100644
index 0000000..2fb2439
--- /dev/null
+++ b/organizer/urls.py
@@ -0,0 +1,21 @@
+from django.urls import path
+from django.contrib.auth import views as auth_views
+from django.contrib.auth.decorators import login_required, permission_required
+from .views import OrganizerManagement, OrganizerAdd, OrganizerDeleteView, OrganizerUpdateView, OrganizerAddContact, OrganizerDelContact, OrganizerUpdateContact, OrganizerAddPassword, OrganizerDelPassword, OrganizerUpdatePassword
+from . import views
+'''
+Permissions definiert in models.py bei USERS und dann hier vor die View geschrieben!
+'''
+urlpatterns = [
+	path('', OrganizerManagement.as_view(template_name="organizer/organizer_management.html"), name='organizer-management'),
+	path('addql/', permission_required('users.moduleorganizer')(OrganizerAdd.as_view(template_name="organizer/ql_add.html")), name='ql-addql'),   
+	path('addcontact/', permission_required('users.moduleorganizer')(OrganizerAddContact.as_view(template_name="organizer/contact_add.html")), name='addcontact'),   
+    path('addql/<int:pk>/delete', permission_required('users.moduleorganizer')(OrganizerDeleteView.as_view()), name='ql-delete'),
+    path('remco/<int:pk>/delete', permission_required('users.moduleorganizer')(OrganizerDelContact.as_view()), name='cont-delete'),
+    path('rempa/<int:pk>/delete', permission_required('users.moduleorganizer')(OrganizerDelPassword.as_view()), name='pass-delete'),
+    path('addql/<int:pk>/', permission_required('users.moduleorganizer')(OrganizerUpdateView.as_view()), name='ql-update'),
+    path('upco/<int:pk>/', permission_required('users.moduleorganizer')(OrganizerUpdateContact.as_view()), name='cont-update'),
+    path('uppass/<int:pk>/', permission_required('users.moduleorganizer')(OrganizerUpdatePassword.as_view()), name='aggpass-update'),
+	path('addpass/', permission_required('users.moduleorganizer')(OrganizerAddPassword.as_view(template_name="organizer/agpass_add.html")), name='add-agpass'),  
+    path('lerg/', views.loaddefaultql, name="ql-ajaxloaddef"),
+]
diff --git a/organizer/views.py b/organizer/views.py
new file mode 100644
index 0000000..4a9fd43
--- /dev/null
+++ b/organizer/views.py
@@ -0,0 +1,196 @@
+from django.shortcuts import render
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.views.generic import CreateView, ListView, UpdateView, DetailView, DeleteView
+from .models import QuickLinks, AGContacts, AGPassword
+from .forms import OrganizerAddQlForm, OrganizerAddContact, OrganizerUpdateContact, AddAGPassword
+from django.contrib import messages
+from django.shortcuts import redirect
+from django.http import HttpResponse, HttpResponseRedirect
+from django.contrib.auth.decorators import login_required
+from django.urls import reverse_lazy
+
+# Create your views here.
+class OrganizerManagement(LoginRequiredMixin, ListView):
+	model = QuickLinks
+	# Adding active_link
+	# Loading only user same agency
+	# Change context and return for template-data
+	def get_context_data(self, **kwargs):
+		context = super().get_context_data(**kwargs)	
+		quicklinks = QuickLinks.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name')
+		context.update({'active_link' : 'organizer', 'quicklinks' : quicklinks, 'contacts' : AGContacts.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('last_name'), 'agpass' : AGPassword.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name')})
+		return context
+
+class OrganizerAdd(LoginRequiredMixin, CreateView):
+	model = QuickLinks
+	success_url = reverse_lazy('organizer-management')
+	form_class = OrganizerAddQlForm
+	
+	def get_context_data(self, **kwargs):
+		context = super().get_context_data(**kwargs)
+		context.update({'active_link' : 'organizer'})
+		return context
+	
+	def form_valid(self, form):	
+		# Send message to the site
+		messages.success(self.request, f'Quicklink angelegt!')
+		# SAVE OBJECTS TO SIGNALE!
+		form.instance.agency = self.request.user.profile.agency
+		return super().form_valid(form)
+
+class OrganizerDeleteView(LoginRequiredMixin, DeleteView):
+	model = QuickLinks
+	success_url = reverse_lazy('organizer-management')	
+	template_name = 'organizer/ql_confirm_delete.html'	
+	
+	def delete(self, request, *args, **kwargs):		
+		response = super(OrganizerDeleteView, self).delete(request, *args, **kwargs)
+		messages.success(request, f'Quicklink wurde gelöscht!')
+		return response
+
+	def get_context_data(self, **kwargs):
+		context = super(OrganizerDeleteView, self).get_context_data(**kwargs)
+		context['active_link'] = 'organizer'
+		return context
+
+class OrganizerUpdateView(LoginRequiredMixin, UpdateView):
+	model = QuickLinks	
+	template_name = 'organizer/ql_update.html'
+	success_url = reverse_lazy('organizer-management')	
+	form_class = OrganizerAddQlForm
+	
+	def form_valid(self, form):	
+		# Send message to the site		
+		messages.success(self.request, f'Quicklink aktualisiert!')
+		return super().form_valid(form)
+
+	def get_context_data(self, **kwargs):
+		context = super(OrganizerUpdateView, self).get_context_data(**kwargs)		
+		context['active_link'] = 'organizer'
+		return context
+
+
+
+
+# CONTACTS
+class OrganizerAddContact(LoginRequiredMixin, CreateView):
+	model = AGContacts
+	success_url = reverse_lazy('organizer-management')
+	form_class = OrganizerAddContact
+	
+	def get_context_data(self, **kwargs):
+		context = super().get_context_data(**kwargs)
+		context.update({'active_link' : 'organizer'})
+		return context
+	
+	def form_valid(self, form):	
+		# Send message to the site
+		messages.success(self.request, f'Kontakt angelegt!')
+		# SAVE OBJECTS TO SIGNALE!
+		form.instance.agency = self.request.user.profile.agency
+		return super().form_valid(form)
+
+
+class OrganizerDelContact(LoginRequiredMixin, DeleteView):
+	model = AGContacts
+	success_url = reverse_lazy('organizer-management')	
+	template_name = 'organizer/contact_delete.html'	
+	
+	def delete(self, request, *args, **kwargs):		
+		response = super(OrganizerDelContact, self).delete(request, *args, **kwargs)
+		messages.success(request, f'Kontakt wurde gelöscht!')
+		return response
+
+	def get_context_data(self, **kwargs):
+		context = super(OrganizerDelContact, self).get_context_data(**kwargs)
+		context['active_link'] = 'organizer'
+		return context
+
+
+class OrganizerUpdateContact(LoginRequiredMixin, UpdateView):
+	model = AGContacts	
+	template_name = 'organizer/contact_update.html'
+	success_url = reverse_lazy('organizer-management')	
+	form_class = OrganizerUpdateContact
+	
+	def form_valid(self, form):	
+		# Send message to the site		
+		messages.success(self.request, f'Kontakt aktualisiert!')
+		return super().form_valid(form)
+
+	def get_context_data(self, **kwargs):
+		context = super(OrganizerUpdateContact, self).get_context_data(**kwargs)		
+		context['active_link'] = 'organizer'
+		return context
+
+
+
+# PASSWORDS
+class OrganizerAddPassword(LoginRequiredMixin, CreateView):
+	model = AGPassword
+	success_url = reverse_lazy('organizer-management')
+	form_class = AddAGPassword
+	
+	def get_context_data(self, **kwargs):
+		context = super().get_context_data(**kwargs)
+		context.update({'active_link' : 'organizer'})
+		return context
+	
+	def form_valid(self, form):	
+		# Send message to the site
+		messages.success(self.request, f'Passwort angelegt!')
+		# SAVE OBJECTS TO SIGNALE!
+		form.instance.agency = self.request.user.profile.agency
+		return super().form_valid(form)
+
+class OrganizerDelPassword(LoginRequiredMixin, DeleteView):
+	model = AGPassword
+	success_url = reverse_lazy('organizer-management')	
+	template_name = 'organizer/agpass_delete.html'	
+	
+	def delete(self, request, *args, **kwargs):		
+		response = super(OrganizerDelPassword, self).delete(request, *args, **kwargs)
+		messages.success(request, f'Passwort wurde gelöscht!')
+		return response
+
+	def get_context_data(self, **kwargs):
+		context = super(OrganizerDelPassword, self).get_context_data(**kwargs)
+		context['active_link'] = 'organizer'
+		return context
+
+
+class OrganizerUpdatePassword(LoginRequiredMixin, UpdateView):
+	model = AGPassword	
+	template_name = 'organizer/agpass_update.html'
+	success_url = reverse_lazy('organizer-management')	
+	form_class = AddAGPassword
+	
+	def form_valid(self, form):	
+		# Send message to the site		
+		messages.success(self.request, f'Kontakt aktualisiert!')
+		return super().form_valid(form)
+
+	def get_context_data(self, **kwargs):
+		context = super(OrganizerUpdatePassword, self).get_context_data(**kwargs)		
+		context['active_link'] = 'organizer'
+		return context
+
+@login_required
+def loaddefaultql(request):
+	if request.method == 'GET':
+		if request.GET['action'] == 'adddefql':
+			defaultlinks = [
+				["EASY", "https://easy.ergo.com	"],
+				["ERGO Ansprechpartner Navigator", "http://ansprechpartner-navigator.de/	"],
+				["ERGO Lokales Marketing", "https://ergo.ergo-mein-lokales-marketing.de/marcapo_platform/WelcomePre.cms		"],
+				["ERGO Meine Druckstücke", "https://www.ergo-meine-druckstuecke.de/?client-check=2	"],
+				["ERGO Vertriebsportal", "https://vertriebsportal.ergo.com/"],
+				["myVVE", "https://www.myvve.de/"],
+				["Wiki", "https://wiki.digitale-agentur.com/"]				
+			]
+			for ele in defaultlinks:
+				print(ele[0] + " " + ele[1])
+				tempql = QuickLinks(agency=request.user.profile.agency, name=ele[0], link=ele[1])
+				tempql.save()
+			return redirect("ql-addql")	
+	return redirect("ql-addql")
\ No newline at end of file
diff --git a/quicklinks/__pycache__/apps.cpython-38.pyc b/quicklinks/__pycache__/apps.cpython-38.pyc
deleted file mode 100644
index 9542ba0411689194507557416483f7fa7b6a751b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmYjN%}&EG40f7=y0S@o1g^d80T4n(LmFHrA=sq~ib5T#vh-)kdf*H%!z=a5i8nwy
z;dF@2l0W<N=h#+OlSvF@;`Ha~nc|lx#}*Pv$=x{t0x|;?%NT<NV1WDskZbnNvjD>f
zNKU?~3li3kuG@Cr)GuX``^vE~A}P6>5@^U60=;G#$ABjAetO@P`P!8A+U+M~@#ep>
zOu{~rvR0LrvX7;#8tjbE$5L)OW&V`V$4{^k?HFK}&M(BuY3syoV+w7>O_O((uD4Ds
z?j8k}MY&Z*tAa|M6^E5VwXK`AZ<f<6?=B#S*ua-`@EN|Ux@cy;&w6c84y*Ush=e}6
O+~0fUKVg_N4t@bq-CRZh

diff --git a/quicklinks/__pycache__/forms.cpython-38.pyc b/quicklinks/__pycache__/forms.cpython-38.pyc
deleted file mode 100644
index 07e9bd615f8de2920f7da71f8c3271708a353434..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 707
zcmZuv-AWuW6wcpdXV+b@_O1^g4269FDMhJh3%amWDTFD*xF-&ynH^1bF6^y+jJ|-c
zl-pkU1|kTaGYjoPn~-nL`I3C+Cv!fTj2MnwKYf4C8T(Dn=1}PD;|hBSz<@i}aKky-
z!ih#2iM9mgRFjy5vttGc=${O<<yZ1v8V!T5EK48pKFfGaE?eIOG=`@wSa*cpBL=3e
z(Y&h{*C+MzIxOh)=8)*@;|lK(EHfOK5g3buz*yp57zq;NsJJzE2LSV4`5&1-<?L?A
zSZNdqQ5nCaNvHrARFry(lEWX{8<NvgyDFoam5nunZ}!4rx<;L}Rh!AEmPkiM93pZ)
z#W;RQKz*KNgP0ZtohphrDvG9s&XGMXircPq>m8rq*_hy_by2(W!nzRkWo;dV2j<_9
z9KrL!r@j0<SReAwt*flh58Fl8*ySqZ$6wBJsH=KaI$Ksqbw0nP{!(%w?_Xhha~BoW
zLs^C~Ldum89OsKp{97bunetos^|b3J1VsPMVQuXYrx9ocfsl&cr;0UPl}qde(Pq4M
irhNjQo;B*e(9l=iU;3YVOh2rf^^yLTKyk(#r+fvZrJh#+

diff --git a/quicklinks/__pycache__/models.cpython-38.pyc b/quicklinks/__pycache__/models.cpython-38.pyc
deleted file mode 100644
index bce235f31e913955d4f26235908135e853e5abfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1375
zcmZuxO>f&a7$zlIU$zrB-LNhN26Q(c>fDQ>XzMLmvDMqU^dfj57?Y7@Q<6hc?PBbf
zT=NU|3;Iv?8+h4ar~ZRsr@pV8ELmC#eDsifNj>j}_`2Uu3AAbW&#!+4g#3+zn+@j3
zQ|KlG5JXT#N}5rM+*4lZXMW3l6_lN<)AB%tWt2rN@2I#;vZUpqO0)EUh)BfeM8uLV
zx@UgY6X7ppn7oJc$&k9Rtc6qt*|S_$vr}M^mT#ms5@`R`!SivgYQ0}bC14_WZKR&e
zaQDsDfx%PgMgT~XQ9&|K`inqz07F49yetA13s3kWfKl?lQ3|83=!g*2UZBcEq~|2-
zi>~OwdrNMMzSue^XEYm#ZSY{=(x01Rw)~-}mMA}|D+ZoOE8qVK8uo{tOH2M6Q?knK
z+;xr=ua@gw-a1+GqS{liQ^;f9C_7qJxl6Ct4u`&rF4tVrtW?bfv$gKR$ukOY)sSN!
zLpL$N?_@##AfS&<Fj^Ha<vVyAsgB<fy#p5iJ|91tVie8vyISQ^Prs>WO(`pDrUx$$
zr=rLU%auemw$alQ^b)n2=_XgB)v1dZGgdQpAHVAX5W3#Ej>qV7`6I1ZU#(VDVxhi-
z2a0Jyg@56J>R_@?PSnF@CAgK&TP?wfaQT+&+zdU9yY=S?0|Y!{19ySBK`t%hN2XSd
zm8{X~E110!cmIaC+jbwR^kHMG@@pU%QN3#^z6Cw=^e(ams1?{T*8ar#@V)hey;6#T
z?_DSIc9J2lfvWS`MRRVrwOZeUPkhpyKFVCpYg?l)573tofOtDJ_SW}q`SYLQWO&EL
zjA7y#b17qxv_>KCF?P~$wOP@aG?(tzS{8Zry*$<Ew2OXv_2c2U<3ks2d~nHl&Nn}w
z-bRA}E5W5NN?33IN&O{E>(3CrK!bRt>y^~@RAX)2$WfauOq7lQkQmHj><{P`JOeNG
zW8b6g>agz;vEWr+kHk?cHS0B4vZGB2Zp3ykO&~m`tqr$5!@J_RQKMtLFO0@}!R=n!
x&FaeP;%LMhJHI*zL+WCzHd~a^bzb6i)N1&YbQeF~g!2jhbfyQ;qgPMd{{Z2?T#*0(

diff --git a/quicklinks/__pycache__/urls.cpython-38.pyc b/quicklinks/__pycache__/urls.cpython-38.pyc
deleted file mode 100644
index c93bbd1277c0015eb39602ab492185da15ee6cad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 863
zcmZuv&5qMB5RRLs`ELvDR(k;MJ<#4)tJSVp36KD31qCUJs7!6rw04r(4nMi>dCy$o
z$ZPNzxp3gLuK*Xu*@z;9rHp63nfWrFnMD|S2AuD&p1l5K8paQ8{C!+7PT`Z^KoEl<
zW^fcCr1cK#a5L&Qy2&iwi+bFSY_Pk;VkUPYhr5x>y~yK!<TrSS1(0JRgCf$S&L$)_
zajp<?iFaiJ=2M#lmx#LH3AN`Ek$&qNv_9{1_{9Kx*y6WZ+;8#QEk2^=rccJ&N~~x=
z4xSs+$u+#gn4-E{V6}$ZdY97oa@wi;EKkyGDd?_D1ts;Upn|7TruiPcMmo7$2N&!q
z&Tv9G%~Wk&uroq5cupBr^d&HAYf%u~T1IsjXjfa7W?MPmu_gbLK3gl!ppZ~eUNA^l
zW|-3|+_C%nAYE_+_b?$lHm@e7q(aVkPD-XLZmFxuUe~{Y=!U;?fUZfc4sIBZ(@Y%|
z+mktIYOY)eXw|_#5sj~G9#dJ2iez5(HQfe(U^&Fnx6h`-+9w;FCHbrrOo|TlsUEe+
zD$kTi-^_5S)&iEys6DMNo6gtw{u4DLbd?LNav?<*5`?9Nt%ak7-b$etSNI@m8_R|)
z3fp>c$<&V3KGXtZR#as2t0BfZL5rWK502u6ZeaW<X9*SYdA=(3EM@%g@r#(GNvbfT
rFyKs;BHs5j)~}ltA8Y6Mru8R!Bcvt`P=JQ$5Czs4-GTcM^?&^acp?Mp

diff --git a/quicklinks/__pycache__/views.cpython-38.pyc b/quicklinks/__pycache__/views.cpython-38.pyc
deleted file mode 100644
index c9826ba56eb445d4f901a8c709e298e67673c337..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4043
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

diff --git a/quicklinks/apps.py b/quicklinks/apps.py
deleted file mode 100644
index a6e7ca4..0000000
--- a/quicklinks/apps.py
+++ /dev/null
@@ -1,4 +0,0 @@
-from django.apps import AppConfig
-
-class QuicklinksConfig(AppConfig):
-    name = 'quicklinks'
diff --git a/quicklinks/forms.py b/quicklinks/forms.py
deleted file mode 100644
index a696478..0000000
--- a/quicklinks/forms.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from django import forms
-from django.forms import ModelForm
-from .models import QuickLinks
-
-
-class QlAddQlForm(forms.ModelForm):
-
-	class Meta:
-		model =QuickLinks
-		labels = {
-			"name" : "Name",
-			"link" : "Weblink",
-			"logo" : "Logo",				
-			}
-		fields = ['name', 'link', 'logo']		
\ No newline at end of file
diff --git a/quicklinks/models.py b/quicklinks/models.py
deleted file mode 100644
index 4a55dac..0000000
--- a/quicklinks/models.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from django.db import models
-from users.models import Agency
-from django.urls import reverse
-from colorful.fields import RGBColorField
-from django.contrib.auth.models import User
-import datetime
-
-'''
-
-Model Quicklinks
-
-Verwaltet alle gespeicherten Bereiche für die Agentur. Wird eine neue erstellt,
-wird dieser die Agency zugewiesen. Das Farb-Feld ist für später, damit im 
-Ogranigramm eine Farbe für den jeweiligen Bereich festgelegt wird.
-
-users speichert alle primary-Keys der User, welche diesem Bereich zugeordnet sind!
-
-'''
-class QuickLinks(models.Model):
-
-	# Wenn die Area gelöscht wird, wird NICHT die Agency gelöscht
-	agency = models.ForeignKey(Agency, on_delete=models.PROTECT)
-	name = models.CharField(max_length=200, blank=False)
-	link = models.CharField(max_length=200, blank=False)
-	logo = models.ImageField(default='agencymain/linkdefault.png', upload_to='agencymain', blank=True)
-	
-	def __str__(self):
-		return f'{self.name}'
-
-	def get_absolute_url(self):
-		return reverse('ql-update', kwargs={'pk':self.pk})
-
-	@property
-	def get_photo_url(self):
-	    if self.logo and hasattr(self.logo, 'url'):
-	        return self.logo.url
-	    else:
-	        return "/media/agencymain/linkdefault.png"
\ No newline at end of file
diff --git a/quicklinks/urls.py b/quicklinks/urls.py
deleted file mode 100644
index 2b140a4..0000000
--- a/quicklinks/urls.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from django.urls import path
-from django.contrib.auth import views as auth_views
-from django.contrib.auth.decorators import login_required, permission_required
-from .views import QlManagement, QlAdd, QlDeleteView, QlUpdateView
-from . import views
-'''
-Permissions definiert in models.py bei USERS und dann hier vor die View geschrieben!
-'''
-urlpatterns = [
-	path('', QlManagement.as_view(template_name="quicklinks/ql_management.html"), name='ql-management'),
-	path('addql/', permission_required('users.modulequicklinks')(QlAdd.as_view(template_name="quicklinks/ql_add.html")), name='ql-addql'),   
-    path('addql/<int:pk>/delete', permission_required('users.modulequicklinks')(QlDeleteView.as_view()), name='ql-delete'),
-    path('addql/<int:pk>/', permission_required('users.modulequicklinks')(QlUpdateView.as_view()), name='ql-update'),
-    path('lerg/', views.loaddefaultql, name="ql-ajaxloaddef"),
-]
diff --git a/quicklinks/views.py b/quicklinks/views.py
deleted file mode 100644
index a2bd21f..0000000
--- a/quicklinks/views.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from django.shortcuts import render
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.views.generic import CreateView, ListView, UpdateView, DetailView, DeleteView
-from .models import QuickLinks
-from .forms import QlAddQlForm
-from django.contrib import messages
-from django.shortcuts import redirect
-from django.http import HttpResponse, HttpResponseRedirect
-from django.contrib.auth.decorators import login_required
-
-# Create your views here.
-class QlManagement(LoginRequiredMixin, ListView):
-	model = QuickLinks
-	# Adding active_link
-	# Loading only user same agency
-	# Change context and return for template-data
-	def get_context_data(self, **kwargs):
-		context = super().get_context_data(**kwargs)	
-		quicklinks = QuickLinks.objects.filter(agency__pk=self.request.user.profile.agency.pk).order_by('name')
-		context.update({'active_link' : 'quicklinks', 'quicklinks' : quicklinks})
-		return context
-
-class QlAdd(LoginRequiredMixin, CreateView):
-	model = QuickLinks
-	success_url = '/ql'	
-	form_class = QlAddQlForm
-	
-	def get_context_data(self, **kwargs):
-		context = super().get_context_data(**kwargs)
-		context.update({'active_link' : 'quicklinks'})
-		return context
-	
-	def form_valid(self, form):	
-		# Send message to the site
-		messages.success(self.request, f'Quicklink angelegt!')
-		# SAVE OBJECTS TO SIGNALE!
-		form.instance.agency = self.request.user.profile.agency
-		return super().form_valid(form)
-
-class QlDeleteView(LoginRequiredMixin, DeleteView):
-	model = QuickLinks
-	success_url = '/ql'	
-	template_name = 'quicklinks/ql_confirm_delete.html'	
-	
-	def delete(self, request, *args, **kwargs):		
-		response = super(QlDeleteView, self).delete(request, *args, **kwargs)
-		messages.success(request, f'Quicklink wurde gelöscht!')
-		return response
-
-	def get_context_data(self, **kwargs):
-		context = super(QlDeleteView, self).get_context_data(**kwargs)
-		context['active_link'] = 'quicklinks'
-		return context
-
-class QlUpdateView(LoginRequiredMixin, UpdateView):
-	model = QuickLinks	
-	template_name = 'quicklinks/ql_update.html'
-	success_url = '/ql'	
-	form_class = QlAddQlForm
-	
-	def form_valid(self, form):	
-		# Send message to the site		
-		messages.success(self.request, f'Quicklink aktualisiert!')
-		return super().form_valid(form)
-
-	def get_context_data(self, **kwargs):
-		context = super(QlUpdateView, self).get_context_data(**kwargs)		
-		context['active_link'] = 'quicklinks'
-		return context
-
-@login_required
-def loaddefaultql(request):
-	if request.method == 'GET':
-		if request.GET['action'] == 'adddefql':
-			defaultlinks = [
-				["EASY", "https://easy.ergo.com	"],
-				["ERGO Ansprechpartner Navigator", "http://ansprechpartner-navigator.de/	"],
-				["ERGO Lokales Marketing", "https://ergo.ergo-mein-lokales-marketing.de/marcapo_platform/WelcomePre.cms		"],
-				["ERGO Meine Druckstücke", "https://www.ergo-meine-druckstuecke.de/?client-check=2	"],
-				["ERGO Vertriebsportal", "https://vertriebsportal.ergo.com/"],
-				["myVVE", "https://www.myvve.de/"],
-				["Wiki", "https://wiki.digitale-agentur.com/"]				
-			]
-			for ele in defaultlinks:
-				print(ele[0] + " " + ele[1])
-				tempql = QuickLinks(agency=request.user.profile.agency, name=ele[0], link=ele[1])
-				tempql.save()
-			return redirect("ql-addql")	
-	return redirect("ql-addql")
\ No newline at end of file
diff --git a/standards/__pycache__/forms.cpython-38.pyc b/standards/__pycache__/forms.cpython-38.pyc
index 92df15ce335e4018876e3be43f028f3582a2b297..fd10a5740a5098a6c6f5142beb7e2d7bdbcfe3d4 100644
GIT binary patch
delta 390
zcmew;_f(EIl$V!_0SKbjRL2Q#<ekVQ5RzGvnxjyfm!c4oT2XR~Ve?)l31*feVFrfD
z*I0doZ*i6u$CsrRCFYgfVg)i&D{f6TWt+{W3pAuiZ}K&^SVptSChVC&avr-Zqxa@L
z?EZ{`{y<qbATDMC5*$oL{+neuzcSUEf;0t!2s04D1|rNsgawGO1QAvs!Wu*<f(RQB
z!44usL4+NMum=$iAi@zuIDrUf5CL%$h~)w#G}(&WL2M5Y;Rz(7CQslI6ZHady+MQ$
zh)@O*W|MdG`04n<1;H|4HDGCwi-Ul;m<331F!4zg1x}XXl$iX1U2SqP??uLd$%g#m
dLPeoK*;bG;sHa0G=ke{}1_cGg&!IqN4gd_+PL2Qo

delta 427
zcmaDV_fd{Fl$V!_0SLVFtKtkd@=j!ucPmQGOiRs4Q3%N_NzM7i59fR4WhCa5Y+lDC
z!OVDT@+npy;V911;`p-EqQtzCC{`ddwIXV=CfjT_J)nU_`jbzw#WI>q)?m++HvtOV
z;*F0_&PgmTPEO6qiH|Q*0x1F$o|`wY`!fpq0tMWFxR?n@a4;45ZWiGD%2aO*Qs)mM
zK&BM2fe2F&VFn`1L4*Z}umll`Ai@enu!9Iu5Mcu%Y(az_h_D9{4j{r2L_pjMVmSc`
zO|~Le5F6x<B6lDWHMxaHOw<F!^#l=M2P=bECX?6m_-T2=1tDGmalz6c7Y6}xF$<93
zVB(XQ%*QD;`3bw)<aFMPjDC}Sxg-RGfl{p?HBcW1Pfp_7!3_!rh=+rLs>CPT@M{79
DzWP{_

diff --git a/standards/__pycache__/models.cpython-38.pyc b/standards/__pycache__/models.cpython-38.pyc
index 4a1625b805fd375405e051f927d6ac82d592bbac..6018776317beab7591516570be269ff6cac6ef89 100644
GIT binary patch
delta 22
ccmdlkuw8&Rl$V!_0SH1jR>xi5$g9Nx06xYAw*UYD

delta 22
ccmdlkuw8&Rl$V!_0SJ1$tKu$h<kjK;06laCg#Z8m

diff --git a/standards/forms.py b/standards/forms.py
index 081e45e..770ae4f 100644
--- a/standards/forms.py
+++ b/standards/forms.py
@@ -22,8 +22,8 @@ class StandardAddStandard(forms.ModelForm):
 			"task" : "Tätigkeitsbereich",
 			"content": "Inhalt",
 			"public" : "Direkt veröffentlichen?",
-			"freefield_title" : "Freifeld Titel",
-			"freefield_content" : "Freifeld Inhalt",
+			"freefield_title" : "Titel und Text",
+			"freefield_content" : "",
 			}
 		fields = ['name', 'area', 'task', 'content', 'public',"freefield_title", "freefield_content"]		
 		
@@ -91,8 +91,8 @@ class StandardUpdateStandard(forms.ModelForm):
 			"area" : "Übergeordneter Bereich",
 			"task" : "Tätigkeitsbereich",
 			"content": "Inhalt",
-			"freefield_title" : "Freifeld Titel",
-			"freefield_content" : "Freifeld Inhalt",
+			"freefield_title" : "Titel und Text",
+			"freefield_content" : "",
 			}
 		fields = ['name', 'area', 'task', 'content',"freefield_title", "freefield_content"]					
 	'''
diff --git a/standards/models.py b/standards/models.py
index 11b975d..acb51ec 100644
--- a/standards/models.py
+++ b/standards/models.py
@@ -59,4 +59,4 @@ class Standards(models.Model):
 
 	# Hier Path für Templates des Models mit Parametern
 	def get_absolute_url(self):
-		return reverse('standards-update', kwargs={'pk':self.pk})
\ No newline at end of file
+		return reverse('standards-update', kwargs={'pk':self.pk})
diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html
index 9a47d68..70a16ce 100644
--- a/standards/templates/standards/standards_add.html
+++ b/standards/templates/standards/standards_add.html
@@ -12,9 +12,13 @@
       {% if field.is_hidden == False %}
         {% if forloop.counter|divisibleby:6 %}
         </div><div class="col-3">
-          {{field|as_crispy_field }}          
+          {% if field.name != 'freefield_content' and field.name != 'freefield_title' %}
+            {{field|as_crispy_field }}    
+          {% endif %}      
         {% else %}
-          {{field|as_crispy_field }}
+          {% if field.name != 'freefield_content' and field.name != 'freefield_title' %}
+            {{field|as_crispy_field }}
+          {% endif %}
         {% endif %}
       {% endif %}
       {% endfor %}
@@ -26,14 +30,60 @@
       {% endfor %}
 
   
-      <button type="button" class="btn btn-primary mb-2" onclick="javascript:changeAddedUsers()">Mitarbeiter zuweisen</button>
+      
       <!-- COLLAPSE AREA FOR GROUPS FILES AND LINKED STANDARDS -->
       <div class="accordion"  id="additionalStandardInfos">
+
+           <div class="card">
+        <div class="card-header" id="st_freefield">
+          <h5 class="mb-0">
+            <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#freefield_content" aria-expanded="false" aria-controls="freefield_content">
+              <i class="fas fa-file-alt"></i>&nbsp;Freifeld{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Vergeben Sie für ein freies Textfeld einen Titel und einen entsprechenden Inhalt." class="far fa-question-circle"></i></small>{% endif %}
+            </button>
+          </h5>
+        </div>        
+        <div id="freefield_content" class="collapse" aria-labelledby="st_freefield" data-parent="#additionalStandardInfos">
+          <div class="card-body">
+            {{ normalForm.freefield_title|as_crispy_field }}
+            {{ normalForm.freefield_content|as_crispy_field }}
+          </div>
+        </div>
+      </div>
+
+
+
+      <div class="card">
+        <div class="card-header" id="st_useraut">
+          <h5 class="mb-0">
+            <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#useraut_content" aria-expanded="false" aria-controls="useraut_content">
+              <i class="fas fa-user"></i>&nbsp;Mitarbeiterzuweisung{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Weisen Sie dem Standard verantwortliche, ausführende und vertretende Mitarbeiter zu." class="far fa-question-circle"></i></small>{% endif %}
+            </button>
+          </h5>
+        </div>        
+        <div id="useraut_content" class="collapse" aria-labelledby="st_useraut" data-parent="#additionalStandardInfos">
+          <div class="card-body">
+            <button type="button" class="btn btn-primary mb-2" onclick="javascript:changeAddedUsers()">Mitarbeiter zuweisen</button>
+          </div>
+        </div>
+      </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
       <div class="card">
         <div class="card-header" id="st_groups">
           <h5 class="mb-0">
             <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#stgroups_content" aria-expanded="false" aria-controls="stgroups_content">
-              Gruppen{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, welche Gruppe diesen Standard sehen kann. Ist keine ausgewählt, ist der Standard für alle sichtbar." class="far fa-question-circle"></i></small>{% endif %}
+              <i class="fas fa-lock"></i>&nbsp;Zugriffsbeschränkung{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, welche Gruppe diesen Standard sehen kann. Ist keine ausgewählt, ist der Standard für alle sichtbar." class="far fa-question-circle"></i></small>{% endif %}
             </button>
           </h5>
         </div>
@@ -54,7 +104,7 @@
         <div class="card-header" id="st_files">
           <h5 class="mb-0">
             <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#st_files_content" aria-expanded="false" aria-controls="st_files_content">
-              Dateien{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Fügen Sie ihren Standards Dateien zu. Diese liegen entweder bereits unter Dateien oder können iher direkt hochgeladen werden. Neu hochgeladene Dateien werden im Heimverzeichnis gespeichert." class="far fa-question-circle"></i></small>{% endif %}
+              <i class="fas fa-file"></i>&nbsp;Dateien{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Fügen Sie ihren Standards Dateien zu. Diese liegen entweder bereits unter Dateien oder können iher direkt hochgeladen werden. Neu hochgeladene Dateien werden im Heimverzeichnis gespeichert." class="far fa-question-circle"></i></small>{% endif %}
             </button>
           </h5>
         </div>
@@ -91,7 +141,7 @@
         <div class="card-header" id="st_linked">
           <h5 class="mb-0">
             <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#st_linked_content" aria-expanded="false" aria-controls="st_linked_content">
-              Standards{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Verlinken Sie hier andere Standards, die etwas mit diesem Standard zutun haben." class="far fa-question-circle"></i></small>{% endif %}
+              <i class="fas fa-fw fa-lightbulb"></i>&nbsp;Standards{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Verlinken Sie hier andere Standards, die etwas mit diesem Standard zutun haben." class="far fa-question-circle"></i></small>{% endif %}
             </button>
           </h5>
         </div>
@@ -250,6 +300,24 @@
   </div>
 </div>
 
+<!-- UPLOADING PROCESS -->
+<div class="modal fade" id="uploadModalProgress" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Hochladen</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <i class="fas fa-spinner fa-spin"></i> Datei wird hochgeladen...  
+      </div>      
+    </div>
+  </div>
+</div>
+
+
 <script type="text/javascript">
 var ua = window.navigator.userAgent;
 var isIE = /MSIE|Trident/.test(ua);
@@ -444,14 +512,20 @@ function uploadAction(filetodo){
         cache: false,
         processData: false,
         contentType: false,
+        beforeSend: function(){          
+            $("#uploadModalProgress").modal("toggle");          
+          },
         success: function(data) {
           if(data["success"] == true){
-            actualFiles.push(String(data["data"]["savedobj_id"]));  
-            $("#id_added_files").val(actualFiles);
-            $("#linkedfiles")   .append('<tr id="fileadded_'+data["data"]["savedobj_id"]+'"><td>' + data["data"]["savedobj_name"] + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remFile('+data["data"]["savedobj_id"]+', \''+data["data"]["savedobj_name"]+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>');
+            setTimeout(function(){
+              $("#uploadModalProgress").modal("toggle");   
+              actualFiles.push(String(data["data"]["savedobj_id"]));  
+              $("#id_added_files").val(actualFiles);
+              $("#linkedfiles")   .append('<tr id="fileadded_'+data["data"]["savedobj_id"]+'"><td>' + data["data"]["savedobj_name"] + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remFile('+data["data"]["savedobj_id"]+', \''+data["data"]["savedobj_name"]+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>');
+            }, 1000);      
           }
           else{
-            $("#forbiddenFileType").modal("toggle")
+            $("#forbiddenFileType").modal("toggle")                 
           }          
         }
      });  
diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html
index 218aae1..1daf12f 100644
--- a/standards/templates/standards/standards_management.html
+++ b/standards/templates/standards/standards_management.html
@@ -187,10 +187,38 @@
   </div>
   <script type="text/javascript">
 
-    $(document).ready(function(){
-       $('[data-toggle="popover"]').popover();  
-        $('#area_tabs li:first-child a').tab('show');
 
+    $('#area_tabs a').on('click', function (e) {
+      e.preventDefault();
+      $(this).tab('show');         
+      lastview_name = $(this)[0]['hash'].substring(1);
+      localStorage.setItem('activeTab', lastview_name);      
+
+    });    
+
+    $(document).ready(function(){
+
+       var activeTab = localStorage.getItem('activeTab');
+       
+        if(activeTab){       
+         if($('#' + activeTab).find().prevObject.length != 0){
+          $('#' + activeTab).tab('show');         
+          $(".nav-link").removeClass("active");
+          areaid = activeTab.split("_")[1];
+          $("#" + areaid).addClass("active");
+          }
+          else{
+             $('#area_tabs li:first-child a').tab('show');
+           }
+        }
+        else{
+          
+          $('#area_tabs li:first-child a').tab('show');
+        }
+
+       
+        
+        $('[data-toggle="popover"]').popover();  
         $("#tableSearch").on("keyup", function() {
         var value = $(this).val().toLowerCase();
         $("#tableresults tr").filter(function() {
diff --git a/standards/templates/standards/standards_update.html b/standards/templates/standards/standards_update.html
index 2fbcbad..768d077 100644
--- a/standards/templates/standards/standards_update.html
+++ b/standards/templates/standards/standards_update.html
@@ -12,20 +12,62 @@
         {% for field in normalForm %}
         {% if forloop.counter|divisibleby:5 %}
         </div><div class="col-3">
-      {{field|as_crispy_field }}
+          {% if field.name != 'freefield_content' and field.name != 'freefield_title' %}
+            {{field|as_crispy_field }}
+          {% endif %}
         {% else %}
-        {{field|as_crispy_field }}
+        {% if field.name != 'freefield_content' and field.name != 'freefield_title' %}
+          {{field|as_crispy_field }}
         {% endif %}
-      {% endfor %}
-        <button type="button" class="btn btn-primary mb-2" onclick="javascript:showUpdateUsersStandard()">Zugewiesene Mitarbeiter</button>
+        {% endif %}
+      {% endfor %}      
       <!-- COLLAPSE AREA FOR GROUPS FILES AND LINKED STANDARDS -->
       <div class="accordion" id="additionalStandardInfos">
 
+         <div class="card">
+        <div class="card-header" id="st_freefield">
+          <h5 class="mb-0">
+            <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#freefield_content" aria-expanded="false" aria-controls="freefield_content">
+              <i class="fas fa-file-alt"></i>&nbsp;Freifeld{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Vergeben Sie für ein freies Textfeld einen Titel und einen entsprechenden Inhalt." class="far fa-question-circle"></i></small>{% endif %}
+            </button>
+          </h5>
+        </div>        
+        <div id="freefield_content" class="collapse" aria-labelledby="st_freefield" data-parent="#additionalStandardInfos">
+          <div class="card-body">
+            {{ normalForm.freefield_title|as_crispy_field }}
+            {{ normalForm.freefield_content|as_crispy_field }}
+          </div>
+        </div>
+      </div>
+
+
+
+      <div class="card">
+        <div class="card-header" id="st_useraut">
+          <h5 class="mb-0">
+            <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#useraut_content" aria-expanded="false" aria-controls="useraut_content">
+              <i class="fas fa-user"></i>&nbsp;Mitarbeiterzuweisung{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Weisen Sie dem Standard verantwortliche, ausführende und vertretende Mitarbeiter zu." class="far fa-question-circle"></i></small>{% endif %}
+            </button>
+          </h5>
+        </div>        
+        <div id="useraut_content" class="collapse" aria-labelledby="st_useraut" data-parent="#additionalStandardInfos">
+          <div class="card-body">
+            <button type="button" class="btn btn-primary mb-2" onclick="javascript:showUpdateUsersStandard()">Mitarbeiter Zuweisen</button>
+          </div>
+        </div>
+      </div>
+
+
+
+
+
+
+
       <div class="card">
         <div class="card-header" id="st_groups">
           <h5 class="mb-0">
             <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#stgroups_content" aria-expanded="false" aria-controls="stgroups_content">
-              Gruppen{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, welche Gruppe diesen Standard sehen kann. Ist keine ausgewählt, ist der Standard für alle sichtbar." class="far fa-question-circle"></i></small>{% endif %}
+              <i class="fas fa-lock"></i>&nbsp;Zugriffsbeschränkung{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Legen Sie fest, welche Gruppe diesen Standard sehen kann. Ist keine ausgewählt, ist der Standard für alle sichtbar." class="far fa-question-circle"></i></small>{% endif %}
             </button>
           </h5>
         </div>        
@@ -51,7 +93,7 @@
         <div class="card-header" id="st_files">
           <h5 class="mb-0">
             <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#st_files_content" aria-expanded="false" aria-controls="st_files_content">
-              Dateien{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Fügen Sie ihren Standards Dateien zu. Diese liegen entweder bereits unter Dateien oder können iher direkt hochgeladen werden. Neu hochgeladene Dateien werden im Heimverzeichnis gespeichert." class="far fa-question-circle"></i></small>{% endif %}
+              <i class="fas fa-file"></i>&nbsp;Dateien{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Fügen Sie ihren Standards Dateien zu. Diese liegen entweder bereits unter Dateien oder können iher direkt hochgeladen werden. Neu hochgeladene Dateien werden im Heimverzeichnis gespeichert." class="far fa-question-circle"></i></small>{% endif %}
             </button>
           </h5>
         </div>
@@ -90,7 +132,7 @@
         <div class="card-header" id="st_linked">
           <h5 class="mb-0">
             <button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#st_linked_content" aria-expanded="false" aria-controls="st_linked_content">
-              Standards{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Verlinken Sie hier andere Standards, die etwas mit diesem Standard zutun haben." class="far fa-question-circle"></i></small>{% endif %}
+              <i class="fas fa-fw fa-lightbulb"></i>&nbsp;Standards{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Verlinken Sie hier andere Standards, die etwas mit diesem Standard zutun haben." class="far fa-question-circle"></i></small>{% endif %}
             </button>
           </h5>
         </div>
@@ -251,6 +293,24 @@
   </div>
 </div>
 
+<!-- UPLOADING PROCESS -->
+<div class="modal fade" id="uploadModalProgress" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Hochladen</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <i class="fas fa-spinner fa-spin"></i> Datei wird hochgeladen...  
+      </div>      
+    </div>
+  </div>
+</div>
+
+
 <script type="text/javascript">
 
 var ua = window.navigator.userAgent;
@@ -530,9 +590,15 @@ function uploadAction(filetodo){
         cache: false,
         processData: false,
         contentType: false,
+        beforeSend: function(){          
+            $("#uploadModalProgress").modal("toggle");          
+          },
         success: function(data) {
           if(data["success"] == true){
+            setTimeout(function(){
+              $("#uploadModalProgress").modal("toggle");   
             $("#linkedfiles")   .append('<tr id="fileadded_'+data["data"]["savedobj_id"]+'"><td>' + data["data"]["savedobj_name"] + '</td><td><button type="button" class="btn btn-danger btn-sm" onclick="javascript:remFile('+data["data"]["savedobj_id"]+', \''+data["data"]["savedobj_name"]+'\')"><i class="fas fa-trash-alt"></i></button></td></tr>');
+            }, 1000);   
             $.ajax({                      
               url: "{% url 'update_standard_by_ajax' standard.pk %}",                    
               data: {
@@ -543,7 +609,7 @@ function uploadAction(filetodo){
             });
           }
           else{
-            $("#forbiddenFileType").modal("toggle")
+              $("#forbiddenFileType").modal("toggle")             
           }
           
         }
diff --git a/users/models.py b/users/models.py
index 5087291..4103850 100644
--- a/users/models.py
+++ b/users/models.py
@@ -49,7 +49,7 @@ class Agency(models.Model):
 
 	# MODULEEINSTELLUNGEN FÜR DIE AGENTUR
 	module_news = models.BooleanField(default=True)
-	module_quicklinks = models.BooleanField(default=True)
+	module_organizer = models.BooleanField(default=True)
 	module_files = models.BooleanField(default=True)
 	module_organigramm = models.BooleanField(default=True)
 	module_messages = models.BooleanField(default=True)
@@ -209,7 +209,7 @@ class AgencyGroup(models.Model):
 			('standardmanager', 'Standards bearbeiten und freischalten'),
 			('modulenews', 'News bearbeiten und veröffentlichen'),
 			('modulesconfig', 'Module verwalten'),
-			('modulequicklinks', 'Quicklinks bearbeiten'),
+			('moduleorganizer', 'Organizer bearbeiten'),
 			('filesmanager', 'Dateien bearbeiten'),			
 			('filedirmanager', 'Ordner bearbeiten'),			
 			('filesviewer', 'Dateien lesen')
diff --git a/users/signals.py b/users/signals.py
index b11e5f0..a46edea 100644
--- a/users/signals.py
+++ b/users/signals.py
@@ -1,4 +1,4 @@
-from django.db.models.signals import post_save, pre_delete, m2m_changed
+from django.db.models.signals import post_save, pre_delete, m2m_changed, pre_save
 from django.contrib.auth.models import User, Group
 from django.dispatch import receiver
 from .models import Profile, Agency, AgencyGroup
@@ -12,6 +12,7 @@ from cloud.models import DataFile
 import os
 from django.conf import settings
 from django.utils import timezone
+from standards.models import Standards
 
 # Deletes all Notifications added to to delete news
 @receiver(pre_delete, sender=News)
@@ -101,7 +102,44 @@ def adjust_group_notifications(instance, action, reverse, model, pk_set, using,
 					    fail_silently=False
 					)
 
-		
+
+
+# SIGNAL FOR STANDARDS POST SAVE
+@receiver(post_save, sender=Standards)
+def save_standard(sender, instance, **kwargs):
+
+	GLOBALSENDMAILS = True
+	# NEW STANDARD AND DIRECT PUBLIC
+	if(kwargs["created"]):
+		usersofagency = User.objects.filter(profile__agency__pk=instance.agency.pk)
+
+		targeturl = settings.BASE_URL + "standards/standard/" + str(instance.pk) + "/single"
+				
+		if(instance.public):
+			
+			for user in usersofagency:	
+
+				if(user.profile.agency_new_standard_mail):
+					notificationtext = "Neuer Agenturstandard: "  + instance.name
+
+					username = user.first_name + " " + user.last_name
+					msg_html = render_to_string('notificsys/notification_mail.html', {'username': username, 'notificationtext' : notificationtext, 'linktarget' : targeturl})		
+					
+					
+					if(GLOBALSENDMAILS):
+						send_mail(
+						    'Agentur-Benachrichtigung',
+						    'Hallo ' + user.first_name + ' ' + user.last_name + '! ' + notificationtext,
+						    'support@digitale-agentur.com',
+						    [user.email],		    
+						    html_message=msg_html,
+						    fail_silently=False
+						)
+					
+				if(user.profile.agency_new_standard_push):
+					newnotification = UserNotification(touser=user, notificationtext="Neuer Agenturstandard: " + instance.name, notificationtype="newstandard", elementid=instance.pk)
+					newnotification.save()
+
     
 # SIGNAL FOR NEWS
 @receiver(post_save, sender=News)
diff --git a/users/static/users/css/custom.css b/users/static/users/css/custom.css
index 8d918c4..79c791a 100644
--- a/users/static/users/css/custom.css
+++ b/users/static/users/css/custom.css
@@ -80,9 +80,6 @@ body{
   font-size: 2em;
 }
 
-
-
-
 /*
 		FOR TREE ORGA
 
@@ -94,6 +91,8 @@ body{
 
 * {margin: 0; padding: 0;}
 
+
+
 .tree ul {
     padding-top: 20px; position: relative;
   
@@ -191,5 +190,6 @@ right connector from last child*/
   border-color:  #94a0b4;
 }
 
+
 /*Thats all. I hope you enjoyed it.
 Thanks :)*/
\ No newline at end of file
diff --git a/users/templates/users/base.html b/users/templates/users/base.html
index 161c7f9..8c31965 100644
--- a/users/templates/users/base.html
+++ b/users/templates/users/base.html
@@ -118,27 +118,15 @@
           <span>Organigramm</span>
         </a>
       </li>
-      <!--
-      {% if active_link == 'agencyinfo' %}
-      <li class="nav-item active">
-        {% else%}
-      <li class="nav-item">
-      {%endif%}
-        <a class="nav-link " href="#" aria-expanded="true">
-          <i class="fas fa-fw fa-info"></i>
-          <span>Agentur</span>
-        </a>
-      </li>
-      -->
-      {% if request.user.profile.agency.module_quicklinks %}
-        {% if active_link == 'quicklinks' %}
+      {% if request.user.profile.agency.module_organizer %}
+        {% if active_link == 'organizer' %}
         <li class="nav-item active">
           {% else%}
         <li class="nav-item">
         {%endif%}
-          <a class="nav-link " href="{% url 'ql-management' %}" aria-expanded="true">
-            <i class="fas fa-external-link-alt"></i>
-            <span>Quicklinks</span>
+          <a class="nav-link " href="{% url 'organizer-management' %}" aria-expanded="true">
+            <i class="fas fa-address-book"></i>
+            <span>Organizer</span>
           </a>
         </li>
       {% endif %}
@@ -175,44 +163,13 @@
 
       
 
-       
-      <!--
-      {% if perms.users.users_usermanagement %}
-        {% if active_link == 'usersmanagement'  %}
-        <li class="nav-item active">
-          {% else%}
-        <li class="nav-item">
-        {%endif%}
-            <a class="nav-link" href="{% url 'users-management' %}"> 
-            <i class="fas fa-fw fa-users"></i>
-            <span>Benutzer</span></a>
-        </li>     
-      {%endif%}
-      -->
-      
-      <!--
-      {% if perms.users.news_management %}
-        {% if active_link == 'newsmanagement'  %}
-          <li class="nav-item active">
-            {% else%}
-          <li class="nav-item">
-          {%endif%}
-        <a class="nav-link " href="{% url 'news-management' %}" aria-expanded="true">
-          <i class="far fa-newspaper"></i>
-          <span>News</span>
-        </a>
-      </li>
-      {%endif%}
-    -->
-      <!-- Divider -->
-      
 
       <!-- Sidebar Toggler (Sidebar) -->
-      <!--
+<!--
       <div class="text-center d-none d-md-inline">
         <button class="rounded-circle border-0" id="sidebarToggle"></button>
       </div>
-    -->
+-->
     <style scoped>
       #bottom_info {
         position: absolute;
@@ -247,7 +204,7 @@
         <a style="color: #999; text-decoration: none;" href="{% url 'impressumda' %}">Impressum</a>
       </div>
       <div style="margin-top: 10px; margin-bottom: 5px;" class="sidebar-heading">
-        Version 0.8.1
+        Version 0.8.2
       </div>
     </div>    
     </ul>
@@ -577,5 +534,8 @@ $(window).click(function() {
   loadUnsendNotifications();
   loadUnviewnNotifications();
 });
+
+
+
 </script>
                   
\ No newline at end of file
diff --git a/users/templates/users/publicbase.html b/users/templates/users/publicbase.html
index f732885..cdce693 100644
--- a/users/templates/users/publicbase.html
+++ b/users/templates/users/publicbase.html
@@ -45,7 +45,7 @@
       <!-- Divider -->
       <hr class="sidebar-divider my-0">
       <div style="bottom: 10px; position: absolute;" class="sidebar-heading">
-        Version 0.8.1
+        Version 0.8.2
       </div>
       <div style="bottom: 40px; position: absolute;" class="sidebar-heading">
         <a style="color: #999; text-decoration: none;" href="{% url 'datenschutzda' %}">Datenschutz</a><br />
diff --git a/users/views.py b/users/views.py
index e490187..340f303 100644
--- a/users/views.py
+++ b/users/views.py
@@ -12,7 +12,7 @@ from django.core.mail import send_mail
 from django.http import HttpResponseRedirect,HttpResponse, JsonResponse
 from areas.models import Areas
 from tasks.models import Tasks
-from quicklinks.models import QuickLinks
+from organizer.models import QuickLinks
 from .priomodel import Prio
 from standards.models import Standards
 from datetime import datetime
@@ -113,6 +113,12 @@ def toUpdate(request):
 	else:
 		print("AGENCY DEF STANDARD DIR - FILESMODULE READY")
 
+
+	# CHANGE RIGHTS ORGNAIZER
+	admingroups = AgencyGroup.objects.filter(is_admin=True)
+	for a in admingroups:
+		a.group.permissions.add(Permission.objects.get(codename="moduleorganizer"))
+
 '''
 
 DASHBOARD-View