From f71e273aaee5263b617d74f8a9db930ba9527ba1 Mon Sep 17 00:00:00 2001
From: Tchama <mat@collectifs.net>
Date: Mon, 21 Jan 2019 09:52:59 +0100
Subject: [PATCH] new event form, like edit form

---
 Resources/views/Event/edit.html.twig |  2 +-
 Resources/views/Event/new.html.twig  | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Resources/views/Event/edit.html.twig b/Resources/views/Event/edit.html.twig
index 164d75be5..34158ef88 100644
--- a/Resources/views/Event/edit.html.twig
+++ b/Resources/views/Event/edit.html.twig
@@ -25,7 +25,7 @@
     {{ form_row(edit_form.moderator) }}
 
     <ul class="record_actions">
-        <li>
+        <li class="cancel">
             <a href="{{ path('chill_event_list_most_recent') }}" class="sc-button bt-cancel">
                 {{ 'Back to the most recent events'|trans }}
             </a>
diff --git a/Resources/views/Event/new.html.twig b/Resources/views/Event/new.html.twig
index 1c29a495d..478e54ffd 100644
--- a/Resources/views/Event/new.html.twig
+++ b/Resources/views/Event/new.html.twig
@@ -10,13 +10,21 @@
     {{ form_row(form.circle) }}
     {{ form_row(form.center) }}
     {{ form_row(form.name) }}
+
+    {# TODO temporaire: chaque fois qu'on a une date + une heure, on veut afficher sur une seule ligne #}
+    <style>
+        div#event_date { display: flex; flex-direction: row; flex-wrap: nowrap; }
+        div#event_date input#event_date_date { margin-right: 1em; }
+        div#event_date div#event_date_time { min-width: 140px; }
+    </style>
     {{ form_row(form.date) }}
+
     {{ form_row(form.type, { 'label': 'Event type' }) }}
+    {{ form_row(form.moderator) }}
 
     <ul class="record_actions">
-        <li>
+        <li class="cancel">
             <a href="{{ path('chill_event_list_most_recent') }}" class="sc-button bt-cancel">
-                <i class="fa fa-arrow-left"></i>
                 {{ 'Back to the most recent events'|trans }}
             </a>
         </li>