diff --git a/controlpanel/templatetags/ui.py b/controlpanel/templatetags/ui.py
index b7afef7..49cfafa 100644
--- a/controlpanel/templatetags/ui.py
+++ b/controlpanel/templatetags/ui.py
@@ -46,16 +46,40 @@ def as_alert(message):
return {"icon": icon, "title": message.extra_tags or title, "body": message.message, "css": css}
-@register.filter
-def daisy(field):
- """Render a bound form field with the right daisyUI classes."""
- widget = field.field.widget
- css = next((css for widget_type, css in WIDGET_CLASSES if isinstance(widget, widget_type)), DEFAULT_WIDGET_CLASS)
+#: Icon shown inside the field, by form field name. Anything unlisted gets none.
+FIELD_ICONS = {
+ "login": "mail",
+ "email": "mail",
+ "email2": "mail",
+ "oldpassword": "lock-keyhole",
+ "password": "lock-keyhole",
+ "password1": "lock-keyhole",
+ "password2": "lock-keyhole",
+ "code": "shield-check",
+}
- classes = [widget.attrs.get("class", ""), css]
- if field.errors:
- classes.append(f"{css.split()[0]}-error")
+
+@register.filter
+def field_icon(field):
+ return FIELD_ICONS.get(field.name, "")
+
+
+@register.filter
+def daisy(field, css=None):
+ """Render a bound form field with the right daisyUI classes.
+
+ Pass ``css`` to override them — the icon-in-field layout wraps the input in a
+ ``label.input``, and there the input itself must NOT carry the ``input`` class
+ (daisyUI styles the wrapper instead), so it is rendered with ``grow``. The error
+ state then belongs on the wrapper too, which is why an override skips it here.
+ """
+ widget = field.field.widget
+
+ if css is None:
+ css = next((css for widget_type, css in WIDGET_CLASSES if isinstance(widget, widget_type)), DEFAULT_WIDGET_CLASS)
+ if field.errors:
+ css = f"{css} {css.split()[0]}-error"
attrs = dict(widget.attrs)
- attrs["class"] = " ".join(part for part in classes if part)
+ attrs["class"] = " ".join(part for part in [widget.attrs.get("class", ""), css] if part)
return field.as_widget(attrs=attrs)
diff --git a/controlpanel/tests.py b/controlpanel/tests.py
index b29f422..1aaba5e 100644
--- a/controlpanel/tests.py
+++ b/controlpanel/tests.py
@@ -19,7 +19,7 @@ from teams.models import Position, Team, TeamMembership
from .services.admins import grant_club_admin
from .services.platform_admins import PlatformAdminError, is_last_superuser, set_platform_access
from .services.statistics import club_statistics, clubs_with_totals, platform_totals
-from .templatetags.ui import as_alert, daisy
+from .templatetags.ui import as_alert, daisy, field_icon
User = get_user_model()
Flag = get_waffle_flag_model()
@@ -455,3 +455,61 @@ class MessageRenderingTests(ControlPanelTestBase):
self.assertContains(response, "alert alert-soft alert-warning")
self.assertContains(response, '
@@ -13,12 +25,30 @@
{{ field.label }}
{% else %}
-
- {{ field|daisy }}
+ {% if not attrs.unlabeled %}
+
+ {% endif %}
+ {% with icon=field|field_icon %}
+ {% if icon %}
+
+ {% else %}
+ {{ field|daisy }}
+ {% endif %}
+ {% endwith %}
{% endif %}
- {% if field.help_text %}{{ field.help_text }}{% endif %}
+ {% comment %}
+ The password field's help_text is allauth's "Forgot your password?" link, so it
+ gets room to breathe. The id is not decorative: Django points the input's
+ aria-describedby at `_helptext`, and without it that reference dangles
+ and the link is never announced.
+ {% endcomment %}
+ {% if field.help_text %}{{ field.help_text }}{% endif %}
{% for error in field.errors %}{{ error }}{% endfor %}