From 6ed19e90a360fd987ce3a0462b5b35558fcac8d2 Mon Sep 17 00:00:00 2001
From: Tobias Kunze <r@rixx.de>
Date: Thu, 20 Mar 2025 09:11:15 +0100
Subject: [PATCH] Form rendering improvements

---
 .../frontend/templates/frontend/forms/field.html |  7 ++++++-
 .../templates/frontend/forms/inline_field.html   |  2 +-
 .../frontend/templates/frontend/profile.html     |  2 +-
 .../frontend/templates/includes/form.html        | 16 +++++++++-------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/servala/frontend/templates/frontend/forms/field.html b/src/servala/frontend/templates/frontend/forms/field.html
index f4b16d1..fe56619 100644
--- a/src/servala/frontend/templates/frontend/forms/field.html
+++ b/src/servala/frontend/templates/frontend/forms/field.html
@@ -1,5 +1,10 @@
 {% load i18n %}
-<div class="form-group d-inline{% if field.field.required %} mandatory{% endif %}{% if errors %} is-invalid{% endif %}{% if extra_class %} {{ extra_class }}{% endif %}">
+<div class="form-group{% if field.field.required %} mandatory{% endif %}{% if errors %} is-invalid{% endif %}{% if extra_class %} {{ extra_class }}{% endif %}">
+    {% if not hide_label %}
+        {% if field.field.widget.input_type != "checkbox" or field.field.widget.allow_multiple_selected %}
+            <label for="{{ field.auto_id }}" class="form-label">{{ field.label }}</label>
+        {% endif %}
+    {% endif %}
     {% if field.use_fieldset %}
         <fieldset {% if field.help_text and field.auto_id and "aria-describedby" not in field.field.widget.attrs %} aria-describedby="{{ field.auto_id }}_helptext"{% endif %}>
         {% endif %}
diff --git a/src/servala/frontend/templates/frontend/forms/inline_field.html b/src/servala/frontend/templates/frontend/forms/inline_field.html
index c229641..ab8edba 100644
--- a/src/servala/frontend/templates/frontend/forms/inline_field.html
+++ b/src/servala/frontend/templates/frontend/forms/inline_field.html
@@ -1 +1 @@
-{% include "frontend/forms/field.html" with extra_class="d-inline" %}
+{% include "frontend/forms/field.html" with extra_class="d-inline" hide_label=True %}
diff --git a/src/servala/frontend/templates/frontend/profile.html b/src/servala/frontend/templates/frontend/profile.html
index 16bbd3e..cfad0e9 100644
--- a/src/servala/frontend/templates/frontend/profile.html
+++ b/src/servala/frontend/templates/frontend/profile.html
@@ -22,7 +22,7 @@
 {% endpartialdef user-email %}
 {% partialdef user-company %}
 <td>
-    {{ request.user.company|default_if_none:"" }}
+    {{ request.user.company|default:"–" }}
     <button class="btn btn-primary"
             hx-get="{% url 'frontend:profile' %}?fragment=user-company-edit"
             hx-target="closest td"
diff --git a/src/servala/frontend/templates/includes/form.html b/src/servala/frontend/templates/includes/form.html
index fec4356..d998fc1 100644
--- a/src/servala/frontend/templates/includes/form.html
+++ b/src/servala/frontend/templates/includes/form.html
@@ -5,11 +5,13 @@
     {% include "includes/form_errors.html" %}
     {% csrf_token %}
     {{ form }}
-    <button class="btn btn-primary" type="submit">
-        {% if form_submit_label %}
-            {{ form_submit_label }}
-        {% else %}
-            {% translate "Save" %}
-        {% endif %}
-    </button>
+    <div class="col-sm-12 d-flex justify-content-end">
+        <button class="btn btn-primary me-1 mb-1" type="submit">
+            {% if form_submit_label %}
+                {{ form_submit_label }}
+            {% else %}
+                {% translate "Save" %}
+            {% endif %}
+        </button>
+    </div>
 </form>