From c3b6392e10774dcc7ff10112e5371083b6326f27 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Tue, 21 Apr 2020 23:40:34 +0200 Subject: [PATCH] 0.8.3 final --- .../templates/dasettings/user_usprof.html | 2 +- .../__pycache__/settings.cpython-38.pyc | Bin 3897 -> 3897 bytes digitaleagentur/settings.py | 3 --- .../templates/organizer/contacts_content.html | 6 +++--- .../organizer/organizer_management.html | 18 +++++++++++++++--- .../organizer/passwords_content.html | 4 ++-- .../organizer/quicklinks_content.html | 4 ++-- .../templates/standards/standards_add.html | 4 ++-- .../standards/standards_management.html | 11 +++++++++-- .../templates/standards/standards_update.html | 4 ++-- users/templates/users/base.html | 3 ++- 11 files changed, 38 insertions(+), 21 deletions(-) diff --git a/dasettings/templates/dasettings/user_usprof.html b/dasettings/templates/dasettings/user_usprof.html index e9a68de..f523d82 100644 --- a/dasettings/templates/dasettings/user_usprof.html +++ b/dasettings/templates/dasettings/user_usprof.html @@ -40,7 +40,7 @@
-

Profil von {{user_fullname}} bearbeiten 

+

Mitarbeiter {{user_fullname}}  

{% if newuser == 1 %}
diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index b48ff62794eb7cd60b21d06b112ea18aafb13583..d4473921dec2851aea67955f3bb47b1c8a949bd4 100644 GIT binary patch delta 44 zcmdlfw^NQcl$V!_0SKHj=EqrW
{% if user|usergperm:"moduleorganizer" %} -  Kontakt - + {% endif %} -
+
diff --git a/organizer/templates/organizer/organizer_management.html b/organizer/templates/organizer/organizer_management.html index 32ac8a1..6e3097d 100644 --- a/organizer/templates/organizer/organizer_management.html +++ b/organizer/templates/organizer/organizer_management.html @@ -25,7 +25,9 @@
-
Kontakte{% if request.user.profile.showtooltips %} {% endif %}
+
Kontakte{% if request.user.profile.showtooltips %} {% endif %} + {% if user|usergperm:"moduleorganizer" %} + + +  Kontakt + {% endif %} +
{% block contacts_content %} {% include "organizer/contacts_content.html" %} @@ -41,7 +49,11 @@
-
Passwörter{% if request.user.profile.showtooltips %} {% endif %}
+
Passwörter{% if request.user.profile.showtooltips %} {% endif %} + {% if user|usergperm:"moduleorganizer" %} +  Passwort + {% endif %} +
{% block passwords_content %} {% include "organizer/passwords_content.html" %} diff --git a/organizer/templates/organizer/passwords_content.html b/organizer/templates/organizer/passwords_content.html index 4dc371d..d04a163 100644 --- a/organizer/templates/organizer/passwords_content.html +++ b/organizer/templates/organizer/passwords_content.html @@ -4,11 +4,11 @@
{% if user|usergperm:"moduleorganizer" %} -  Passwort + {% endif %}
-
+
diff --git a/organizer/templates/organizer/quicklinks_content.html b/organizer/templates/organizer/quicklinks_content.html index f8d7331..5e26424 100644 --- a/organizer/templates/organizer/quicklinks_content.html +++ b/organizer/templates/organizer/quicklinks_content.html @@ -2,11 +2,11 @@ {% if user|usergperm:"moduleorganizer" %}
-  Quicklink +
{% endif %} -
+
diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html index 5265a8d..6df3c8d 100644 --- a/standards/templates/standards/standards_add.html +++ b/standards/templates/standards/standards_add.html @@ -36,7 +36,7 @@
@@ -126,7 +126,7 @@ {% if user|usergperm:"filesmanager" %} {% endif %} diff --git a/standards/templates/standards/standards_management.html b/standards/templates/standards/standards_management.html index 0de95d0..acde627 100644 --- a/standards/templates/standards/standards_management.html +++ b/standards/templates/standards/standards_management.html @@ -13,8 +13,9 @@
+