From e0bf25dea018a55747c2c731b969e8e4be84f595 Mon Sep 17 00:00:00 2001 From: Andrew Gormley Date: Wed, 10 Jul 2024 15:23:12 +0100 Subject: [PATCH] fixed #16849: h elements not in sequential order --- netbox/templates/500.html | 4 +-- netbox/templates/account/password.html | 2 +- netbox/templates/account/preferences.html | 4 +-- netbox/templates/account/profile.html | 6 ++-- netbox/templates/account/token.html | 2 +- netbox/templates/base/40x.html | 4 +-- netbox/templates/circuits/circuit.html | 2 +- netbox/templates/circuits/circuittype.html | 2 +- .../circuits/inc/circuit_termination.html | 4 +-- netbox/templates/circuits/provider.html | 6 ++-- .../templates/circuits/provideraccount.html | 4 +-- .../templates/circuits/providernetwork.html | 4 +-- netbox/templates/core/configrevision.html | 4 +-- netbox/templates/core/datafile.html | 4 +-- netbox/templates/core/datasource.html | 6 ++-- netbox/templates/core/job.html | 6 ++-- netbox/templates/core/objectchange.html | 10 +++---- netbox/templates/core/rq_task.html | 2 +- netbox/templates/core/rq_worker.html | 2 +- netbox/templates/core/system.html | 6 ++-- netbox/templates/dcim/cable.html | 6 ++-- netbox/templates/dcim/cable_trace.html | 2 +- netbox/templates/dcim/consoleport.html | 4 +-- netbox/templates/dcim/consoleserverport.html | 4 +-- netbox/templates/dcim/device.html | 20 ++++++------- .../templates/dcim/device/render_config.html | 6 ++-- netbox/templates/dcim/device_edit.html | 30 +++++++++---------- netbox/templates/dcim/devicebay.html | 4 +-- netbox/templates/dcim/devicebay_populate.html | 2 +- netbox/templates/dcim/devicerole.html | 2 +- netbox/templates/dcim/devicetype.html | 2 +- netbox/templates/dcim/frontport.html | 4 +-- netbox/templates/dcim/htmx/cable_edit.html | 12 ++++---- .../dcim/inc/panels/inventory_items.html | 4 +-- netbox/templates/dcim/interface.html | 18 +++++------ netbox/templates/dcim/inventoryitem.html | 2 +- netbox/templates/dcim/inventoryitemrole.html | 2 +- netbox/templates/dcim/location.html | 10 +++---- netbox/templates/dcim/manufacturer.html | 2 +- netbox/templates/dcim/module.html | 2 +- netbox/templates/dcim/modulebay.html | 4 +-- netbox/templates/dcim/moduletype.html | 2 +- .../dcim/moduletype/component_templates.html | 2 +- netbox/templates/dcim/platform.html | 2 +- netbox/templates/dcim/powerfeed.html | 6 ++-- netbox/templates/dcim/poweroutlet.html | 4 +-- netbox/templates/dcim/powerpanel.html | 4 +-- netbox/templates/dcim/powerport.html | 4 +-- netbox/templates/dcim/rack.html | 4 +-- netbox/templates/dcim/rackreservation.html | 4 +-- netbox/templates/dcim/rackrole.html | 2 +- netbox/templates/dcim/rearport.html | 4 +-- netbox/templates/dcim/region.html | 6 ++-- netbox/templates/dcim/site.html | 10 +++---- netbox/templates/dcim/sitegroup.html | 6 ++-- netbox/templates/dcim/virtualchassis.html | 6 ++-- netbox/templates/dcim/virtualchassis_add.html | 6 ++-- .../dcim/virtualchassis_add_member.html | 2 +- .../templates/dcim/virtualchassis_edit.html | 6 ++-- .../templates/dcim/virtualdevicecontext.html | 4 +-- netbox/templates/extras/configcontext.html | 4 +-- netbox/templates/extras/configtemplate.html | 6 ++-- netbox/templates/extras/customfield.html | 10 +++---- .../extras/customfieldchoiceset.html | 4 +-- netbox/templates/extras/customlink.html | 12 ++++---- netbox/templates/extras/eventrule.html | 12 ++++---- netbox/templates/extras/exporttemplate.html | 6 ++-- .../templates/extras/htmx/script_result.html | 6 ++-- .../extras/inc/configcontext_data.html | 4 +-- netbox/templates/extras/journalentry.html | 2 +- .../extras/object_configcontext.html | 4 +-- netbox/templates/extras/object_journal.html | 2 +- netbox/templates/extras/savedfilter.html | 8 ++--- netbox/templates/extras/script.html | 2 +- netbox/templates/extras/script_list.html | 4 +-- netbox/templates/extras/tag.html | 8 ++--- netbox/templates/extras/webhook.html | 14 ++++----- netbox/templates/generic/_base.html | 2 +- .../templates/generic/bulk_add_component.html | 2 +- netbox/templates/generic/bulk_edit.html | 6 ++-- netbox/templates/generic/bulk_import.html | 2 +- netbox/templates/generic/bulk_rename.html | 2 +- .../templates/generic/confirmation_form.html | 2 +- netbox/templates/htmx/form.html | 2 +- netbox/templates/inc/panel_table.html | 2 +- netbox/templates/inc/panels/comments.html | 4 +-- .../templates/inc/panels/custom_fields.html | 2 +- .../inc/panels/image_attachments.html | 4 +-- .../templates/inc/panels/related_objects.html | 2 +- netbox/templates/inc/panels/tags.html | 2 +- netbox/templates/ipam/aggregate.html | 2 +- netbox/templates/ipam/asn.html | 2 +- netbox/templates/ipam/asnrange.html | 2 +- netbox/templates/ipam/fhrpgroup.html | 8 ++--- .../ipam/inc/panels/fhrp_groups.html | 4 +-- netbox/templates/ipam/ipaddress.html | 4 +-- netbox/templates/ipam/ipaddress_assign.html | 2 +- netbox/templates/ipam/ipaddress_bulk_add.html | 6 ++-- netbox/templates/ipam/iprange.html | 2 +- netbox/templates/ipam/prefix.html | 6 ++-- netbox/templates/ipam/rir.html | 2 +- netbox/templates/ipam/role.html | 2 +- netbox/templates/ipam/routetarget.html | 10 +++---- netbox/templates/ipam/service.html | 2 +- netbox/templates/ipam/servicetemplate.html | 2 +- netbox/templates/ipam/vlan.html | 6 ++-- netbox/templates/ipam/vlan_edit.html | 8 ++--- netbox/templates/ipam/vlangroup.html | 2 +- netbox/templates/ipam/vrf.html | 2 +- netbox/templates/tenancy/contact.html | 4 +-- netbox/templates/tenancy/contactgroup.html | 6 ++-- netbox/templates/tenancy/contactrole.html | 2 +- netbox/templates/tenancy/tenant.html | 2 +- netbox/templates/tenancy/tenantgroup.html | 6 ++-- netbox/templates/users/group.html | 6 ++-- netbox/templates/users/objectpermission.html | 12 ++++---- netbox/templates/users/token.html | 2 +- netbox/templates/users/user.html | 8 ++--- netbox/templates/virtualization/cluster.html | 4 +-- .../virtualization/clustergroup.html | 2 +- .../templates/virtualization/clustertype.html | 2 +- .../templates/virtualization/virtualdisk.html | 2 +- .../virtualization/virtualmachine.html | 14 ++++----- .../virtualmachine/render_config.html | 4 +-- .../templates/virtualization/vminterface.html | 6 ++-- netbox/templates/vpn/ikepolicy.html | 4 +-- netbox/templates/vpn/ikeproposal.html | 2 +- netbox/templates/vpn/ipsecpolicy.html | 4 +-- netbox/templates/vpn/ipsecprofile.html | 6 ++-- netbox/templates/vpn/ipsecproposal.html | 2 +- netbox/templates/vpn/l2vpn.html | 6 ++-- netbox/templates/vpn/l2vpntermination.html | 2 +- netbox/templates/vpn/tunnel.html | 6 ++-- netbox/templates/vpn/tunnelgroup.html | 2 +- netbox/templates/vpn/tunneltermination.html | 4 +-- .../wireless/inc/authentication_attrs.html | 2 +- netbox/templates/wireless/wirelesslan.html | 4 +-- .../templates/wireless/wirelesslangroup.html | 6 ++-- netbox/templates/wireless/wirelesslink.html | 6 ++-- .../form_helpers/render_fieldset.html | 2 +- 140 files changed, 333 insertions(+), 333 deletions(-) diff --git a/netbox/templates/500.html b/netbox/templates/500.html index b26b61973..b3433b829 100644 --- a/netbox/templates/500.html +++ b/netbox/templates/500.html @@ -14,9 +14,9 @@
-
+

{% trans "Server Error" %} -

+
{% block message %}

diff --git a/netbox/templates/account/password.html b/netbox/templates/account/password.html index 002ecadc7..38d0403c1 100644 --- a/netbox/templates/account/password.html +++ b/netbox/templates/account/password.html @@ -8,7 +8,7 @@

{% csrf_token %}
-
{% trans "Password" %}
+

{% trans "Password" %}

{% render_field form.old_password %} {% render_field form.new_password1 %} {% render_field form.new_password2 %} diff --git a/netbox/templates/account/preferences.html b/netbox/templates/account/preferences.html index 0276b9adb..07df7c3f0 100644 --- a/netbox/templates/account/preferences.html +++ b/netbox/templates/account/preferences.html @@ -19,7 +19,7 @@ {% if plugin_fields %}
-
{% trans "Plugins" %}
+

{% trans "Plugins" %}

{% for name in plugin_fields %} {% render_field form|getfield:name %} @@ -31,7 +31,7 @@ {# Table configurations #}
-
{% trans "Table Configurations" %}
+

{% trans "Table Configurations" %}

{% if request.user.config.data.tables %} diff --git a/netbox/templates/account/profile.html b/netbox/templates/account/profile.html index 6a58450e0..a9cda8da7 100644 --- a/netbox/templates/account/profile.html +++ b/netbox/templates/account/profile.html @@ -9,7 +9,7 @@
-
{% trans "Account Details" %}
+

{% trans "Account Details" %}

@@ -50,7 +50,7 @@
-
{% trans "Assigned Groups" %}
+

{% trans "Assigned Groups" %}

    {% for group in request.user.groups.all %}
  • {{ group }}
  • @@ -65,7 +65,7 @@
    -
    {% trans "Recent Activity" %}
    +

    {% trans "Recent Activity" %}

    {% render_table changelog_table 'inc/table.html' %}
    diff --git a/netbox/templates/account/token.html b/netbox/templates/account/token.html index 7001d6a14..35ff2ab88 100644 --- a/netbox/templates/account/token.html +++ b/netbox/templates/account/token.html @@ -16,7 +16,7 @@
    -
    {% trans "Token" %}
    +

    {% trans "Token" %}

{% trans "Username" %}
diff --git a/netbox/templates/base/40x.html b/netbox/templates/base/40x.html index d14882964..fabc6237d 100644 --- a/netbox/templates/base/40x.html +++ b/netbox/templates/base/40x.html @@ -7,9 +7,9 @@
-
+

{{ request_path }} -

+
{% block message %}{% endblock %}
diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index fb3d8185a..3e3480275 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -12,7 +12,7 @@
-
{% trans "Circuit" %}
+

{% trans "Circuit" %}

{% trans "Key" %}
diff --git a/netbox/templates/circuits/circuittype.html b/netbox/templates/circuits/circuittype.html index 2f63eaf8a..99769cd6c 100644 --- a/netbox/templates/circuits/circuittype.html +++ b/netbox/templates/circuits/circuittype.html @@ -16,7 +16,7 @@
-
{% trans "Circuit Type" %}
+

{% trans "Circuit Type" %}

{% trans "Provider" %}
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index acec208c0..fa76bfe92 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -2,7 +2,7 @@ {% load i18n %}
-
+

{% blocktrans %}Termination{% endblocktrans %} {{ side }}
{% if not termination and perms.circuits.add_circuittermination %} @@ -24,7 +24,7 @@ {% endif %}
-

+ {% if termination %}
{% trans "Name" %}
{% include 'circuits/inc/circuit_termination_fields.html' with termination=termination %} diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index 44ec1e4af..32b886ac0 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -17,7 +17,7 @@
-
{% trans "Provider" %}
+

{% trans "Provider" %}

@@ -48,13 +48,13 @@
-
{% trans "Provider Accounts" %}
+

{% trans "Provider Accounts" %}

{% htmx_table 'circuits:provideraccount_list' provider_id=object.pk %}
-
{% trans "Circuits" %}
+

{% trans "Circuits" %}

{% htmx_table 'circuits:circuit_list' provider_id=object.pk %}
{% plugin_full_width_page object %} diff --git a/netbox/templates/circuits/provideraccount.html b/netbox/templates/circuits/provideraccount.html index 9042bd98a..37c5a754f 100644 --- a/netbox/templates/circuits/provideraccount.html +++ b/netbox/templates/circuits/provideraccount.html @@ -14,7 +14,7 @@
-
{% trans "Provider Account" %}
+

{% trans "Provider Account" %}

{% trans "ASNs" %}
@@ -41,7 +41,7 @@
-
{% trans "Circuits" %}
+

{% trans "Circuits" %}

{% htmx_table 'circuits:circuit_list' provider_account_id=object.pk %}
{% plugin_full_width_page object %} diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html index f074db590..2722d57b6 100644 --- a/netbox/templates/circuits/providernetwork.html +++ b/netbox/templates/circuits/providernetwork.html @@ -14,7 +14,7 @@
-
{% trans "Provider Network" %}
+

{% trans "Provider Network" %}

{% trans "Provider" %}
@@ -47,7 +47,7 @@
-
{% trans "Circuits" %}
+

{% trans "Circuits" %}

{% htmx_table 'circuits:circuit_list' provider_network_id=object.pk %}
{% plugin_full_width_page object %} diff --git a/netbox/templates/core/configrevision.html b/netbox/templates/core/configrevision.html index 71831e161..1b6ed191b 100644 --- a/netbox/templates/core/configrevision.html +++ b/netbox/templates/core/configrevision.html @@ -32,12 +32,12 @@
-
{% trans "Configuration Data" %}
+

{% trans "Configuration Data" %}

{% include 'core/inc/config_data.html' with config=object.data %}
-
{% trans "Comment" %}
+

{% trans "Comment" %}

{{ object.comment|placeholder }}
diff --git a/netbox/templates/core/datafile.html b/netbox/templates/core/datafile.html index db83d8378..5e7385bae 100644 --- a/netbox/templates/core/datafile.html +++ b/netbox/templates/core/datafile.html @@ -21,7 +21,7 @@
-
{% trans "Data File" %}
+

{% trans "Data File" %}

{% trans "Provider" %}
@@ -52,7 +52,7 @@
{% trans "Source" %}
-
{% trans "Content" %}
+

{% trans "Content" %}

{{ object.data_as_string }}
diff --git a/netbox/templates/core/datasource.html b/netbox/templates/core/datasource.html index 3b5f86490..82b0c3870 100644 --- a/netbox/templates/core/datasource.html +++ b/netbox/templates/core/datasource.html @@ -28,7 +28,7 @@
-
{% trans "Data Source" %}
+

{% trans "Data Source" %}

@@ -81,7 +81,7 @@
-
{% trans "Backend" %}
+

{% trans "Backend" %}

{% with backend=object.backend_class %}
{% trans "Name" %}
{% for name, field in backend.parameters.items %} @@ -111,7 +111,7 @@
-
{% trans "Files" %}
+

{% trans "Files" %}

{% htmx_table 'core:datafile_list' source_id=object.pk %}
{% plugin_full_width_page object %} diff --git a/netbox/templates/core/job.html b/netbox/templates/core/job.html index 1c67791b8..7b68d3a82 100644 --- a/netbox/templates/core/job.html +++ b/netbox/templates/core/job.html @@ -14,7 +14,7 @@
-
{% trans "Job" %}
+

{% trans "Job" %}

@@ -45,7 +45,7 @@
-
{% trans "Scheduling" %}
+

{% trans "Scheduling" %}

{% trans "Object Type" %}
@@ -75,7 +75,7 @@
-
{% trans "Data" %}
+

{% trans "Data" %}

{{ object.data|json }}
diff --git a/netbox/templates/core/objectchange.html b/netbox/templates/core/objectchange.html index 6613adb22..54738a4fa 100644 --- a/netbox/templates/core/objectchange.html +++ b/netbox/templates/core/objectchange.html @@ -26,7 +26,7 @@
-
{% trans "Change" %}
+

{% trans "Change" %}

{% trans "Created" %}
@@ -75,7 +75,7 @@
-
+

{% trans "Difference" %} -

+
{% if diff_added == diff_removed %} @@ -108,7 +108,7 @@
-
{% trans "Pre-Change Data" %}
+

{% trans "Pre-Change Data" %}

{% if object.prechange_data %} {% spaceless %} @@ -128,7 +128,7 @@
-
{% trans "Post-Change Data" %}
+

{% trans "Post-Change Data" %}

{% if object.postchange_data %} {% spaceless %} diff --git a/netbox/templates/core/rq_task.html b/netbox/templates/core/rq_task.html index d84bc5a3f..752dedc10 100644 --- a/netbox/templates/core/rq_task.html +++ b/netbox/templates/core/rq_task.html @@ -55,7 +55,7 @@
-
{% trans "Job" %}
+

{% trans "Job" %}

{% trans "Time" %}
diff --git a/netbox/templates/core/rq_worker.html b/netbox/templates/core/rq_worker.html index 4dc4bf91d..abf55a7ee 100644 --- a/netbox/templates/core/rq_worker.html +++ b/netbox/templates/core/rq_worker.html @@ -37,7 +37,7 @@
-
{% trans "Worker" %}
+

{% trans "Worker" %}

{% trans "Queue" %}
diff --git a/netbox/templates/core/system.html b/netbox/templates/core/system.html index 4d133ca53..fe6bd4691 100644 --- a/netbox/templates/core/system.html +++ b/netbox/templates/core/system.html @@ -25,7 +25,7 @@
-
{% trans "System Status" %}
+

{% trans "System Status" %}

{% trans "Name" %}
@@ -82,7 +82,7 @@
-
{% trans "Plugins" %}
+

{% trans "Plugins" %}

{% render_table plugins_table %}
@@ -92,7 +92,7 @@
-
{% trans "Current Configuration" %}
+

{% trans "Current Configuration" %}

{% include 'core/inc/config_data.html' with config=config.data %}
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index 91ca10269..9284bb9c1 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -9,7 +9,7 @@
-
{% trans "Cable" %}
+

{% trans "Cable" %}

{% trans "NetBox release" %}
@@ -65,11 +65,11 @@
-
{% trans "Termination" %} A
+

{% trans "Termination" %} A

{% include 'dcim/inc/cable_termination.html' with terminations=object.a_terminations %}
-
{% trans "Termination" %} B
+

{% trans "Termination" %} B

{% include 'dcim/inc/cable_termination.html' with terminations=object.b_terminations %}
{% plugin_right_page object %} diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html index 92ce9ef19..92521bc56 100644 --- a/netbox/templates/dcim/cable_trace.html +++ b/netbox/templates/dcim/cable_trace.html @@ -82,7 +82,7 @@ {# Related paths #}
-
{% trans "Related Paths" %}
+

{% trans "Related Paths" %}

{% trans "Type" %}
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html index b26f21753..2e84876d0 100644 --- a/netbox/templates/dcim/consoleport.html +++ b/netbox/templates/dcim/consoleport.html @@ -14,7 +14,7 @@
-
{% trans "Console Port" %}
+

{% trans "Console Port" %}

@@ -52,7 +52,7 @@
-
{% trans "Connection" %}
+

{% trans "Connection" %}

{% if object.mark_connected %}
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html index 269615f49..6677fc150 100644 --- a/netbox/templates/dcim/consoleserverport.html +++ b/netbox/templates/dcim/consoleserverport.html @@ -14,7 +14,7 @@
-
{% trans "Console Server Port" %}
+

{% trans "Console Server Port" %}

{% trans "Device" %}
@@ -52,7 +52,7 @@
-
{% trans "Connection" %}
+

{% trans "Connection" %}

{% if object.mark_connected %}
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 50136f7a9..93e91f846 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -12,7 +12,7 @@
-
{% trans "Device" %}
+

{% trans "Device" %}

{% trans "Device" %}
@@ -116,14 +116,14 @@ {% if vc_members %}
-
+

{% trans "Virtual Chassis" %} -

+
{% trans "Region" %}
@@ -154,7 +154,7 @@ {% include 'inc/panels/tags.html' %} {% include 'inc/panels/comments.html' %}
-
+

{% trans "Virtual Device Contexts" %} {% if perms.dcim.add_virtualdevicecontext %}
@@ -163,14 +163,14 @@
{% endif %} -

+ {% htmx_table 'dcim:virtualdevicecontext_list' device_id=object.pk %}
{% plugin_left_page object %}
-
{% trans "Management" %}
+

{% trans "Management" %}

{% trans "Device" %}
@@ -242,7 +242,7 @@ {% if object.powerports.exists and object.poweroutlets.exists %}
-
{% trans "Power Utilization" %}
+

{% trans "Power Utilization" %}

{% trans "Status" %}
@@ -291,7 +291,7 @@ {% endif %}
-
+

{% trans "Services" %} {% if perms.ipam.add_service %}
@@ -300,12 +300,12 @@
{% endif %} -

+ {% htmx_table 'ipam:service_list' device_id=object.pk %}
{% include 'inc/panels/image_attachments.html' %}
-
{% trans "Dimensions" %}
+

{% trans "Dimensions" %}

diff --git a/netbox/templates/dcim/device/render_config.html b/netbox/templates/dcim/device/render_config.html index bf53fdefb..e2d3d6c28 100644 --- a/netbox/templates/dcim/device/render_config.html +++ b/netbox/templates/dcim/device/render_config.html @@ -8,7 +8,7 @@
-
{% trans "Config Template" %}
+

{% trans "Config Template" %}

{% trans "Height" %}
@@ -49,12 +49,12 @@
-
+

{% trans "Rendered Config" %} {% trans "Download" %} -

+ {% if config_template %}
{{ rendered_config }}
{% else %} diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html index 7824ae81b..a867d4379 100644 --- a/netbox/templates/dcim/device_edit.html +++ b/netbox/templates/dcim/device_edit.html @@ -4,30 +4,30 @@ {% block form %} {% render_errors form %} - +
-
{% trans "Device" %}
+

{% trans "Device" %}

{% render_field form.name %} {% render_field form.role %} {% render_field form.description %} {% render_field form.tags %}
- +
-
{% trans "Hardware" %}
+

{% trans "Hardware" %}

{% render_field form.device_type %} {% render_field form.airflow %} {% render_field form.serial %} {% render_field form.asset_tag %}
- +
-
{% trans "Location" %}
+

{% trans "Location" %}

{% render_field form.site %} {% render_field form.location %} @@ -58,10 +58,10 @@ {% render_field form.longitude %} {% endif %}
- +
-
{% trans "Management" %}
+

{% trans "Management" %}

{% render_field form.status %} {% render_field form.platform %} @@ -72,17 +72,17 @@ {% render_field form.oob_ip %} {% endif %}
- +
-
{% trans "Virtualization" %}
+

{% trans "Virtualization" %}

{% render_field form.cluster %}
- +
-
{% trans "Tenancy" %}
+

{% trans "Tenancy" %}

{% render_field form.tenant_group %} {% render_field form.tenant %} @@ -90,7 +90,7 @@
-
{% trans "Virtual Chassis" %}
+

{% trans "Virtual Chassis" %}

{% render_field form.virtual_chassis %} {% render_field form.vc_position %} @@ -100,14 +100,14 @@ {% if form.custom_fields %}
-
{% trans "Custom Fields" %}
+

{% trans "Custom Fields" %}

{% render_custom_fields form %}
{% endif %}
-
{% trans "Local Config Context Data" %}
+

{% trans "Local Config Context Data" %}

{% render_field form.local_context_data %}
diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html index c2173c86c..227ba7c70 100644 --- a/netbox/templates/dcim/devicebay.html +++ b/netbox/templates/dcim/devicebay.html @@ -14,7 +14,7 @@
-
{% trans "Device Bay" %}
+

{% trans "Device Bay" %}

{% trans "Config Template" %}
@@ -40,7 +40,7 @@
-
{% trans "Installed Device" %}
+

{% trans "Installed Device" %}

{% if object.installed_device %} {% with device=object.installed_device %}
{% trans "Device" %}
diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html index b6e7a6560..1aad1116a 100644 --- a/netbox/templates/dcim/devicebay_populate.html +++ b/netbox/templates/dcim/devicebay_populate.html @@ -10,7 +10,7 @@
-
{% block title %}{% trans "Populate" %} {{ device_bay }}{% endblock %}
+

{% block title %}{% trans "Populate" %} {{ device_bay }}{% endblock %}

diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html index 6bb16c894..585234453 100644 --- a/netbox/templates/dcim/devicerole.html +++ b/netbox/templates/dcim/devicerole.html @@ -20,7 +20,7 @@
-
{% trans "Device Role" %}
+

{% trans "Device Role" %}

diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 9709b88a7..af044878f 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -8,7 +8,7 @@
-
{% trans "Chassis" %}
+

{% trans "Chassis" %}

{% trans "Name" %}
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html index 6a3375d39..b630f3579 100644 --- a/netbox/templates/dcim/frontport.html +++ b/netbox/templates/dcim/frontport.html @@ -14,7 +14,7 @@
-
{% trans "Front Port" %}
+

{% trans "Front Port" %}

{% trans "Manufacturer" %}
@@ -66,7 +66,7 @@
-
{% trans "Connection" %}
+

{% trans "Connection" %}

{% if object.mark_connected %}
{% trans "Marked as Connected" %} diff --git a/netbox/templates/dcim/htmx/cable_edit.html b/netbox/templates/dcim/htmx/cable_edit.html index acd7baf0f..617d00881 100644 --- a/netbox/templates/dcim/htmx/cable_edit.html +++ b/netbox/templates/dcim/htmx/cable_edit.html @@ -7,7 +7,7 @@ {# A side termination #}
-
{% trans "A Side" %}
+

{% trans "A Side" %}

{% render_field form.a_terminations_type %} {% if 'termination_a_device' in form.fields %} @@ -27,7 +27,7 @@ {# B side termination #}
-
{% trans "B Side" %}
+

{% trans "B Side" %}

{% render_field form.b_terminations_type %} {% if 'termination_b_device' in form.fields %} @@ -47,7 +47,7 @@ {# Cable attributes #}
-
{% trans "Cable" %}
+

{% trans "Cable" %}

{% render_field form.status %} {% render_field form.type %} @@ -69,7 +69,7 @@
-
{% trans "Tenancy" %}
+

{% trans "Tenancy" %}

{% render_field form.tenant_group %} {% render_field form.tenant %} @@ -78,7 +78,7 @@ {% if form.custom_fields %}
-
{% trans "Custom Fields" %}
+

{% trans "Custom Fields" %}

{% render_custom_fields form %}
@@ -86,7 +86,7 @@ {% if form.comments %}
-
{% trans "Comments" %}
+

{% trans "Comments" %}

{% render_field form.comments %}
{% endif %} diff --git a/netbox/templates/dcim/inc/panels/inventory_items.html b/netbox/templates/dcim/inc/panels/inventory_items.html index 124d4221d..0f499c5bb 100644 --- a/netbox/templates/dcim/inc/panels/inventory_items.html +++ b/netbox/templates/dcim/inc/panels/inventory_items.html @@ -2,7 +2,7 @@ {% load i18n %}
-
+

{% trans "Inventory Items" %} {% if perms.dcim.add_inventoryitem %}
@@ -11,7 +11,7 @@
{% endif %} -

+
{% trans "Device" %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 0c9b639f8..ad2fb14b8 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -24,7 +24,7 @@
-
{% trans "Interface" %}
+

{% trans "Interface" %}

@@ -96,7 +96,7 @@
{% trans "Device" %}
-
{% trans "Related Interfaces" %}
+

{% trans "Related Interfaces" %}

@@ -119,7 +119,7 @@
{% include 'inc/panel_table.html' with table=vdc_table heading="Virtual Device Contexts" %}
-
{% trans "Addressing" %}
+

{% trans "Addressing" %}

{% trans "Parent" %}
@@ -137,7 +137,7 @@ {% if not object.is_virtual %}
-
{% trans "Connection" %}
+

{% trans "Connection" %}

{% if object.mark_connected %}
@@ -207,7 +207,7 @@ {% endif %} {% if object.is_wireless %}
-
{% trans "Wireless" %}
+

{% trans "Wireless" %}

{% with peer=object.connected_endpoints.0 %}
{% trans "MAC Address" %}
@@ -277,7 +277,7 @@ {% endwith %}
-
{% trans "Wireless LANs" %}
+

{% trans "Wireless LANs" %}

@@ -302,7 +302,7 @@ {% endif %} {% if object.is_lag %}
-
{% trans "LAG Members" %}
+

{% trans "LAG Members" %}

@@ -335,7 +335,7 @@
-
+

{% trans "IP Addresses" %} {% if perms.ipam.add_ipaddress %}
@@ -344,7 +344,7 @@
{% endif %} -

+ {% htmx_table 'ipam:ipaddress_list' interface_id=object.pk %}
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html index 29d4c3ef5..ed8a77f30 100644 --- a/netbox/templates/dcim/inventoryitem.html +++ b/netbox/templates/dcim/inventoryitem.html @@ -14,7 +14,7 @@
-
{% trans "Inventory Item" %}
+

{% trans "Inventory Item" %}

diff --git a/netbox/templates/dcim/inventoryitemrole.html b/netbox/templates/dcim/inventoryitemrole.html index 9dd3b5b46..9b720d969 100644 --- a/netbox/templates/dcim/inventoryitemrole.html +++ b/netbox/templates/dcim/inventoryitemrole.html @@ -12,7 +12,7 @@
-
{% trans "Inventory Item Role" %}
+

{% trans "Inventory Item Role" %}

{% trans "Device" %}
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html index 9f2b766ea..19fd83e6c 100644 --- a/netbox/templates/dcim/location.html +++ b/netbox/templates/dcim/location.html @@ -23,7 +23,7 @@
-
{% trans "Location" %}
+

{% trans "Location" %}

{% trans "Name" %}
@@ -73,7 +73,7 @@
-
+

{% trans "Child Locations" %} {% if perms.dcim.add_location %}
@@ -82,11 +82,11 @@
{% endif %} -

+ {% htmx_table 'dcim:location_list' parent_id=object.pk %}
-
+

{% trans "Non-Racked Devices" %} {% if perms.dcim.add_device %}
@@ -95,7 +95,7 @@
{% endif %} -

+ {% htmx_table 'dcim:device_list' location_id=object.pk rack_id='null' parent_bay_id='null' %}
{% plugin_full_width_page object %} diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html index 527dcf399..3524bcd9d 100644 --- a/netbox/templates/dcim/manufacturer.html +++ b/netbox/templates/dcim/manufacturer.html @@ -30,7 +30,7 @@
-
{% trans "Manufacturer" %}
+

{% trans "Manufacturer" %}

{% trans "Name" %}
diff --git a/netbox/templates/dcim/module.html b/netbox/templates/dcim/module.html index 2180a83a3..e25694ddd 100644 --- a/netbox/templates/dcim/module.html +++ b/netbox/templates/dcim/module.html @@ -48,7 +48,7 @@
-
{% trans "Module" %}
+

{% trans "Module" %}

{% trans "Name" %}
diff --git a/netbox/templates/dcim/modulebay.html b/netbox/templates/dcim/modulebay.html index c6e814ffe..ac8bd4566 100644 --- a/netbox/templates/dcim/modulebay.html +++ b/netbox/templates/dcim/modulebay.html @@ -14,7 +14,7 @@
-
{% trans "Module Bay" %}
+

{% trans "Module Bay" %}

{% trans "Device" %}
@@ -46,7 +46,7 @@
{% include 'inc/panels/custom_fields.html' %}
-
{% trans "Installed Module" %}
+

{% trans "Installed Module" %}

{% if object.installed_module %} {% with module=object.installed_module %}
{% trans "Device" %}
diff --git a/netbox/templates/dcim/moduletype.html b/netbox/templates/dcim/moduletype.html index 77feece97..022c4045f 100644 --- a/netbox/templates/dcim/moduletype.html +++ b/netbox/templates/dcim/moduletype.html @@ -8,7 +8,7 @@
-
{% trans "Module Type" %}
+

{% trans "Module Type" %}

diff --git a/netbox/templates/dcim/moduletype/component_templates.html b/netbox/templates/dcim/moduletype/component_templates.html index d67c6e8fb..354c2f8ca 100644 --- a/netbox/templates/dcim/moduletype/component_templates.html +++ b/netbox/templates/dcim/moduletype/component_templates.html @@ -35,7 +35,7 @@ {% else %}
-
{{ title }}
+

{{ title }}

{% include 'htmx/table.html' %}
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html index 07dad3d0e..3d116c7ea 100644 --- a/netbox/templates/dcim/platform.html +++ b/netbox/templates/dcim/platform.html @@ -23,7 +23,7 @@
-
{% trans "Platform" %}
+

{% trans "Platform" %}

{% trans "Manufacturer" %}
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 367683bf0..478fece21 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -18,7 +18,7 @@
-
{% trans "Power Feed" %}
+

{% trans "Power Feed" %}

{% trans "Name" %}
@@ -77,7 +77,7 @@
{% trans "Power Panel" %}
-
{% trans "Electrical Characteristics" %}
+

{% trans "Electrical Characteristics" %}

@@ -107,7 +107,7 @@
-
{% trans "Connection" %}
+

{% trans "Connection" %}

{% if object.mark_connected %}
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html index 0e1b07706..ad2e53a81 100644 --- a/netbox/templates/dcim/poweroutlet.html +++ b/netbox/templates/dcim/poweroutlet.html @@ -14,7 +14,7 @@
-
{% trans "Power Outlet" %}
+

{% trans "Power Outlet" %}

{% trans "Supply" %}
@@ -56,7 +56,7 @@
-
{% trans "Connection" %}
+

{% trans "Connection" %}

{% if object.mark_connected %}
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html index 8866994fe..33b760dcb 100644 --- a/netbox/templates/dcim/powerpanel.html +++ b/netbox/templates/dcim/powerpanel.html @@ -16,7 +16,7 @@
-
{% trans "Power Panel" %}
+

{% trans "Power Panel" %}

{% trans "Device" %}
@@ -48,7 +48,7 @@ {% csrf_token %}
-
{% trans "Power Feeds" %}
+

{% trans "Power Feeds" %}

{% htmx_table 'dcim:powerfeed_list' power_panel_id=object.pk %}
{% trans "Site" %}
@@ -56,7 +56,7 @@
-
{% trans "Connection" %}
+

{% trans "Connection" %}

{% if object.mark_connected %}
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index b28ee6e31..81908b482 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -10,7 +10,7 @@
-
{% trans "Rack" %}
+

{% trans "Rack" %}

{% trans "Device" %}
@@ -70,7 +70,7 @@
{% trans "Region" %}
-
{% trans "Dimensions" %}
+

{% trans "Dimensions" %}

diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html index 63a4da733..84570a62c 100644 --- a/netbox/templates/dcim/rackreservation.html +++ b/netbox/templates/dcim/rackreservation.html @@ -16,7 +16,7 @@
-
{% trans "Rack" %}
+

{% trans "Rack" %}

{% trans "Type" %}
@@ -39,7 +39,7 @@
{% trans "Region" %}
-
{% trans "Reservation Details" %}
+

{% trans "Reservation Details" %}

diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html index 6aa72598e..2e3bb0110 100644 --- a/netbox/templates/dcim/rackrole.html +++ b/netbox/templates/dcim/rackrole.html @@ -16,7 +16,7 @@
-
{% trans "Rack Role" %}
+

{% trans "Rack Role" %}

{% trans "Units" %}
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html index d0d45ac67..304587ddb 100644 --- a/netbox/templates/dcim/rearport.html +++ b/netbox/templates/dcim/rearport.html @@ -14,7 +14,7 @@
-
{% trans "Rear Port" %}
+

{% trans "Rear Port" %}

{% trans "Name" %}
@@ -62,7 +62,7 @@
-
{% trans "Connection" %}
+

{% trans "Connection" %}

{% if object.mark_connected %}
{% trans "Marked as Connected" %} diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html index fd37cc026..97e3451e0 100644 --- a/netbox/templates/dcim/region.html +++ b/netbox/templates/dcim/region.html @@ -23,7 +23,7 @@
-
{% trans "Region" %}
+

{% trans "Region" %}

{% trans "Device" %}
@@ -51,7 +51,7 @@
-
+

{% trans "Child Regions" %} {% if perms.dcim.add_region %}
@@ -60,7 +60,7 @@
{% endif %} -

+ {% htmx_table 'dcim:region_list' parent_id=object.pk %}
{% plugin_full_width_page object %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index ca0937bed..fa3395b60 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -25,7 +25,7 @@
-
{% trans "Site" %}
+

{% trans "Site" %}

{% trans "Name" %}
@@ -123,7 +123,7 @@
-
+

{% trans "Locations" %} {% if perms.dcim.add_location %}
@@ -132,11 +132,11 @@
{% endif %} -

+ {% htmx_table 'dcim:location_list' site_id=object.pk %}
-
+

{% trans "Non-Racked Devices" %} {% if perms.dcim.add_device %}
@@ -145,7 +145,7 @@
{% endif %} -

+ {% htmx_table 'dcim:device_list' site_id=object.pk rack_id='null' parent_bay_id='null' %}
{% plugin_full_width_page object %} diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html index e8b25cdea..0b1b44c73 100644 --- a/netbox/templates/dcim/sitegroup.html +++ b/netbox/templates/dcim/sitegroup.html @@ -23,7 +23,7 @@
-
{% trans "Site Group" %}
+

{% trans "Site Group" %}

{% trans "Region" %}
@@ -51,7 +51,7 @@
-
+

{% trans "Child Groups" %} {% if perms.dcim.add_sitegroup %}
@@ -60,7 +60,7 @@
{% endif %} -

+ {% htmx_table 'dcim:sitegroup_list' parent_id=object.pk %}
{% plugin_full_width_page object %} diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html index 8defd5370..81270f64f 100644 --- a/netbox/templates/dcim/virtualchassis.html +++ b/netbox/templates/dcim/virtualchassis.html @@ -17,7 +17,7 @@
-
{% trans "Virtual Chassis" %}
+

{% trans "Virtual Chassis" %}

{% trans "Name" %}
@@ -49,7 +49,7 @@
-
+

{% trans "Members" %} {% if perms.dcim.change_virtualchassis %}
@@ -58,7 +58,7 @@
{% endif %} -

+
{% trans "Domain" %}
diff --git a/netbox/templates/dcim/virtualchassis_add.html b/netbox/templates/dcim/virtualchassis_add.html index 444878701..1f8e97cb6 100644 --- a/netbox/templates/dcim/virtualchassis_add.html +++ b/netbox/templates/dcim/virtualchassis_add.html @@ -5,7 +5,7 @@ {% block form %}
-
{% trans "Virtual Chassis" %}
+

{% trans "Virtual Chassis" %}

{% render_field form.name %} {% render_field form.domain %} @@ -15,7 +15,7 @@
-
{% trans "Member Devices" %}
+

{% trans "Member Devices" %}

{% render_field form.region %} {% render_field form.site_group %} @@ -28,7 +28,7 @@ {% if form.custom_fields %}
-
{% trans "Custom Fields" %}
+

{% trans "Custom Fields" %}

{% render_custom_fields form %}
diff --git a/netbox/templates/dcim/virtualchassis_add_member.html b/netbox/templates/dcim/virtualchassis_add_member.html index 2c0ba8d9c..09afe7a8c 100644 --- a/netbox/templates/dcim/virtualchassis_add_member.html +++ b/netbox/templates/dcim/virtualchassis_add_member.html @@ -16,7 +16,7 @@ {% csrf_token %}
-
{% trans "Add New Member" %}
+

{% trans "Add New Member" %}

{% render_form member_select_form %} {% render_form membership_form %} diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html index feceadc80..a502209ed 100644 --- a/netbox/templates/dcim/virtualchassis_edit.html +++ b/netbox/templates/dcim/virtualchassis_edit.html @@ -21,7 +21,7 @@ {{ formset.management_form }}
-
{% trans "Virtual Chassis" %}
+

{% trans "Virtual Chassis" %}

{% render_field vc_form.name %} {% render_field vc_form.domain %} @@ -37,14 +37,14 @@ {% if vc_form.custom_fields %}
-
{% trans "Custom Fields" %}
+

{% trans "Custom Fields" %}

{% render_custom_fields vc_form %}
{% endif %}
-
{% trans "Members" %}
+

{% trans "Members" %}

diff --git a/netbox/templates/dcim/virtualdevicecontext.html b/netbox/templates/dcim/virtualdevicecontext.html index c829b13b5..bfed4639e 100644 --- a/netbox/templates/dcim/virtualdevicecontext.html +++ b/netbox/templates/dcim/virtualdevicecontext.html @@ -12,7 +12,7 @@
-
{% trans "Virtual Device Context" %}
+

{% trans "Virtual Device Context" %}

@@ -78,7 +78,7 @@
-
{% trans "Interfaces" %}
+

{% trans "Interfaces" %}

{% htmx_table 'dcim:interface_list' vdc_id=object.pk %}
{% plugin_full_width_page object %} diff --git a/netbox/templates/extras/configcontext.html b/netbox/templates/extras/configcontext.html index f467354b6..204b5c783 100644 --- a/netbox/templates/extras/configcontext.html +++ b/netbox/templates/extras/configcontext.html @@ -7,7 +7,7 @@
-
{% trans "Config Context" %}
+

{% trans "Config Context" %}

{% trans "Name" %}
@@ -57,7 +57,7 @@
{% trans "Name" %}
-
{% trans "Assignment" %}
+

{% trans "Assignment" %}

{% for title, objects in assigned_objects %} diff --git a/netbox/templates/extras/configtemplate.html b/netbox/templates/extras/configtemplate.html index ea96e2ea6..ec0f35edf 100644 --- a/netbox/templates/extras/configtemplate.html +++ b/netbox/templates/extras/configtemplate.html @@ -7,7 +7,7 @@
-
{% trans "Config Template" %}
+

{% trans "Config Template" %}

@@ -53,7 +53,7 @@
-
{% trans "Environment Parameters" %}
+

{% trans "Environment Parameters" %}

{{ object.environment_params }}
@@ -64,7 +64,7 @@
-
{% trans "Template" %}
+

{% trans "Template" %}

{% include 'inc/sync_warning.html' %}
{{ object.template_code }}
diff --git a/netbox/templates/extras/customfield.html b/netbox/templates/extras/customfield.html index fa0986778..9d5e85027 100644 --- a/netbox/templates/extras/customfield.html +++ b/netbox/templates/extras/customfield.html @@ -7,7 +7,7 @@
-
{% trans "Custom Field" %}
+

{% trans "Custom Field" %}

{% trans "Name" %}
@@ -55,7 +55,7 @@
{% trans "Name" %}
-
{% trans "Behavior" %}
+

{% trans "Behavior" %}

@@ -90,7 +90,7 @@
-
{% trans "Object Types" %}
+

{% trans "Object Types" %}

{% trans "Search Weight" %}
{% for ct in object.object_types.all %} @@ -100,7 +100,7 @@
-
{% trans "Validation Rules" %}
+

{% trans "Validation Rules" %}

@@ -127,7 +127,7 @@
{% trans "Minimum Value" %}
-
Related Objects
+

Related Objects