From 52b245b14ef9d38ba20ed56d5141ed648c5b9b4e Mon Sep 17 00:00:00 2001
From: Marie Birner <mb@studiomitte.com>
Date: Mon, 23 Oct 2023 22:36:57 +0200
Subject: [PATCH] [TASK] correct sorting verified and style input / btn combi

---
 templates/boatdamages.html.tera | 18 +++++++++---------
 templates/kiosk.html.tera       |  4 +++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/templates/boatdamages.html.tera b/templates/boatdamages.html.tera
index 09d39eb..0bfadbd 100644
--- a/templates/boatdamages.html.tera
+++ b/templates/boatdamages.html.tera
@@ -45,9 +45,9 @@
 
   <div id="filter-result-js" class="bg-gray-200 text-primary-950 pb-3 px-3 text-right"></div>
 
-  {% for boatdamage in boatdamages %}
+  {% for boatdamage in boatdamages | sort(attribute="verified") %}
     <div data-filterable="true" data-filter="{{ boatdamage.boat.name }} {{ boatdamage.user_created.name }}" class="w-full border-t bg-white p-3 {% if boatdamage.verified_at %} opacity-50 {% endif %}">
-      <div>
+      <div class="w-full">
         <strong>{{ boatdamage.created_at | date(format='%d.%m.%Y') }} <span class="font-normal text-gray-600">({{ boatdamage.boat.name }})</span></strong>{% if boatdamage.boat.damage %}<small class="block text-gray-600">(Boot gesperrt)</small>{% endif %}
         <div>{{ boatdamage.desc }}</div>
         <small class="block text-gray-600">
@@ -58,12 +58,12 @@
           <small class="block text-gray-600">Repariert von {{ boatdamage.user_fixed.name }} am/um {{ boatdamage.fixed_at | date(format='%d.%m.%Y (%H:%M)') }}</small>
         {% else %}
           {% if loggedin_user.is_cox %}
-            <form action="/boatdamage/{{ boatdamage.id }}/fixed" method="post" class="mt-3">
-              <input type="text" name="desc" value="{{ boatdamage.desc }}" />
+            <form action="/boatdamage/{{ boatdamage.id }}/fixed" method="post" class="flex justify-between mt-3">
+              <input type="text" name="desc" value="{{ boatdamage.desc }}" class="grow input rounded-s" />
               {% if loggedin_user.is_tech %}
-                <input type="submit" class="btn btn-primary"  value="Repariert und verifiziert" />
+                <input type="submit" class="btn btn-primary" style="border-top-left-radius: 0; border-bottom-left-radius: 0;" value="Repariert und verifiziert" />
               {% else %}
-                <input type="submit" class="btn btn-primary" value="Repariert" />
+                <input type="submit" class="btn btn-primary" style="border-top-left-radius: 0; border-bottom-left-radius: 0;" value="Repariert" />
               {% endif %}
             </form>
           {% endif %}
@@ -73,9 +73,9 @@
           <small class="block text-gray-600">Verifziert von {{ boatdamage.user_verified.name }} am/um {{ boatdamage.verified_at | date(format='%d.%m.%Y (%H:%M)') }}</small>
         {% else %}
           {% if loggedin_user.is_tech and boatdamage.fixed_at  %}
-            <form action="/boatdamage/{{ boatdamage.id }}/verified" method="post" class="mt-3">
-              <input type="text" name="desc" value="{{ boatdamage.desc }}" />
-              <input type="submit" class="btn btn-dark"  value="Verifiziert" />
+            <form action="/boatdamage/{{ boatdamage.id }}/verified" method="post" class="flex justify-between mt-3">
+              <input type="text" name="desc" value="{{ boatdamage.desc }}" class="grow input rounded-s"/>
+              <input type="submit" class="btn btn-dark" style="border-top-left-radius: 0; border-bottom-left-radius: 0;"  value="Verifiziert" />
             </form>
           {% endif %}
         {% endif %}
diff --git a/templates/kiosk.html.tera b/templates/kiosk.html.tera
index e3243cf..35b8018 100644
--- a/templates/kiosk.html.tera
+++ b/templates/kiosk.html.tera
@@ -9,7 +9,9 @@
   <h1 class="h1">Logbuch</h1>
 
   {% if flash %}
-    {{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}
+    <div class="pt-3 max-w-lg m-auto">
+        {{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}
+    </div>
   {% endif %}
 
   <div class="w-full grid md:grid-cols-5 gap-3 mt-5">