From 4179b7bd6b7bc93127f0567bfaa60208c1e1be16 Mon Sep 17 00:00:00 2001
From: Marie Birner <mb@studiomitte.com>
Date: Tue, 31 Oct 2023 21:43:25 +0100
Subject: [PATCH] [TASK] declutter end trip view

---
 frontend/scss/components/_input.scss   |  2 +-
 templates/includes/forms/log.html.tera | 37 ++++++++++++--------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/frontend/scss/components/_input.scss b/frontend/scss/components/_input.scss
index a83d016..33489c2 100644
--- a/frontend/scss/components/_input.scss
+++ b/frontend/scss/components/_input.scss
@@ -135,7 +135,7 @@ select {
 }
 
 .choices__inner {
-  @apply input rounded-md;
+  @apply input rounded-md bg-white;
 }
 .is-focused .choices__inner, .is-open .choices__inner {
   @apply border-0 ring-1 ring-inset ring-gray-300;
diff --git a/templates/includes/forms/log.html.tera b/templates/includes/forms/log.html.tera
index 16276c3..f274cbc 100644
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@@ -212,25 +212,10 @@
 {% endmacro show_old %}
 
 {% macro home(log, only_ones) %}
-	{# @MB: Maaaarieeee, please fix col-span-2 madness #}
 	<form class="grid grid-cols-1 gap-3" action="/log/{{log.id}}" method="post">
-		{{ log::rower_select(id="rowers"~log.id, selected=log.rowers, amount_seats=log.boat.amount_seats, class="col-span-2", steering_person_id=log.steering_user.id, cox_on_boat=log.shipmaster_user.id) }}
-		{{ macros::select(label="Schiffsführer", data=[], name='shipmaster', id="shipmaster-rowers"~log.id, wrapper_class="col-span-2", class="change-id-js", selected_id=log.shipmaster_user.id, required=true) }}
-		{{ macros::select(label="Steuerperson", data=[], name='steering_person', id="steering_person-rowers"~log.id, wrapper_class="col-span-2", class="change-id-js", selected_id=log.steering_user.id, required=true) }}
+		{{ macros::input(label='Ankunftszeit', name='arrival', type='datetime-local', required=true, class="change-id-js rounded-md current-date-time") }}
 
-		<div class="col-span-2">
-			{{ macros::checkbox(label="Handgesteuert", name="shipmaster_only_steering", id="shipmaster_only_steering" ~ log.id , checked=log.shipmaster_only_steering,class="rounded-md change-id-js") }}
-		</div>
-
-		<div class="col-span-2">
-			{{ macros::input(label='Abfahrtszeit', name='departure', type='datetime-local', required=true, class="change-id-js rounded-md", value=log.departure) }}
-		</div>
-
-		<div class="col-span-2">
-			{{ macros::input(label='Ankunftszeit', name='arrival', type='datetime-local', required=true, class="change-id-js rounded-md current-date-time") }}
-		</div>
-
-		<div class="col-span-2">
+		<div>
 			<label for="destination" class="text-sm text-gray-600">Ziel</label>
 
 			<input class="input rounded-md set-distance-js change-id-js" type="search" list="destinations" placeholder="Destination" required="required" id="destination{{ log.id }}" name="destination" value="{{log.destination}}" data-relation="distance_in_km{{log.id}}"/>
@@ -241,9 +226,21 @@
 			<span class="absolute right-0 bottom-0 py-1.5 px-2 bg-white border-0 text-gray-600 ring-1 ring-inset ring-gray-300 rounded-br-md rounded-tr-md">km</span>
 		</div>
 
-		{{ macros::input(label="Kommentar", name="comments", id="comments" ~ log.id, type="text", value=log.comments, class="rounded-md change-id-js", wrapper_class="col-span-2") }}
-    		{{ macros::select(label="Typ", data=logtypes, name="logtype", id="logtype" ~ log.id, default="Normal", selected_id=log.logtype, class="rounded-md change-id-js col-span-2") }}
+    {{ macros::input(label="Kommentar", name="comments", id="comments" ~ log.id, type="text", value=log.comments, class="rounded-md change-id-js") }}
 
-		<input class="btn btn-primary col-span-2" type="submit" value="Ausfahrt beenden"/>
+    <details class="bg-gray-200 bg-opacity-80 rounded-md p-2">
+      <summary class="cursor-pointer">Details ändern</summary>
+      <div class="grid grid-cols-1 gap-3">
+        {{ macros::input(label='Abfahrtszeit', name='departure', type='datetime-local', required=true, class="change-id-js rounded-md", value=log.departure) }}
+        {{ log::rower_select(id="rowers"~log.id, selected=log.rowers, amount_seats=log.boat.amount_seats, steering_person_id=log.steering_user.id, cox_on_boat=log.shipmaster_user.id) }}
+        {{ macros::select(label="Schiffsführer", data=[], name='shipmaster', id="shipmaster-rowers"~log.id, class="change-id-js", selected_id=log.shipmaster_user.id, required=true) }}
+        {{ macros::select(label="Steuerperson", data=[], name='steering_person', id="steering_person-rowers"~log.id, class="change-id-js", selected_id=log.steering_user.id, required=true) }}
+        <div>{{ macros::checkbox(label="Handgesteuert", name="shipmaster_only_steering", id="shipmaster_only_steering" ~ log.id , checked=log.shipmaster_only_steering,class="rounded-md change-id-js") }}</div>
+        {{ macros::select(label="Typ", data=logtypes, name="logtype", id="logtype" ~ log.id, default="Normal", selected_id=log.logtype, class="rounded-md change-id-js") }}
+      </div>
+    </details>
+
+
+		<input class="btn btn-primary" type="submit" value="Ausfahrt beenden"/>
 	</form>
 {% endmacro home %}