#6372: Template cleanup & fix form width

netbox/templates/dcim/device_edit.html

@@ -3,12 +3,14 @@
 
 {% block form %}
     {% render_errors form %}
+    
     <div class="field-group">
         <h4>Device</h4>
         {% render_field form.name %}
         {% render_field form.device_role %}
         {% render_field form.tags %}
     </div>
+    
     <div class="field-group">
         <h4>Hardware</h4>
         {% render_field form.manufacturer %}
@@ -16,6 +18,7 @@
         {% render_field form.serial %}
         {% render_field form.asset_tag %}
     </div>
+    
     <div class="field-group">
         <h4>Location</h4>
         {% render_field form.region %}
@@ -23,6 +26,7 @@
         {% render_field form.site %}
         {% render_field form.location %}
         {% render_field form.rack %}
+        
         {% if obj.device_type.is_child_device and obj.parent_bay %}
             <div class="form-floating mb-3">
                 <input class="form-control" value="{{ obj.parent_bay.device }}" disabled />
@@ -42,6 +46,7 @@
             {% render_field form.position %}
         {% endif %}
     </div>
+    
     <div class="field-group">
         <h4>Management</h4>
         {% render_field form.status %}
@@ -51,28 +56,34 @@
             {% render_field form.primary_ip6 %}
         {% endif %}
     </div>
+    
     <div class="field-group">
         <h4>Virtualization</h4>
         {% render_field form.cluster_group %}
         {% render_field form.cluster %}
     </div>
+    
     <div class="field-group">
         <h4>Tenancy</h4>
         {% render_field form.tenant_group %}
         {% render_field form.tenant %}
     </div>
+
 {% if form.custom_fields %}
     <div class="field-group">
         <h4>Custom Fields</h4>
         {% render_custom_fields form %}
     </div>
+
 {% endif %}
     <div class="field-group">
         <h4>Local Config Context Data</h4>
         {% render_field form.local_context_data %}
     </div>
+
     <div class="field-group">
         <h4>Comments</h4>
         {% render_field form.comments %}
     </div>
+
 {% endblock %}

netbox/templates/generic/object_edit.html

@@ -16,8 +16,9 @@
   <form action="" method="post" enctype="multipart/form-data">
     {% csrf_token %}
     {% for field in form.hidden_fields %}{{ field }}{% endfor %}
+
     <div class="row">
-    <div class="col col-md-8 offset-md-2">
+      <div class="col col-md-8 offset-md-2 col-lg-6 offset-lg-3">
         {% block tabs %}{% endblock %}
         {% block form %}
           {% if form.Meta.fieldsets %}
@@ -25,41 +26,52 @@
           {# Render grouped fields according to Form #} 
           {% for group, fields in form.Meta.fieldsets %}
             <div class="field-group">
-          <h4 class="mb-3">{{ group }}</h4>
-          {% for name in fields %}{% render_field form|getfield:name %}{% endfor %}
-        </div>
 
+              <h4>{{ group }}</h4>
+
+              {% for name in fields %}
+                  {% render_field form|getfield:name %}
               {% endfor %}
+
+            </div>
+          {% endfor %}
+
           {% if form.custom_fields %}
             <div class="field-group">
-        <h4 class="mb-3">Custom Fields</h4>
+              <h4>Custom Fields</h4>
               {% render_custom_fields form %}
             </div>
           {% endif %}
+
           {% if form.comments %}
             <div class="field-group">
-        <h4 class="mb-3">Comments</h4>
+              <h4>Comments</h4>
               {% render_field form.comments %}
             </div>
           {% endif %}
+
           {% else %} 
             {# Render all fields in a single group #}
             <div class="field-group">
-        <h4 class="mb-3">{{ obj_type|capfirst }}</h4>
+              <h4>{{ obj_type|capfirst }}</h4>
               {% block form_fields %}{% render_form form %}{% endblock %}
             </div>
           {% endif %}
+
         {% endblock form %}
       </div>
     </div>
+
     <div class="row my-3">
       <div class="col col-md-8 offset-md-2 text-end">
         {% block buttons %}
           <a class="btn btn-outline-danger" href="{{ return_url }}">Cancel</a>
+
           {% if obj.pk %}
             <button type="submit" name="_update" class="btn btn-primary">
               Save
             </button>
+
           {% else %}
             <button type="submit" name="_addanother" class="btn btn-outline-primary">
               Create & Add Another
@@ -67,12 +79,16 @@
             <button type="submit" name="_create" class="btn btn-primary">
               Create
             </button>
+
           {% endif %}
+
         {% endblock buttons %}
       </div>
     </div>
   </form>
+
 {% if obj and settings.DOCS_ROOT %} 
   {% include 'inc/modal.html' with name='docs' content=obj|get_docs %}
 {% endif %}
+
 {% endblock content %}

netbox/templates/utilities/render_field.html

@@ -69,6 +69,7 @@
             </ul>
         </div>
     </div>
+
 {% elif field|widget_type == 'fileinput' or field|widget_type == 'clearablefileinput' %}
     <div class="input-group mb-3">
         <input
@@ -82,6 +83,7 @@
         />
         <label for="{{ field.id_for_label }}" class="input-group-text">{{ field.label|bettertitle }}</label>
     </div>
+
 {% elif field|widget_type == 'selectmultiple' %}
     <div class="row">
         <label for="{{ field.id_for_label }}" class="form-label col col-md-3{% if field.field.required %} required{% endif %}">
@@ -91,25 +93,30 @@
             {{ field }}
         </div>
     </div>
+
 {% else %}
     <div class="form-floating mb-3">
         {{ field }}
         <label for="{{ field.id_for_label }}" {% if field.field.required %}class="required"{% endif %}>
             {{ field.label }}
         </label>
+        
         {% if field.help_text %}
             <span class="form-text">{{ field.help_text|safe }}</span>
         {% endif %}
+        
         <div class="invalid-feedback">{% if field.field.required %}<strong>{{ field.label }}</strong> field is required.{% endif %}</div>
     </div>
+    
+{% endif %}
+
 {% if bulk_nullable %}
     <div class="form-check">
         <input type="checkbox" class="form-check-input" name="_nullify" value="{{ field.name }}" />
         <label class="form-check-label">Set Null</label>
     </div>
+
     {% if field.help_text %}
         <span class="form-text">{{ field.help_text|safe }}</span>
     {% endif %}
 {% endif %}
-    
-{% endif %}