From 2044802586d700ed02e148a4976743c9dfcbde02 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Fri, 18 Jul 2025 11:19:39 -0400
Subject: [PATCH] Cosmetic improvements to form fields

---
 netbox/templates/generic/bulk_delete.html   |  2 +-
 netbox/templates/generic/bulk_edit.html     |  2 +-
 netbox/templates/generic/object_delete.html |  2 +-
 netbox/templates/htmx/delete_form.html      | 19 ++++++++++++++++---
 netbox/templates/htmx/form.html             |  5 ++++-
 netbox/templates/inc/htmx_modal.html        |  2 +-
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/netbox/templates/generic/bulk_delete.html b/netbox/templates/generic/bulk_delete.html
index 021803485..37f9cef5c 100644
--- a/netbox/templates/generic/bulk_delete.html
+++ b/netbox/templates/generic/bulk_delete.html
@@ -66,7 +66,7 @@ Context:
         {% endfor %}
 
         {# Meta fields #}
-        <div class="bg-primary-subtle border border-primary rounded-1 pt-3 mb-3">
+        <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
           {% render_field form.changelog_message %}
           {% render_field form.background_job %}
         </div>
diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html
index f41b88ef5..687739e50 100644
--- a/netbox/templates/generic/bulk_edit.html
+++ b/netbox/templates/generic/bulk_edit.html
@@ -103,7 +103,7 @@ Context:
         {% endif %}
 
         {# Meta fields #}
-        <div class="bg-primary-subtle border border-primary rounded-1 pt-3 mb-3">
+        <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
           {% render_field form.changelog_message %}
           {% render_field form.background_job %}
         </div>
diff --git a/netbox/templates/generic/object_delete.html b/netbox/templates/generic/object_delete.html
index bde8830d9..71d8d3984 100644
--- a/netbox/templates/generic/object_delete.html
+++ b/netbox/templates/generic/object_delete.html
@@ -20,7 +20,7 @@ Context:
 {% endblock %}
 
 {% block content %}
-  <div class="modal" tabindex="-1" style="display: block; position: static">
+  <div class="modal modal-lg" tabindex="-1" style="display: block; position: static">
     <div class="modal-dialog">
       <div class="modal-content border-1 border-danger">
         {% include 'htmx/delete_form.html' %}
diff --git a/netbox/templates/htmx/delete_form.html b/netbox/templates/htmx/delete_form.html
index 80aec2c82..eb267e44c 100644
--- a/netbox/templates/htmx/delete_form.html
+++ b/netbox/templates/htmx/delete_form.html
@@ -2,10 +2,16 @@
 {% load i18n %}
 
 <form action="{{ form_url }}" method="post">
+  {# Render hidden fields #}
   {% csrf_token %}
+  {% for field in form.hidden_fields %}
+    {{ field }}
+  {% endfor %}
+
   <div class="modal-header">
     <h5 class="modal-title">{% trans "Confirm Deletion" %}</h5>
   </div>
+
   <div class="modal-body">
     <p>
       {% blocktrans trimmed %}
@@ -16,10 +22,10 @@
       <p>
         {% trans "The following objects will be deleted as a result of this action." %}
       </p>
-      <div class="accordion" id="deleteAccordion">
+      <div class="accordion mb-3" id="deleteAccordion">
         {% for model, instances in dependent_objects.items %}
           <div class="accordion-item">
-            <h2 class="accordion-header" id="deleteheading{{ forloop.counter }}">
+            <h2 class="accordion-header h4" id="deleteheading{{ forloop.counter }}">
               <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse{{ forloop.counter }}" aria-expanded="false" aria-controls="collapse{{ forloop.counter }}">
                 {% with object_count=instances|length %}
                   {{ object_count }}
@@ -46,8 +52,15 @@
         {% endfor %}
       </div>
     {% endif %}
-    {% render_form form %}
+
+    {# Meta fields #}
+    {% if form.changelog_message %}
+      <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3">
+        {% render_field form.changelog_message %}
+      </div>
+    {% endif %}
   </div>
+
   <div class="modal-footer">
     {% if return_url %}
       <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
diff --git a/netbox/templates/htmx/form.html b/netbox/templates/htmx/form.html
index 1108a6113..40b795d11 100644
--- a/netbox/templates/htmx/form.html
+++ b/netbox/templates/htmx/form.html
@@ -28,8 +28,11 @@
     </div>
   {% endif %}
 
+  {# Meta fields #}
   {% if form.changelog_message %}
-    {% render_field form.changelog_message %}
+    <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
+      {% render_field form.changelog_message %}
+    </div>
   {% endif %}
 
 {% else %}
diff --git a/netbox/templates/inc/htmx_modal.html b/netbox/templates/inc/htmx_modal.html
index 5361fc5f7..1a475644c 100644
--- a/netbox/templates/inc/htmx_modal.html
+++ b/netbox/templates/inc/htmx_modal.html
@@ -1,4 +1,4 @@
-<div class="modal fade" id="htmx-modal" tabindex="-1" aria-hidden="true">
+<div class="modal modal-lg fade" id="htmx-modal" tabindex="-1" aria-hidden="true">
   <div class="modal-dialog{% if size %} modal-{{ size }}{% endif %}">
     <div class="modal-content" id="htmx-modal-content">
       {# Dynamic content goes here #}