diff --git a/cloud/templates/cloud/cloud_main.html b/cloud/templates/cloud/cloud_main.html index 6186e50..41e1da2 100644 --- a/cloud/templates/cloud/cloud_main.html +++ b/cloud/templates/cloud/cloud_main.html @@ -16,17 +16,17 @@ a.disabled {

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

-
+ +
@@ -39,20 +39,20 @@ a.disabled { -{% if user|usergperm:"filesviewer" %} +{% if user|usergperm:"filesviewer" %} @@ -64,49 +64,49 @@ a.disabled { - - {% for d in dirs %} - + + {% for d in dirs %} + {% setbool False %} {% for dirgroup in d.visibleby.all %} - {% if user|has_group:dirgroup.group.name %} - {% setbool True %} + {% if user|has_group:dirgroup.group.name %} + {% setbool True %} {% endif %} - {% endfor %} + {% endfor %} {% if d.visibleby.all|length == 0 %} - {% setbool True %} + {% setbool True %} {% endif %} - + {% getbool as groupchecker %} {% if groupchecker %} - + {% else %} {% endif %} - - + - {% endfor %} - {% for file in files %} - + {% endfor %} + {% for file in files %} + + - {% endfor %} + {% endfor %}
+ + {% if groupchecker %} {{d.name}} {% else %} -  {{d.name}} +  {{d.name}} {% endif %} - {{d.owner.first_name}} {{d.owner.last_name}} {{d.date_created|date:"d.m.Y G:i"}} {{d.date_last_modified|date:"d.m.Y G:i"}} - {% if user|usergperm:"filedirmanager" and groupchecker and d.is_defaultstandard == False %} + {% if user|usergperm:"filedirmanager" and groupchecker and d.is_defaultstandard == False %}
- {{file.name}} {{file.owner.first_name}} {{file.owner.last_name}} {{file.date_created|date:"d.m.Y G:i"}} {{file.date_last_modified|date:"d.m.Y G:i"}} - {% if user|usergperm:"filesmanager" %} + {% if user|usergperm:"filesmanager" %}
{% endif %} -{% if user|usergperm:"filesmanager" %} -
+{% if user|usergperm:"filesmanager" %} +
- + @@ -201,7 +201,7 @@ a.disabled {
- -{% endfor %} +{% endfor %} - @@ -72,10 +72,10 @@ @@ -96,7 +96,7 @@ Es werden immer automatisch die Feiertage für die nächsten zwei Jahre geladen.
- + {% getsomeyears 2023 as years %} -
- - + + + @@ -141,17 +141,17 @@ Möchten Sie wirklich alle gespeicherten Feiertage löschen? - - + +
Möchten Sie diesem Verbund beitreten?
-
+ diff --git a/dasettings/templates/dasettings/structure_content.html b/dasettings/templates/dasettings/structure_content.html index 3689af4..41e09a1 100644 --- a/dasettings/templates/dasettings/structure_content.html +++ b/dasettings/templates/dasettings/structure_content.html @@ -33,26 +33,26 @@ noclickeffect:active { border-style: outset !important;}
- +      - + +
- + - + @@ -65,15 +65,15 @@ noclickeffect:active { border-style: outset !important;} - + + {% endif %} - {% endfor %} - + {% endfor %} +
Name BereichErstellt vonErstellt von Erstellt am  
{{ task.area.name }} {{ task.created_area_by.first_name }} {{ task.created_area_by.last_name }} {{ task.created_area_date }} - + + - -
@@ -103,8 +103,8 @@ noclickeffect:active { border-style: outset !important;}
- @@ -72,15 +72,15 @@ {% if abday.confirm_status == 0 %} Genehmigt {% elif abday.confirm_status == 1 %} Beantragt {% else %} Abgelehnt {% endif %} {{abday.confirm_info}} - {% endfor %} - - + {% endfor %} + + \ No newline at end of file +