diff --git a/cloud/templates/cloud/cloud_main.html b/cloud/templates/cloud/cloud_main.html index 044cfab..d850e79 100644 --- a/cloud/templates/cloud/cloud_main.html +++ b/cloud/templates/cloud/cloud_main.html @@ -24,7 +24,8 @@ a.disabled {
-

Dateien{% if request.user.profile.showtooltips %} {% endif %}

+

Dateien{% if request.user.profile.showtooltips %} {% endif %} +

@@ -1098,4 +1099,66 @@ function addDirAction(){ }); } + + + + + + + + + + {% endblock %} \ No newline at end of file diff --git a/dasettings/templates/dasettings/agency_content.html b/dasettings/templates/dasettings/agency_content.html index 04a9c09..32502a5 100644 --- a/dasettings/templates/dasettings/agency_content.html +++ b/dasettings/templates/dasettings/agency_content.html @@ -164,7 +164,7 @@ function addAgencyJob(){ success: function( data ) { new_id = data["data"]["new_id"]; - $('#allagencyjobs > tbody:last-child').append(''); + $('#allagencyjobs > tbody:last-child').append(''); } }); } @@ -281,7 +281,7 @@ function updateFunc(id, funcname){ - + {% endfor %} @@ -316,7 +316,7 @@ function updateFunc(id, funcname){ - + {% endfor %} diff --git a/dasettings/templates/dasettings/settings.html b/dasettings/templates/dasettings/settings.html index bcebdab..5fc94e8 100644 --- a/dasettings/templates/dasettings/settings.html +++ b/dasettings/templates/dasettings/settings.html @@ -97,6 +97,7 @@ {% if user|usergperm:"agencyinfo" %}
Agenturinformationen{% if request.user.profile.showtooltips %} {% endif %} +
{% block agency_content %} @@ -115,7 +116,9 @@ {% endif %} {% if user|usergperm:"agencynetwork" %}
-
Agenturverbünde{% if request.user.profile.showtooltips %} {% endif %}
+
Agenturverbünde{% if request.user.profile.showtooltips %} {% endif %} + +
{% block agencynetwork_content %} {% include "dasettings/agencynetwork_content.html" %} @@ -124,7 +127,9 @@ {% endif %} {% if user|usergperm:"structuremanager" %}
-
Struktur{% if request.user.profile.showtooltips %} {% endif %}
+
Struktur{% if request.user.profile.showtooltips %} {% endif %} + +
{% block structure_content %} {% include "dasettings/structure_content.html" %} @@ -133,7 +138,9 @@ {% endif %} {% if user|usergperm:"usermanager" %}
-
Mitarbeiter{% if request.user.profile.showtooltips %} {% endif %}
+
Mitarbeiter{% if request.user.profile.showtooltips %} {% endif %} + +
{% block user_content %} {% include "dasettings/user_content.html" %} @@ -142,7 +149,9 @@ {% endif %} {% if user|usergperm:"groupmanager" %}
-
Gruppen{% if request.user.profile.showtooltips %} {% endif %}
+
Gruppen{% if request.user.profile.showtooltips %} {% endif %} + +
{% block groups_content %} {% include "dasettings/groups_content.html" %} @@ -200,12 +209,238 @@ var defaultsettingsview = "profil"; e.preventDefault(); $(this).tab('show'); lastview_name = $(this)[0]['hash'].substring(1); - localStorage.setItem('activeTabSettings', lastview_name); - console.log(lastview_name) + localStorage.setItem('activeTabSettings', lastview_name); }); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% endblock content %} \ No newline at end of file diff --git a/dasettings/templates/dasettings/structure_content.html b/dasettings/templates/dasettings/structure_content.html index 38e1a4b..df0018a 100644 --- a/dasettings/templates/dasettings/structure_content.html +++ b/dasettings/templates/dasettings/structure_content.html @@ -378,7 +378,7 @@ function mainmodalTaskSave(){ newtaskareaname = data['data']['areaname']; taskcreatedby = data['data']['taskcreator_fullname']; taskcreateddate = data['data']['createdate']; - $("#areatask_" + taskaddtoarea).prepend(''+newtaskname+''+newtaskareaname+''+taskcreatedby+''+taskcreateddate+' >'); + $("#areatask_" + taskaddtoarea).prepend(''+newtaskname+''+newtaskareaname+''+taskcreatedby+''+taskcreateddate+' >'); } else{ diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 6e440fa..ea5d7d4 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 6403933..dd60c7f 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -14,32 +14,35 @@ import os # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -############################################## PROD ##################################### -BASE_URL = "https://digitale-agentur.com/" +############################################## LOCAL ##################################### +BASE_URL = "http://localhost:8000/" CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D" MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak" # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True -# MAIL PROD -EMAIL_HOST = 'smtp.strato.de' -EMAIL_PORT = 587 -EMAIL_USE_TLS = True -EMAIL_HOST_USER = "noreply@digitale-agentur.com" -EMAIL_HOST_PASSWORD = "48c3n6YggZBuPyShtqOQ" -DEFAULT_FROM_EMAIL = "noreply@digitale-agentur.com" - -# PROD +# Database +# https://docs.djangoproject.com/en/2.2/ref/settings/#databases +# DEV DATABASES = { 'default': { 'ENGINE': 'django.db.backends.mysql', 'NAME' : 'digitaleagentur', - 'USER' : 'digitaleagentur', - 'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh', + 'USER' : 'root', + 'PASSWORD' : '', 'PORT' : 3306 } } -############################################## PROD ##################################### + +# 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 ############################### diff --git a/message/templates/message/message.html b/message/templates/message/message.html index 9ee2817..1b8de16 100644 --- a/message/templates/message/message.html +++ b/message/templates/message/message.html @@ -4,7 +4,9 @@ {% if request.user.profile.agency.module_messages %}
-

Mitteilungen{% if request.user.profile.showtooltips %} {% endif %}

+

Mitteilungen{% if request.user.profile.showtooltips %} {% endif %} + +

@@ -171,4 +173,64 @@ {% else %}

Das Modul Mitteilungen wurde in ihrer Agentur deaktiviert.

{% endif %} + + + + + + + + {% endblock content %} \ No newline at end of file diff --git a/message/templates/message/message_single.html b/message/templates/message/message_single.html index b076898..9483c63 100644 --- a/message/templates/message/message_single.html +++ b/message/templates/message/message_single.html @@ -15,7 +15,7 @@ Mit freundlichen Grüßen

{{mess.created_by.first_name}} {{mess.created_by.last_name}}
- +
diff --git a/news/templates/news/news_management.html b/news/templates/news/news_management.html index 05e2be6..8c69e57 100644 --- a/news/templates/news/news_management.html +++ b/news/templates/news/news_management.html @@ -7,6 +7,7 @@ {% if perms.users.modulenews %}  News {% endif %} +
@@ -260,4 +261,64 @@ $('#news_tabs a').on('click', function (e) { {% else %}

Das Modul News wurde in ihrer Agentur deaktiviert.

{% endif %} + + + + + + + + + {% endblock content %} diff --git a/organizer/templates/organizer/organizer_management.html b/organizer/templates/organizer/organizer_management.html index 1912438..24c3b59 100644 --- a/organizer/templates/organizer/organizer_management.html +++ b/organizer/templates/organizer/organizer_management.html @@ -3,7 +3,9 @@ {% block content %} {% if request.user.profile.agency.module_organizer %}
-

Organizer{% if request.user.profile.showtooltips %} {% endif %}

+

Organizer{% if request.user.profile.showtooltips %} {% endif %} + +

@@ -116,4 +118,66 @@ function saveDefQL(){ {% else %}

Das Modul Organizer wurden in ihrer Agentur deaktiviert.

{% endif %} + + + + + + + + + + {% endblock content %} diff --git a/standards/templates/standards/standards_add_SAVE.html b/standards/templates/standards/standards_add_SAVE.html index 6df3c8d..70e3145 100644 --- a/standards/templates/standards/standards_add_SAVE.html +++ b/standards/templates/standards/standards_add_SAVE.html @@ -475,7 +475,7 @@ function updateLinkedStandards(){ actualStandards.push(tempid_standard); clearSearchfieldAddStandard(); $("#" + id).remove(); - $("#linkedstandards").append('' + g + ''); + $("#linkedstandards").append('' + g + ''); } $("#id_added_standards").val(actualStandards); @@ -616,7 +616,7 @@ function doUploadAction(filetodo, replacestat){ hideUpload(); actualFiles.push(String(data["data"]["savedobj_id"])); $("#id_added_files").val(actualFiles); - $("#linkedfiles") .append('' + data["data"]["savedobj_name"] + ''); + $("#linkedfiles") .append('' + data["data"]["savedobj_name"] + ''); }, 1000); } else{ @@ -646,7 +646,7 @@ function updateLinkedFiles(){ $("#id_added_files").val(actualFiles) clearSearchfieldAddFile(); $("#" + id).remove(); - $("#linkedfiles") .append('' + g + ''); + $("#linkedfiles") .append('' + g + ''); } } diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index b1337c7..c16516e 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

Sichtbar sind alle veröffentlichten und von {{ user.first_name }} {{ user.last_name}} erstellten Standards. @@ -237,7 +237,7 @@ + + + + + + + + + + {% endblock content %} \ No newline at end of file diff --git a/standards/templates/standards/standards_update.html b/standards/templates/standards/standards_update.html index a3cfd60..e3685d0 100644 --- a/standards/templates/standards/standards_update.html +++ b/standards/templates/standards/standards_update.html @@ -111,7 +111,7 @@ Verlinkte Dateien: {% for f in standard.addedfiles.all %} - + {% endfor %}
{{f.name|truncatechars:30}}
{{f.name|truncatechars:30}}
@@ -152,7 +152,7 @@ Verlinkte Standards: {% for s in standard.linked_standards.all %} - + {% endfor %}
{{s.name|truncatechars:30}}
{{s.name|truncatechars:30}}
@@ -561,7 +561,7 @@ function updateLinkedStandards(){ tempid_standard = id.split("_")[1]; clearSearchfieldAddStandard(); $("#" + id).remove(); - $("#linkedstandards").append('' + g + ''); + $("#linkedstandards").append('' + g + ''); } $.ajax({ @@ -600,7 +600,7 @@ function updateLinkedFiles(){ tempid_file = id.split("_")[1]; clearSearchfieldAddFile(); $("#" + id).remove(); - $("#linkedfiles") .append('' + g + ''); + $("#linkedfiles") .append('' + g + ''); $.ajax({ url: "{% url 'update_standard_by_ajax' standard.pk %}", @@ -745,7 +745,7 @@ function doUploadAction(filetodo, parid, replacestat){ if(data["success"] == true){ setTimeout(function(){ $("#uploadModalProgress").modal("toggle"); - $("#linkedfiles") .append('' + data["data"]["savedobj_name"] + ''); + $("#linkedfiles") .append('' + data["data"]["savedobj_name"] + ''); }, 1000); $.ajax({ url: "{% url 'update_standard_by_ajax' standard.pk %}", @@ -760,7 +760,7 @@ function doUploadAction(filetodo, parid, replacestat){ { if(data["success"] == true){ - $("#linkedfiles") .append('' + data["data"]["savedobj_name"] + ''); + $("#linkedfiles") .append('' + data["data"]["savedobj_name"] + ''); $.ajax({ url: "{% url 'update_standard_by_ajax' standard.pk %}", data: { diff --git a/users/templates/users/dashboard.html b/users/templates/users/dashboard.html index 24da1a7..35981d9 100644 --- a/users/templates/users/dashboard.html +++ b/users/templates/users/dashboard.html @@ -11,7 +11,7 @@ {% if request.user.profile.agency.module_news %}
-
News +
News  {% if perms.users.modulenews %} {% endif %} @@ -83,9 +83,66 @@
{% endif %}
+ + + + + + + + {% endblock content %}