From 330b8fddb3711efa2a5d7385c029790d290ffac5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 26 Nov 2025 13:38:24 +0100
Subject: [PATCH] Improve accessibility of event form

- use <label> tag instead of <legend>
- display time selectors on same line as date selector
---
 .changes/unreleased/UX-20251126-133910.yaml   |  6 ++++++
 .../Controller/ParticipationController.php    |  2 +-
 .../Resources/views/Event/edit.html.twig      | 21 +++++++++++++++++--
 .../Resources/views/Event/new.html.twig       | 20 +++++++++++++++++-
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251126-133910.yaml

diff --git a/.changes/unreleased/UX-20251126-133910.yaml b/.changes/unreleased/UX-20251126-133910.yaml
new file mode 100644
index 000000000..474e52fac
--- /dev/null
+++ b/.changes/unreleased/UX-20251126-133910.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Improve accessibility of event form
+time: 2025-11-26T13:39:10.462348982+01:00
+custom:
+    Issue: "474"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
index 7fac83bf5..b100e47cd 100644
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -486,7 +486,7 @@ final class ParticipationController extends AbstractController
 
             return $this->redirectToRoute(
                 'chill_event__event_show',
-                ['event_id' => $event->getId()]
+                ['id' => $event->getId()]
             );
         }
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
index 55c2fc21f..464233008 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
@@ -14,8 +14,25 @@
     {{ form_errors(edit_form) }}
     {{ form_row(edit_form.circle) }}
     {{ form_row(edit_form.name) }}
-    {{ form_row(edit_form.date) }}
-
+    <div class="mb-3 row">
+        <label for="{{ edit_form.date.date.vars.id }}" class="col-form-label col-sm-4 required">
+            {{ 'Date'|trans }}
+        </label>
+        <div class="col-sm-8 d-flex align-items-start gap-2">
+            {{ form_widget(edit_form.date.date, {
+                attr: {
+                    class: 'form-control',
+                    style: 'flex: 1 1 auto;'
+                }
+            }) }}
+            {{ form_widget(edit_form.date.time, {
+                attr: {
+                    class: 'form-control',
+                    style: 'flex: 0 0 200px; max-width: 200px; white-space: nowrap;'
+                }
+            }) }}
+        </div>
+    </div>
     {{ form_row(edit_form.type, { label: "Event type" }) }}
     {{ form_row(edit_form.themes) }}
     {{ form_row(edit_form.moderator) }}
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig
index 2f5a82c8d..6fec850c6 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig
@@ -16,7 +16,25 @@
     {{ form_errors(form) }}
     {{ form_row(form.name) }}
     {{ form_row(form.circle) }}
-    {{ form_row(form.date) }}
+    <div class="mb-3 row">
+        <label for="{{ form.date.date.vars.id }}" class="col-form-label col-sm-4 required">
+            {{ 'Date'|trans }}
+        </label>
+        <div class="col-sm-8 d-flex align-items-start gap-2">
+            {{ form_widget(form.date.date, {
+                attr: {
+                    class: 'form-control',
+                    style: 'flex: 1 1 auto;'
+                }
+            }) }}
+            {{ form_widget(form.date.time, {
+                attr: {
+                    class: 'form-control',
+                    style: 'flex: 0 0 200px; max-width: 200px; white-space: nowrap;'
+                }
+            }) }}
+        </div>
+    </div>
     {{ form_row(form.type, { label: "Event type" }) }}
     {{ form_row(form.themes) }}
     {{ form_row(form.moderator) }}