From 468b71cee82ec3c31ada92c359d31cdcb60fa061 Mon Sep 17 00:00:00 2001
From: Simon Oliver Tveit <simtve@uninett.no>
Date: Fri, 4 Oct 2024 10:12:54 +0200
Subject: [PATCH 1/2] Uncrispify password change in preferences.html

---
 python/nav/web/templates/webfront/preferences.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/python/nav/web/templates/webfront/preferences.html b/python/nav/web/templates/webfront/preferences.html
index 00ab7d8d74..9082f8e04e 100644
--- a/python/nav/web/templates/webfront/preferences.html
+++ b/python/nav/web/templates/webfront/preferences.html
@@ -77,7 +77,11 @@
         </p>
     {% else %}
         <form method="post" id="change-password-form" action="{% url 'webfront-preferences-changepassword' %}">
-            {% crispy password_form %}
+          {% if password_form.attrs %}
+            {% include 'custom_crispy_templates/_form_content.html' with form=password_form %}
+          {% else %}
+            {{ password_form }}
+          {% endif %}
         </form>
     {% endif %}
 

From ef4d14ce317355e9827ee82c53ae11ea6ee51007 Mon Sep 17 00:00:00 2001
From: Simon Oliver Tveit <simtve@uninett.no>
Date: Fri, 4 Oct 2024 10:13:46 +0200
Subject: [PATCH 2/2] Uncrispify ChangePasswordForm

---
 python/nav/web/webfront/forms.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/python/nav/web/webfront/forms.py b/python/nav/web/webfront/forms.py
index 6817dd9030..29a7c7d62b 100644
--- a/python/nav/web/webfront/forms.py
+++ b/python/nav/web/webfront/forms.py
@@ -19,13 +19,14 @@
 from django.forms.models import modelformset_factory
 from django.urls import reverse
 from crispy_forms.helper import FormHelper
-from crispy_forms_foundation.layout import Layout, Fieldset, Row, Column, HTML, Submit
+from crispy_forms_foundation.layout import Layout, Fieldset, Row, Column, HTML
 from nav.models.profiles import NavbarLink, Account
 from nav.web.crispyforms import (
     CheckBox,
     NavSubmit,
     SubmitField,
     set_flat_form_attributes,
+    FlatFieldset,
 )
 
 
@@ -96,16 +97,18 @@ def __init__(self, *args, **kwargs):
 
         super(ChangePasswordForm, self).__init__(*args, **kwargs)
 
-        self.helper = FormHelper()
-        self.helper.form_tag = False
-        self.helper.layout = Layout(
-            Fieldset(
-                'Change password',
-                'old_password',
-                'new_password1',
-                'new_password2',
-                Submit('submit', 'Change password', css_class='small'),
-            )
+        self.attrs = set_flat_form_attributes(
+            form_fields=[
+                FlatFieldset(
+                    legend='Change password',
+                    fields=[
+                        self['old_password'],
+                        self['new_password1'],
+                        self['new_password2'],
+                        SubmitField(value='Change password', css_classes='small'),
+                    ],
+                )
+            ],
         )
 
     def clean_old_password(self):