diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index 3a8096351..b61dac6fc 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 899ba83c3..ad81de7e1 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 af883e56f..d353e4f37 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 a5eac1f78..18a11e115 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 e9cde6e00..c5d1f7906 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 ee8b56980..c340cbc5c 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 8eb84993c..91de60252 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 9ae9df7d4..869ab1ec7 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 382cbc4ee..2c2d7fe6f 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 40955f5d6..4239f9eb2 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 43ded0c6a..c6b6cea48 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 f9a9b0425..0715bec58 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 545e8f1e4..e55d441d4 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 459880ca8..eeb891daf 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 2a56b57cc..792a3e127 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 7229d8078..bbdf809dd 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 b4fb06081..f29a127e3 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 f8973c79b..1f960e0d5 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 10975fa1b..a99aabf32 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 db367df1f..74ad9603b 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 0196a9a18..586d31771 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 9d1b4deea..07ca55f7c 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 703e7e3d2..2668905f4 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 1104bd988..b60e04882 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 1ee21a60e..c03b11e7d 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 92023f8d6..8442ae41e 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 610917078..dbee2c835 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 12088e892..fd31be60d 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 925d98b41..2e7fcbbf5 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 c254d9d63..202b6e41c 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 668290458..d98544de4 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 729f1ed42..e3d37a87a 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 4e3fd2edf..877ed49e0 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 d9d13e110..26d5e71da 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 72a4767c9..7fc967047 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 94eec6a15..f615d2d50 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 6083d1b5e..7609a280b 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 a46bef3b0..2d31feb22 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 863753c0d..b320fe6b8 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 ca46fdb31..8bdf6c030 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 1511565c3..0eef750eb 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 f081afc34..4ddde3624 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 54b29e946..dc51b48c5 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 06fd07522..31a756d9e 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 fa8cad039..84b8235ad 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 fd83c10f3..b367d97f7 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 9ef1abb8e..e3c050a1b 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 0ef590112..0d9ea4a22 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 6a618a1be..ef12b63a1 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 %}