Clean up object edit forms

This commit is contained in:
jeremystretch
2021-08-25 15:03:19 -04:00
parent 99cba25108
commit 66619cdc2f
19 changed files with 148 additions and 72 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -243,6 +243,7 @@ table {
&.attr-table { &.attr-table {
th { th {
font-weight: normal;
width: 25%; width: 25%;
} }
} }
@@ -723,10 +724,6 @@ div.paginator > form > div.input-group {
width: fit-content; width: fit-content;
} }
div.field-group:not(:first-of-type) {
margin-top: $spacer * 3;
}
label.required { label.required {
font-weight: $font-weight-bold; font-weight: $font-weight-bold;

View File

@@ -5,7 +5,7 @@
{% block title %}{{ obj.circuit.provider }} {{ obj.circuit }} - Side {{ form.term_side.value }}{% endblock %} {% block title %}{{ obj.circuit.provider }} {{ obj.circuit }} - Side {{ form.term_side.value }}{% endblock %}
{% block form %} {% block form %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Circuit Termination</h5> <h5 class="offset-sm-3">Circuit Termination</h5>
</div> </div>
@@ -41,7 +41,7 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="tab-content p-0"> <div class="tab-content p-0 border-0">
<div class="tab-pane{% if not providernetwork_tab_active %} active{% endif %}" id="site"> <div class="tab-pane{% if not providernetwork_tab_active %} active{% endif %}" id="site">
{% render_field form.region %} {% render_field form.region %}
{% render_field form.site_group %} {% render_field form.site_group %}
@@ -53,7 +53,9 @@
</div> </div>
{% endwith %} {% endwith %}
</div> </div>
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Termination Details</h5> <h5 class="offset-sm-3">Termination Details</h5>
</div> </div>

View File

@@ -4,7 +4,7 @@
{% block form %} {% block form %}
{% render_errors form %} {% render_errors form %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Device</h5> <h5 class="offset-sm-3">Device</h5>
</div> </div>
@@ -12,8 +12,9 @@
{% render_field form.device_role %} {% render_field form.device_role %}
{% render_field form.tags %} {% render_field form.tags %}
</div> </div>
<hr />
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Hardware</h5> <h5 class="offset-sm-3">Hardware</h5>
</div> </div>
@@ -22,8 +23,9 @@
{% render_field form.serial %} {% render_field form.serial %}
{% render_field form.asset_tag %} {% render_field form.asset_tag %}
</div> </div>
<hr />
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Location</h5> <h5 class="offset-sm-3">Location</h5>
</div> </div>
@@ -56,8 +58,9 @@
{% render_field form.position %} {% render_field form.position %}
{% endif %} {% endif %}
</div> </div>
<hr />
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Management</h5> <h5 class="offset-sm-3">Management</h5>
</div> </div>
@@ -68,38 +71,43 @@
{% render_field form.primary_ip6 %} {% render_field form.primary_ip6 %}
{% endif %} {% endif %}
</div> </div>
<hr />
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Virtualization</h5> <h5 class="offset-sm-3">Virtualization</h5>
</div> </div>
{% render_field form.cluster_group %} {% render_field form.cluster_group %}
{% render_field form.cluster %} {% render_field form.cluster %}
</div> </div>
<hr />
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Tenancy</h5> <h5 class="offset-sm-3">Tenancy</h5>
</div> </div>
{% render_field form.tenant_group %} {% render_field form.tenant_group %}
{% render_field form.tenant %} {% render_field form.tenant %}
</div> </div>
<hr />
{% if form.custom_fields %} {% if form.custom_fields %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Custom Fields</h5> <h5 class="offset-sm-3">Custom Fields</h5>
</div> </div>
{% render_custom_fields form %} {% render_custom_fields form %}
</div> </div>
<hr />
{% endif %}
{% endif %} <div class="field-group my-4">
<div class="field-group">
<h5 class="text-center">Local Config Context Data</h5> <h5 class="text-center">Local Config Context Data</h5>
{% render_field form.local_context_data %} {% render_field form.local_context_data %}
</div> </div>
<hr />
<div class="field-group"> <div class="field-group my-4">
{% render_field form.comments label='Comments' %} {% render_field form.comments label='Comments' %}
</div> </div>

View File

@@ -16,8 +16,11 @@
</div> </div>
{% render_field form.tags %} {% render_field form.tags %}
{% if form.custom_fields %} {% if form.custom_fields %}
<hr />
<div class="field-group"> <div class="field-group">
<h4>Custom Fields</h4> <div class="row mb-2">
{% render_custom_fields form %} <h5 class="offset-sm-3">Custom Fields</h5>
</div>
{% render_custom_fields form %}
</div> </div>
{% endif %} {% endif %}

View File

@@ -2,7 +2,7 @@
{% load form_helpers %} {% load form_helpers %}
{% block form %} {% block form %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Interface</h5> <h5 class="offset-sm-3">Interface</h5>
</div> </div>
@@ -27,7 +27,9 @@
{% render_field form.mgmt_only %} {% render_field form.mgmt_only %}
{% render_field form.mark_connected %} {% render_field form.mark_connected %}
</div> </div>
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">802.1Q Switching</h5> <h5 class="offset-sm-3">802.1Q Switching</h5>
</div> </div>
@@ -36,13 +38,15 @@
{% render_field form.untagged_vlan %} {% render_field form.untagged_vlan %}
{% render_field form.tagged_vlans %} {% render_field form.tagged_vlans %}
</div> </div>
{% if form.custom_fields %} {% if form.custom_fields %}
<div class="field-group"> <hr />
<div class="row mb-2"> <div class="field-group my-4">
<h5 class="offset-sm-3">Custom Fields</h5> <div class="row mb-2">
</div> <h5 class="offset-sm-3">Custom Fields</h5>
{% render_custom_fields form %}
</div> </div>
{% render_custom_fields form %}
</div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

View File

@@ -2,7 +2,7 @@
{% load form_helpers %} {% load form_helpers %}
{% block form %} {% block form %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Rack</h5> <h5 class="offset-sm-3">Rack</h5>
</div> </div>
@@ -15,7 +15,9 @@
{% render_field form.role %} {% render_field form.role %}
{% render_field form.tags %} {% render_field form.tags %}
</div> </div>
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Inventory Control</h5> <h5 class="offset-sm-3">Inventory Control</h5>
</div> </div>
@@ -23,14 +25,18 @@
{% render_field form.serial %} {% render_field form.serial %}
{% render_field form.asset_tag %} {% render_field form.asset_tag %}
</div> </div>
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Tenancy</h5> <h5 class="offset-sm-3">Tenancy</h5>
</div> </div>
{% render_field form.tenant_group %} {% render_field form.tenant_group %}
{% render_field form.tenant %} {% render_field form.tenant %}
</div> </div>
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Dimensions</h5> <h5 class="offset-sm-3">Dimensions</h5>
</div> </div>
@@ -54,15 +60,19 @@
</div> </div>
{% render_field form.desc_units %} {% render_field form.desc_units %}
</div> </div>
<hr />
{% if form.custom_fields %} {% if form.custom_fields %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Custom Fields</h5> <h5 class="offset-sm-3">Custom Fields</h5>
</div> </div>
{% render_custom_fields form %} {% render_custom_fields form %}
</div> </div>
<hr />
{% endif %} {% endif %}
<div class="field-group">
<div class="field-group my-4">
{% render_field form.comments label='Comments' %} {% render_field form.comments label='Comments' %}
</div> </div>
{% endblock %} {% endblock %}

View File

@@ -209,7 +209,14 @@
Locations Locations
</h5> </h5>
<div class='card-body'> <div class='card-body'>
{% if locations %}
<table class="table table-hover"> <table class="table table-hover">
<tr>
<th>Location</th>
<th>Racks</th>
<th>Devices</th>
<th></th>
</tr>
{% for location in locations %} {% for location in locations %}
<tr> <tr>
<td style="padding-left: {{ location.level }}8px"> <td style="padding-left: {{ location.level }}8px">
@@ -230,6 +237,9 @@
</tr> </tr>
{% endfor %} {% endfor %}
</table> </table>
{% else %}
<span class="text-muted">None</span>
{% endif %}
</div> </div>
</div> </div>
<div class="card"> <div class="card">

View File

@@ -2,7 +2,7 @@
{% load form_helpers %} {% load form_helpers %}
{% block form %} {% block form %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Virtual Chassis</h5> <h5 class="offset-sm-3">Virtual Chassis</h5>
</div> </div>
@@ -10,7 +10,9 @@
{% render_field form.domain %} {% render_field form.domain %}
{% render_field form.tags %} {% render_field form.tags %}
</div> </div>
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Member Devices</h5> <h5 class="offset-sm-3">Member Devices</h5>
</div> </div>
@@ -21,8 +23,10 @@
{% render_field form.members %} {% render_field form.members %}
{% render_field form.initial_position %} {% render_field form.initial_position %}
</div> </div>
{% if form.custom_fields %} {% if form.custom_fields %}
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Custom Fields</h5> <h5 class="offset-sm-3">Custom Fields</h5>
</div> </div>

View File

@@ -11,7 +11,7 @@
{% csrf_token %} {% csrf_token %}
{{ pk_form.pk }} {{ pk_form.pk }}
{{ formset.management_form }} {{ formset.management_form }}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Virtual Chassis</h5> <h5 class="offset-sm-3">Virtual Chassis</h5>
</div> </div>
@@ -20,14 +20,18 @@
{% render_field vc_form.master %} {% render_field vc_form.master %}
{% render_field vc_form.tags %} {% render_field vc_form.tags %}
</div> </div>
<hr />
{% if vc_form.custom_fields %} {% if vc_form.custom_fields %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Custom Fields</h5> <h5 class="offset-sm-3">Custom Fields</h5>
</div> </div>
{% render_custom_fields vc_form %} {% render_custom_fields vc_form %}
</div> </div>
<hr />
{% endif %} {% endif %}
<div class="field-group mb-5"> <div class="field-group mb-5">
<h5 class="text-center">Members</h5> <h5 class="text-center">Members</h5>
<table class="table"> <table class="table">

View File

@@ -42,7 +42,7 @@
{# Render grouped fields according to Form #} {# Render grouped fields according to Form #}
{% for group, fields in form.Meta.fieldsets %} {% for group, fields in form.Meta.fieldsets %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">{{ group }}</h5> <h5 class="offset-sm-3">{{ group }}</h5>
</div> </div>
@@ -50,11 +50,15 @@
{% render_field form|getfield:name %} {% render_field form|getfield:name %}
{% endfor %} {% endfor %}
</div> </div>
{% if not forloop.last %}
<hr />
{% endif %}
{% endfor %} {% endfor %}
{% if form.custom_fields %} {% if form.custom_fields %}
<div class="field-group"> <hr />
<div class="row mb-1"> <div class="field-group my-4">
<div class="row mb-2">
<h5 class="offset-sm-3">Custom Fields</h5> <h5 class="offset-sm-3">Custom Fields</h5>
</div> </div>
{% render_custom_fields form %} {% render_custom_fields form %}
@@ -62,14 +66,15 @@
{% endif %} {% endif %}
{% if form.comments %} {% if form.comments %}
<div class="field-group"> <hr />
<div class="field-group my-4">
{% render_field form.comments label='Comments' %} {% render_field form.comments label='Comments' %}
</div> </div>
{% endif %} {% endif %}
{% else %} {% else %}
{# Render all fields in a single group #} {# Render all fields in a single group #}
<div class="field-group"> <div class="field-group my-4">
{% block form_fields %}{% render_form form %}{% endblock %} {% block form_fields %}{% render_form form %}{% endblock %}
</div> </div>
{% endif %} {% endif %}

View File

@@ -48,7 +48,7 @@
<i class="mdi mdi-backspace"></i> Reset <i class="mdi mdi-backspace"></i> Reset
</button> </button>
<button type="submit" class="btn btn-sm btn-primary m-1"> <button type="submit" class="btn btn-sm btn-primary m-1">
<i class="mdi mdi-filter-variant"></i> Filter <i class="mdi mdi-magnify"></i> Search
</button> </button>
</div> </div>
</div> </div>

View File

@@ -9,8 +9,10 @@
{% endblock %} {% endblock %}
{% block form %} {% block form %}
<div class="field-group"> <div class="field-group my-4">
<h5 class="text-center">IP Addresses</h5> <div class="row mb-2">
<h5 class="offset-sm-3">IP Addresses</h5>
</div>
{% render_field form.pattern %} {% render_field form.pattern %}
{% render_field model_form.status %} {% render_field model_form.status %}
{% render_field model_form.role %} {% render_field model_form.role %}
@@ -18,14 +20,21 @@
{% render_field model_form.description %} {% render_field model_form.description %}
{% render_field model_form.tags %} {% render_field model_form.tags %}
</div> </div>
<div class="field-group"> <hr />
<h5 class="text-center">Tenancy</h5>
<div class="field-group my-4">
<div class="row mb-2">
<h5 class="offset-sm-3">Tenancy</h5>
</div>
{% render_field model_form.tenant_group %} {% render_field model_form.tenant_group %}
{% render_field model_form.tenant %} {% render_field model_form.tenant %}
</div> </div>
{% if model_form.custom_fields %} {% if model_form.custom_fields %}
<div class="field-group"> <hr />
<h5 class="text-center">Custom Fields</h5> <div class="field-group my-4">
<div class="row mb-2">
<h5 class="offset-sm-3">Custom Fields</h5>
</div>
{% render_custom_fields model_form %} {% render_custom_fields model_form %}
</div> </div>
{% endif %} {% endif %}

View File

@@ -8,7 +8,7 @@
{% endblock tabs %} {% endblock tabs %}
{% block form %} {% block form %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">IP Address</h5> <h5 class="offset-sm-3">IP Address</h5>
</div> </div>
@@ -20,14 +20,18 @@
{% render_field form.description %} {% render_field form.description %}
{% render_field form.tags %} {% render_field form.tags %}
</div> </div>
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Tenancy</h5> <h5 class="offset-sm-3">Tenancy</h5>
</div> </div>
{% render_field form.tenant_group %} {% render_field form.tenant_group %}
{% render_field form.tenant %} {% render_field form.tenant %}
</div> </div>
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Interface Assignment</h5> <h5 class="offset-sm-3">Interface Assignment</h5>
</div> </div>
@@ -64,7 +68,7 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="tab-content p-0"> <div class="tab-content p-0 border-0">
<div class="tab-pane {% if not vm_tab_active %}active{% endif %}" id="device" role="tabpanel" aria-labeled-by="device_tab"> <div class="tab-pane {% if not vm_tab_active %}active{% endif %}" id="device" role="tabpanel" aria-labeled-by="device_tab">
{% render_field form.device %} {% render_field form.device %}
{% render_field form.interface %} {% render_field form.interface %}
@@ -77,7 +81,9 @@
</div> </div>
{% endwith %} {% endwith %}
</div> </div>
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">NAT IP (Inside)</h5> <h5 class="offset-sm-3">NAT IP (Inside)</h5>
</div> </div>
@@ -126,7 +132,7 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="tab-content p-0"> <div class="tab-content p-0 border-0">
<div class="tab-pane active" id="by_device" aria-labelledby="device_tab" role="tabpanel"> <div class="tab-pane active" id="by_device" aria-labelledby="device_tab" role="tabpanel">
{% render_field form.nat_region %} {% render_field form.nat_region %}
{% render_field form.nat_site_group %} {% render_field form.nat_site_group %}
@@ -144,8 +150,10 @@
{% render_field form.nat_inside %} {% render_field form.nat_inside %}
</div> </div>
</div> </div>
{% if form.custom_fields %} {% if form.custom_fields %}
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Custom Fields</h5> <h5 class="offset-sm-3">Custom Fields</h5>
</div> </div>

View File

@@ -2,7 +2,7 @@
{% load form_helpers %} {% load form_helpers %}
{% block form %} {% block form %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Service</h5> <h5 class="offset-sm-3">Service</h5>
</div> </div>
@@ -41,7 +41,9 @@
{% render_field form.description %} {% render_field form.description %}
{% render_field form.tags %} {% render_field form.tags %}
</div> </div>
{% if form.custom_fields %} {% if form.custom_fields %}
<hr />
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Custom Fields</h5> <h5 class="offset-sm-3">Custom Fields</h5>
</div> </div>

View File

@@ -4,7 +4,7 @@
{% load helpers %} {% load helpers %}
{% block form %} {% block form %}
<div class="field-group mb-3"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">VLAN</h5> <h5 class="offset-sm-3">VLAN</h5>
</div> </div>
@@ -15,14 +15,18 @@
{% render_field form.description %} {% render_field form.description %}
{% render_field form.tags %} {% render_field form.tags %}
</div> </div>
<div class="field-group mb-3"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Tenancy</h5> <h5 class="offset-sm-3">Tenancy</h5>
</div> </div>
{% render_field form.tenant_group %} {% render_field form.tenant_group %}
{% render_field form.tenant %} {% render_field form.tenant %}
</div> </div>
<div class="field-group mb-3"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Assignment</h5> <h5 class="offset-sm-3">Assignment</h5>
</div> </div>
@@ -39,7 +43,7 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="tab-content p-0"> <div class="tab-content p-0 border-0">
<div class="tab-pane{% if not site_tab_active %} active{% endif %}" id="group"> <div class="tab-pane{% if not site_tab_active %} active{% endif %}" id="group">
{% render_field form.scope_type %} {% render_field form.scope_type %}
{% render_field form.group %} {% render_field form.group %}
@@ -52,8 +56,10 @@
</div> </div>
{% endwith %} {% endwith %}
</div> </div>
{% if form.custom_fields %} {% if form.custom_fields %}
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Custom Fields</h5> <h5 class="offset-sm-3">Custom Fields</h5>
</div> </div>

View File

@@ -2,7 +2,7 @@
{% load form_helpers %} {% load form_helpers %}
{% block form %} {% block form %}
<div class="field-group"> <div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Interface</h5> <h5 class="offset-sm-3">Interface</h5>
</div> </div>
@@ -22,7 +22,9 @@
{% render_field form.description %} {% render_field form.description %}
{% render_field form.tags %} {% render_field form.tags %}
</div> </div>
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">802.1Q Switching</h5> <h5 class="offset-sm-3">802.1Q Switching</h5>
</div> </div>
@@ -31,8 +33,10 @@
{% render_field form.untagged_vlan %} {% render_field form.untagged_vlan %}
{% render_field form.tagged_vlans %} {% render_field form.tagged_vlans %}
</div> </div>
{% if form.custom_fields %} {% if form.custom_fields %}
<div class="field-group"> <hr />
<div class="field-group my-4">
<div class="row mb-2"> <div class="row mb-2">
<h5 class="offset-sm-3">Custom Fields</h5> <h5 class="offset-sm-3">Custom Fields</h5>
</div> </div>