diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 86187e5ab..dde053ee0 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -90,8 +90,7 @@ {% if circuit.tenant %} {% if circuit.tenant.group %} - {{ circuit.tenant.group }} - + {{ circuit.tenant.group }} / {% endif %} {{ circuit.tenant }} {% else %} diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index 759d1043c..aaeb114eb 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -30,8 +30,7 @@ Site {% if termination.site.region %} - {{ termination.site.region }} - + {{ termination.site.region }} / {% endif %} {{ termination.site }} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 583275333..82e34c861 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -162,8 +162,7 @@ Site {% if device.site.region %} - {{ device.site.region }} - + {{ device.site.region }} / {% endif %} {{ device.site }} @@ -173,8 +172,7 @@ {% if device.rack %} {% if device.rack.group %} - {{ device.rack.group }} - + {{ device.rack.group }} / {% endif %} {{ device.rack }} {% else %} @@ -187,7 +185,7 @@ {% if device.parent_bay %} {% with device.parent_bay.device as parent %} - {{ parent }} {{ device.parent_bay }} + {{ parent }} / {{ device.parent_bay }} {% if parent.position %} (U{{ parent.position }} / {{ parent.get_face_display }}) {% endif %} @@ -206,8 +204,7 @@ {% if device.tenant %} {% if device.tenant.group %} - {{ device.tenant.group }} - + {{ device.tenant.group }} / {% endif %} {{ device.tenant }} {% else %} @@ -323,8 +320,7 @@ Cluster {% if device.cluster.group %} - {{ device.cluster.group }} - + {{ device.cluster.group }} / {% endif %} {{ device.cluster }} diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index e4924fbc5..e18f592cd 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -83,8 +83,7 @@ Site {% if rack.site.region %} - {{ rack.site.region }} - + {{ rack.site.region }} / {% endif %} {{ rack.site }} @@ -94,7 +93,7 @@ {% if rack.group %} {% for group in rack.group.get_ancestors %} - {{ group }} + {{ group }} / {% endfor %} {{ rack.group }} {% else %} @@ -111,8 +110,7 @@ {% if rack.tenant %} {% if rack.tenant.group %} - {{ rack.tenant.group }} - + {{ rack.tenant.group }} / {% endif %} {{ rack.tenant }} {% else %} diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html index 3a6f591a5..1e8d7b8bd 100644 --- a/netbox/templates/dcim/rackreservation.html +++ b/netbox/templates/dcim/rackreservation.html @@ -66,8 +66,7 @@ Site {% if rack.site.region %} - {{ rack.site.region }} - + {{ rack.site.region }} / {% endif %} {{ rack.site }} @@ -105,8 +104,7 @@ {% if rackreservation.tenant %} {% if rackreservation.tenant.group %} - {{ rackreservation.tenant.group }} - + {{ rackreservation.tenant.group }} / {% endif %} {{ rackreservation.tenant }} {% else %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index 079cd62b2..f49df18fa 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -81,8 +81,7 @@ {% if site.region %} {% for region in site.region.get_ancestors %} - {{ region }} - + {{ region }} / {% endfor %} {{ site.region }} {% else %} @@ -95,8 +94,7 @@ {% if site.tenant %} {% if site.tenant.group %} - {{ site.tenant.group }} - + {{ site.tenant.group }} / {% endif %} {{ site.tenant }} {% else %} diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index f94500a39..0ed2deac8 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -85,8 +85,7 @@ {% if ipaddress.tenant %} {% if ipaddress.tenant.group %} - {{ ipaddress.tenant.group }} - + {{ ipaddress.tenant.group }} / {% endif %} {{ ipaddress.tenant }} {% else %} diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 95f1cf4b5..9f0f3c81c 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -104,8 +104,7 @@ {% if prefix.tenant %} {% if prefix.tenant.group %} - {{ prefix.tenant.group }} - + {{ prefix.tenant.group }} / {% endif %} {{ prefix.tenant }} {% else %} @@ -128,8 +127,7 @@ {% if prefix.site %} {% if prefix.site.region %} - {{ prefix.site.region }} - + {{ prefix.site.region }} / {% endif %} {{ prefix.site }} {% else %} @@ -142,8 +140,7 @@ {% if prefix.vlan %} {% if prefix.vlan.group %} - {{ prefix.vlan.group }} - + {{ prefix.vlan.group }} / {% endif %} {{ prefix.vlan.display_name }} {% else %} diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index 0dd5481c7..e0e07260e 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -79,8 +79,7 @@ {% if vlan.site %} {% if vlan.site.region %} - {{ vlan.site.region }} - + {{ vlan.site.region }} / {% endif %} {{ vlan.site }} {% else %} @@ -111,8 +110,7 @@ {% if vlan.tenant %} {% if vlan.tenant.group %} - {{ vlan.tenant.group }} - + {{ vlan.tenant.group }} / {% endif %} {{ vlan.tenant }} {% else %} diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 428dec624..891cc9f15 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -110,8 +110,7 @@ {% if virtualmachine.tenant %} {% if virtualmachine.tenant.group %} - {{ virtualmachine.tenant.group }} - + {{ virtualmachine.tenant.group }} / {% endif %} {{ virtualmachine.tenant }} {% else %} @@ -177,8 +176,7 @@ Cluster {% if virtualmachine.cluster.group %} - {{ virtualmachine.cluster.group }} - + {{ virtualmachine.cluster.group }} / {% endif %} {{ virtualmachine.cluster }}