From 1b73b94e074ae2bfe9b3c929332a768ab4e87b83 Mon Sep 17 00:00:00 2001
From: Patrick Mayr <patrick@fet.at>
Date: Fri, 18 Jul 2025 11:33:29 +0200
Subject: [PATCH] Refactor baseform templates

---
 fet2020/templates/baseform/email.html    | 21 +--------------------
 fet2020/templates/baseform/file.html     | 16 +---------------
 fet2020/templates/baseform/input.html    | 22 ++++++++++++++++++++++
 fet2020/templates/baseform/password.html | 21 +--------------------
 fet2020/templates/baseform/text.html     | 21 +--------------------
 5 files changed, 26 insertions(+), 75 deletions(-)
 create mode 100644 fet2020/templates/baseform/input.html

diff --git a/fet2020/templates/baseform/email.html b/fet2020/templates/baseform/email.html
index f96cc4ac..281cd4de 100644
--- a/fet2020/templates/baseform/email.html
+++ b/fet2020/templates/baseform/email.html
@@ -1,20 +1 @@
-<label>
-    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
-    {% if field.errors %}
-        <div class="alert alert-danger">
-            <div class="alert-body">{{ field.errors }}</div>
-        </div>
-    {% endif %}
-    <input
-        type="email"
-        name="{{ field.name }}"
-        {% if field.value %}value="{{ field.value }}"{% endif %}
-        {% if field.field.required %}required{% endif %}
-        {% if field.field.disabled %}disabled{% endif %}
-        {% if field.field.autofocus %}autofocus{% endif %}
-        class="w-full"
-    >
-    {% if field.help_text %}
-        <small class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</small>
-    {% endif %}
-</label>
+{% include "baseform/input.html" %}
diff --git a/fet2020/templates/baseform/file.html b/fet2020/templates/baseform/file.html
index 6199af54..281cd4de 100644
--- a/fet2020/templates/baseform/file.html
+++ b/fet2020/templates/baseform/file.html
@@ -1,15 +1 @@
-<label>
-    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
-    {% if field.errors %}
-        <div class="alert alert-danger">
-            <div class="alert-body">{{ field.errors }}</div>
-        </div>
-    {% endif %}
-    <input
-        type="file"
-        name="{{ field.name }}"
-        {% if field.field.required %}required{% endif %}
-        {% if field.field.disabled %}disabled{% endif %}
-        {% if field.field.autofocus %}autofocus{% endif %}
-    >
-</label>
+{% include "baseform/input.html" %}
diff --git a/fet2020/templates/baseform/input.html b/fet2020/templates/baseform/input.html
new file mode 100644
index 00000000..e41905b1
--- /dev/null
+++ b/fet2020/templates/baseform/input.html
@@ -0,0 +1,22 @@
+<label>
+    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
+    {% if field.errors %}
+        <div class="alert alert-danger">
+            <div class="alert-body">{{ field.errors }}</div>
+        </div>
+    {% endif %}
+    <input
+        type="{{ field.field.widget.input_type }}"
+        name="{{ field.name }}"
+        {% if field.value %}value="{{ field.value }}"{% endif %}
+        {% if field.field.required %}required{% endif %}
+        {% if field.field.disabled %}disabled{% endif %}
+        {% if field.field.autofocus or field.field.widget.attrs.autofocus %}autofocus{% endif %}
+        {% if field.field.widget.attrs.autocapitalize %}autocapitalize="{{ field.field.widget.attrs.autocapitalize }}"{% endif %}
+        {% if field.field.widget.attrs.maxlength %}maxlength="{{ field.field.widget.attrs.maxlength }}"{% endif %}
+        class="w-full"
+    >
+    {% if field.help_text %}
+        <small class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</small>
+    {% endif %}
+</label>
diff --git a/fet2020/templates/baseform/password.html b/fet2020/templates/baseform/password.html
index 85244570..281cd4de 100644
--- a/fet2020/templates/baseform/password.html
+++ b/fet2020/templates/baseform/password.html
@@ -1,20 +1 @@
-<label>
-    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
-    {% if field.errors %}
-        <div class="alert alert-danger">
-            <div class="alert-body">{{ field.errors }}</div>
-        </div>
-    {% endif %}
-    <input
-        type="password"
-        id="id_{{ field.name }}"
-        name="{{ field.name }}"
-        {% if field.field.required %}required{% endif %}
-        {% if field.field.disabled %}disabled{% endif %}
-        {% if field.field.autofocus %}autofocus{% endif %}
-        class="w-full"
-    >
-    {% if field.help_text %}
-        <small class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</small>
-    {% endif %}
-</label>
+{% include "baseform/input.html" %}
diff --git a/fet2020/templates/baseform/text.html b/fet2020/templates/baseform/text.html
index a4447221..281cd4de 100644
--- a/fet2020/templates/baseform/text.html
+++ b/fet2020/templates/baseform/text.html
@@ -1,20 +1 @@
-<label>
-    <span>{{ field.label }} {% if not field.field.required %}(optional){% endif %}</span>
-    {% if field.errors %}
-        <div class="alert alert-danger">
-            <div class="alert-body">{{ field.errors }}</div>
-        </div>
-    {% endif %}
-    <input
-        type="text"
-        name="{{ field.name }}"
-        {% if field.value %}value="{{ field.value }}"{% endif %}
-        {% if field.field.required %}required{% endif %}
-        {% if field.field.disabled %}disabled{% endif %}
-        {% if field.field.autofocus %}autofocus{% endif %}
-        class="w-full"
-    >
-    {% if field.help_text %}
-        <small class="text-gray-700 dark:text-gray-200">{{ field.help_text }}</small>
-    {% endif %}
-</label>
+{% include "baseform/input.html" %}