diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html
index 6c09f49ef..da08e7b9c 100644
--- a/netbox/templates/dcim/inc/cable_termination.html
+++ b/netbox/templates/dcim/inc/cable_termination.html
@@ -5,19 +5,19 @@
{% if terminations.0.device %}
{# Device component #}
- {% trans "Site" %} |
+ {% trans "Site" %} |
{{ terminations.0.device.site|linkify }} |
- {% trans "Location" %} |
+ {% trans "Location" %} |
{{ terminations.0.device.location|linkify|placeholder }} |
- {% trans "Rack" %} |
+ {% trans "Rack" %} |
{{ terminations.0.device.rack|linkify|placeholder }} |
- {{ terminations.0|meta:"verbose_name"|capfirst }} |
+ {{ terminations.0|meta:"verbose_name"|capfirst }} |
{% for term in terminations %}
{{term.device|linkify}}
@@ -30,15 +30,15 @@
{% elif terminations.0.power_panel %}
{# Power feed #}
|
- {% trans "Site" %} |
+ {% trans "Site" %} |
{{ terminations.0.power_panel.site|linkify }} |
- {% trans "Power Panel" %} |
+ {% trans "Power Panel" %} |
{{ terminations.0.power_panel|linkify }} |
- {{ terminations.0|meta:"verbose_name"|capfirst }} |
+ {{ terminations.0|meta:"verbose_name"|capfirst }} |
{% for term in terminations %}
{{ term|linkify }}{% if not forloop.last %},{% endif %}
@@ -48,11 +48,11 @@
{% elif terminations.0.circuit %}
{# Circuit termination #}
|
- {% trans "Provider" %} |
+ {% trans "Provider" %} |
{{ terminations.0.circuit.provider|linkify }} |
- {% trans "Circuit" %} |
+ {% trans "Circuit" %} |
{% for term in terminations %}
{{ term.circuit|linkify }} ({{ term }}){% if not forloop.last %},{% endif %}
diff --git a/netbox/templates/dcim/moduletype.html b/netbox/templates/dcim/moduletype.html
index ce382c9fe..500f3b7dc 100644
--- a/netbox/templates/dcim/moduletype.html
+++ b/netbox/templates/dcim/moduletype.html
@@ -12,15 +12,15 @@
- {% trans "Manufacturer" %} |
+ {% trans "Manufacturer" %} |
{{ object.manufacturer|linkify }} |
- {% trans "Model Name" %} |
+ {% trans "Model Name" %} |
{{ object.model }} |
- {% trans "Part Number" %} |
+ {% trans "Part Number" %} |
{{ object.part_number|placeholder }} |
@@ -28,14 +28,14 @@
{{ object.description|placeholder }} |
- {% trans "Weight" %} |
-
- {% if object.weight %}
- {{ object.weight|floatformat }} {{ object.get_weight_unit_display }}
- {% else %}
- {{ ''|placeholder }}
- {% endif %}
- |
+ {% trans "Weight" %} |
+
+ {% if object.weight %}
+ {{ object.weight|floatformat }} {{ object.get_weight_unit_display }}
+ {% else %}
+ {{ ''|placeholder }}
+ {% endif %}
+ |
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 0ee630b31..1d162c4f0 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -12,23 +12,23 @@
- {% trans "Family" %} |
+ {% trans "Family" %} |
IPv{{ object.family }} |
- {% trans "RIR" %} |
+ {% trans "RIR" %} |
{{ object.rir }}
|
- {% trans "Utilization" %} |
+ {% trans "Utilization" %} |
{% utilization_graph object.get_utilization %}
|
- {% trans "Tenant" %} |
+ {% trans "Tenant" %} |
{% if object.tenant.group %}
{{ object.tenant.group|linkify }} /
@@ -37,11 +37,11 @@
|
- {% trans "Date Added" %} |
+ {% trans "Date Added" %} |
{{ object.date_added|annotated_date|placeholder }} |
- {% trans "Description" %} |
+ {% trans "Description" %} |
{{ object.description|placeholder }} |
diff --git a/netbox/templates/ipam/asn.html b/netbox/templates/ipam/asn.html
index 2acbdc968..19f9db444 100644
--- a/netbox/templates/ipam/asn.html
+++ b/netbox/templates/ipam/asn.html
@@ -21,17 +21,17 @@
- {% trans "AS Number" %} |
+ {% trans "AS Number" %} |
{{ object.asn_with_asdot }} |
- {% trans "RIR" %} |
+ {% trans "RIR" %} |
{{ object.rir }}
|
- {% trans "Tenant" %} |
+ {% trans "Tenant" %} |
{% if object.tenant.group %}
{{ object.tenant.group|linkify }} /
@@ -40,7 +40,7 @@
|
- {% trans "Description" %} |
+ {% trans "Description" %} |
{{ object.description|placeholder }} |
diff --git a/netbox/templates/ipam/asnrange.html b/netbox/templates/ipam/asnrange.html
index c0bebd8c2..c8952c1eb 100644
--- a/netbox/templates/ipam/asnrange.html
+++ b/netbox/templates/ipam/asnrange.html
@@ -13,21 +13,21 @@
- {% trans "Name" %} |
+ {% trans "Name" %} |
{{ object.name }} |
- {% trans "RIR" %} |
+ {% trans "RIR" %} |
{{ object.rir }}
|
- {% trans "Range" %} |
+ {% trans "Range" %} |
{{ object.range_as_string }} |
- {% trans "Tenant" %} |
+ {% trans "Tenant" %} |
{% if object.tenant.group %}
{{ object.tenant.group|linkify }} /
@@ -36,7 +36,7 @@
|
- {% trans "Description" %} |
+ {% trans "Description" %} |
{{ object.description|placeholder }} |
diff --git a/netbox/templates/ipam/fhrpgroup.html b/netbox/templates/ipam/fhrpgroup.html
index 9ab718a52..3e8e6490b 100644
--- a/netbox/templates/ipam/fhrpgroup.html
+++ b/netbox/templates/ipam/fhrpgroup.html
@@ -20,19 +20,19 @@
- {% trans "Protocol" %} |
+ {% trans "Protocol" %} |
{{ object.get_protocol_display }} |
- {% trans "Group ID" %} |
+ {% trans "Group ID" %} |
{{ object.group_id }} |
- {% trans "Name" %} |
+ {% trans "Name" %} |
{{ object.name|placeholder }} |
- {% trans "Description" %} |
+ {% trans "Description" %} |
{{ object.description|placeholder }} |
@@ -52,11 +52,11 @@
- {% trans "Authentication Type" %} |
+ {% trans "Authentication Type" %} |
{{ object.get_auth_type_display|placeholder }} |
- {% trans "Authentication Key" %} |
+ {% trans "Authentication Key" %} |
{{ object.auth_key|placeholder }} |
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 5021dabbd..862e7e3e2 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -98,11 +98,11 @@
- Primary IP |
+ Primary IP |
{% checkmark object.is_primary_ip %} |
- OOB IP |
+ OOB IP |
{% checkmark object.is_oob_ip %} |
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index 7049a6a2a..48c1cc526 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -129,7 +129,7 @@
|
{% endwith %}
- {% trans "First available IP" %} |
+ {% trans "First available IP" %} |
{% with first_available_ip=object.get_first_available_ip %}
{% if first_available_ip %}
@@ -184,19 +184,19 @@
- {% trans "Network Address" %} |
+ {% trans "Network Address" %} |
{{ object.prefix.network }} |
- {% trans "Network Mask" %} |
+ {% trans "Network Mask" %} |
{{ object.prefix.netmask }} |
- {% trans "Wildcard Mask" %} |
+ {% trans "Wildcard Mask" %} |
{{ object.prefix.hostmask }} |
- {% trans "Broadcast Address" %} |
+ {% trans "Broadcast Address" %} |
{{ object.prefix.broadcast }} |
diff --git a/netbox/templates/tenancy/contact.html b/netbox/templates/tenancy/contact.html
index 9db91a47b..04f3eec0e 100644
--- a/netbox/templates/tenancy/contact.html
+++ b/netbox/templates/tenancy/contact.html
@@ -19,19 +19,19 @@
- {% trans "Group" %} |
+ {% trans "Group" %} |
{{ object.group|linkify|placeholder }} |
- {% trans "Name" %} |
+ {% trans "Name" %} |
{{ object.name }} |
- {% trans "Title" %} |
+ {% trans "Title" %} |
{{ object.title|placeholder }} |
- {% trans "Phone" %} |
+ {% trans "Phone" %} |
{% if object.phone %}
{{ object.phone }}
@@ -41,7 +41,7 @@
|
- {% trans "Email" %} |
+ {% trans "Email" %} |
{% if object.email %}
{{ object.email }}
@@ -51,11 +51,11 @@
|
- {% trans "Address" %} |
+ {% trans "Address" %} |
{{ object.address|linebreaksbr|placeholder }} |
- {% trans "Link" %} |
+ {% trans "Link" %} |
{% if object.link %}
{{ object.link }}
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index 7e4c17025..da16637fc 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -18,11 +18,11 @@
- {% trans "Group" %} |
+ {% trans "Group" %} |
{{ object.group|linkify|placeholder }} |
- {% trans "Description" %} |
+ {% trans "Description" %} |
{{ object.description|placeholder }} |
diff --git a/netbox/templates/wireless/inc/wirelesslink_interface.html b/netbox/templates/wireless/inc/wirelesslink_interface.html
index 322b1225a..f1440a4fc 100644
--- a/netbox/templates/wireless/inc/wirelesslink_interface.html
+++ b/netbox/templates/wireless/inc/wirelesslink_interface.html
@@ -3,27 +3,27 @@
- {% trans "Device" %} |
+ {% trans "Device" %} |
{{ interface.device|linkify }} |
- {% trans "Interface" %} |
+ {% trans "Interface" %} |
{{ interface|linkify }} |
- {% trans "Type" %} |
+ {% trans "Type" %} |
{{ interface.get_type_display }}
|
- {% trans "Role" %} |
+ {% trans "Role" %} |
{{ interface.get_rf_role_display|placeholder }}
|
- {% trans "Channel" %} |
+ {% trans "Channel" %} |
{{ interface.get_rf_channel_display|placeholder }}
|
diff --git a/netbox/templates/wireless/wirelesslan.html b/netbox/templates/wireless/wirelesslan.html
index dcd42d365..82abc2f74 100644
--- a/netbox/templates/wireless/wirelesslan.html
+++ b/netbox/templates/wireless/wirelesslan.html
@@ -16,11 +16,11 @@
{{ object.ssid }} |
- {% trans "Group" %} |
+ {% trans "Group" %} |
{{ object.group|linkify|placeholder }} |
- {% trans "Status" %} |
+ {% trans "Status" %} |
{% badge object.get_status_display bg_color=object.get_status_color %} |
| |