From 7050d68293f7f350655c267108f935b8a5008d9a Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Thu, 21 Mar 2024 20:42:49 +0100 Subject: [PATCH] [TASK] style notifications, add rowing icon and refactor menu --- templates/includes/macros.html.tera | 38 +--- templates/includes/rowing-icon.html.tera | 18 ++ templates/index.html.tera | 271 +++++++++++------------ 3 files changed, 154 insertions(+), 173 deletions(-) create mode 100644 templates/includes/rowing-icon.html.tera diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera index 497b872..f2f9e5d 100644 --- a/templates/includes/macros.html.tera +++ b/templates/includes/macros.html.tera @@ -16,22 +16,12 @@
- {% if "Donau Linz" in loggedin_user.roles %} - - {% else %} - - {% endif %} - Hü - {{ loggedin_user.name }} - + + Hü + {{ loggedin_user.name }} +
- - {% include "includes/question-icon" %} - FAQs - {% if "scheckbuch" in loggedin_user.roles and loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %} Ausfahrt eintragen Logbuch + {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %} + + Userverwaltung + + {% endif %} {% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %} Ergo {% endif %} @@ -78,20 +74,6 @@
{% endif %} - {% if "admin" in loggedin_user.roles or "Vorstand" in loggedin_user.roles %} - - - - - Userverwaltung - - {% endif %} + + + + + + + + + + + + + + + + + diff --git a/templates/index.html.tera b/templates/index.html.tera index 4e86fe4..22dba1a 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -3,197 +3,178 @@ {% block content %}

Ruderassistent

-
-
+
+ + {% include "includes/rowing-icon" %} + Geplante Ausfahrten + +
+ -
- -
{% if loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %} -
{% 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 %} -
-
{% endif %} {% if "scheckbuch" in loggedin_user.roles %} -
-
{% endif %} {% if "schnupper-betreuer" in loggedin_user.roles %} -
-
{% endif %} {% if "Vorstand" in loggedin_user.roles %} -
-
{% endif %} {% if "admin" in loggedin_user.roles %} -
-
{% endif %} +
{% endblock content %}