From 7950b23c495ca9e496538b1ec50e855827ba3007 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 28 Apr 2023 18:35:42 +0200 Subject: [PATCH 1/4] TASK improve structure index file --- templates/dynamics/popup.html.tera | 0 templates/dynamics/sidebar.html.tera | 0 templates/forms/event.html.tera | 14 ++++++++++++++ templates/forms/trip.html.tera | 11 +++++++++++ templates/index.html.tera | 28 ++-------------------------- 5 files changed, 27 insertions(+), 26 deletions(-) create mode 100644 templates/dynamics/popup.html.tera create mode 100644 templates/dynamics/sidebar.html.tera create mode 100644 templates/forms/event.html.tera create mode 100644 templates/forms/trip.html.tera diff --git a/templates/dynamics/popup.html.tera b/templates/dynamics/popup.html.tera new file mode 100644 index 0000000..e69de29 diff --git a/templates/dynamics/sidebar.html.tera b/templates/dynamics/sidebar.html.tera new file mode 100644 index 0000000..e69de29 diff --git a/templates/forms/event.html.tera b/templates/forms/event.html.tera new file mode 100644 index 0000000..8c80a83 --- /dev/null +++ b/templates/forms/event.html.tera @@ -0,0 +1,14 @@ +{% import "includes/macros" as macros %} + + \ No newline at end of file diff --git a/templates/forms/trip.html.tera b/templates/forms/trip.html.tera new file mode 100644 index 0000000..ae6e1d2 --- /dev/null +++ b/templates/forms/trip.html.tera @@ -0,0 +1,11 @@ +{% import "includes/macros" as macros %} + + \ No newline at end of file diff --git a/templates/index.html.tera b/templates/index.html.tera index 5d13103..b284e75 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -273,31 +273,7 @@
{# --- END Add Trip Sidebar --- #} -{# --- START Form Add Trip --- #} - -{# --- END Form Add Trip --- #} - -{# --- START Form Add Event --- #} - -{# --- END Form Add Event --- #} +{% include "forms/trip" %} +{% include "forms/event" %} {% endblock content %} From fa1e980e04f2e355fbf00d9af5c9521d6f7f97b0 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 28 Apr 2023 18:41:38 +0200 Subject: [PATCH 2/4] add unicode icons in readme --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 9d16c70..f38249e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ # TODO - [ ] Allow sign-outs only >2h before event +# Icons +- Regatta: 🏅 +- Lange Ausfahrt: 💪 +- Wanderfahrt: ⛱ + # Notes / Bugfixes - [] delete flag user administration - [] max_people = 0 -> Rot hervorheben, dass Ausfahrt abgesagt wurde? From a8dbf6b025e37cadcd0915019aafeb2ee1843dc5 Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 28 Apr 2023 18:55:51 +0200 Subject: [PATCH 3/4] add missing sidebar --- templates/dynamics/sidebar.html.tera | 17 +++++++++++++ templates/includes/buttons.html.tera | 16 ++++++++++++ templates/includes/macros.html.tera | 2 +- templates/index.html.tera | 38 ++-------------------------- 4 files changed, 36 insertions(+), 37 deletions(-) create mode 100644 templates/includes/buttons.html.tera diff --git a/templates/dynamics/sidebar.html.tera b/templates/dynamics/sidebar.html.tera index e69de29..ce2341a 100644 --- a/templates/dynamics/sidebar.html.tera +++ b/templates/dynamics/sidebar.html.tera @@ -0,0 +1,17 @@ + +
\ No newline at end of file diff --git a/templates/includes/buttons.html.tera b/templates/includes/buttons.html.tera new file mode 100644 index 0000000..09734f4 --- /dev/null +++ b/templates/includes/buttons.html.tera @@ -0,0 +1,16 @@ +{% if loggedin_user.is_cox %} +
+ + + +
+{% endif %} \ No newline at end of file diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera index 80d1413..077a1f0 100644 --- a/templates/includes/macros.html.tera +++ b/templates/includes/macros.html.tera @@ -46,7 +46,7 @@
{% if participants | length > 0 %} {% for rower in participants %} - {{ rower.name }}
+ {{ rower.name }} {% if rower.isGuest %} (Gast) {% endif %}
{% endfor %} {% else %} {{ text }} diff --git a/templates/index.html.tera b/templates/index.html.tera index b284e75..93a5bac 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -10,22 +10,7 @@

Ausfahrten

- {% if loggedin_user.is_cox %} -
- - - -
- {% endif %} + {% include "includes/buttons" %} {% for day in days %} {% set amount_trips = day.planned_events | length + day.trips | length %} @@ -253,26 +238,7 @@
-{# --- START Add Trip Sidebar --- #} - -
-{# --- END Add Trip Sidebar --- #} - +{% include "dynamics/sidebar" %} {% include "forms/trip" %} {% include "forms/event" %} From ed684a0ff5f904ac8f060ae2d96319a9cd54701d Mon Sep 17 00:00:00 2001 From: Philipp Date: Fri, 28 Apr 2023 19:04:35 +0200 Subject: [PATCH 4/4] show if_guest next to name --- templates/includes/macros.html.tera | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera index 077a1f0..c03055f 100644 --- a/templates/includes/macros.html.tera +++ b/templates/includes/macros.html.tera @@ -46,7 +46,7 @@
{% if participants | length > 0 %} {% for rower in participants %} - {{ rower.name }} {% if rower.isGuest %} (Gast) {% endif %}
+ {{ rower.name }} {% if rower.is_guest %} (Gast) {% endif %}
{% endfor %} {% else %} {{ text }}