From 582b69de74409b998c12972aa08121162886e6ba Mon Sep 17 00:00:00 2001
From: Matt <mtt.lov@gmail.com>
Date: Wed, 4 Aug 2021 10:57:01 -0700
Subject: [PATCH] #6797: Improve object edit form field layout

---
 netbox/templates/dcim/device_edit.html        | 3 +--
 netbox/templates/dcim/rack_edit.html          | 5 ++---
 netbox/templates/generic/object_edit.html     | 3 +--
 netbox/templates/utilities/render_field.html  | 6 ++++++
 netbox/utilities/templatetags/form_helpers.py | 3 ++-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index 1bb1921c3..0b385674d 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -86,8 +86,7 @@
     </div>
 
     <div class="field-group">
-        <h5 class="text-center">Comments</h5>
-        {% render_field form.comments %}
+        {% render_field form.comments label='Comments' %}
     </div>
 
 {% endblock %}
diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html
index 0c38f15e7..530f23244 100644
--- a/netbox/templates/dcim/rack_edit.html
+++ b/netbox/templates/dcim/rack_edit.html
@@ -30,7 +30,7 @@
         {% render_field form.width %}
         {% render_field form.u_height %}
         <div class="row mb-3">
-            <label class="col col-md-3 col-form-label">Outer Dimensions</label>
+            <label class="col col-md-3 col-form-label text-end">Outer Dimensions</label>
             <div class="col col-md-3">
                 {{ form.outer_width }}
                 <div class="form-text">Width</div>
@@ -53,7 +53,6 @@
         </div>
     {% endif %}
     <div class="field-group">
-        <h5 class="text-center">Comments</h5>
-        {% render_field form.comments %}
+        {% render_field form.comments label='Comments' %}
     </div>
 {% endblock %}
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index b5e73ab16..43425e060 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -48,8 +48,7 @@
 
             {% if form.comments %}
               <div class="field-group">
-                <h5 class="text-center">Comments</h5>
-                {% render_field form.comments %}
+                {% render_field form.comments label='Comments' %}
               </div>
             {% endif %}
 
diff --git a/netbox/templates/utilities/render_field.html b/netbox/templates/utilities/render_field.html
index 4702795fb..c67df331a 100644
--- a/netbox/templates/utilities/render_field.html
+++ b/netbox/templates/utilities/render_field.html
@@ -25,6 +25,12 @@
 
 {% elif field|widget_type == 'textarea' and not field.label %}
     <div class="row mb-3">
+        {% if label %}
+        <label class="col-sm-3 col-form-label text-end{% if field.field.required %} required{% endif %}" for="{{ field.id_for_label }}">
+            {{ label }}
+        </label>
+        {% else %}
+        {% endif %}
         <div class="col">
             {{ field }}
             {% if field.help_text %}
diff --git a/netbox/utilities/templatetags/form_helpers.py b/netbox/utilities/templatetags/form_helpers.py
index 1ef2d58aa..808b24b4d 100644
--- a/netbox/utilities/templatetags/form_helpers.py
+++ b/netbox/utilities/templatetags/form_helpers.py
@@ -13,12 +13,13 @@ def getfield(form, fieldname):
 
 
 @register.inclusion_tag('utilities/render_field.html')
-def render_field(field, bulk_nullable=False):
+def render_field(field, bulk_nullable=False, label=None):
     """
     Render a single form field from template
     """
     return {
         'field': field,
+        'label': label,
         'bulk_nullable': bulk_nullable,
     }