From 9089f5cf670c5a85966c844f2cf20fcbf7e68a41 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 5 Oct 2021 15:37:49 -0400 Subject: [PATCH] #7450: Clean up object edit forms --- .../circuits/circuittermination_edit.html | 5 +- netbox/templates/dcim/cable_connect.html | 10 +- netbox/templates/dcim/device_edit.html | 153 +++++++++--------- netbox/templates/dcim/inc/cable_form.html | 1 - netbox/templates/dcim/interface_edit.html | 8 +- netbox/templates/dcim/rack_edit.html | 26 ++- netbox/templates/dcim/virtualchassis_add.html | 8 +- .../templates/dcim/virtualchassis_edit.html | 6 +- netbox/templates/generic/object_edit.html | 38 ++--- netbox/templates/ipam/ipaddress_bulk_add.html | 8 +- netbox/templates/ipam/ipaddress_edit.html | 14 +- netbox/templates/ipam/service_edit.html | 3 +- netbox/templates/ipam/vlan_edit.html | 11 +- .../virtualization/vminterface_edit.html | 8 +- 14 files changed, 129 insertions(+), 170 deletions(-) diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index 76ef4a5d2..9ba41216d 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -5,7 +5,7 @@ {% block title %}{{ obj.circuit.provider }} {{ obj.circuit }} - Side {{ form.term_side.value }}{% endblock %} {% block form %} -
+
Circuit Termination
@@ -53,9 +53,8 @@
{% endwith %}
-
-
+
Termination Details
diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html index 83891bc21..03dcaa2e4 100644 --- a/netbox/templates/dcim/cable_connect.html +++ b/netbox/templates/dcim/cable_connect.html @@ -17,9 +17,7 @@
-
- A Side -
+
A Side
{% if termination_a.device %} {# Device component #} @@ -100,9 +98,7 @@
-
- B Side -
+
B Side
{% if tabs %}
    @@ -154,7 +150,7 @@
    -
    Cable
    +
    Cable
    {% include 'dcim/inc/cable_form.html' %}
    diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html index ab754a74f..fbafa197d 100644 --- a/netbox/templates/dcim/device_edit.html +++ b/netbox/templates/dcim/device_edit.html @@ -4,111 +4,104 @@ {% block form %} {% render_errors form %} -
    -
    -
    Device
    -
    - {% render_field form.name %} - {% render_field form.device_role %} - {% render_field form.tags %} +
    +
    +
    Device
    +
    + {% render_field form.name %} + {% render_field form.device_role %} + {% render_field form.tags %}
    -
    -
    -
    -
    Hardware
    -
    - {% render_field form.manufacturer %} - {% render_field form.device_type %} - {% render_field form.serial %} - {% render_field form.asset_tag %} +
    +
    +
    Hardware
    +
    + {% render_field form.manufacturer %} + {% render_field form.device_type %} + {% render_field form.serial %} + {% render_field form.asset_tag %}
    -
    -
    -
    -
    Location
    +
    +
    +
    Location
    +
    + {% render_field form.region %} + {% render_field form.site_group %} + {% render_field form.site %} + {% render_field form.location %} + {% render_field form.rack %} + + {% if obj.device_type.is_child_device and obj.parent_bay %} +
    + +
    + +
    - {% render_field form.region %} - {% render_field form.site_group %} - {% render_field form.site %} - {% render_field form.location %} - {% render_field form.rack %} - - {% if obj.device_type.is_child_device and obj.parent_bay %} -
    - -
    - -
    +
    + +
    +
    + + +  Remove +
    -
    - -
    -
    - - -  Remove - -
    -
    - {% else %} - {% render_field form.face %} - {% render_field form.position %} - {% endif %} +
    + {% else %} + {% render_field form.face %} + {% render_field form.position %} + {% endif %}
    -
    -
    -
    -
    Management
    -
    - {% render_field form.status %} - {% render_field form.platform %} - {% if obj.pk %} - {% render_field form.primary_ip4 %} - {% render_field form.primary_ip6 %} - {% endif %} +
    +
    +
    Management
    +
    + {% render_field form.status %} + {% render_field form.platform %} + {% if obj.pk %} + {% render_field form.primary_ip4 %} + {% render_field form.primary_ip6 %} + {% endif %}
    -
    -
    -
    -
    Virtualization
    -
    - {% render_field form.cluster_group %} - {% render_field form.cluster %} +
    +
    +
    Virtualization
    +
    + {% render_field form.cluster_group %} + {% render_field form.cluster %}
    -
    -
    -
    -
    Tenancy
    -
    - {% render_field form.tenant_group %} - {% render_field form.tenant %} +
    +
    +
    Tenancy
    +
    + {% render_field form.tenant_group %} + {% render_field form.tenant %}
    -
    {% if form.custom_fields %} -
    +
    Custom Fields
    {% render_custom_fields form %}
    -
    {% endif %} -
    -
    Local Config Context Data
    - {% render_field form.local_context_data %} +
    +
    Local Config Context Data
    + {% render_field form.local_context_data %}
    -
    -
    - {% render_field form.comments label='Comments' %} +
    +
    Comments
    + {% render_field form.comments %}
    {% endblock %} diff --git a/netbox/templates/dcim/inc/cable_form.html b/netbox/templates/dcim/inc/cable_form.html index f1baeb756..05929821c 100644 --- a/netbox/templates/dcim/inc/cable_form.html +++ b/netbox/templates/dcim/inc/cable_form.html @@ -16,7 +16,6 @@
    {% render_field form.tags %} {% if form.custom_fields %} -
    Custom Fields
    diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html index 64cd8407e..38b22fe5e 100644 --- a/netbox/templates/dcim/interface_edit.html +++ b/netbox/templates/dcim/interface_edit.html @@ -2,7 +2,7 @@ {% load form_helpers %} {% block form %} -
    +
    Interface
    @@ -27,9 +27,8 @@ {% render_field form.mgmt_only %} {% render_field form.mark_connected %}
    -
    -
    +
    802.1Q Switching
    @@ -40,8 +39,7 @@
    {% if form.custom_fields %} -
    -
    +
    Custom Fields
    diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html index 64e366ea7..ca97be34d 100644 --- a/netbox/templates/dcim/rack_edit.html +++ b/netbox/templates/dcim/rack_edit.html @@ -2,7 +2,7 @@ {% load form_helpers %} {% block form %} -
    +
    Rack
    @@ -15,9 +15,8 @@ {% render_field form.role %} {% render_field form.tags %}
    -
    -
    +
    Inventory Control
    @@ -25,18 +24,16 @@ {% render_field form.serial %} {% render_field form.asset_tag %}
    -
    -
    +
    Tenancy
    {% render_field form.tenant_group %} {% render_field form.tenant %}
    -
    -
    +
    Dimensions
    @@ -45,34 +42,33 @@ {% render_field form.u_height %}
    -
    +
    {{ form.outer_width }}
    Width
    -
    +
    {{ form.outer_depth }}
    Depth
    -
    +
    {{ form.outer_unit }}
    Unit
    {% render_field form.desc_units %}
    -
    {% if form.custom_fields %} -
    +
    Custom Fields
    {% render_custom_fields form %}
    -
    {% endif %} -
    - {% render_field form.comments label='Comments' %} +
    +
    Comments
    + {% render_field form.comments %}
    {% endblock %} diff --git a/netbox/templates/dcim/virtualchassis_add.html b/netbox/templates/dcim/virtualchassis_add.html index 1ff0cd8bd..3c0b10826 100644 --- a/netbox/templates/dcim/virtualchassis_add.html +++ b/netbox/templates/dcim/virtualchassis_add.html @@ -2,7 +2,7 @@ {% load form_helpers %} {% block form %} -
    +
    Virtual Chassis
    @@ -10,9 +10,8 @@ {% render_field form.domain %} {% render_field form.tags %}
    -
    -
    +
    Member Devices
    @@ -25,8 +24,7 @@
    {% if form.custom_fields %} -
    -
    +
    Custom Fields
    diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html index c994f05dc..a37ff102a 100644 --- a/netbox/templates/dcim/virtualchassis_edit.html +++ b/netbox/templates/dcim/virtualchassis_edit.html @@ -11,7 +11,7 @@ {% csrf_token %} {{ pk_form.pk }} {{ formset.management_form }} -
    +
    Virtual Chassis
    @@ -20,16 +20,14 @@ {% render_field vc_form.master %} {% render_field vc_form.tags %}
    -
    {% if vc_form.custom_fields %} -
    +
    Custom Fields
    {% render_custom_fields vc_form %}
    -
    {% endif %}
    diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html index bd3f6059b..c7b4c8a8b 100644 --- a/netbox/templates/generic/object_edit.html +++ b/netbox/templates/generic/object_edit.html @@ -6,18 +6,6 @@ {% if obj.pk %}Editing {{ obj_type }} {{ obj }}{% else %}Add a new {{ obj_type }}{% endif %} {% endblock title %} -{% block controls %} - {% if obj and settings.DOCS_ROOT %} -
    -
    - - Help - -
    -
    - {% endif %} -{% endblock controls %} - {% block tabs %}