diff --git a/cloud/templates/cloud/cloud_main.html b/cloud/templates/cloud/cloud_main.html index a192630..044cfab 100644 --- a/cloud/templates/cloud/cloud_main.html +++ b/cloud/templates/cloud/cloud_main.html @@ -131,7 +131,7 @@ a.disabled {
-
Dateioptionen
+
Dateioptionen
Verschieben Ersetzen
@@ -264,7 +264,7 @@ a.disabled { Sie können die Datei nicht mit sich selbst ersetzen.
- +
@@ -285,8 +285,8 @@ a.disabled {
-    - +    +
@@ -324,8 +324,8 @@ a.disabled {
   -    - +    +
@@ -348,7 +348,7 @@ a.disabled {
- +
@@ -377,8 +377,9 @@ a.disabled {
-   - + + +  
diff --git a/cloud/views.py b/cloud/views.py index dbd3982..ee8860d 100644 --- a/cloud/views.py +++ b/cloud/views.py @@ -249,7 +249,8 @@ def adddirbyajax(request, parent): request.decoding = 'utf-8' # VALIDATE FILE-TYPE - file_ext = request.FILES['uploadedfile'].name.split(".")[1] + file_ext_arr = request.FILES['uploadedfile'].name.split(".") + file_ext = file_ext_arr[len(file_ext_arr)-1] allowed_types = ["txt", "TXT", "png", "PNG", "jpeg", "JPEG", "jpg", "JPG", "PDF", "pdf", "csv", "CSV", "DOC", "doc", "DOCX", "docx", "ODT", "odt", "PPT", "ppt", "PPTX", "pptx", "XLS", "xls", "XLSX", "xlsx", "mov", "MOV", "SVG", "svg", "ZIP", "zip", "RAR", "rar", "EPS", "eps", "MP3", "mp3", "WAV", "wav", "avi", "AVI", "FLV", "flv", "MP4", "mp4"] file_ok = False diff --git a/dasettings/forms.py b/dasettings/forms.py index 31acecf..11bbe89 100644 --- a/dasettings/forms.py +++ b/dasettings/forms.py @@ -4,6 +4,7 @@ from django.contrib.auth.models import User from users.models import AgencyGroup, Agency, Profile, AgencyJob, AgencyNetwork, UserTime from PIL import Image from bootstrap_datepicker_plus import DatePickerInput +from django.utils.translation import gettext as _ class AgencyTimeManagement(forms.ModelForm): class Meta: @@ -76,7 +77,7 @@ class UserTimeForm(forms.ModelForm): } fields = ["holiday", "loose_holidedate", "startdate", "holiday_start", "wd_mo", "wd_tu", "wd_we", "wd_th", "wd_fr"] widgets = { - 'loose_holidedate': DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}), + 'loose_holidedate': DatePickerInput(options={"format":'DD.MM', "locale":'de'}), "startdate" : DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}) } @@ -121,6 +122,13 @@ class UserNewUserForm(forms.ModelForm): model = User fields = ["first_name", "last_name", "email"] + + error_messages = { + 'email': { + 'unique': _("Diese E-Mailadresse ist bereits vergeben."), + }, + } + # NEW USER PROFILE FORM class UserProfileForm(forms.ModelForm): diff --git a/dasettings/templates/dasettings/addagencynetwork_content.html b/dasettings/templates/dasettings/addagencynetwork_content.html index 30b032b..f926d53 100644 --- a/dasettings/templates/dasettings/addagencynetwork_content.html +++ b/dasettings/templates/dasettings/addagencynetwork_content.html @@ -17,7 +17,7 @@ {{ form|crispy }}
Abbrechen - + diff --git a/dasettings/templates/dasettings/agency_content.html b/dasettings/templates/dasettings/agency_content.html index 9784143..04a9c09 100644 --- a/dasettings/templates/dasettings/agency_content.html +++ b/dasettings/templates/dasettings/agency_content.html @@ -29,7 +29,7 @@
-   +  
@@ -61,8 +61,9 @@ +   - + @@ -280,7 +281,7 @@ function updateFunc(id, funcname){ - + {% endfor %} @@ -292,7 +293,7 @@ function updateFunc(id, funcname){
- +
diff --git a/dasettings/templates/dasettings/agencynetwork_content.html b/dasettings/templates/dasettings/agencynetwork_content.html index a2f464a..33e5122 100644 --- a/dasettings/templates/dasettings/agencynetwork_content.html +++ b/dasettings/templates/dasettings/agencynetwork_content.html @@ -1,7 +1,7 @@ {% load crispy_forms_tags %} {% load counter_tag %} {% load static %} - Agenturverbund erstellen + Agenturverbund

Ihre Agenturverbünde

@@ -117,8 +117,8 @@ Möchten Sie den Agenturverbund NAME verlassen?
-   - +   +
diff --git a/dasettings/templates/dasettings/delagencynetwork_content.html b/dasettings/templates/dasettings/delagencynetwork_content.html index fc48e7d..a906101 100644 --- a/dasettings/templates/dasettings/delagencynetwork_content.html +++ b/dasettings/templates/dasettings/delagencynetwork_content.html @@ -7,9 +7,9 @@ Achtung! Wenn Sie den Agenturverbund löschen, können die Agenturen innerhalb des Verbunds keine Informationen mehr austauschen.
{% csrf_token %} -
-   - Abbrechen +
+   + Abbrechen
diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html index 4f6d88f..a7528f3 100644 --- a/dasettings/templates/dasettings/groups_content.html +++ b/dasettings/templates/dasettings/groups_content.html @@ -7,15 +7,15 @@
{% for aggroup in agencygroups %} -{% setvar 0 %} - {% for user in usersofagency %} - {% for group in user.groups.all %} - {% if group.name == aggroup.group.name %} - {% incvar %} - {% endif %} - {% endfor %} - {% endfor %} -{% getvar as varcounter %} + {% setvar 0 %} + {% for user in usersofagency %} + {% for group in user.groups.all %} + {% if group.name == aggroup.group.name %} + {% incvar %} + {% endif %} + {% endfor %} + {% endfor %} + {% getvar as varcounter %}
@@ -99,6 +99,11 @@
+ +{% if forloop.counter == 2 %} +
+{% endif %} + {% endfor %}
@@ -446,9 +451,10 @@ function validateGroupName(groupname){ -
-   - +
+ +   +
@@ -467,8 +473,8 @@ function validateGroupName(groupname){
-    - +    +
diff --git a/dasettings/templates/dasettings/moduls_content.html b/dasettings/templates/dasettings/moduls_content.html index 0685ac9..f6fd6e9 100644 --- a/dasettings/templates/dasettings/moduls_content.html +++ b/dasettings/templates/dasettings/moduls_content.html @@ -28,7 +28,7 @@ {% endfor %} - + @@ -56,18 +56,22 @@ {% endif %} {% if formfield.name == 'module_organigramm' and user.profile.agency.module_organigramm %}
-   - + + +   +
{% elif formfield.name == 'module_timemanagement' and user.profile.agency.module_timemanagement %}
-   - + + +   +
{% else %}
-   +  
{% endif %} diff --git a/dasettings/templates/dasettings/profil_content.html b/dasettings/templates/dasettings/profil_content.html index 61c2110..db7ec54 100644 --- a/dasettings/templates/dasettings/profil_content.html +++ b/dasettings/templates/dasettings/profil_content.html @@ -63,7 +63,7 @@ Agenturrelevante Daten (Bild, Telefonnummer etc.) werden in der Benutzerverwaltung verändert.
-   +  
@@ -76,7 +76,7 @@
-   +  
diff --git a/dasettings/templates/dasettings/settings.html b/dasettings/templates/dasettings/settings.html index a4ab6b8..bcebdab 100644 --- a/dasettings/templates/dasettings/settings.html +++ b/dasettings/templates/dasettings/settings.html @@ -133,7 +133,7 @@ {% endif %} {% if user|usergperm:"usermanager" %}
-
Mtarbeiter{% if request.user.profile.showtooltips %} {% endif %}
+
Mitarbeiter{% if request.user.profile.showtooltips %} {% endif %}
{% block user_content %} {% include "dasettings/user_content.html" %} @@ -200,7 +200,8 @@ var defaultsettingsview = "profil"; e.preventDefault(); $(this).tab('show'); lastview_name = $(this)[0]['hash'].substring(1); - localStorage.setItem('activeTabSettings', lastview_name); + localStorage.setItem('activeTabSettings', lastview_name); + console.log(lastview_name) }); diff --git a/dasettings/templates/dasettings/structure_content.html b/dasettings/templates/dasettings/structure_content.html index 6a769ae..213c2b6 100644 --- a/dasettings/templates/dasettings/structure_content.html +++ b/dasettings/templates/dasettings/structure_content.html @@ -40,7 +40,7 @@ noclickeffect:active { border-style: outset !important;} Bereich {{area.name}}  - +
@@ -65,8 +65,8 @@ noclickeffect:active { border-style: outset !important;} {{ task.created_area_by.first_name }} {{ task.created_area_by.last_name }} {{ task.created_area_date }} - - + + {% endif %} @@ -103,8 +103,10 @@ noclickeffect:active { border-style: outset !important;}
-   - + + +   +
@@ -125,8 +127,8 @@ noclickeffect:active { border-style: outset !important;} Möchten Sie den Bereich wirklich löschen? Alle darin enthaltenen Tätigkeiten werden gelöscht und die Standards müssen neu einer Tätigkeit und einem Bereich zugeordnet werde!
-    - +    +
@@ -153,8 +155,10 @@ noclickeffect:active { border-style: outset !important;}
-   - + + +   +
@@ -204,8 +208,8 @@ noclickeffect:active { border-style: outset !important;}
-    - +    +
@@ -245,8 +249,8 @@ noclickeffect:active { border-style: outset !important;} Möchten Sie den Bereich wirklich löschen? Alle darin enthaltenen Standards müssen eine Tätigkeit erhalten!
-    - +    +
diff --git a/dasettings/templates/dasettings/user_content.html b/dasettings/templates/dasettings/user_content.html index 6aad58f..8c36b41 100644 --- a/dasettings/templates/dasettings/user_content.html +++ b/dasettings/templates/dasettings/user_content.html @@ -28,7 +28,7 @@ {{ item.profile.phonemobile }} {% if item != request.user %} - + {% endif %} diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html index c956c94..9195f25 100644 --- a/dasettings/templates/dasettings/user_usprof.html +++ b/dasettings/templates/dasettings/user_usprof.html @@ -61,7 +61,7 @@ {{ mail }} 

-    +   

@@ -143,12 +143,18 @@
- {% if newuser == 1 %} + {% if newuser == 1 %} + Profil später bearbeiten + {% else %} + Abbrechen + {% endif%} + + {% if newuser == 1 %} {% else %} - + {% endif %} - Profilbearbeitung abbrechen +
diff --git a/dasettings/views.py b/dasettings/views.py index 9818f76..23b418a 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -99,7 +99,7 @@ def DASettings(request): context.update({"agencyjobs" : AgencyJob.objects.filter(agency__pk=request.user.profile.agency.pk).order_by("name")}) # LOAD GROUPS - agencygroups = AgencyGroup.objects.filter(agency__pk=request.user.profile.agency.pk).order_by("agencygroupname") + agencygroups = AgencyGroup.objects.filter(agency__pk=request.user.profile.agency.pk).order_by("agencygroupname").order_by("-savefordel") context.update({"agencygroups" : agencygroups}) # LOAD AREAS @@ -393,9 +393,22 @@ def SettingsAjaxRouter(request): area.save() success = True # REMOVE AREA - elif request.method == 'GET' and request.GET['action'] == "remove_area" : - Areas(pk=request.GET['id']).delete() - success = True + elif request.method == 'GET' and request.GET['action'] == "remove_area" : + todelarea = Areas.objects.get(pk=request.GET['id'], agency=request.user.profile.agency) + # REMOVE STANDARDS AREA + tempstandards = Standards.objects.filter(agency=request.user.profile.agency, area=todelarea) + if(request.user.has_perm('standardmanager')): + for s in tempstandards: + s.area = None + s.task = None + s.public = False + s.save() + + + todelarea.delete() + success = True + else: + success = False # ADD TASK elif request.method == 'GET' and request.GET['action'] == "add_task" : task = Tasks(created_area_by=request.user, area=Areas.objects.get(pk=request.GET['areaid']), agency=request.user.profile.agency, name=request.GET["newvalue"]) @@ -427,7 +440,22 @@ def SettingsAjaxRouter(request): success = True # REMOVE Task elif request.method == 'GET' and request.GET['action'] == "remove_task" : - Tasks.objects.get(pk=request.GET['id'], agency=request.user.profile.agency).delete() + + todeltask = Tasks.objects.get(pk=request.GET['id'], agency=request.user.profile.agency) + # REMOVE STANDARDS AREA + tempstandards = Standards.objects.filter(agency=request.user.profile.agency, task=todeltask) + if(request.user.has_perm('standardmanager')): + for s in tempstandards: + s.task = None + s.public = False + s.save() + + todeltask.delete() + success = True + else: + success = False + + success = True # UPDATE TASK VISIBLE elif request.method == 'GET' and request.GET['action'] == "update_visible_taskname" : @@ -574,6 +602,14 @@ def UserProfileUpdate(request, pk, newuser=0): return render(request, 'dasettings/user_usprof.html', context) else: + usertime = "" + try: + usertime = UserTimeForm(instance=UserTime.objects.get(user=usertochange)) + except: + usertime = UserTime(user=usertochange) + usertime.save() + usertime = UserTimeForm(instance=UserTime.objects.get(user=usertochange)) + context = { 'active_link' : 'dasettings', diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 11e175b..f348433 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 0b9a80c..8d3422d 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -15,35 +15,32 @@ import os BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -############################################## LOCAL ##################################### -BASE_URL = "http://localhost:8000/" -CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" +############################################## DEV ##################################### +BASE_URL = "https://dev01.digitale-agentur.com/" +CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -# Database -# https://docs.djangoproject.com/en/2.2/ref/settings/#databases +# MAIL DEV +EMAIL_HOST = 'smtp.strato.de' +EMAIL_PORT = 587 +EMAIL_USE_TLS = True +EMAIL_HOST_USER = "support@dev01.digitale-agentur.com" +EMAIL_HOST_PASSWORD = "support@dev01.digitale-agentur.com" +DEFAULT_FROM_EMAIL = "support@dev01.digitale-agentur.com" + # DEV DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', - 'NAME' : 'digitaleagentur', - 'USER' : 'root', - 'PASSWORD' : '', + 'NAME' : 'digitaleagentur_dev01', + 'USER' : 'digitaleagentur_dev01', + 'PASSWORD' : 't3TvtGAOkFHYXdJlUMIu9u3U', 'PORT' : 3306 } } - -# MAIL DEV -EMAIL_HOST = 'gymhum.de' -EMAIL_PORT = 587 -EMAIL_USE_TLS = True -EMAIL_HOST_USER = "holger.trampe" -EMAIL_HOST_PASSWORD = "Motte2016_!" -DEFAULT_FROM_EMAIL = "holger.trampe@gymhum.de" - -################################################### LOCAL ############################### +############################################## DEV ##################################### # Nach zehn Stunden läuft der Cookie ab! diff --git a/message/templates/message/message.html b/message/templates/message/message.html index 34cf216..9ee2817 100644 --- a/message/templates/message/message.html +++ b/message/templates/message/message.html @@ -28,8 +28,8 @@ {{form|crispy}}

Ihrer Mitteilung wird Automatisch eine Anrede und eine Verabscheidung hinzugefügt!

-   - Abbrechen +   + Abbrechen
@@ -55,7 +55,7 @@ {{ item.created_by.first_name }} {{ item.created_by.last_name }} {{ item.created_date }} {{ item.content|truncatechars:30 }} - + {% endfor %} @@ -86,8 +86,8 @@ Wollen Sie die Mitteilung wirklich löschen?
-    - +    +
diff --git a/message/templates/message/message_single.html b/message/templates/message/message_single.html index f34f645..b076898 100644 --- a/message/templates/message/message_single.html +++ b/message/templates/message/message_single.html @@ -3,18 +3,20 @@ {% block content %} {% if request.user.profile.agency.module_messages %}
+

Mitteilung von {{mess.created_by.first_name}} {{mess.created_by.last_name}}

Versendet am {{mess.created_date}}
- +
+
Hallo {{request.user.first_name}} {{request.user.last_name}},

{{mess.content}}

Mit freundlichen Grüßen

{{mess.created_by.first_name}} {{mess.created_by.last_name}}
- -
+ +
-    - +    +
diff --git a/news/templates/news/news_addnews.html b/news/templates/news/news_addnews.html index f2c7377..6a85a8b 100644 --- a/news/templates/news/news_addnews.html +++ b/news/templates/news/news_addnews.html @@ -12,7 +12,7 @@ {{normalForm.media}} {{normalForm|crispy}}
-   +   Abbrechen diff --git a/news/templates/news/news_confirm_delete.html b/news/templates/news/news_confirm_delete.html index 2b3c308..3925540 100644 --- a/news/templates/news/news_confirm_delete.html +++ b/news/templates/news/news_confirm_delete.html @@ -12,8 +12,8 @@
{% csrf_token %}
-   - Abbrechen +   + Abbrechen
diff --git a/news/templates/news/news_management.html b/news/templates/news/news_management.html index 85d58ef..05e2be6 100644 --- a/news/templates/news/news_management.html +++ b/news/templates/news/news_management.html @@ -2,16 +2,14 @@ {% block content %} {% if request.user.profile.agency.module_news %}
-

News 

+

News  + + {% if perms.users.modulenews %} +  News + {% endif %} +

- {% if perms.users.modulenews %} -
-
-  News -
-
-
- {% endif %} +
@@ -103,18 +98,14 @@ {{ news_single.go_online_on|date:"d.m.Y, H:i"}} bis {{ news_single.go_offline_on|date:"d.m.Y, H:i"}} {% if news_single.created_by == request.user or perms.users.news_management %} -
- -
- Bearbeiten -
- Löschen -
-
+ + + +   + + + {% endif %} -
{% endfor %} @@ -154,18 +145,14 @@ {{ news_single.go_online_on|date:"d.m.Y, H:i"}} bis {{ news_single.go_offline_on|date:"d.m.Y, H:i"}} {% if news_single.created_by == request.user or perms.users.news_management %} -
- -
- Bearbeiten -
- Löschen -
-
+ + + +   + + + {% endif %} -
{% endfor %} diff --git a/news/templates/news/news_update.html b/news/templates/news/news_update.html index 4b15d3e..68afd70 100644 --- a/news/templates/news/news_update.html +++ b/news/templates/news/news_update.html @@ -10,7 +10,7 @@ {{normalForm.media}} {{normalForm|crispy}}
-   +   Abbrechen diff --git a/news/views.py b/news/views.py index 1bbb7f6..78365d1 100644 --- a/news/views.py +++ b/news/views.py @@ -112,7 +112,7 @@ class NewsDeleteView(LoginRequiredMixin, DeleteView): template_name = 'news/news_confirm_delete.html' def get_context_data(self, **kwargs): - context = super(NewsDeleteView, self).get_context_data(**kwargs) + context = super(NewsDeleteView, self).get_context_data(**kwargs) context['active_link'] = 'newsmanagement' return context diff --git a/notificsys/templates/notificsys/allnotifications.html b/notificsys/templates/notificsys/allnotifications.html index 113e2e2..1160d2b 100644 --- a/notificsys/templates/notificsys/allnotifications.html +++ b/notificsys/templates/notificsys/allnotifications.html @@ -3,12 +3,12 @@

Alle Benachrichtigungen

- + {% for notification in usernotifications %}
- +

{% if notification.notificationtype == "agencynews" %} @@ -45,8 +45,8 @@ Möchten Sie alle Benachrichtigungen löschen?

-    - +    +
diff --git a/orga/templates/orga/orga_single.html b/orga/templates/orga/orga_single.html index 462f0e1..fc7335c 100644 --- a/orga/templates/orga/orga_single.html +++ b/orga/templates/orga/orga_single.html @@ -56,11 +56,11 @@

Festnetz

- {{ phoneland }} + {{ phoneland }}

Mobil

- {{ phonemobile }}{% if phone_public %} (nur Intern){% endif %} + {{ phonemobile }}{% if phone_public %} (nur Intern){% endif %}

diff --git a/organizer/templates/organizer/agpass_add.html b/organizer/templates/organizer/agpass_add.html index e3991d2..593aa0f 100644 --- a/organizer/templates/organizer/agpass_add.html +++ b/organizer/templates/organizer/agpass_add.html @@ -9,7 +9,7 @@ {% csrf_token %} {{form|crispy}}
-   +   Abbrechen diff --git a/organizer/templates/organizer/agpass_delete.html b/organizer/templates/organizer/agpass_delete.html index 8864c60..e53297b 100644 --- a/organizer/templates/organizer/agpass_delete.html +++ b/organizer/templates/organizer/agpass_delete.html @@ -13,8 +13,8 @@
{% csrf_token %}
-   - Abbrechen +   + Abbrechen
diff --git a/organizer/templates/organizer/agpass_update.html b/organizer/templates/organizer/agpass_update.html index 25ce6c2..a20030c 100644 --- a/organizer/templates/organizer/agpass_update.html +++ b/organizer/templates/organizer/agpass_update.html @@ -11,7 +11,7 @@ {{form|crispy}}
-   +   Abbrechen diff --git a/organizer/templates/organizer/cat_confirm_delete.html b/organizer/templates/organizer/cat_confirm_delete.html index 8984030..82211d4 100644 --- a/organizer/templates/organizer/cat_confirm_delete.html +++ b/organizer/templates/organizer/cat_confirm_delete.html @@ -14,8 +14,8 @@
{% csrf_token %}
-   - Abbrechen +   + Abbrechen
diff --git a/organizer/templates/organizer/cat_update.html b/organizer/templates/organizer/cat_update.html index 77e9a9d..7519f58 100644 --- a/organizer/templates/organizer/cat_update.html +++ b/organizer/templates/organizer/cat_update.html @@ -9,7 +9,7 @@ {% csrf_token %} {{ form|crispy }}
-   +   Abbrechen diff --git a/organizer/templates/organizer/contact_add.html b/organizer/templates/organizer/contact_add.html index 06609d9..3d11e34 100644 --- a/organizer/templates/organizer/contact_add.html +++ b/organizer/templates/organizer/contact_add.html @@ -19,7 +19,7 @@ {% endfor %}
-   +   Abbrechen diff --git a/organizer/templates/organizer/contact_delete.html b/organizer/templates/organizer/contact_delete.html index e802da4..e0b4b50 100644 --- a/organizer/templates/organizer/contact_delete.html +++ b/organizer/templates/organizer/contact_delete.html @@ -13,8 +13,8 @@
{% csrf_token %}
-   - Abbrechen +   + Abbrechen
diff --git a/organizer/templates/organizer/contact_update.html b/organizer/templates/organizer/contact_update.html index 313364b..f755087 100644 --- a/organizer/templates/organizer/contact_update.html +++ b/organizer/templates/organizer/contact_update.html @@ -19,7 +19,7 @@
-   +   Abbrechen diff --git a/organizer/templates/organizer/contacts_content.html b/organizer/templates/organizer/contacts_content.html index 5575254..70c4d79 100644 --- a/organizer/templates/organizer/contacts_content.html +++ b/organizer/templates/organizer/contacts_content.html @@ -43,16 +43,14 @@ {% if user|usergperm:"moduleorganizer" %} -
- -
- Bearbeiten -
- Löschen -
-
+ + + + + + + + {% endif %} @@ -94,7 +92,7 @@ {% endif %}
- +
@@ -122,7 +120,7 @@ - + {% endfor %} @@ -134,7 +132,7 @@
- +
@@ -282,7 +280,7 @@ function addCategory(){ success: function( data ) { new_id = data["new_id"]; - $('#allCategory > tbody:last-child').append(''); + $('#allCategory > tbody:last-child').append(''); } }); } diff --git a/organizer/templates/organizer/passwords_content.html b/organizer/templates/organizer/passwords_content.html index d04a163..ca3e954 100644 --- a/organizer/templates/organizer/passwords_content.html +++ b/organizer/templates/organizer/passwords_content.html @@ -121,7 +121,7 @@
- +
diff --git a/organizer/templates/organizer/ql_add.html b/organizer/templates/organizer/ql_add.html index ad5740e..5cf5995 100644 --- a/organizer/templates/organizer/ql_add.html +++ b/organizer/templates/organizer/ql_add.html @@ -10,7 +10,7 @@ {{ form|crispy }}

Hinweis zum Weblink: Bitte setzen Sie den vollständigen Link in das Formular!
Z.B. https://digitale-agentur.com

-   +   Abbrechen diff --git a/organizer/templates/organizer/ql_confirm_delete.html b/organizer/templates/organizer/ql_confirm_delete.html index 7d6ba54..2dd2165 100644 --- a/organizer/templates/organizer/ql_confirm_delete.html +++ b/organizer/templates/organizer/ql_confirm_delete.html @@ -13,8 +13,8 @@
{% csrf_token %}
-   - Abbrechen +   + Abbrechen
diff --git a/organizer/templates/organizer/ql_update.html b/organizer/templates/organizer/ql_update.html index e687c49..705c1dc 100644 --- a/organizer/templates/organizer/ql_update.html +++ b/organizer/templates/organizer/ql_update.html @@ -12,7 +12,7 @@

Hinweis zum Weblink: Bitte setzen Sie den vollständigen Link in das Formular!
Z.B. https://digitale-agentur.com

-   +   Abbrechen diff --git a/organizer/templates/organizer/quicklinks_content.html b/organizer/templates/organizer/quicklinks_content.html index 5e26424..062a322 100644 --- a/organizer/templates/organizer/quicklinks_content.html +++ b/organizer/templates/organizer/quicklinks_content.html @@ -7,7 +7,7 @@ {% endif %} -
+
@@ -28,16 +28,14 @@ diff --git a/standards/models.py b/standards/models.py index bded89a..62ab592 100644 --- a/standards/models.py +++ b/standards/models.py @@ -41,8 +41,8 @@ class Standards(models.Model): public = models.BooleanField(default=False) - freefield_title = models.CharField(max_length=200, blank=False, default="") - freefield_content = models.TextField(max_length=500, blank=False, default="") + freefield_title = models.CharField(max_length=200, blank=False, null=True, default="") + freefield_content = models.TextField(max_length=500, blank=False, null=True, default="") delflag = models.BooleanField(default=False) deldate = models.DateTimeField(default=timezone.now, blank=True) diff --git a/standards/templates/standards/standard_confirm_delete.html b/standards/templates/standards/standard_confirm_delete.html index 469268b..14604fe 100644 --- a/standards/templates/standards/standard_confirm_delete.html +++ b/standards/templates/standards/standard_confirm_delete.html @@ -12,8 +12,8 @@ {% csrf_token %}
-   - Abbrechen +   + Abbrechen
diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html index 4278a1d..ed36bfd 100644 --- a/standards/templates/standards/standards_add.html +++ b/standards/templates/standards/standards_add.html @@ -99,7 +99,7 @@
{% if user|usergperm:"moduleorganizer" %} -
- -
- Bearbeiten -
- Löschen -
-
+ + + + + + + + {% endif %}
{% if update == True %} {% for s in standard.linked_standards.all %} - + {% endfor %} {% endif %}
{{s.name}}
{{s.name}}
@@ -152,7 +152,7 @@ {% if update == True %} {% for f in standard.addedfiles.all %} - + {% endfor %} {% endif %}
{{f.name}}
{{f.name}}
@@ -240,7 +240,7 @@ {% endif %}
-   Abbrechen @@ -398,7 +398,7 @@ {% endif %}
- +
@@ -478,13 +478,13 @@ {% if update == True %} {% for q in standard.addedquicklinks.all %} - + {% endfor %} {% endif %}
- +
@@ -522,13 +522,13 @@ {% if update == True %} {% for q in standard.addedcontacts.all %} - + {% endfor %} {% endif %}
{{q.company}}
{{q.company}}
- +
@@ -566,14 +566,14 @@ {% if update == True %} {% for q in standard.addedpasswords.all %} - + {% endfor %} {% endif %}
{{q.name}}
{{q.name}}
- +
diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index b038731..4579fb0 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -5,7 +5,7 @@

Standards{% if request.user.profile.showtooltips %} {% endif %} -  Standard +  Standard

Sichtbar sind alle veröffentlichten und von {{ user.first_name }} {{ user.last_name}} erstellten Standards.
@@ -185,7 +185,7 @@ {{standard.name}} {% else %} {% if standard.created_standard_by == request.user or perms.users.standardmanager %} - {{standard.name}}  + {{standard.name}}  {% else %} {{standard.name}}  {% endif %} diff --git a/standards/views.py b/standards/views.py index 384ca1c..515b303 100644 --- a/standards/views.py +++ b/standards/views.py @@ -30,10 +30,8 @@ class StandardsManagement(LoginRequiredMixin, ListView): standards_of_user = Standards.objects.filter(agency__pk=self.request.user.profile.agency.pk, created_standard_by=self.request.user.pk) #standards_of_agency = Standards.objects.filter(agency__pk=self.request.user.profile.agency.pk, public=True) unpubstandards_of_user = Standards.objects.filter(agency__pk=self.request.user.profile.agency.pk, public=False) - #tasks = Tasks.objects.filter(agency__pk=self.request.user.profile.agency.pk) - + #tasks = Tasks.objects.filter(agency__pk=self.request.user.profile.agency.pk) standardcontent = [] - for a in areas: standardcontent.append({"area" : a, "tasks" : []}) tasks_in_area = Tasks.objects.filter(agency__pk=self.request.user.profile.agency.pk, area__pk=a.pk).order_by("name") diff --git a/users/models.py b/users/models.py index 1e86219..415d28e 100644 --- a/users/models.py +++ b/users/models.py @@ -17,11 +17,11 @@ User._meta.get_field('last_name').blank = False # PATH FOR AGENCYPIC def picturepath_agency(instance, filename): # file will be uploaded to MEDIA_URL/agency_// - return settings.MEDIA_URL + 'agencydata/agency_{0}/agencystats/{1}'.format(instance.pk, filename) + return 'agencydata/agency_{0}/agencystats/{1}'.format(instance.pk, filename) # PATH FOR PROFILEPICS def picturepath_user(instance, filename): - return settings.MEDIA_URL + 'agencydata/agency_{0}/agencystats/profilepics/{1}'.format(instance.agency.pk, filename) + return 'agencydata/agency_{0}/agencystats/profilepics/{1}'.format(instance.agency.pk, filename) @@ -81,7 +81,7 @@ class Agency(models.Model): plz = models.CharField(default="", max_length=5, blank=True) agency_email = models.EmailField(default="", blank=True) phone = models.CharField(default="", max_length=50, blank=True) - agencypic = models.ImageField(default=settings.MEDIA_URL + 'ag_default.jpg', upload_to=picturepath_agency, blank=True) + agencypic = models.ImageField(default='ag_default.jpg', upload_to=picturepath_agency, blank=True) @@ -170,7 +170,7 @@ class Profile(models.Model): func = models.ForeignKey("AgencyJob", blank=True, null=True, default=None, on_delete=models.SET_NULL) # Wenn dieses Profil gelöscht wird, wird NICHT die Agency geslöscht agency = models.ForeignKey(Agency, on_delete=models.PROTECT) - image = models.ImageField(default=settings.MEDIA_URL + 'default.jpg', upload_to=picturepath_user, blank=True) + image = models.ImageField(default='default.jpg', upload_to=picturepath_user, blank=True) compfunc = models.CharField(max_length=60, blank=True) visible = models.BooleanField(default=True) persnumber = models.CharField(default="", max_length=50, blank=True) diff --git a/users/static/users/img/favicon_OLD.png b/users/static/users/img/favicon_OLD.png deleted file mode 100644 index 52fe313..0000000 Binary files a/users/static/users/img/favicon_OLD.png and /dev/null differ diff --git a/users/static/users/img/logo.png b/users/static/users/img/logo.png new file mode 100644 index 0000000..95a064f Binary files /dev/null and b/users/static/users/img/logo.png differ diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 5ef0e75..4865856 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -324,20 +324,28 @@ Alle Benachrichtigungen ansehen
- - +
  • - + + - Orga-Profil + Einstellungen + + + + Benachrichtigungen
    @@ -432,7 +440,15 @@