diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index c7a088e8e..560da785c 100644 Binary files a/netbox/project-static/dist/netbox.css and b/netbox/project-static/dist/netbox.css differ diff --git a/netbox/project-static/styles/transitional/_cards.scss b/netbox/project-static/styles/transitional/_cards.scss index 6a7666524..1b619ab9b 100644 --- a/netbox/project-static/styles/transitional/_cards.scss +++ b/netbox/project-static/styles/transitional/_cards.scss @@ -16,6 +16,12 @@ background: var(--#{$prefix}bg-surface-tertiary); } + // Use
font size for card headers + h2.card-header { + @extend h5; + margin-bottom: 0; + } + // Reduce padding .list-group-item { padding: 0.5rem 0.75rem; diff --git a/netbox/project-static/styles/transitional/_forms.scss b/netbox/project-static/styles/transitional/_forms.scss index a489d87de..187b4bbcc 100644 --- a/netbox/project-static/styles/transitional/_forms.scss +++ b/netbox/project-static/styles/transitional/_forms.scss @@ -4,6 +4,13 @@ form.object-edit { max-width: 800px; } +// Use

style for field group headings +.field-group { + h2 { + @extend h4; + } +} + // Set bond font & append an asterisk to labels for required fields .col-form-label.required { font-weight: bold; diff --git a/netbox/templates/500.html b/netbox/templates/500.html index b3433b829..4805e9240 100644 --- a/netbox/templates/500.html +++ b/netbox/templates/500.html @@ -14,7 +14,7 @@
-

+

{% trans "Server Error" %}

diff --git a/netbox/templates/account/password.html b/netbox/templates/account/password.html index 38d0403c1..b2988ddcc 100644 --- a/netbox/templates/account/password.html +++ b/netbox/templates/account/password.html @@ -8,7 +8,9 @@
{% 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 07df7c3f0..da266ace1 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 a9cda8da7..d8be72e08 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 35ff2ab88..f8ce7badd 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 fabc6237d..003da1a75 100644 --- a/netbox/templates/base/40x.html +++ b/netbox/templates/base/40x.html @@ -7,7 +7,7 @@
-

+

{{ request_path }}

diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 3e3480275..36450e4dc 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 99769cd6c..df34c4dea 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 fa76bfe92..49c23e885 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 %} diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index 32b886ac0..cc6672694 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -17,7 +17,7 @@
-

{% trans "Provider" %}

+

{% trans "Provider" %}

{% trans "Name" %}
@@ -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 37c5a754f..9bb2bef20 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 2722d57b6..000548734 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 1b6ed191b..ecb9f1c17 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 5e7385bae..175a0e2bc 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 82b0c3870..1ce14451b 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 7b68d3a82..e9ecb5c96 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 54738a4fa..5b6105587 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" %}
@@ -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 752dedc10..baab5ff8d 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 abf55a7ee..d3f253a54 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 fe6bd4691..7109e54c9 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 9284bb9c1..7ccf6559f 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 92521bc56..f216dc9b5 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 2e84876d0..d6e4188b6 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 6677fc150..1b79a23b2 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 8bd57aa22..1b2488e56 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -12,7 +12,7 @@
-

{% trans "Device" %}

+

{% trans "Device" %}

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

+

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

+

{% trans "Virtual Device Contexts" %} {% if perms.dcim.add_virtualdevicecontext %}
@@ -170,7 +170,7 @@
-

{% trans "Management" %}

+

{% trans "Management" %}

{% trans "Region" %}
@@ -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 %}
@@ -305,7 +305,7 @@
{% 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 e2d3d6c28..785939a83 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,7 +49,7 @@
-

+

{% trans "Rendered Config" %} {% trans "Download" %} diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html index a867d4379..fcf1494b7 100644 --- a/netbox/templates/dcim/device_edit.html +++ b/netbox/templates/dcim/device_edit.html @@ -7,7 +7,7 @@
-

{% trans "Device" %}

+

{% trans "Device" %}

{% render_field form.name %} {% render_field form.role %} @@ -17,7 +17,7 @@
-

{% trans "Hardware" %}

+

{% trans "Hardware" %}

{% render_field form.device_type %} {% render_field form.airflow %} @@ -27,7 +27,7 @@
-

{% trans "Location" %}

+

{% trans "Location" %}

{% render_field form.site %} {% render_field form.location %} @@ -61,7 +61,7 @@
-

{% trans "Management" %}

+

{% trans "Management" %}

{% render_field form.status %} {% render_field form.platform %} @@ -75,14 +75,14 @@
-

{% 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 227ba7c70..c47afcb32 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 1aad1116a..4b89a9dfc 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 585234453..d9e170af3 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 af044878f..08e2f8d63 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 b630f3579..b57c5835d 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 617d00881..6bb4af973 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 0f499c5bb..aea5eae16 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 %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index ad2fb14b8..016a6c890 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -24,7 +24,7 @@
-

{% trans "Interface" %}

+

{% trans "Interface" %}

{% trans "Device" %}
@@ -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 %}
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html index ed8a77f30..44648d53e 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 9b720d969..4cc3c5864 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 19fd83e6c..97dcc20f0 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 %}
@@ -86,7 +86,7 @@ {% htmx_table 'dcim:location_list' parent_id=object.pk %}
-

+

{% trans "Non-Racked Devices" %} {% if perms.dcim.add_device %}
diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html index 3524bcd9d..13c4b1764 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 e25694ddd..ab06c770e 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 ac8bd4566..33b31e288 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 022c4045f..6a65a280b 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 354c2f8ca..9c4d59cba 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 3d116c7ea..76b50fcbb 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 478fece21..fb3609965 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 ad2e53a81..ef02ec52a 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 33b760dcb..c712bbd1f 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 %}
{% if perms.dcim.change_powerfeed %} diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html index cc03ab4f2..7c25b2b5b 100644 --- a/netbox/templates/dcim/powerport.html +++ b/netbox/templates/dcim/powerport.html @@ -14,7 +14,7 @@
-

{% trans "Power Port" %}

+

{% trans "Power Port" %}

{% 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 7b4dae160..a472b838b 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 19481c9a6..f0f25dd83 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 2e3bb0110..5c1ec5e07 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 304587ddb..7d5952c56 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 97e3451e0..1e1b75cd5 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 %}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index fa3395b60..38b740612 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 %}
@@ -136,7 +136,7 @@ {% htmx_table 'dcim:location_list' site_id=object.pk %}
-

+

{% trans "Non-Racked Devices" %} {% if perms.dcim.add_device %}
diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html index 0b1b44c73..3ae43f210 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 %}
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html index 81270f64f..d48306257 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 %}
diff --git a/netbox/templates/dcim/virtualchassis_add.html b/netbox/templates/dcim/virtualchassis_add.html index 1f8e97cb6..d2108fa34 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 09afe7a8c..7926c303d 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 a502209ed..9cc1bb753 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" %}

{% trans "Domain" %}
diff --git a/netbox/templates/dcim/virtualdevicecontext.html b/netbox/templates/dcim/virtualdevicecontext.html index bfed4639e..d7718cc8c 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 204b5c783..e60b3f234 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 ec0f35edf..5218a3b8f 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 b8006948b..f68a83f7d 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