From 0658ea9479620454f2f37ab5238246ee3e972410 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 5 Jan 2024 15:07:51 -0500 Subject: [PATCH] Clean up form layouts --- netbox/templates/account/preferences.html | 14 ++++---- .../circuits/circuittermination_edit.html | 16 +++++----- netbox/templates/dcim/cable_edit.html | 20 ++++++------ netbox/templates/dcim/device_edit.html | 32 +++++++++---------- netbox/templates/dcim/inventoryitem_edit.html | 16 +++++----- netbox/templates/dcim/rack_edit.html | 20 ++++++------ netbox/templates/dcim/virtualchassis_add.html | 12 +++---- .../templates/dcim/virtualchassis_edit.html | 8 ++--- netbox/templates/extras/script.html | 4 +-- netbox/templates/generic/bulk_edit.html | 16 +++++----- netbox/templates/htmx/form.html | 8 ++--- .../ipam/fhrpgroupassignment_edit.html | 4 +-- netbox/templates/ipam/ipaddress_bulk_add.html | 12 +++---- netbox/templates/ipam/ipaddress_edit.html | 26 +++++++-------- netbox/templates/ipam/service_create.html | 16 +++++----- netbox/templates/ipam/service_edit.html | 12 +++---- netbox/templates/ipam/vlan_edit.html | 20 ++++++------ .../tenancy/contactassignment_edit.html | 8 ++--- .../templates/vpn/l2vpntermination_edit.html | 10 +++--- 19 files changed, 137 insertions(+), 137 deletions(-) diff --git a/netbox/templates/account/preferences.html b/netbox/templates/account/preferences.html index e31baf0e7..f63a4c8c7 100644 --- a/netbox/templates/account/preferences.html +++ b/netbox/templates/account/preferences.html @@ -12,8 +12,8 @@ {# Built-in preferences #} {% for group, fields in form.fieldsets %}
-
-
{{ group }}
+
+
{{ group }}
{% for name in fields %} {% render_field form|getfield:name %} @@ -25,8 +25,8 @@ {% with plugin_fields=form.plugin_fields %} {% if plugin_fields %}
-
-
{% trans "Plugins" %}
+
+
{% trans "Plugins" %}
{% for name in plugin_fields %} {% render_field form|getfield:name %} @@ -37,8 +37,8 @@ {# Table configurations #}
-
-
{% trans "Table Configurations" %}
+
+
{% trans "Table Configurations" %}
{% if request.user.config.data.tables %} @@ -72,7 +72,7 @@
{% else %} -
+

{% trans "None found" %}

{% endif %} diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index 907c5a3d7..56c2eb6e4 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -5,16 +5,16 @@ {% block form %}
-
-
{% trans "Circuit Termination" %}
+
+
{% trans "Circuit Termination" %}
{% render_field form.circuit %} {% render_field form.term_side %} {% render_field form.tags %} {% render_field form.mark_connected %} {% with providernetwork_tab_active=form.initial.provider_network %} -
-
+
+
-
-
{% trans "Termination Details" %}
+
+
{% trans "Termination Details" %}
{% render_field form.port_speed %} {% render_field form.upstream_speed %} @@ -49,8 +49,8 @@ {% if form.custom_fields %}
-
-
{% trans "Custom Fields" %}
+
+
{% trans "Custom Fields" %}
{% render_custom_fields form %}
diff --git a/netbox/templates/dcim/cable_edit.html b/netbox/templates/dcim/cable_edit.html index 14d763dc3..b5c1f8752 100644 --- a/netbox/templates/dcim/cable_edit.html +++ b/netbox/templates/dcim/cable_edit.html @@ -8,8 +8,8 @@ {# A side termination #}
-
-
{% trans "A Side" %}
+
+
{% trans "A Side" %}
{% if 'termination_a_device' in form.fields %} {% render_field form.termination_a_device %} @@ -25,8 +25,8 @@ {# B side termination #}
-
-
{% trans "B Side" %}
+
+
{% trans "B Side" %}
{% if 'termination_b_device' in form.fields %} {% render_field form.termination_b_device %} @@ -42,8 +42,8 @@ {# Cable attributes #}
-
-
{% trans "Cable" %}
+
+
{% trans "Cable" %}
{% render_field form.status %} {% render_field form.type %} @@ -64,8 +64,8 @@
-
-
{% trans "Tenancy" %}
+
+
{% trans "Tenancy" %}
{% render_field form.tenant_group %} {% render_field form.tenant %} @@ -73,8 +73,8 @@ {% if form.custom_fields %}
-
-
{% trans "Custom Fields" %}
+
+
{% trans "Custom Fields" %}
{% render_custom_fields form %}
diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html index 4dbb2f477..7824ae81b 100644 --- a/netbox/templates/dcim/device_edit.html +++ b/netbox/templates/dcim/device_edit.html @@ -6,8 +6,8 @@ {% render_errors form %}
-
-
{% trans "Device" %}
+
+
{% trans "Device" %}
{% render_field form.name %} {% render_field form.role %} @@ -16,8 +16,8 @@
-
-
{% trans "Hardware" %}
+
+
{% trans "Hardware" %}
{% render_field form.device_type %} {% render_field form.airflow %} @@ -26,8 +26,8 @@
-
-
{% trans "Location" %}
+
+
{% trans "Location" %}
{% render_field form.site %} {% render_field form.location %} @@ -60,8 +60,8 @@
-
-
{% trans "Management" %}
+
+
{% trans "Management" %}
{% render_field form.status %} {% render_field form.platform %} @@ -74,23 +74,23 @@
-
-
{% trans "Virtualization" %}
+
+
{% trans "Virtualization" %}
{% render_field form.cluster %}
-
-
{% trans "Tenancy" %}
+
+
{% trans "Tenancy" %}
{% render_field form.tenant_group %} {% render_field form.tenant %}
-
-
{% trans "Virtual Chassis" %}
+
+
{% trans "Virtual Chassis" %}
{% render_field form.virtual_chassis %} {% render_field form.vc_position %} @@ -99,8 +99,8 @@ {% if form.custom_fields %}
-
-
{% trans "Custom Fields" %}
+
+
{% trans "Custom Fields" %}
{% render_custom_fields form %}
diff --git a/netbox/templates/dcim/inventoryitem_edit.html b/netbox/templates/dcim/inventoryitem_edit.html index 640f8dbfe..efa207e60 100644 --- a/netbox/templates/dcim/inventoryitem_edit.html +++ b/netbox/templates/dcim/inventoryitem_edit.html @@ -6,8 +6,8 @@ {% block form %}
-
-
{% trans "Inventory Item" %}
+
+
{% trans "Inventory Item" %}
{% render_field form.device %} {% render_field form.parent %} @@ -19,8 +19,8 @@
-
-
{% trans "Hardware" %}
+
+
{% trans "Hardware" %}
{% render_field form.manufacturer %} {% render_field form.part_id %} @@ -29,8 +29,8 @@
-
-
{% trans "Component Assignment" %}
+
+
{% trans "Component Assignment" %}
    @@ -98,8 +98,8 @@ {% if form.custom_fields %}
    -
    -
    {% trans "Custom Fields" %}
    +
    +
    {% trans "Custom Fields" %}
    {% render_custom_fields form %}
    diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html index 193cfa02e..21bc8303d 100644 --- a/netbox/templates/dcim/rack_edit.html +++ b/netbox/templates/dcim/rack_edit.html @@ -4,8 +4,8 @@ {% block form %}
    -
    -
    {% trans "Rack" %}
    +
    +
    {% trans "Rack" %}
    {% render_field form.site %} {% render_field form.location %} @@ -17,8 +17,8 @@
    -
    -
    {% trans "Inventory Control" %}
    +
    +
    {% trans "Inventory Control" %}
    {% render_field form.facility_id %} {% render_field form.serial %} @@ -26,16 +26,16 @@
    -
    -
    {% trans "Tenancy" %}
    +
    +
    {% trans "Tenancy" %}
    {% render_field form.tenant_group %} {% render_field form.tenant %}
    -
    -
    {% trans "Dimensions" %}
    +
    +
    {% trans "Dimensions" %}
    {% render_field form.type %} {% render_field form.width %} @@ -77,8 +77,8 @@ {% if form.custom_fields %}
    -
    -
    {% trans "Custom Fields" %}
    +
    +
    {% trans "Custom Fields" %}
    {% render_custom_fields form %}
    diff --git a/netbox/templates/dcim/virtualchassis_add.html b/netbox/templates/dcim/virtualchassis_add.html index 052eb3b86..444878701 100644 --- a/netbox/templates/dcim/virtualchassis_add.html +++ b/netbox/templates/dcim/virtualchassis_add.html @@ -4,8 +4,8 @@ {% block form %}
    -
    -
    {% trans "Virtual Chassis" %}
    +
    +
    {% trans "Virtual Chassis" %}
    {% render_field form.name %} {% render_field form.domain %} @@ -14,8 +14,8 @@
    -
    -
    {% trans "Member Devices" %}
    +
    +
    {% trans "Member Devices" %}
    {% render_field form.region %} {% render_field form.site_group %} @@ -27,8 +27,8 @@ {% if form.custom_fields %}
    -
    -
    {% trans "Custom Fields" %}
    +
    +
    {% trans "Custom Fields" %}
    {% render_custom_fields form %}
    diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html index ca80f0071..5aff4a4cd 100644 --- a/netbox/templates/dcim/virtualchassis_edit.html +++ b/netbox/templates/dcim/virtualchassis_edit.html @@ -21,8 +21,8 @@ {{ pk_form.pk }} {{ formset.management_form }}
    -
    -
    {% trans "Virtual Chassis" %}
    +
    +
    {% trans "Virtual Chassis" %}
    {% render_field vc_form.name %} {% render_field vc_form.domain %} @@ -37,8 +37,8 @@ {% if vc_form.custom_fields %}
    -
    -
    {% trans "Custom Fields" %}
    +
    +
    {% trans "Custom Fields" %}
    {% render_custom_fields vc_form %}
    diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html index 9a1c47530..9aa606dc3 100644 --- a/netbox/templates/extras/script.html +++ b/netbox/templates/extras/script.html @@ -20,8 +20,8 @@ {% for group, fields in script.get_fieldsets %} {% if fields %}
    -
    -
    {{ group }}
    +
    +
    {{ group }}
    {% for name in fields %} {% with field=form|getfield:name %} diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html index 33eb9e798..adfc4408b 100644 --- a/netbox/templates/generic/bulk_edit.html +++ b/netbox/templates/generic/bulk_edit.html @@ -57,8 +57,8 @@ Context: {# Render grouped fields according to declared fieldsets #} {% for group, fields in form.fieldsets %}
    -
    -
    +
    +
    {% if group %}{{ group }}{% else %}{{ model|meta:"verbose_name"|bettertitle }}{% endif %}
    @@ -77,8 +77,8 @@ Context: {# Render tag add/remove fields #} {% if form.add_tags and form.remove_tags %}
    -
    -
    {% trans "Tags" %}
    +
    +
    {% trans "Tags" %}
    {% render_field form.add_tags %} {% render_field form.remove_tags %} @@ -88,8 +88,8 @@ Context: {# Render custom fields #} {% if form.custom_fields %}
    -
    -
    {% trans "Custom Fields" %}
    +
    +
    {% trans "Custom Fields" %}
    {% render_custom_fields form %}
    @@ -98,8 +98,8 @@ Context: {# Render comments #} {% if form.comments %}
    -
    -
    {% trans "Comments" %}
    +
    +
    {% trans "Comments" %}
    {% render_field form.comments bulk_nullable=True %}
    diff --git a/netbox/templates/htmx/form.html b/netbox/templates/htmx/form.html index 5cbbdcc42..3aafc2a21 100644 --- a/netbox/templates/htmx/form.html +++ b/netbox/templates/htmx/form.html @@ -12,8 +12,8 @@ {% for group, fields in form.fieldsets %}
    {% if group %} -
    -
    {{ group }}
    +
    +
    {{ group }}
    {% endif %} {% for name in fields %} @@ -28,8 +28,8 @@ {% if form.custom_fields %}
    -
    -
    {% trans "Custom Fields" %}
    +
    +
    {% trans "Custom Fields" %}
    {% render_custom_fields form %}
    diff --git a/netbox/templates/ipam/fhrpgroupassignment_edit.html b/netbox/templates/ipam/fhrpgroupassignment_edit.html index cd3756511..bbc1505f2 100644 --- a/netbox/templates/ipam/fhrpgroupassignment_edit.html +++ b/netbox/templates/ipam/fhrpgroupassignment_edit.html @@ -4,8 +4,8 @@ {% block form %}
    -
    -
    {% trans "FHRP Group Assignment" %}
    +
    +
    {% trans "FHRP Group Assignment" %}
    diff --git a/netbox/templates/ipam/ipaddress_bulk_add.html b/netbox/templates/ipam/ipaddress_bulk_add.html index c3d82a8ea..e4764fd33 100644 --- a/netbox/templates/ipam/ipaddress_bulk_add.html +++ b/netbox/templates/ipam/ipaddress_bulk_add.html @@ -11,8 +11,8 @@ {% block form %}
    -
    -
    {% trans "IP Addresses" %}
    +
    +
    {% trans "IP Addresses" %}
    {% render_field form.pattern %} {% render_field model_form.status %} @@ -23,16 +23,16 @@
    -
    -
    {% trans "Tenancy" %}
    +
    +
    {% trans "Tenancy" %}
    {% render_field model_form.tenant_group %} {% render_field model_form.tenant %}
    {% if model_form.custom_fields %}
    -
    -
    {% trans "Custom Fields" %}
    +
    +
    {% trans "Custom Fields" %}
    {% render_custom_fields model_form %}
    diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html index 7d79d0e29..93045761f 100644 --- a/netbox/templates/ipam/ipaddress_edit.html +++ b/netbox/templates/ipam/ipaddress_edit.html @@ -10,8 +10,8 @@ {% block form %}
    -
    -
    {% trans "IP Address" %}
    +
    +
    {% trans "IP Address" %}
    {% render_field form.address %} {% render_field form.status %} @@ -23,19 +23,19 @@
    -
    -
    {% trans "Tenancy" %}
    +
    +
    {% trans "Tenancy" %}
    {% render_field form.tenant_group %} {% render_field form.tenant %}
    -
    -
    {% trans "Interface Assignment" %}
    +
    +
    {% trans "Interface Assignment" %}
    -
    -
    +
    +
    -
    -
    {% trans "NAT IP (Inside" %})
    +
    +
    {% trans "NAT IP (Inside" %})
    -
    +
    {% render_field form.nat_inside %}
    @@ -84,8 +84,8 @@ {% if form.custom_fields %}
    -
    -
    {% trans "Custom Fields" %}
    +
    +
    {% trans "Custom Fields" %}
    {% render_custom_fields form %}
    diff --git a/netbox/templates/ipam/service_create.html b/netbox/templates/ipam/service_create.html index d3aa6ad27..73033f687 100644 --- a/netbox/templates/ipam/service_create.html +++ b/netbox/templates/ipam/service_create.html @@ -4,13 +4,13 @@ {% block form %}
    -
    -
    {% trans "Service" %}
    +
    +
    {% trans "Service" %}
    {# Device/VM selection #} -
    -
    +
    +
    {# Template or custom #} -
    -
    +
    +
    {% if form.custom_fields %} -
    -
    {% trans "Custom Fields" %}
    +
    +
    {% trans "Custom Fields" %}
    {% render_custom_fields form %} {% endif %} diff --git a/netbox/templates/ipam/service_edit.html b/netbox/templates/ipam/service_edit.html index 1e5fe1a48..c0f1f21a2 100644 --- a/netbox/templates/ipam/service_edit.html +++ b/netbox/templates/ipam/service_edit.html @@ -4,12 +4,12 @@ {% block form %}
    -
    -
    {% trans "Service" %}
    +
    +
    {% trans "Service" %}
    -
    -
    +
    +
    {% if form.custom_fields %} -
    -
    {% trans "Custom Fields" %}
    +
    +
    {% trans "Custom Fields" %}
    {% render_custom_fields form %} {% endif %} diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html index 169f014e0..145fb060e 100644 --- a/netbox/templates/ipam/vlan_edit.html +++ b/netbox/templates/ipam/vlan_edit.html @@ -6,8 +6,8 @@ {% block form %}
    -
    -
    {% trans "VLAN" %}
    +
    +
    {% trans "VLAN" %}
    {% render_field form.vid %} {% render_field form.name %} @@ -18,20 +18,20 @@
    -
    -
    {% trans "Tenancy" %}
    +
    +
    {% trans "Tenancy" %}
    {% render_field form.tenant_group %} {% render_field form.tenant %}
    -
    -
    {% trans "Assignment" %}
    +
    +
    {% trans "Assignment" %}
    {% with site_tab_active=form.initial.site %} -
    -
    +
    +