diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index 3a8096351d5..b61dac6fc1e 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -64,16 +64,16 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='circuits:circuit_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:circuit_list' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
{% include 'circuits/inc/circuit_termination.html' with termination=object.termination_a side='A' %}
{% include 'circuits/inc/circuit_termination.html' with termination=object.termination_z side='Z' %}
- {% include 'inc/contacts_panel.html' %}
- {% include 'inc/image_attachments_panel.html' %}
+ {% include 'inc/panels/contacts.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/circuits/circuittype.html b/netbox/templates/circuits/circuittype.html
index 899ba83c3a4..ad81de7e1f7 100644
--- a/netbox/templates/circuits/circuittype.html
+++ b/netbox/templates/circuits/circuittype.html
@@ -31,7 +31,7 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index af883e56faa..d353e4f3767 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -47,13 +47,13 @@
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='circuits:provider_list' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:provider_list' %}
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'inc/comments_panel.html' %}
- {% include 'inc/contacts_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/comments.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html
index a5eac1f7892..18a11e115d5 100644
--- a/netbox/templates/circuits/providernetwork.html
+++ b/netbox/templates/circuits/providernetwork.html
@@ -37,9 +37,9 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='circuits:providernetwork_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:providernetwork_list' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html
index e9cde6e0001..c5d1f790696 100644
--- a/netbox/templates/dcim/cable.html
+++ b/netbox/templates/dcim/cable.html
@@ -63,8 +63,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:cable_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:cable_list' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
index ee8b5698036..c340cbc5c89 100644
--- a/netbox/templates/dcim/consoleport.html
+++ b/netbox/templates/dcim/consoleport.html
@@ -40,8 +40,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index 8eb84993c34..91de60252a3 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -40,8 +40,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 9ae9df7d485..869ab1ec7d7 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -220,9 +220,9 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:device_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:device_list' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
@@ -296,8 +296,8 @@
{% endif %}
- {% include 'inc/contacts_panel.html' %}
- {% include 'inc/image_attachments_panel.html' %}
+ {% include 'inc/panels/contacts.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html
index 382cbc4ee6e..2c2d7fe6f4f 100644
--- a/netbox/templates/dcim/devicerole.html
+++ b/netbox/templates/dcim/devicerole.html
@@ -61,7 +61,7 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 40955f5d655..4239f9eb266 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -130,9 +130,9 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:devicetype_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:devicetype_list' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index 43ded0c6a1a..c6b6cea48c3 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -52,8 +52,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index f9a9b04250d..0715bec58cf 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -102,8 +102,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html
index 545e8f1e45a..e55d441d4fa 100644
--- a/netbox/templates/dcim/inventoryitem.html
+++ b/netbox/templates/dcim/inventoryitem.html
@@ -64,8 +64,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index 459880ca80c..eeb891daf34 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -71,9 +71,9 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'inc/contacts_panel.html' %}
- {% include 'inc/image_attachments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html
index 2a56b57cc11..792a3e127cf 100644
--- a/netbox/templates/dcim/manufacturer.html
+++ b/netbox/templates/dcim/manufacturer.html
@@ -37,8 +37,8 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'inc/contacts_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index 7229d8078aa..bbdf809dd11 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -66,7 +66,7 @@
{{ object.napalm_args }}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index b4fb0608179..f29a127e3e5 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -107,8 +107,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:powerfeed_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:powerfeed_list' %}
{% plugin_left_page object %}
@@ -182,7 +182,7 @@
{% endif %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index f8973c79b31..1f960e0d5fe 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -44,8 +44,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index 10975fa1b10..a99aabf3259 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -39,13 +39,13 @@
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:powerpanel_list' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:powerpanel_list' %}
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'inc/contacts_panel.html' %}
- {% include 'inc/image_attachments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index db367df1f2b..74ad9603b29 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -44,8 +44,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 0196a9a183e..586d3177112 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -162,9 +162,9 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:rack_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:rack_list' %}
+ {% include 'inc/panels/comments.html' %}
{% if power_feeds %}
{% endif %}
- {% include 'inc/image_attachments_panel.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
{% endif %}
- {% include 'inc/contacts_panel.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html
index 9d1b4deea1f..07ca55f7c3d 100644
--- a/netbox/templates/dcim/rackreservation.html
+++ b/netbox/templates/dcim/rackreservation.html
@@ -83,8 +83,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:rackreservation_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:rackreservation_list' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html
index 703e7e3d2d1..2668905f405 100644
--- a/netbox/templates/dcim/rackrole.html
+++ b/netbox/templates/dcim/rackrole.html
@@ -37,7 +37,7 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index 1104bd98882..b60e048827f 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -46,8 +46,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html
index 1ee21a60e8c..c03b11e7db4 100644
--- a/netbox/templates/dcim/region.html
+++ b/netbox/templates/dcim/region.html
@@ -45,8 +45,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'inc/contacts_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 92023f8d6c6..8442ae41ef3 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -132,7 +132,7 @@
- {% include 'inc/contacts_panel.html' %}
+ {% include 'inc/panels/contacts.html' %}
@@ -180,9 +180,9 @@
{% endwith %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:site_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:site_list' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
@@ -257,7 +257,7 @@
{% endif %}
- {% include 'inc/image_attachments_panel.html' %}
+ {% include 'inc/panels/image_attachments.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html
index 61091707830..dbee2c8356d 100644
--- a/netbox/templates/dcim/sitegroup.html
+++ b/netbox/templates/dcim/sitegroup.html
@@ -45,8 +45,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'inc/contacts_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index 12088e892b5..fd31be60d3b 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -38,8 +38,8 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='dcim:virtualchassis_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:virtualchassis_list' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/extras/journalentry.html b/netbox/templates/extras/journalentry.html
index 925d98b41d5..2e7fcbbf57a 100644
--- a/netbox/templates/extras/journalentry.html
+++ b/netbox/templates/extras/journalentry.html
@@ -45,7 +45,7 @@
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/comments.html' %}
{% endblock %}
diff --git a/netbox/templates/inc/comments_panel.html b/netbox/templates/inc/panels/comments.html
similarity index 100%
rename from netbox/templates/inc/comments_panel.html
rename to netbox/templates/inc/panels/comments.html
diff --git a/netbox/templates/inc/contacts_panel.html b/netbox/templates/inc/panels/contacts.html
similarity index 100%
rename from netbox/templates/inc/contacts_panel.html
rename to netbox/templates/inc/panels/contacts.html
diff --git a/netbox/templates/inc/custom_fields_panel.html b/netbox/templates/inc/panels/custom_fields.html
similarity index 100%
rename from netbox/templates/inc/custom_fields_panel.html
rename to netbox/templates/inc/panels/custom_fields.html
diff --git a/netbox/templates/inc/image_attachments_panel.html b/netbox/templates/inc/panels/image_attachments.html
similarity index 100%
rename from netbox/templates/inc/image_attachments_panel.html
rename to netbox/templates/inc/panels/image_attachments.html
diff --git a/netbox/templates/extras/inc/tags_panel.html b/netbox/templates/inc/panels/tags.html
similarity index 100%
rename from netbox/templates/extras/inc/tags_panel.html
rename to netbox/templates/inc/panels/tags.html
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index c254d9d63ab..202b6e41c3d 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -64,8 +64,8 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='ipam:aggregate_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:aggregate_list' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index 668290458e8..d98544de42e 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -107,7 +107,7 @@
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_left_page object %}
@@ -145,7 +145,7 @@
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='ipam:ipaddress_list' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:ipaddress_list' %}
diff --git a/netbox/templates/ipam/iprange.html b/netbox/templates/ipam/iprange.html
index 729f1ed42e7..e3d37a87acb 100644
--- a/netbox/templates/ipam/iprange.html
+++ b/netbox/templates/ipam/iprange.html
@@ -82,8 +82,8 @@
{% plugin_left_page object %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='ipam:prefix_list' %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:prefix_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index 4e3fd2edf32..877ed49e071 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -121,8 +121,8 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='ipam:prefix_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:prefix_list' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/ipam/rir.html b/netbox/templates/ipam/rir.html
index d9d13e11031..26d5e71dafb 100644
--- a/netbox/templates/ipam/rir.html
+++ b/netbox/templates/ipam/rir.html
@@ -41,7 +41,7 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html
index 72a4767c916..7fc967047b7 100644
--- a/netbox/templates/ipam/role.html
+++ b/netbox/templates/ipam/role.html
@@ -35,7 +35,7 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/ipam/routetarget.html b/netbox/templates/ipam/routetarget.html
index 94eec6a155f..f615d2d5061 100644
--- a/netbox/templates/ipam/routetarget.html
+++ b/netbox/templates/ipam/routetarget.html
@@ -3,50 +3,48 @@
{% load plugins %}
{% block content %}
-
-
-
-
-
-
-
- | Name |
- {{ object.name }} |
-
-
- | Tenant |
-
- {% if object.tenant %}
- {{ object.tenant }}
- {% else %}
- None
- {% endif %}
- |
-
-
- | Description |
- {{ object.description|placeholder }} |
-
-
-
+
+
+
+
+
+
+
+ | Name |
+ {{ object.name }} |
+
+
+ | Tenant |
+
+ {% if object.tenant %}
+ {{ object.tenant }}
+ {% else %}
+ None
+ {% endif %}
+ |
+
+
+ | Description |
+ {{ object.description|placeholder }} |
+
+
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='ipam:routetarget_list' %}
- {% include 'inc/custom_fields_panel.html' %}
- {% plugin_left_page object %}
-
-
-
+
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:routetarget_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% plugin_left_page object %}
+
+
+
{% include 'inc/panel_table.html' with table=importing_vrfs_table heading="Importing VRFs" %}
-
- {% include 'inc/panel_table.html' with table=exporting_vrfs_table heading="Exporting VRFs" %}
- {% plugin_right_page object %}
+
+ {% include 'inc/panel_table.html' with table=exporting_vrfs_table heading="Exporting VRFs" %}
+ {% plugin_right_page object %}
-
-
+
+
- {% plugin_full_width_page object %}
+ {% plugin_full_width_page object %}
-
+
{% endblock %}
diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html
index 6083d1b5e76..7609a280b1e 100644
--- a/netbox/templates/ipam/service.html
+++ b/netbox/templates/ipam/service.html
@@ -60,8 +60,8 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='ipam:service_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:service_list' %}
{% plugin_right_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='ipam:vlan_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:vlan_list' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html
index a46bef3b060..2d31feb2209 100644
--- a/netbox/templates/ipam/vlangroup.html
+++ b/netbox/templates/ipam/vlangroup.html
@@ -57,7 +57,7 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html
index 863753c0d7f..b320fe6b8e8 100644
--- a/netbox/templates/ipam/vrf.html
+++ b/netbox/templates/ipam/vrf.html
@@ -60,8 +60,8 @@
{% plugin_left_page object %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='ipam:vrf_list' %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:vrf_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/tenancy/contact.html b/netbox/templates/tenancy/contact.html
index ca46fdb311f..8bdf6c030c6 100644
--- a/netbox/templates/tenancy/contact.html
+++ b/netbox/templates/tenancy/contact.html
@@ -55,12 +55,12 @@
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='tenancy:tenant_list' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='tenancy:tenant_list' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/tenancy/contactgroup.html b/netbox/templates/tenancy/contactgroup.html
index 1511565c3f9..0eef750eb25 100644
--- a/netbox/templates/tenancy/contactgroup.html
+++ b/netbox/templates/tenancy/contactgroup.html
@@ -48,7 +48,7 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/tenancy/contactrole.html b/netbox/templates/tenancy/contactrole.html
index f081afc34b0..4ddde362419 100644
--- a/netbox/templates/tenancy/contactrole.html
+++ b/netbox/templates/tenancy/contactrole.html
@@ -33,7 +33,7 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index 54b29e94622..dc51b48c503 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -35,10 +35,10 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='tenancy:tenant_list' %}
- {% include 'inc/comments_panel.html' %}
- {% include 'inc/contacts_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='tenancy:tenant_list' %}
+ {% include 'inc/panels/comments.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_left_page object %}
diff --git a/netbox/templates/tenancy/tenantgroup.html b/netbox/templates/tenancy/tenantgroup.html
index 06fd0752224..31a756d9ea3 100644
--- a/netbox/templates/tenancy/tenantgroup.html
+++ b/netbox/templates/tenancy/tenantgroup.html
@@ -48,7 +48,7 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html
index fa8cad03933..84b8235ade1 100644
--- a/netbox/templates/virtualization/cluster.html
+++ b/netbox/templates/virtualization/cluster.html
@@ -56,13 +56,13 @@
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='virtualization:cluster_list' %}
- {% include 'inc/contacts_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='virtualization:cluster_list' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/virtualization/clustergroup.html b/netbox/templates/virtualization/clustergroup.html
index fd83c10f3c0..b367d97f789 100644
--- a/netbox/templates/virtualization/clustergroup.html
+++ b/netbox/templates/virtualization/clustergroup.html
@@ -31,8 +31,8 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'inc/contacts_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/virtualization/clustertype.html b/netbox/templates/virtualization/clustertype.html
index 9ef1abb8ead..e3c050a1b9b 100644
--- a/netbox/templates/virtualization/clustertype.html
+++ b/netbox/templates/virtualization/clustertype.html
@@ -31,7 +31,7 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 0ef5901122b..0d9ea4a22a8 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -89,9 +89,9 @@
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all url='virtualization:virtualmachine_list' %}
- {% include 'inc/comments_panel.html' %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all url='virtualization:virtualmachine_list' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
@@ -173,7 +173,7 @@
{% endif %}
- {% include 'inc/contacts_panel.html' %}
+ {% include 'inc/panels/contacts.html' %}
{% plugin_right_page object %}
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index 6a618a1be1b..ef12b63a138 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -69,8 +69,8 @@
{% plugin_left_page object %}
- {% include 'inc/custom_fields_panel.html' %}
- {% include 'extras/inc/tags_panel.html' with tags=object.tags.all %}
+ {% include 'inc/panels/custom_fields.html' %}
+ {% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% plugin_right_page object %}