Merge pull request 'format tera files' (#627) from restructure-user into staging

Reviewed-on: #627

templates/admin/user/index.html.tera

@@ -36,11 +36,11 @@
                    placeholder="Suchen nach (Name, [yes|no]-role:<name>, has-[no-]membership-pdf)" />
         </div>
         <!-- END filterBar -->
-        <div id="filter-result-js"
+        <div id="filter-result-js" class="search-result"></div>
-                 class="search-result"></div>
         {% for user in users %}
             <div data-filterable="true"
-                     data-filter="{{ user.name }} {% for role in roles %} {% if role.name in user.roles %} yes-role:{{ role.name }} {% else %} no-role:{{ role.name }} {% endif %} role-{{ role }} {% endfor %} {% if user.membership_pdf %}has-membership-pdf{% else %}has-no-membership-pdf{% endif %}" class="border-t bg-white dark:bg-primary-900 py-3 px-4 relative">
+                 data-filter="{{ user.name }} {% for role in roles %} {% if role.name in user.roles %} yes-role:{{ role.name }} {% else %} no-role:{{ role.name }} {% endif %} role-{{ role }} {% endfor %} {% if user.membership_pdf %}has-membership-pdf{% else %}has-no-membership-pdf{% endif %}"
+                 class="border-t bg-white dark:bg-primary-900 py-3 px-4 relative">
                 <details class="block dark:text-white w-full">
                     <summary>
                         <span class="text-black dark:text-white cursor-pointer">
@@ -52,30 +52,28 @@
                                           enctype="multipart/form-data"
                                           class="inline">
                                         &bullet; <a class="font-normal text-primary-600 dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
-                                                    href="/admin/user/{{ user.id }}/send-welcome-mail" onclick="return confirm('Willst du wirklich das Willkommensmail an {{ user.name }} ausschicken?');">Willkommensmail verschicken</a>
+    href="/admin/user/{{ user.id }}/send-welcome-mail"
+    onclick="return confirm('Willst du wirklich das Willkommensmail an {{ user.name }} ausschicken?');">Willkommensmail verschicken</a>
                                     </form>
                                 {% endif %}
-                             
+                                {% if user.last_access %}&bullet; ⏳&nbsp;{{ user.last_access | date }}{% endif %}
-                                {% if user.last_access %}
-				                            &bullet; ⏳&nbsp;{{ user.last_access | date }}
-                                {% endif %}
                             </span>
-
                             <small class="block text-gray-600 dark:text-gray-100">
                                 {% for role in user.roles %}
-                                  {{ role }}{% if not loop.last %}, {% endif %}
+                                    {{ role }}
+                                    {% if not loop.last %},{% endif %}
                                 {% endfor %}
                             </small>
                         </span>
                     </summary>
-
                     <form action="/admin/user"
                           method="post"
                           enctype="multipart/form-data"
                           class="w-full mt-2">
                         {% if user.pw %}
                             <a class="block my-1 font-normal text-[#f43f5e] dark:text-primary-200 hover:text-primary-900 dark:hover:text-primary-300 underline"
-                                  href="/admin/user/{{ user.id }}/reset-pw" onclick="return confirm('Willst du wirklich das Passwort zurücksetzen?');">Passwort zurücksetzen</a>
+                               href="/admin/user/{{ user.id }}/reset-pw"
+                               onclick="return confirm('Willst du wirklich das Passwort zurücksetzen?');">Passwort zurücksetzen</a>
                         {% endif %}
                         <div class="w-full grid gap-3 mt-3">
                             <input type="hidden" name="id" value="{{ user.id }}" />

templates/planned.html.tera

@@ -393,13 +393,7 @@
         {% if "manage_events" in loggedin_user.roles or "cox" in loggedin_user.roles %}
             <div class="grid {% if "manage_events" in loggedin_user.roles and "cox" in loggedin_user.roles %}grid-cols-2{% endif %} text-center">
                 {% if "manage_events" in loggedin_user.roles %}
-                    <a href="#"
+                    <a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>Event</strong> am {{ day.day| date(format='%d.%m.%Y') }} erstellen" data-day="{{ day.day }}" data-body="#addEventForm" class="relative inline-block w-full bg-primary-900 hover:bg-primary-950 focus:bg-primary-950 dark:bg-primary-950 text-white py-2 text-sm font-semibold
-                       data-sidebar="true"
-                       data-trigger="sidebar"
-                       data-header="<strong>Event</strong> am {{ day.day| date(format='%d.%m.%Y') }} erstellen"
-                       data-day="{{ day.day }}"
-                       data-body="#addEventForm"
-                       class="relative inline-block w-full bg-primary-900 hover:bg-primary-950 focus:bg-primary-950 dark:bg-primary-950 text-white py-2 text-sm font-semibold
                         {% if "cox" in loggedin_user.roles %}
                             rounded-bl-md
                         {% else %}