From 856956afce76286372adb352f0f5fd196ad8d34e Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 20 Jul 2021 12:14:01 -0400 Subject: [PATCH] Standardize object breadcrumbs --- netbox/templates/circuits/circuit.html | 3 +-- netbox/templates/circuits/circuittype.html | 5 ---- netbox/templates/circuits/provider.html | 5 ---- .../templates/circuits/providernetwork.html | 3 +-- netbox/templates/dcim/cable.html | 5 ---- netbox/templates/dcim/consoleport.html | 5 ---- netbox/templates/dcim/consoleserverport.html | 5 ---- netbox/templates/dcim/device/base.html | 3 +-- netbox/templates/dcim/device_component.html | 10 ++------ netbox/templates/dcim/devicebay.html | 5 ---- netbox/templates/dcim/devicerole.html | 1 - netbox/templates/dcim/devicetype.html | 3 +-- netbox/templates/dcim/frontport.html | 6 ----- netbox/templates/dcim/interface.html | 5 ---- netbox/templates/dcim/inventoryitem.html | 5 ---- netbox/templates/dcim/location.html | 3 +-- netbox/templates/dcim/manufacturer.html | 5 ---- netbox/templates/dcim/platform.html | 6 +++-- netbox/templates/dcim/powerfeed.html | 3 +-- netbox/templates/dcim/poweroutlet.html | 5 ---- netbox/templates/dcim/powerpanel.html | 3 +-- netbox/templates/dcim/powerport.html | 5 ---- netbox/templates/dcim/rack.html | 11 ++++----- netbox/templates/dcim/rackreservation.html | 4 ++-- netbox/templates/dcim/rackrole.html | 5 ---- netbox/templates/dcim/rearport.html | 5 ---- netbox/templates/dcim/region.html | 5 ++-- netbox/templates/dcim/site.html | 12 ++++++---- netbox/templates/dcim/sitegroup.html | 5 ++-- netbox/templates/dcim/virtualchassis.html | 8 ------- netbox/templates/extras/configcontext.html | 5 ---- netbox/templates/extras/customfield.html | 5 ---- netbox/templates/extras/customlink.html | 5 ---- netbox/templates/extras/exporttemplate.html | 4 ++-- netbox/templates/extras/journalentry.html | 3 +-- netbox/templates/extras/objectchange.html | 1 - netbox/templates/extras/report.html | 1 - netbox/templates/extras/script.html | 1 - netbox/templates/extras/tag.html | 5 ---- netbox/templates/extras/webhook.html | 5 ---- netbox/templates/generic/object.html | 4 +++- netbox/templates/ipam/aggregate.html | 3 +-- netbox/templates/ipam/ipaddress.html | 5 ++-- netbox/templates/ipam/iprange/base.html | 11 ++------- netbox/templates/ipam/prefix/base.html | 11 ++------- netbox/templates/ipam/rir.html | 5 ---- netbox/templates/ipam/role.html | 5 ---- netbox/templates/ipam/routetarget.html | 5 ---- netbox/templates/ipam/service.html | 9 +++++--- netbox/templates/ipam/vlan/base.html | 23 ++++++------------- netbox/templates/ipam/vlangroup.html | 4 ++-- netbox/templates/ipam/vrf.html | 5 ---- netbox/templates/tenancy/tenant.html | 5 ++-- netbox/templates/tenancy/tenantgroup.html | 5 ++-- .../virtualization/cluster/base.html | 16 ++++--------- .../virtualization/clustergroup.html | 5 ---- .../templates/virtualization/clustertype.html | 5 ---- .../virtualization/virtualmachine/base.html | 3 +-- .../templates/virtualization/vminterface.html | 7 ++---- 59 files changed, 72 insertions(+), 253 deletions(-) diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 423920fcd..576a7775d 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -3,9 +3,8 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} - {% endblock %} {% block content %} diff --git a/netbox/templates/circuits/circuittype.html b/netbox/templates/circuits/circuittype.html index 62e301dc9..899ba83c3 100644 --- a/netbox/templates/circuits/circuittype.html +++ b/netbox/templates/circuits/circuittype.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index 8ca9b2c4c..c331c978a 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -3,11 +3,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html index f0bf4c4ca..e54eae227 100644 --- a/netbox/templates/circuits/providernetwork.html +++ b/netbox/templates/circuits/providernetwork.html @@ -4,9 +4,8 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} - {% endblock %} {% block content %} diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index af55cd70b..55af37b88 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -4,11 +4,6 @@ {% load perms %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block controls %} {% plugin_buttons object %}
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html index 084dc5d7d..20e67a2d1 100644 --- a/netbox/templates/dcim/consoleport.html +++ b/netbox/templates/dcim/consoleport.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html index e32c4f0fc..676dbf096 100644 --- a/netbox/templates/dcim/consoleserverport.html +++ b/netbox/templates/dcim/consoleserverport.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/dcim/device/base.html b/netbox/templates/dcim/device/base.html index 32a637c57..8bc10352c 100644 --- a/netbox/templates/dcim/device/base.html +++ b/netbox/templates/dcim/device/base.html @@ -5,13 +5,12 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} {% if object.parent_bay %} {% endif %} - {% endblock %} {% block extra_controls %} diff --git a/netbox/templates/dcim/device_component.html b/netbox/templates/dcim/device_component.html index 998551838..fbd542774 100644 --- a/netbox/templates/dcim/device_component.html +++ b/netbox/templates/dcim/device_component.html @@ -3,13 +3,7 @@ {% load perms %} {% load plugins %} -{% block title %}{{ object.device }} / {{ object }}{% endblock %} - {% block breadcrumbs %} - - - {% if breadcrumb_url %} - - {% endif %} - + {{ block.super }} + {% endblock %} diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html index cafbffa76..cc19413b1 100644 --- a/netbox/templates/dcim/devicebay.html +++ b/netbox/templates/dcim/devicebay.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html index 87b078e59..e6890b17d 100644 --- a/netbox/templates/dcim/devicerole.html +++ b/netbox/templates/dcim/devicerole.html @@ -4,7 +4,6 @@ {% block breadcrumbs %} - {% endblock %} {% block content %} diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 984fc81ac..532dad86c 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -6,9 +6,8 @@ {% block title %}{{ object.manufacturer }} {{ object.model }}{% endblock %} {% block breadcrumbs %} - + {{ block.super }} - {% endblock %} {% block controls %} diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html index c5b2efe8d..43ded0c6a 100644 --- a/netbox/templates/dcim/frontport.html +++ b/netbox/templates/dcim/frontport.html @@ -2,12 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index ba6ba6a13..ecffeca2d 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -3,11 +3,6 @@ {% load plugins %} {% load render_table from django_tables2 %} -{% block breadcrumbs %} - - -{% endblock %} - {% block extra_controls %} {% if perms.dcim.add_interface and not object.is_virtual %} diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html index 509c7f804..545e8f1e4 100644 --- a/netbox/templates/dcim/inventoryitem.html +++ b/netbox/templates/dcim/inventoryitem.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html index f151f08bf..16a4f8793 100644 --- a/netbox/templates/dcim/location.html +++ b/netbox/templates/dcim/location.html @@ -3,11 +3,10 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} {% for location in object.get_ancestors %} {% endfor %} - {% endblock %} {% block content %} diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html index a4624c42f..e814a778e 100644 --- a/netbox/templates/dcim/manufacturer.html +++ b/netbox/templates/dcim/manufacturer.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html index e921fc0b9..8e3640009 100644 --- a/netbox/templates/dcim/platform.html +++ b/netbox/templates/dcim/platform.html @@ -3,8 +3,10 @@ {% load plugins %} {% block breadcrumbs %} - - + {{ block.super }} + {% if object.manufacturer %} + + {% endif %} {% endblock %} {% block content %} diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 3331bd085..0632cff4c 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -5,13 +5,12 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} {% if object.rack %} {% endif %} - {% endblock %} {% block content %} diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html index 2ef2fd8dd..ef7b4319a 100644 --- a/netbox/templates/dcim/poweroutlet.html +++ b/netbox/templates/dcim/poweroutlet.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html index d21d8cb7a..c0bfbcf25 100644 --- a/netbox/templates/dcim/powerpanel.html +++ b/netbox/templates/dcim/powerpanel.html @@ -4,12 +4,11 @@ {% load render_table from django_tables2 %} {% block breadcrumbs %} - + {{ block.super }} {% if object.location %} {% endif %} - {% endblock %} {% block content %} diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html index e3d94ecfb..f997f02c9 100644 --- a/netbox/templates/dcim/powerport.html +++ b/netbox/templates/dcim/powerport.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 025cdc862..25d4e888f 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -7,15 +7,14 @@ {% block title %}Rack {{ object }}{% endblock %} {% block breadcrumbs %} - + {{ block.super }} - {% if object.group %} - {% for group in object.group.get_ancestors %} - + {% if object.location %} + {% for location in object.location.get_ancestors %} + {% endfor %} - + {% endif %} - {% endblock %} {% block extra_controls %} diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html index e685ba18e..27e448170 100644 --- a/netbox/templates/dcim/rackreservation.html +++ b/netbox/templates/dcim/rackreservation.html @@ -5,8 +5,8 @@ {% load plugins %} {% block breadcrumbs %} - - + {{ block.super }} + {% endblock %} diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html index 85da68a25..703e7e3d2 100644 --- a/netbox/templates/dcim/rackrole.html +++ b/netbox/templates/dcim/rackrole.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html index 5fb330844..1104bd988 100644 --- a/netbox/templates/dcim/rearport.html +++ b/netbox/templates/dcim/rearport.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html index 2f59f935e..b46c905c3 100644 --- a/netbox/templates/dcim/region.html +++ b/netbox/templates/dcim/region.html @@ -3,11 +3,10 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} {% for region in object.get_ancestors %} - + {% endfor %} - {% endblock %} {% block content %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index 8f8ac1a7d..72ce2b21e 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -4,14 +4,18 @@ {% load tz %} {% block breadcrumbs %} - + {{ block.super }} {% if object.region %} {% for region in object.region.get_ancestors %} - + {% endfor %} - + + {% elif object.group %} + {% for group in object.group.get_ancestors %} + + {% endfor %} + {% endif %} - {% endblock %} {% block content %} diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html index 6fe426859..856a86d64 100644 --- a/netbox/templates/dcim/sitegroup.html +++ b/netbox/templates/dcim/sitegroup.html @@ -3,11 +3,10 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} {% for sitegroup in object.get_ancestors %} - + {% endfor %} - {% endblock %} {% block content %} diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html index 6f98559db..fe2f7baa9 100644 --- a/netbox/templates/dcim/virtualchassis.html +++ b/netbox/templates/dcim/virtualchassis.html @@ -3,14 +3,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - {% if object.master %} - - {% endif %} - -{% endblock %} - {% block buttons %} {% if perms.dcim.change_virtualchassis %} {% edit_button object %} diff --git a/netbox/templates/extras/configcontext.html b/netbox/templates/extras/configcontext.html index dde954a2d..0b6cc9eab 100644 --- a/netbox/templates/extras/configcontext.html +++ b/netbox/templates/extras/configcontext.html @@ -2,11 +2,6 @@ {% load helpers %} {% load static %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/extras/customfield.html b/netbox/templates/extras/customfield.html index f0694f33a..49e3d2daf 100644 --- a/netbox/templates/extras/customfield.html +++ b/netbox/templates/extras/customfield.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/extras/customlink.html b/netbox/templates/extras/customlink.html index f337fd6e4..5a3c3056e 100644 --- a/netbox/templates/extras/customlink.html +++ b/netbox/templates/extras/customlink.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/extras/exporttemplate.html b/netbox/templates/extras/exporttemplate.html index 1da716d71..5a4b150a7 100644 --- a/netbox/templates/extras/exporttemplate.html +++ b/netbox/templates/extras/exporttemplate.html @@ -3,8 +3,8 @@ {% load plugins %} {% block breadcrumbs %} - - + {{ block.super }} + {% endblock %} {% block content %} diff --git a/netbox/templates/extras/journalentry.html b/netbox/templates/extras/journalentry.html index c5077bca7..2862fb8bc 100644 --- a/netbox/templates/extras/journalentry.html +++ b/netbox/templates/extras/journalentry.html @@ -3,9 +3,8 @@ {% load static %} {% block breadcrumbs %} - + {{ block.super }} - {% endblock %} {% block content %} diff --git a/netbox/templates/extras/objectchange.html b/netbox/templates/extras/objectchange.html index 1de40f5c7..8774f3669 100644 --- a/netbox/templates/extras/objectchange.html +++ b/netbox/templates/extras/objectchange.html @@ -12,7 +12,6 @@ {% elif object.changed_object %} {% endif %} - {% endblock %} {% block content %} diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html index 1ca0294e6..e486f9255 100644 --- a/netbox/templates/extras/report.html +++ b/netbox/templates/extras/report.html @@ -6,7 +6,6 @@ {% block breadcrumbs %} - {% endblock %} {% block content %} diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html index 47a8c1f77..6d394b874 100644 --- a/netbox/templates/extras/script.html +++ b/netbox/templates/extras/script.html @@ -8,7 +8,6 @@ {% block breadcrumbs %} - {% endblock %} {% block content %} diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html index 285bcab80..cd4257179 100644 --- a/netbox/templates/extras/tag.html +++ b/netbox/templates/extras/tag.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/extras/webhook.html b/netbox/templates/extras/webhook.html index 9546952e5..a24cbe6db 100644 --- a/netbox/templates/extras/webhook.html +++ b/netbox/templates/extras/webhook.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html index d3d11c31f..70dfa46fa 100644 --- a/netbox/templates/generic/object.html +++ b/netbox/templates/generic/object.html @@ -9,7 +9,9 @@ {# Breadcrumbs #} {{ block.super }} diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html index 4696465c7..0e8366e4a 100644 --- a/netbox/templates/ipam/aggregate.html +++ b/netbox/templates/ipam/aggregate.html @@ -4,9 +4,8 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} - {% endblock %} {% block extra_controls %} diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index effdbfab7..7dbc05bba 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -4,11 +4,10 @@ {% load render_table from django_tables2 %} {% block breadcrumbs %} - + {{ block.super }} {% if object.vrf %} - + {% endif %} - {% endblock %} {% block content %} diff --git a/netbox/templates/ipam/iprange/base.html b/netbox/templates/ipam/iprange/base.html index 9924a6b6b..1993e29c4 100644 --- a/netbox/templates/ipam/iprange/base.html +++ b/netbox/templates/ipam/iprange/base.html @@ -3,17 +3,10 @@ {% load helpers %} {% block breadcrumbs %} - + {{ block.super }} {% if object.vrf %} - + {% endif %} - {% endblock %} {% block tab_items %} diff --git a/netbox/templates/ipam/prefix/base.html b/netbox/templates/ipam/prefix/base.html index 9edeef167..eca2250a6 100644 --- a/netbox/templates/ipam/prefix/base.html +++ b/netbox/templates/ipam/prefix/base.html @@ -3,17 +3,10 @@ {% load helpers %} {% block breadcrumbs %} - + {{ block.super }} {% if object.vrf %} - + {% endif %} - {% endblock %} {% block tab_items %} diff --git a/netbox/templates/ipam/rir.html b/netbox/templates/ipam/rir.html index 4bbf9b99d..d9d13e110 100644 --- a/netbox/templates/ipam/rir.html +++ b/netbox/templates/ipam/rir.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html index be2360600..72a4767c9 100644 --- a/netbox/templates/ipam/role.html +++ b/netbox/templates/ipam/role.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/ipam/routetarget.html b/netbox/templates/ipam/routetarget.html index c29bdc0bd..14a0e0ddd 100644 --- a/netbox/templates/ipam/routetarget.html +++ b/netbox/templates/ipam/routetarget.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html index d1065a398..17415ac7c 100644 --- a/netbox/templates/ipam/service.html +++ b/netbox/templates/ipam/service.html @@ -5,9 +5,12 @@ {% load plugins %} {% block breadcrumbs %} - - - + {{ block.super }} + {% if object.device %} + + {% elif object.virtual_machine %} + + {% endif %} {% endblock %} {% block controls %} diff --git a/netbox/templates/ipam/vlan/base.html b/netbox/templates/ipam/vlan/base.html index ae2e254f1..bd8dfe4c7 100644 --- a/netbox/templates/ipam/vlan/base.html +++ b/netbox/templates/ipam/vlan/base.html @@ -5,22 +5,13 @@ {% block title %}VLAN {{ object }}{% endblock %} {% block breadcrumbs %} - -{% if object.site %} - -{% endif %} -{% if object.group %} - -{% endif %} - + {{ block.super }} + {% if object.site %} + + {% endif %} + {% if object.group %} + + {% endif %} {% endblock %} {% block tabs %} diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html index 285851e7b..a46bef3b0 100644 --- a/netbox/templates/ipam/vlangroup.html +++ b/netbox/templates/ipam/vlangroup.html @@ -3,11 +3,11 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} {% if object.scope %} + {# TODO: This should link to a filtered list of VLANGroups #} {% endif %} - {% endblock %} {% block buttons %} diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html index 937c1d6de..37fb5a531 100644 --- a/netbox/templates/ipam/vrf.html +++ b/netbox/templates/ipam/vrf.html @@ -5,11 +5,6 @@ {% block title %}VRF {{ object }}{% endblock %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index 9e5391bb2..7d251739b 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -3,11 +3,10 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} {% if object.group %} - + {% endif %} - {% endblock breadcrumbs %} {% block content %} diff --git a/netbox/templates/tenancy/tenantgroup.html b/netbox/templates/tenancy/tenantgroup.html index 12a81a1e8..c442cfcd3 100644 --- a/netbox/templates/tenancy/tenantgroup.html +++ b/netbox/templates/tenancy/tenantgroup.html @@ -3,11 +3,10 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} {% for tenantgroup in object.get_ancestors %} - + {% endfor %} - {% endblock %} {% block content %} diff --git a/netbox/templates/virtualization/cluster/base.html b/netbox/templates/virtualization/cluster/base.html index 0ae02d2ce..dbcd08ea0 100644 --- a/netbox/templates/virtualization/cluster/base.html +++ b/netbox/templates/virtualization/cluster/base.html @@ -4,17 +4,11 @@ {% load plugins %} {% block breadcrumbs %} - -{% if object.group %} - -{% endif %} - + {{ block.super }} + + {% if object.group %} + + {% endif %} {% endblock %} {% block extra_controls %} diff --git a/netbox/templates/virtualization/clustergroup.html b/netbox/templates/virtualization/clustergroup.html index f9a37aaea..f7e8cbe5b 100644 --- a/netbox/templates/virtualization/clustergroup.html +++ b/netbox/templates/virtualization/clustergroup.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/virtualization/clustertype.html b/netbox/templates/virtualization/clustertype.html index 9c3fa8ba0..9ef1abb8e 100644 --- a/netbox/templates/virtualization/clustertype.html +++ b/netbox/templates/virtualization/clustertype.html @@ -2,11 +2,6 @@ {% load helpers %} {% load plugins %} -{% block breadcrumbs %} - - -{% endblock %} - {% block content %}
diff --git a/netbox/templates/virtualization/virtualmachine/base.html b/netbox/templates/virtualization/virtualmachine/base.html index 3c0d8fe93..83b134230 100644 --- a/netbox/templates/virtualization/virtualmachine/base.html +++ b/netbox/templates/virtualization/virtualmachine/base.html @@ -4,9 +4,8 @@ {% load plugins %} {% block breadcrumbs %} - + {{ block.super }} - {% endblock %} {% block extra_controls %} diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html index 5429aadd0..826999774 100644 --- a/netbox/templates/virtualization/vminterface.html +++ b/netbox/templates/virtualization/vminterface.html @@ -3,12 +3,9 @@ {% load plugins %} {% load render_table from django_tables2 %} -{% block title %}{{ object.virtual_machine }} / {{ object.name }}{% endblock %} - {% block breadcrumbs %} - - - + {{ block.super }} + {% endblock %} {% block content %}