Merge pull request 'ui-improvements' (#749) from ui-improvements into main

Reviewed-on: #749

templates/admin/schnupper/index.html.tera

@@ -8,17 +8,20 @@
                  role="alert">
                 <h2 class="h2">Angemeldete Personen: {{ schnupperanten | length }}</h2>
                 <div class="text-sm p-3">
-                    <ol class="ms-2" style="list-style: number;">
+                    <ol class="list-decimal">
                         {% for user in schnupperanten %}
-                            <li class="py-1"
+                            <li class="py-1 ml-4">
-                                {% if "paid" in user.roles %}style="background-color: green;"{% endif %}>
+                                <span class="flex items-center justify-between">
-                                {{ user.name }} ({{ user.mail }}
+                                    <span>
+                                      <span class="status-damage status-damage-{% if "paid" in user.roles %}none {% else %}locked {% endif %}"></span>&nbsp;{{ user.name }} ({{ user.mail }}
                                       {%- if user.notes %} | {{ user.notes }}
                                       {% endif -%}
                                       )
+                                    </span>
                                     <a class="btn btn-primary"
                                       href="/admin/user/move/schnupperant/{{ user.id }}/to/scheckbuch"
                                       onclick="return confirm('Willst du wirklich ein Scheckbuch erstellen? Die Person erhält ein Mail mit allen Infos.')">Zu Scheckbuch umwandeln</a>
+                                </span>
                             </li>
                         {% endfor %}
                     </ol>

templates/admin/user/fees.html.tera

@@ -1,43 +1,44 @@
 {% import "includes/macros" as macros %}
 {% extends "base" %}
 {% block content %}
-    <div class="max-w-screen-lg w-full bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5">
+    <div class="max-w-screen-lg w-full">
-        <h1 class="h1">Gebühren</h1>
+        <h1 class="h1">
-        <!-- START filterBar -->
+            Gebühren
+        </h1>
         <div class="search-wrapper">
             <label for="name" class="sr-only">Suche</label>
             <input type="search"
                    name="name"
                    id="filter-js"
                    class="search-bar"
-                   placeholder="Suchen nach Name" />
+                   placeholder="Suchen nach Namen..." />
         </div>
-        <!-- END filterBar -->
+        <div id="filter-result-js" class="search-result"></div>
-        <div class="bg-primary-100 dark:bg-primary-950 p-3 rounded-b-md grid gap-4">
+        <div class="border-r border-l border-gray-200 dark:border-primary-600">
-            <div id="filter-result-js"
-                 class="text-primary-950 dark:text-white text-right"></div>
             {% for fee in fees | sort(attribute="name") %}
-                <div {% if fee.paid %}style="background-color: green;"{% endif %}
+                <div class="border-t border-gray-200 dark:border-primary-600 {% if fee.paid %}bg-[#15803d] text-white {% else %} bg-white {% endif %} dark:bg-primary-900 text-black dark:text-white flex justify-between items-center px-3 py-1 " 
                      data-filterable="true"
                      data-filter="{{ fee.name }} {% if fee.paid %} has-already-paid {% else %} has-not-paid {% endif %}"
                      class="bg-white dark:bg-primary-900 p-3 rounded-md w-full">
-                    <div class="grid sm:grid-cols-1 gap-3">
+                    <div class="grid md:grid-cols-3 gap-3 w-full py-3">
-                        <div style="width: 100%" class="col-span-2">
+                        <div>
-                            <b>{{ fee.name }}</b>
+                            <strong>{{ fee.name }}</strong>
+                            <span class="block">{{ fee.sum_in_cents / 100 }}€</span>
                         </div>
-                        <div style="width: 100%">{{ fee.sum_in_cents / 100 }}€:</div>
+                        <div>
-                        <div style="width: 100%">
                             {% for p in fee.parts %}
                                 {{ p.0 }} ({{ p.1 / 100 }}€)
                                 {% if not loop.last %}+{% endif %}
                             {% endfor %}
                         </div>
                         {% if "admin" in loggedin_user.roles or "kassier" in loggedin_user.roles %}
-                            <a href="/admin/user/fees/paid?{{ fee.user_ids }}">Zahlungsstatus ändern</a>
+                            <div class="text-end"><a href="/admin/user/fees/paid?{{ fee.user_ids }}" class="btn btn-primary">Zahlungsstatus ändern</a></div>
                         {% endif %}
                     </div>
                 </div>
             {% endfor %}
           </div>
         </div>
+
+
 {% endblock content %}