Reorganize panel inclusion templates

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">