Merge pull request 'notification' (#301) from notification into staging

Reviewed-on: #301

src/model/logbook.rs

@@ -531,7 +531,7 @@ ORDER BY departure DESC
                 db,
                 &user,
                 &format!(
-                    "Neuer Logbucheintrag: Ausfahrt am {}.{}.{} nach {} ({} km)",
+                    "Ausfahrt am {}.{}.{} nach {} ({} km)",
                     dep.day(),
                     dep.month(),
                     dep.year(),

src/model/usertrip.rs

@@ -75,7 +75,7 @@ impl UserTrip {
                     "{} hat sich für deine Ausfahrt am {} registriert",
                     name_newly_registered_person, trip.day
                 ),
-                "Registrierung bei Ausfahrt",
+                "Registrierung bei deiner Ausfahrt",
                 None,
             )
             .await;

templates/includes/macros.html.tera

@@ -16,196 +16,176 @@
     <header class="bg-primary-900 text-white flex justify-center p-3 fixed w-full z-10">
         <div class="max-w-screen-xl w-full flex justify-between items-center">
             <div class="w-1/3 truncate">
-                {% if "Donau Linz" in loggedin_user.roles %}
+                <a href="/">
-                    <a href="/planned">
+                    Hü
-                    {% else %}
+                    {{ loggedin_user.name }}
-                        <a href="/">
+                </a>
-                        {% endif %}
+            </div>
-                        Hü
+            <div>
-                        {{ loggedin_user.name }}
+                {% if "scheckbuch" in loggedin_user.roles and loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
-                    </a>
+                    <a href="#"
-                </div>
+                       class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
-                <div>
+                       data-sidebar="true"
-                    <a href="https://wiki.rudernlinz.at/ruderassistent#faq"
+                       data-trigger="sidebar"
-                       target="_blank"
+                       data-header="Ergo Challenge"
-                       class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer">
+                       data-body="#mobile-menu-guest">
-                        {% include "includes/question-icon" %}
+                        {% include "includes/book" %}
-                        <span class="sr-only">FAQs</span>
+                        <span class="sr-only">Ergo</span>
-                    </a>
+                    </a>
-                    {% if "scheckbuch" in loggedin_user.roles and loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
+                    <div class="hidden">
-                        <a href="#"
+                        <div id="mobile-menu-guest">
-                           class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
+                            <a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
-                           data-sidebar="true"
+                        </div>
-                           data-trigger="sidebar"
+                    </div>
-                           data-header="Ergo Challenge"
+                {% endif %}
-                           data-body="#mobile-menu-guest">
+                {% if "scheckbuch" not in loggedin_user.roles %}
-                            {% include "includes/book" %}
+                    <a href="#"
-                            <span class="sr-only">Ergo</span>
+                       class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
-                        </a>
+                       data-sidebar="true"
-                        <div class="hidden">
+                       data-trigger="sidebar"
-                            <div id="mobile-menu-guest">
+                       data-header="Menü"
-                                <a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
+                       data-body="#mobile-menu">
-                            </div>
+                        {% include "includes/book" %}
-                        </div>
+                        <span class="sr-only">Logbuch</span>
-                    {% endif %}
+                    </a>
-                    {% if "scheckbuch" not in loggedin_user.roles %}
+                    <div class="hidden">
-                        <a href="#"
+                        <div id="mobile-menu">
-                           class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
+                            <a href="/log" class="block w-100 py-2 hover:text-primary-600">Ausfahrt eintragen</a>
-                           data-sidebar="true"
+                            <a href="/log/show"
-                           data-trigger="sidebar"
+                               class="block w-100 py-2 hover:text-primary-600 border-t">Logbuch</a>
-                           data-header="Menü"
+                            {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
-                           data-body="#mobile-menu">
+                                <a href="/admin/user"
-                            {% include "includes/book" %}
+                                   class="block w-100 py-2 hover:text-primary-600 border-t">Userverwaltung</a>
-                            <span class="sr-only">Logbuch</span>
+                            {% endif %}
-                        </a>
+                            {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
-                        <div class="hidden">
+                                <a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
-                            <div id="mobile-menu">
+                            {% endif %}
-                                <a href="/log" class="block w-100 py-2 hover:text-primary-600">Ausfahrt eintragen</a>
+                            <a href="/stat" class="block w-100 py-2 hover:text-primary-600 border-t">Statistik</a>
-                                <a href="/log/show"
+                            <a href="/stat/boats"
-                                   class="block w-100 py-2 hover:text-primary-600 border-t">Logbuch</a>
+                               class="block w-100 py-2 hover:text-primary-600 border-t">Bootsauswertung</a>
-                                {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
+                            {% if "admin" in loggedin_user.roles %}
-                                    <a href="/ergo" class="block w-100 py-2 hover:text-primary-600 border-t">Ergo</a>
+                                <a href="/admin/boat"
-                                {% endif %}
+                                   class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a>
-                                <a href="/stat" class="block w-100 py-2 hover:text-primary-600 border-t">Statistik</a>
+                            {% endif %}
-                                <a href="/stat/boats"
+                            <a href="/boatdamage"
-                                   class="block w-100 py-2 hover:text-primary-600 border-t">Bootsauswertung</a>
+                               class="block w-100 py-2 hover:text-primary-600 border-t">Bootsschaden</a>
-                                {% if "admin" in loggedin_user.roles %}
+                        </div>
-                                    <a href="/admin/boat"
+                    </div>
-                                       class="block w-100 py-2 hover:text-primary-600 border-t">Boote</a>
+                {% endif %}
-                                {% endif %}
+                <a href="/auth/logout"
-                                <a href="/boatdamage"
+                   class="inline-flex justify-center rounded-md bg-gray-200 ml-1 px-3 py-2 text-sm font-semibold text-primary-950 hover:bg-gray-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer">
-                                   class="block w-100 py-2 hover:text-primary-600 border-t">Bootsschaden</a>
+                    <svg class="inline h-4"
-                            </div>
+                         width="24"
-                        </div>
+                         height="24"
-                    {% endif %}
+                         viewbox="0 0 24 24"
-                    {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %}
+                         fill="none"
-                        <a href="/admin/user"
+                         stroke="currentColor"
-                           class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer">
+                         stroke-width="2"
-                            <svg class="inline h-4"
+                         stroke-linecap="round"
-                                 width="16"
+                         stroke-linejoin="round"
-                                 height="16"
+                         class="feather feather-log-out">
-                                 fill="currentColor"
+                        <path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path>
-                                 class="bi bi-person-lines-fill"
+                        <polyline points="16 17 21 12 16 7"></polyline>
-                                 viewbox="0 0 16 16">
+                        <line x1="21" y1="12" x2="9" y2="12"></line>
-                                <path d="M6 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6zm-5 6s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H1zM11 3.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1h-4a.5.5 0 0 1-.5-.5zm.5 2.5a.5.5 0 0 0 0 1h4a.5.5 0 0 0 0-1h-4zm2 3a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2zm0 3a.5.5 0 0 0 0 1h2a.5.5 0 0 0 0-1h-2z" />
+                    </svg>
-                            </svg>
+                    <span class="sr-only">Ausloggen</span>
-                            <span class="sr-only">Userverwaltung</span>
+                </a>
-                        </a>
-                    {% endif %}
-                    <a href="/auth/logout"
-                       class="inline-flex justify-center rounded-md bg-gray-200 ml-1 px-3 py-2 text-sm font-semibold text-primary-950 hover:bg-gray-300 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer">
-                        <svg class="inline h-4"
-                             width="24"
-                             height="24"
-                             viewbox="0 0 24 24"
-                             fill="none"
-                             stroke="currentColor"
-                             stroke-width="2"
-                             stroke-linecap="round"
-                             stroke-linejoin="round"
-                             class="feather feather-log-out">
-                            <path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"></path>
-                            <polyline points="16 17 21 12 16 7"></polyline>
-                            <line x1="21" y1="12" x2="9" y2="12"></line>
-                        </svg>
-                        <span class="sr-only">Ausloggen</span>
-                    </a>
-                </div>
             </div>
-        </header>
-        <div class="h-8"></div>
-    {% endmacro header %}
-    {% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false, wrapper_class='', pattern='', readonly=false, accept='') %}
-        <div class="{{ wrapper_class }}">
-            <label for="{{ name }}"
-                   class="{% if hide_label %} sr-only {% else %} text-sm text-gray-600 dark:text-white {% endif %}">
-                {{ label }}
-            </label>
-            <input {% if type=='datetime-local' %}onclick='if (!this.value) setCurrentdate(this)'{% endif %}
-                   {% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %}
-                   name="{{ name }}"
-                   type="{{ type }}"
-                   {% if required %}required{% endif %}
-                   value="{{ value }}"
-                   class="input {{ class }}"
-                   placeholder="{% if hide_label %}{{ label }}{% endif %}"
-                   {% if min is defined %}min="{{ min }}"{% endif %}
-                   {% if autofocus %}autofocus{% endif %}
-                   {% if accept %}accept="{{ accept }}"{% endif %}
-                   {% if pattern %}pattern="{{ pattern }}"{% endif %}
-                   {% if readonly %}readonly{% endif %}>
         </div>
-    {% endmacro input %}
+    </header>
-    {% macro checkbox(label, name, id='', checked=false, class='', disabled=false) %}
+    <div class="h-8"></div>
-        <label for="{{ name }}{{ id }}"
+{% endmacro header %}
-               class="flex items-center cursor-pointer text-black dark:text-white hover:text-gray-900 dark:hover:text-gray-100 {{ class }}">
+{% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false, wrapper_class='', pattern='', readonly=false, accept='') %}
-            <input type="checkbox"
+    <div class="{{ wrapper_class }}">
-                   id="{{ name }}{{ id }}"
+        <label for="{{ name }}"
-                   name="{{ name }}"
+               class="{% if hide_label %} sr-only {% else %} text-sm text-gray-600 dark:text-white {% endif %}">
-                   {% if checked %}checked{% endif %}
-                   {% if disabled %}disabled{% endif %}
-                   class="h-4 w-4 accent-primary-600 dark:accent-primary-200 mr-2" />
             {{ label }}
         </label>
-    {% endmacro checkbox %}
+        <input {% if type=='datetime-local' %}onclick='if (!this.value) setCurrentdate(this)'{% endif %}
-    {% macro select(label, data, name='trip_type', default='', id='', selected_id='', display='', extras='', class='', wrapper_class='', required=false, show_seats=false, new_last_entry='') %}
+               {% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %}
-        <div class="{{ wrapper_class }}">
+               name="{{ name }}"
-            <label for="{{ name }}" class="text-sm text-gray-600 dark:text-gray-100">{{ label }}</label>
+               type="{{ type }}"
-            {% if display == '' %}
+               {% if required %}required{% endif %}
-                {% set display = ["name"] %}
+               value="{{ value }}"
-            {% endif %}
+               class="input {{ class }}"
-            <select name="{{ name }}"
+               placeholder="{% if hide_label %}{{ label }}{% endif %}"
-                    {% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %}
+               {% if min is defined %}min="{{ min }}"{% endif %}
-                    class="input rounded-md {{ class }}"
+               {% if autofocus %}autofocus{% endif %}
-                    {% if required %}required="required"{% endif %}>
+               {% if accept %}accept="{{ accept }}"{% endif %}
-                {% if default %}<option selected value>{{ default }}</option>{% endif %}
+               {% if pattern %}pattern="{{ pattern }}"{% endif %}
-                {% for d in data %}
+               {% if readonly %}readonly{% endif %}>
-                    <option value="{{ d.id }}" {% if d.id == selected_id %}selected{% endif %} {% if extras != '' %} {% for extra in extras %} {% if extra != 'on_water' and d[extra] %} data-{{ extra }}={{ d[extra] }} {% else %} {% if d[extra] %}disabled{% endif %} {% endif %} {% endfor %} {% endif %} {% if show_seats %} data-custom-properties='{"amount_seats": {{ d["amount_seats"] }}, "owner": "{{ d["owner"] }}", "default_destination": "{{ d["default_destination"] }}", "boat_in_ottensheim": {{ d["location_id"] == 2 }}}'{% endif %}>
+    </div>
-                        {% for displa in display -%}
+{% endmacro input %}
-                            {%- if d[displa] -%}
+{% macro checkbox(label, name, id='', checked=false, class='', disabled=false) %}
-                                {{- d[displa] -}}
+    <label for="{{ name }}{{ id }}"
-                            {%- else -%}
+           class="flex items-center cursor-pointer text-black dark:text-white hover:text-gray-900 dark:hover:text-gray-100 {{ class }}">
-                                {{- displa -}}
+        <input type="checkbox"
-                            {%- endif -%}
+               id="{{ name }}{{ id }}"
-                        {%- endfor %}
+               name="{{ name }}"
-                    </option>
+               {% if checked %}checked{% endif %}
-                {% endfor %}
+               {% if disabled %}disabled{% endif %}
-                {% if new_last_entry %}<option value="-1">{{ new_last_entry }}</option>{% endif %}
+               class="h-4 w-4 accent-primary-600 dark:accent-primary-200 mr-2" />
-            </select>
+        {{ label }}
-        </div>
+    </label>
-    {% endmacro select %}
+{% endmacro checkbox %}
-    {% macro alert(message, type, class='') %}
+{% macro select(label, data, name='trip_type', default='', id='', selected_id='', display='', extras='', class='', wrapper_class='', required=false, show_seats=false, new_last_entry='') %}
-        <div class="{{ class }} alert-{{ type }} text-white px-3 py-1 rounded-md text-center">{{ message }}</div>
+    <div class="{{ wrapper_class }}">
-    {% endmacro alert %}
+        <label for="{{ name }}" class="text-sm text-gray-600 dark:text-gray-100">{{ label }}</label>
-    {% macro box(participants, empty_seats='', header='Freie Plätze:', text='Keine Ruderer angemeldet', bg='primary-600', color='white', trip_details_id='', allow_removing=false) %}
+        {% if display == '' %}
-        <div class="text-{{ color }} bg-{{ bg }} text-center p-1 mt-1 rounded-t-md">
+            {% set display = ["name"] %}
-            {{ header }}
+        {% endif %}
-            {{ empty_seats }}
+        <select name="{{ name }}"
-        </div>
+                {% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %}
-        <div class="p-2 border border-t-0 border-{{ bg }} mb-4 rounded-b-md">
+                class="input rounded-md {{ class }}"
-            {% if participants | length > 0 %}
+                {% if required %}required="required"{% endif %}>
-                {% for rower in participants %}
+            {% if default %}<option selected value>{{ default }}</option>{% endif %}
-                    {{ rower.name }}
+            {% for d in data %}
-                    {% if rower.is_guest %}<small class="text-gray-600 dark:text-gray-100">(Scheckbuch)</small>{% endif %}
+                <option value="{{ d.id }}" {% if d.id == selected_id %}selected{% endif %} {% if extras != '' %} {% for extra in extras %} {% if extra != 'on_water' and d[extra] %} data-{{ extra }}={{ d[extra] }} {% else %} {% if d[extra] %}disabled{% endif %} {% endif %} {% endfor %} {% endif %} {% if show_seats %} data-custom-properties='{"amount_seats": {{ d["amount_seats"] }}, "owner": "{{ d["owner"] }}", "default_destination": "{{ d["default_destination"] }}", "boat_in_ottensheim": {{ d["location_id"] == 2 }}}'{% endif %}>
-                    {% if rower.is_real_guest %}
+                    {% for displa in display -%}
-                        <small class="text-gray-600 dark:text-gray-100">(Gast)</small>
+                        {%- if d[displa] -%}
-                        {% if allow_removing %}
+                            {{- d[displa] -}}
-                            <a href="/planned/remove/{{ trip_details_id }}/{{ rower.name }}"
+                        {%- else -%}
-                               class="btn btn-attention btn-fw">Abmelden</a>
+                            {{- displa -}}
-                        {% endif %}
+                        {%- endif -%}
+                    {%- endfor %}
+                </option>
+            {% endfor %}
+            {% if new_last_entry %}<option value="-1">{{ new_last_entry }}</option>{% endif %}
+        </select>
+    </div>
+{% endmacro select %}
+{% macro alert(message, type, class='') %}
+    <div class="{{ class }} alert-{{ type }} text-white px-3 py-1 rounded-md text-center">{{ message }}</div>
+{% endmacro alert %}
+{% macro box(participants, empty_seats='', header='Freie Plätze:', text='Keine Ruderer angemeldet', bg='primary-600', color='white', trip_details_id='', allow_removing=false) %}
+    <div class="text-{{ color }} bg-{{ bg }} text-center p-1 mt-1 rounded-t-md">
+        {{ header }}
+        {{ empty_seats }}
+    </div>
+    <div class="p-2 border border-t-0 border-{{ bg }} mb-4 rounded-b-md">
+        {% if participants | length > 0 %}
+            {% for rower in participants %}
+                {{ rower.name }}
+                {% if rower.is_guest %}<small class="text-gray-600 dark:text-gray-100">(Scheckbuch)</small>{% endif %}
+                {% if rower.is_real_guest %}
+                    <small class="text-gray-600 dark:text-gray-100">(Gast)</small>
+                    {% if allow_removing %}
+                        <a href="/planned/remove/{{ trip_details_id }}/{{ rower.name }}"
+                           class="btn btn-attention btn-fw">Abmelden</a>
                     {% endif %}
-                    <span class="hidden">(angemeldet seit
+                {% endif %}
-                    {{ rower.registered_at }})</span>
+                <span class="hidden">(angemeldet seit
-                    <br />
+                {{ rower.registered_at }})</span>
-                {% endfor %}
+                <br />
-            {% else %}
+            {% endfor %}
-                {{ text }}
+        {% else %}
-            {% endif %}
+            {{ text }}
-        </div>
+        {% endif %}
-    {% endmacro box %}
+    </div>
-    {% macro faq(question, answer) %}
+{% endmacro box %}
-        <div>
+{% macro faq(question, answer) %}
-            <h2 class="flex mb-4 text-lg font-bold text-primary-900">{{ question }}</h2>
+    <div>
-            <p class="text-primary-950">{{ answer | safe }}</p>
+        <h2 class="flex mb-4 text-lg font-bold text-primary-900">{{ question }}</h2>
-        </div>
+        <p class="text-primary-950">{{ answer | safe }}</p>
-    {% endmacro faq %}
+    </div>
+{% endmacro faq %}

templates/includes/rowing-icon.html.tera

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%"
+     class="flex-shrink-0 w-6 h-6 inline-block"
+     height="100%"
+     viewBox="0 0 583 1024"
+     version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
+     xml:space="preserve"
+     xmlns:serif="http://www.serif.com/"
+     style="fill-rule:evenodd;
+            clip-rule:evenodd;
+            stroke-linejoin:round;
+            stroke-miterlimit:2">
+    <g transform="matrix(1,0,0,1,-1574,-536.199)">
+    <g transform="matrix(1,0,0,1,0,10.8235)">
+    <g transform="matrix(0.948324,0.317305,0.307947,-0.920356,-304.665,1886.18)">
+    <rect x="1838.29" y="1006.52" width="17.353" height="644.204" style="fill:white;fill-opacity:0.7;" />
+    </g>
+    <path d="M1944.68,934.772C1921.09,896.523 1932.18,782.181 1974.56,655.531C1990.23,608.676 2009.04,563.787 2029.1,525.376L2156.88,568.132C2149.78,610.876 2137.79,658.046 2122.11,704.901C2079.26,832.966 2018.43,931.728 1976.52,946.409L2085.08,568.504L1944.68,934.772Z" style="fill:white;fill-opacity:0.7;" />
+    </g>
+    <g transform="matrix(-1,0,0,1,3730.88,10.8235)">
+    <g transform="matrix(0.948324,0.317305,0.307947,-0.920356,-304.665,1886.18)">
+    <rect x="1838.29" y="1006.52" width="17.353" height="644.204" style="fill:white;fill-opacity:0.7;" />
+    </g>
+    <path d="M1944.68,934.772C1921.09,896.523 1932.18,782.181 1974.56,655.531C1990.23,608.676 2009.04,563.787 2029.1,525.376L2156.88,568.132C2149.78,610.876 2137.79,658.046 2122.11,704.901C2079.26,832.966 2018.43,931.728 1976.52,946.409L2085.08,568.504L1944.68,934.772Z" style="fill:white;fill-opacity:0.7;" />
+    </g>
+    </g>
+</svg>

templates/index.html.tera

@@ -3,197 +3,177 @@
 {% block content %}
     <div class="max-w-screen-lg w-full">
         <h1 class="h1">Ruderassistent</h1>
-        <div class="grid gap-3">
+        <div class="grid gap-3 my-5">
+            <div class="m-auto">
+                <a href="/planned"
+                   class="btn btn-primary flex items-center justify-center">
+                    {% include "includes/rowing-icon" %}
+                    <span class="text-xl px-3">Geplante Ausfahrten</span>
+                </a>
+            </div>
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                  role="alert">
                 <h2 class="h2">Nachrichten</h2>
-                <div class="text-sm p-3">
+                <div class="divide-y">
                     {% for notification in notifications %}
                         {% if not notification.read_at %}
-                            <div class="relative flex bg-clip-border rounded-xl bg-white text-gray-700 shadow-md w-full flex-row">
+                            <div class="relative flex justify-between items-center p-3">
-                                <div class="p-6">
+                                <div class="grow me-4">
-                                    <h6 class="block mb-4 font-sans text-base antialiased font-semibold leading-relaxed tracking-normal text-gray-700 uppercase">
+                                    <small class="uppercase text-gray-600 dark:text-gray-100">
-                                        {{ notification.category }}
+                                        <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
-                                    </h6>
+                                    </small>
-                                    <h4 class="block mb-2 font-sans text-2xl antialiased font-semibold leading-snug tracking-normal text-blue-gray-900">
+                                    <div class="mt-1">{{ notification.message }}</div>
-                                        {{ notification.message }}
+                                </div>
-                                    </h4>
+                                <div>
-                                    <p class="block mb-8 font-sans text-base antialiased font-normal leading-relaxed text-gray-700">
-                                        {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
-                                    </p>
                                     {% if not notification.read_at %}
                                         <a href="/notification/{{ notification.id }}/read" class="inline-block">
-                                            <button class="flex items-center gap-2 px-6 py-3 font-sans text-xs font-bold text-center text-gray-900 uppercase align-middle transition-all rounded-lg select-none disabled:opacity-50 disabled:shadow-none disabled:pointer-events-none hover:bg-gray-900/10 active:bg-gray-900/20"
+                                            <button class="btn btn-primary" type="button">
-                                                    type="button">Als gelesen markieren</button>
+                                                &#10003;
+                                                <span class="sr-only">Notification gelesen</span>
+                                            </button>
                                         </a>
                                     {% endif %}
                                 </div>
                             </div>
                         {% endif %}
                     {% endfor %}
-                    <details>
+                </div>
-                        <summary>Vergangene Nachrichten</summary>
+                <details class="py-3 bg-gray-200 dark:bg-primary-950 rounded-b-md">
+                    <summary class="px-3">Vergangene Nachrichten</summary>
+                    <div class="divide-y text-sm">
                         {% for notification in notifications %}
                             {% if notification.read_at %}
-                                <div class="relative flex bg-clip-border rounded-xl bg-white text-gray-700 shadow-md w-full flex-row">
+                                <div class="p-3 relative">
-                                    <div class="p-6">
+                                    <small class="uppercase text-gray-600 dark:text-gray-100">
-                                        <h6 class="block mb-4 font-sans text-base antialiased font-semibold leading-relaxed tracking-normal text-gray-700 uppercase">
+                                        <strong>{{ notification.category }}</strong> &bullet; {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
-                                            {{ notification.category }}
+                                    </small>
-                                        </h6>
+                                    <div class="mt-1">{{ notification.message }}</div>
-                                        <h4 class="block mb-2 font-sans text-2xl antialiased font-semibold leading-snug tracking-normal text-blue-gray-900">
-                                            {{ notification.message }}
-                                        </h4>
-                                        <p class="block mb-8 font-sans text-base antialiased font-normal leading-relaxed text-gray-700">
-                                            {{ notification.created_at | date(format="%d.%m.%Y %H:%M") }}
-                                        </p>
-                                    </div>
                                 </div>
                             {% endif %}
                         {% endfor %}
-                    </details>
+                    </div>
-                </div>
+                </details>
             </div>
-        </div>
+            {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
-        <div class="grid gap-3">
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                     role="alert">
+                    <h2 class="h2">Ergo</h2>
+                    <div class="p-3">
+                        <ul class="list-none ms-2">
+                            <li class="py-1">
+                                <a href="/ergo" class="block w-100 py-2 hover:text-primary-600">Ergo</a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            {% endif %}
+            {% if "Donau Linz" in loggedin_user.roles and "Unterstützend" not in loggedin_user.roles and "Förderndes Mitglied" not in loggedin_user.roles %}
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                     role="alert">
+                    <h2 class="h2">Aktives Vereinsmitglied</h2>
+                    <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
+                        <li class="py-1">
+                            <a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/log" class="block w-100 py-2 hover:text-primary-600">Ausfahrt eintragen</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/log/show" class="block w-100 py-2 hover:text-primary-600">Logbuch</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/stat" class="block w-100 py-2 hover:text-primary-600">Statistik</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/stat/boats" class="block w-100 py-2 hover:text-primary-600">Bootsauswertung</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/boatdamage" class="block w-100 py-2 hover:text-primary-600">Bootsschaden</a>
+                        </li>
+                    </ul>
+                </div>
+            {% endif %}
+            {% if "scheckbuch" in loggedin_user.roles %}
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                     role="alert">
+                    <h2 class="h2">Scheckbuch</h2>
+                    <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
+                        <li class="py-1">
+                            <a href="/planned" class="block w-100 py-2 hover:text-primary-600">Geplante Ausfahrten</a>
+                        </li>
+                    </ul>
+                </div>
+            {% endif %}
+            {% if "schnupper-betreuer" in loggedin_user.roles %}
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                     role="alert">
+                    <h2 class="h2">Schnupper-Betreuer</h2>
+                    <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
+                        <li class="py-1">
+                            <a href="/admin/schnupper"
+                               class="block w-100 py-2 hover:text-primary-600">Schnuppern</a>
+                        </li>
+                    </ul>
+                </div>
+            {% endif %}
+            {% if "Vorstand" in loggedin_user.roles %}
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                     role="alert">
+                    <h2 class="h2">Vorstand</h2>
+                    <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
+                        <li class="py-1">
+                            <a href="/admin/user/fees"
+                               class="block w-100 py-2 hover:text-primary-600">Übersicht User Gebühren</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/admin/user/scheckbuch"
+                               class="block w-100 py-2 hover:text-primary-600">Scheckbuch</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/board/boathouse"
+                               class="block w-100 py-2 hover:text-primary-600">Bootshaus</a>
+                        </li>
+                    </ul>
+                </div>
+            {% endif %}
+            {% if "admin" in loggedin_user.roles %}
+                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
+                     role="alert">
+                    <h2 class="h2">Admin</h2>
+                    <ul class="list-none ms-2 divide-y divide-gray-200 dark:divide-primary-600">
+                        <li class="py-1">
+                            <a href="/admin/boat" class="block w-100 py-2 hover:text-primary-600">Boote</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail (beautifully layouted)</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/admin/rss" class="block w-100 py-2 hover:text-primary-600">Logs</a>
+                        </li>
+                        <li class="py-1">
+                            <a href="/admin/list" class="block w-100 py-2 hover:text-primary-600">Fingerabdruck-Liste überprüfen</a>
+                        </li>
+                    </ul>
+                </div>
+            {% endif %}
             <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
                  role="alert">
                 <h2 class="h2">Allgemein</h2>
-                <div class="text-sm p-3">
+                <div class="p-3">
-                    <ul class="list-disc ms-2">
+                    <ul class="list-none ms-2">
                         <li class="py-1">
                             <a href="https://wiki.rudernlinz.at/ruderassistent#faq"
                                target="_blank"
-                               class="link-primary">FAQ (extern)</a>
+                               class="block w-100 py-2 hover:text-primary-600">FAQ (extern)</a>
                         </li>
                     </ul>
                 </div>
             </div>
         </div>
-        {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
+    {% endblock content %}
-            <div class="grid gap-3">
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
-                     role="alert">
-                    <h2 class="h2">Ergo</h2>
-                    <div class="text-sm p-3">
-                        <ul class="list-disc ms-2">
-                            <li class="py-1">
-                                <a href="/ergo" class="link-primary">Ergo</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        {% endif %}
-        {% if "Donau Linz" in loggedin_user.roles and "Unterstützend" not in loggedin_user.roles and "Förderndes Mitglied" not in loggedin_user.roles %}
-            <div class="grid gap-3">
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
-                     role="alert">
-                    <h2 class="h2">Aktives Vereinsmitglied</h2>
-                    <div class="text-sm p-3">
-                        <ul class="list-disc ms-2">
-                            <li class="py-1">
-                                <a href="/planned" class="link-primary">Geplante Ausfahrten</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/log" class="link-primary">Ausfahrt eintragen</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/log/show" class="link-primary">Logbuch</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/stat" class="link-primary">Statistik</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/stat/boats" class="link-primary">Bootsauswertung</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/boatdamage" class="link-primary">Bootsschaden</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        {% endif %}
-        {% if "scheckbuch" in loggedin_user.roles %}
-            <div class="grid gap-3">
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
-                     role="alert">
-                    <h2 class="h2">Scheckbuch</h2>
-                    <div class="text-sm p-3">
-                        <ul class="list-disc ms-2">
-                            <li class="py-1">
-                                <a href="/planned" class="link-primary">Geplante Ausfahrten</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        {% endif %}
-        {% if "schnupper-betreuer" in loggedin_user.roles %}
-            <div class="grid gap-3">
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
-                     role="alert">
-                    <h2 class="h2">Schnupper-Betreuer</h2>
-                    <div class="text-sm p-3">
-                        <ul class="list-disc ms-2">
-                            <li class="py-1">
-                                <a href="/admin/schnupper" class="link-primary">Schnuppern</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        {% endif %}
-        {% if "Vorstand" in loggedin_user.roles %}
-            <div class="grid gap-3">
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
-                     role="alert">
-                    <h2 class="h2">Vorstand</h2>
-                    <div class="text-sm p-3">
-                        <ul class="list-disc ms-2">
-                            <li class="py-1">
-                                <a href="/admin/user/fees" class="link-primary">Übersicht User Gebühren</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/admin/user/scheckbuch" class="link-primary">Scheckbuch</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/admin/user" class="link-primary">User</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/board/boathouse" class="link-primary">Bootshaus</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        {% endif %}
-        {% if "admin" in loggedin_user.roles %}
-            <div class="grid gap-3">
-                <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
-                     role="alert">
-                    <h2 class="h2">Admin</h2>
-                    <div class="text-sm p-3">
-                        <ul class="list-disc ms-2">
-                            <li class="py-1">
-                                <a href="/admin/boat" class="link-primary">Boote</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/admin/user" class="link-primary">User</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/admin/mail" class="link-primary">Mail (beautifully layouted)</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/admin/rss" class="link-primary">Logs</a>
-                            </li>
-                            <li class="py-1">
-                                <a href="/admin/list" class="link-primary">Fingerabdruck-Liste überprüfen</a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        {% endif %}
-    </div>
-{% endblock content %}