Reorganize panel inclusion templates

netbox/templates/circuits/circuit.html

@@ -64,16 +64,16 @@
                 </table>
             </div>
         </div>
-        {% 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 %}
 	</div>
 	<div class="col col-md-6">
     {% 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 %}
   </div>
 </div>

netbox/templates/circuits/circuittype.html

@@ -31,7 +31,7 @@
     {% plugin_left_page object %}
   </div>
 	<div class="col col-md-6">
-    {% include 'inc/custom_fields_panel.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
 	</div>
 </div>

netbox/templates/circuits/provider.html

@@ -47,13 +47,13 @@
                 </table>
             </div>
         </div>
-        {% 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 %}
     </div>
     <div class="col col-md-6">
-        {% 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 %}
     </div>
     <div class="col col-md-12">

netbox/templates/circuits/providernetwork.html

@@ -37,9 +37,9 @@
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-        {% 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 %}
     </div>
 </div>

netbox/templates/dcim/cable.html

@@ -63,8 +63,8 @@
                     </table>
                 </div>
             </div>
-            {% 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 %}
         </div>
         <div class="col col-md-6">

netbox/templates/dcim/consoleport.html

@@ -40,8 +40,8 @@
                     </table>
                 </div>
             </div>
-            {% 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 %}
         </div>
         <div class="col col-md-6">

netbox/templates/dcim/consoleserverport.html

@@ -40,8 +40,8 @@
                     </table>
                 </div>
             </div>
-            {% 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 %}
         </div>
         <div class="col col-md-6">

netbox/templates/dcim/device.html

@@ -220,9 +220,9 @@
                     </table>
                 </div>
             </div>
-            {% 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 %}
         </div>
         <div class="col col-md-6">
@@ -296,8 +296,8 @@
                 </div>
                 {% endif %}
             </div>
-            {% include 'inc/contacts_panel.html' %}
-            {% include 'inc/image_attachments_panel.html' %}
+            {% include 'inc/panels/contacts.html' %}
+            {% include 'inc/panels/image_attachments.html' %}
             <div class="card noprint">
                 <h5 class="card-header">
                     Related Devices

netbox/templates/dcim/devicebay.html

@@ -32,8 +32,8 @@
                     </table>
                 </div>
             </div>
-        {% 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 %}
         </div>
         <div class="col col-md-6">

netbox/templates/dcim/devicerole.html

@@ -61,7 +61,7 @@
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
-    {% include 'inc/custom_fields_panel.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
   </div>
 </div>

netbox/templates/dcim/devicetype.html

@@ -130,9 +130,9 @@
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
-            {% 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 %}
         </div>
     </div>

netbox/templates/dcim/frontport.html

@@ -52,8 +52,8 @@
                     </table>
                 </div>
             </div>
-            {% 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 %}
         </div>
         <div class="col col-md-6">

netbox/templates/dcim/interface.html

@@ -102,8 +102,8 @@
                     </table>
                 </div>
             </div>
-            {% 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 %}
         </div>
         <div class="col col-md-6">

netbox/templates/dcim/inventoryitem.html

@@ -64,8 +64,8 @@
                     </table>
                 </div>
             </div>
-            {% 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 %}
         </div>
         <div class="col col-md-6">

netbox/templates/dcim/location.html

@@ -71,9 +71,9 @@
     {% plugin_left_page object %}
   </div>
 	<div class="col col-md-6">
-    {% 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 %}
 	</div>
 </div>

netbox/templates/dcim/manufacturer.html

@@ -37,8 +37,8 @@
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
-    {% 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 %}
   </div>
 </div>

netbox/templates/dcim/platform.html

@@ -66,7 +66,7 @@
         <pre>{{ object.napalm_args }}</pre>
       </div>
     </div>
-    {% include 'inc/custom_fields_panel.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
   </div>
 </div>

netbox/templates/dcim/powerfeed.html

@@ -107,8 +107,8 @@
                 </table>
             </div>
         </div>
-        {% 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 %}
     </div>
     <div class="col col-md-6">
@@ -182,7 +182,7 @@
             </div>
             {% endif %}
         </div>
-        {% include 'inc/comments_panel.html' %}
+        {% include 'inc/panels/comments.html' %}
         {% plugin_right_page object %}
     </div>
 </div>

netbox/templates/dcim/poweroutlet.html

@@ -44,8 +44,8 @@
                     </table>
                 </div>
             </div>
-            {% 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 %}
         </div>
         <div class="col col-md-6">

netbox/templates/dcim/powerpanel.html

@@ -39,13 +39,13 @@
                 </table>
             </div>
         </div>
-        {% 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 %}
     </div>
 	<div class="col col-md-6">
-        {% 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 %}
     </div>
 </div>

netbox/templates/dcim/powerport.html

@@ -44,8 +44,8 @@
                     </table>
                 </div>
             </div>
-            {% 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 %}
         </div>
         <div class="col col-md-6">

netbox/templates/dcim/rack.html

@@ -162,9 +162,9 @@
                 </table>
             </div>
         </div>
-        {% 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 %}
             <div class="card">
                 <h5 class="card-header">
@@ -206,7 +206,7 @@
                 </div>
             </div>
         {% endif %}
-        {% include 'inc/image_attachments_panel.html' %}
+        {% include 'inc/panels/image_attachments.html' %}
         <div class="card">
             <h5 class="card-header">
                 Reservations
@@ -332,7 +332,7 @@
                 </div>
             {% endif %}
         </div>
-        {% include 'inc/contacts_panel.html' %}
+        {% include 'inc/panels/contacts.html' %}
         {% plugin_right_page object %}
     </div>
   </div>

netbox/templates/dcim/rackreservation.html

@@ -83,8 +83,8 @@
                 </table>
             </div>
         </div>
-        {% 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 %}
 	</div>
     <div class="col col-12 col-xl-7">

netbox/templates/dcim/rackrole.html

@@ -37,7 +37,7 @@
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
-    {% include 'inc/custom_fields_panel.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
   </div>
 </div>

netbox/templates/dcim/rearport.html

@@ -46,8 +46,8 @@
                     </table>
                 </div>
             </div>
-            {% 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 %}
         </div>
         <div class="col col-md-6">

netbox/templates/dcim/region.html

@@ -45,8 +45,8 @@
         </table>
       </div>
     </div>
-    {% 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 %}
   </div>
 	<div class="col col-md-6">

netbox/templates/dcim/site.html

@@ -132,7 +132,7 @@
                 </table>
             </div>
         </div>
-        {% include 'inc/contacts_panel.html' %}
+        {% include 'inc/panels/contacts.html' %}
         <div class="card">
             <h5 class="card-header">Contact Info</h5>
             <div class="card-body">
@@ -180,9 +180,9 @@
               {% endwith %}
             </div>
         </div>
-        {% 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 %}
     </div>
     <div class="col col-md-5">
@@ -257,7 +257,7 @@
               {% endif %}
             </div>
         </div>
-        {% include 'inc/image_attachments_panel.html' %}
+        {% include 'inc/panels/image_attachments.html' %}
         {% plugin_right_page object %}
 	</div>
 </div>

netbox/templates/dcim/sitegroup.html

@@ -45,8 +45,8 @@
         </table>
       </div>
     </div>
-    {% 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 %}
   </div>
 	<div class="col col-md-6">

netbox/templates/dcim/virtualchassis.html

@@ -38,8 +38,8 @@
                 </table>
             </div>
         </div>
-        {% 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 %}
     </div>
     <div class="col col-md-8">

netbox/templates/extras/journalentry.html

@@ -45,7 +45,7 @@
             </div>
         </div>
         <div class="col col-md-8">
-            {% include 'inc/comments_panel.html' %}
+            {% include 'inc/panels/comments.html' %}
         </div>
     </div>
 {% endblock %}

netbox/templates/ipam/aggregate.html

@@ -64,8 +64,8 @@
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-        {% 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 %}
     </div>
 </div>

netbox/templates/ipam/ipaddress.html

@@ -107,7 +107,7 @@
                 </table>
             </div>
         </div>
-        {% include 'inc/custom_fields_panel.html' %}
+        {% include 'inc/panels/custom_fields.html' %}
         
         {% plugin_left_page object %}
 	</div>
@@ -145,7 +145,7 @@
 
 <div class="row my-3">
     <div class="col col-md-4">
-        {% 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' %}
     </div>
     
 </div>

netbox/templates/ipam/iprange.html

@@ -82,8 +82,8 @@
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-        {% 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 %}
     </div>
 </div>

netbox/templates/ipam/prefix.html

@@ -121,8 +121,8 @@
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-        {% 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 %}
     </div>
 </div>

netbox/templates/ipam/rir.html

@@ -41,7 +41,7 @@
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
-    {% include 'inc/custom_fields_panel.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
   </div>
 </div>

netbox/templates/ipam/role.html

@@ -35,7 +35,7 @@
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
-    {% include 'inc/custom_fields_panel.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
   </div>
 </div>

netbox/templates/ipam/routetarget.html

@@ -3,50 +3,48 @@
 {% load plugins %}
 
 {% block content %}
-<div class="row">
-	<div class="col col-md-6">
-        <div class="card">
-            <h5 class="card-header">
-                Route Target
-            </h5>
-            <div class="card-body">
-                <table class="table table-hover attr-table">
-                    <tr>
-                        <th scope="row">Name</th>
-                        <td class="font-monospace">{{ object.name }}</td>
-                    </tr>
-                    <tr>
-                        <th  scope="row">Tenant</th>
-                        <td>
-                            {% if object.tenant %}
-                                <a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
-                            {% else %}
-                                <span class="text-muted">None</span>
-                            {% endif %}
-                        </td>
-                    </tr>
-                    <tr>
-                        <th scope="row">Description</th>
-                        <td>{{ object.description|placeholder }}</td>
-                    </tr>
-                </table>
-            </div>
+  <div class="row">
+    <div class="col col-md-6">
+      <div class="card">
+        <h5 class="card-header">Route Target</h5>
+        <div class="card-body">
+          <table class="table table-hover attr-table">
+            <tr>
+              <th scope="row">Name</th>
+              <td class="font-monospace">{{ object.name }}</td>
+            </tr>
+            <tr>
+              <th  scope="row">Tenant</th>
+              <td>
+                {% if object.tenant %}
+                  <a href="{{ object.tenant.get_absolute_url }}">{{ object.tenant }}</a>
+                {% else %}
+                  <span class="text-muted">None</span>
+                {% endif %}
+              </td>
+            </tr>
+            <tr>
+              <th scope="row">Description</th>
+              <td>{{ object.description|placeholder }}</td>
+            </tr>
+          </table>
         </div>
-        {% 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 %}
-	</div>
-	<div class="col col-md-6">
-        <div class="mb-4">
+      </div>
+      {% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:routetarget_list' %}
+      {% include 'inc/panels/custom_fields.html' %}
+      {% plugin_left_page object %}
+    </div>
+    <div class="col col-md-6">
+      <div class="mb-4">
         {% include 'inc/panel_table.html' with table=importing_vrfs_table heading="Importing VRFs" %}
-        </div>
-        {% include 'inc/panel_table.html' with table=exporting_vrfs_table heading="Exporting VRFs" %}
-        {% plugin_right_page object %}
+      </div>
+      {% include 'inc/panel_table.html' with table=exporting_vrfs_table heading="Exporting VRFs" %}
+      {% plugin_right_page object %}
     </div>
-</div>
-<div class="row">
+  </div>
+  <div class="row">
     <div class="col col-md-12">
-        {% plugin_full_width_page object %}
+      {% plugin_full_width_page object %}
     </div>
-</div>
+  </div>
 {% endblock %}

netbox/templates/ipam/service.html

@@ -60,8 +60,8 @@
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-        {% 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 %}
     </div>
 </div>

netbox/templates/ipam/vlan.html

@@ -82,8 +82,8 @@
             {% plugin_left_page object %}
         </div>
         <div class="col col-md-6">
-            {% 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 %}
         </div>
     </div>

netbox/templates/ipam/vlangroup.html

@@ -57,7 +57,7 @@
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
-    {% include 'inc/custom_fields_panel.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
   </div>
 </div>

netbox/templates/ipam/vrf.html

@@ -60,8 +60,8 @@
       {% plugin_left_page object %}
   </div>
   <div class="col col-md-6">
-    {% 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 %}
 	</div>
 </div>

netbox/templates/tenancy/contact.html

@@ -55,12 +55,12 @@
           </table>
         </div>
       </div>
-      {% include 'inc/comments_panel.html' %}
+      {% include 'inc/panels/comments.html' %}
       {% plugin_left_page object %}
     </div>
     <div class="col col-md-5">
-      {% 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 %}
     </div>
   </div>

netbox/templates/tenancy/contactgroup.html

@@ -48,7 +48,7 @@
       {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-      {% include 'inc/custom_fields_panel.html' %}
+      {% include 'inc/panels/custom_fields.html' %}
       {% plugin_right_page object %}
     </div>
   </div>

netbox/templates/tenancy/contactrole.html

@@ -33,7 +33,7 @@
       {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-      {% include 'inc/custom_fields_panel.html' %}
+      {% include 'inc/panels/custom_fields.html' %}
       {% plugin_right_page object %}
     </div>
   </div>

netbox/templates/tenancy/tenant.html

@@ -35,10 +35,10 @@
                 </table>
             </div>
         </div>
-        {% 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 %}
 	</div>
 	<div class="col col-md-5">

netbox/templates/tenancy/tenantgroup.html

@@ -48,7 +48,7 @@
     {% plugin_left_page object %}
   </div>
 	<div class="col col-md-6">
-    {% include 'inc/custom_fields_panel.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
 	</div>
 </div>

netbox/templates/virtualization/cluster.html

@@ -56,13 +56,13 @@
             </table>
         </div>
     </div>
-    {% include 'inc/comments_panel.html' %}
+    {% include 'inc/panels/comments.html' %}
     {% plugin_left_page object %}
   </div>
   <div class="col col-md-6">
-    {% 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 %}
   </div>
 </div>

netbox/templates/virtualization/clustergroup.html

@@ -31,8 +31,8 @@
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
-    {% 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 %}
   </div>
 </div>

netbox/templates/virtualization/clustertype.html

@@ -31,7 +31,7 @@
     {% plugin_left_page object %}
 	</div>
 	<div class="col col-md-6">
-    {% include 'inc/custom_fields_panel.html' %}
+    {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
   </div>
 </div>

netbox/templates/virtualization/virtualmachine.html

@@ -89,9 +89,9 @@
                 </table>
             </div>
         </div>
-        {% 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 %}
     </div>
 	<div class="col col-md-6">
@@ -173,7 +173,7 @@
                 </div>
             {% endif %}
         </div>
-        {% include 'inc/contacts_panel.html' %}
+        {% include 'inc/panels/contacts.html' %}
         {% plugin_right_page object %}
     </div>
 </div>

netbox/templates/virtualization/vminterface.html

@@ -69,8 +69,8 @@
         {% plugin_left_page object %}
     </div>
     <div class="col col-md-6">
-        {% 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 %}
     </div>
 </div>