From c50dc1eb353cd79da88a4379b96a39529835656e Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Mon, 13 Dec 2021 15:36:51 -0500
Subject: [PATCH] Standardize usage of table template

---
 netbox/templates/circuits/circuittype.html    |  5 +-
 netbox/templates/circuits/provider.html       |  5 +-
 .../templates/circuits/providernetwork.html   |  5 +-
 .../templates/dcim/device/consoleports.html   |  4 +-
 .../dcim/device/consoleserverports.html       |  4 +-
 netbox/templates/dcim/device/devicebays.html  |  4 +-
 netbox/templates/dcim/device/frontports.html  |  4 +-
 netbox/templates/dcim/device/interfaces.html  |  4 +-
 netbox/templates/dcim/device/inventory.html   |  4 +-
 .../templates/dcim/device/poweroutlets.html   |  4 +-
 netbox/templates/dcim/device/powerports.html  |  4 +-
 netbox/templates/dcim/device/rearports.html   |  4 +-
 netbox/templates/dcim/devicerole.html         |  5 +-
 netbox/templates/dcim/interface.html          |  2 +-
 netbox/templates/dcim/location.html           |  5 +-
 netbox/templates/dcim/manufacturer.html       |  5 +-
 netbox/templates/dcim/platform.html           |  5 +-
 netbox/templates/dcim/powerpanel.html         |  2 +-
 netbox/templates/dcim/rackrole.html           |  5 +-
 netbox/templates/dcim/region.html             |  9 ++-
 netbox/templates/dcim/sitegroup.html          |  9 ++-
 netbox/templates/extras/object_changelog.html |  4 +-
 netbox/templates/extras/object_journal.html   |  4 +-
 .../generic/object_bulk_add_component.html    |  5 +-
 .../templates/generic/object_bulk_delete.html |  5 +-
 .../templates/generic/object_bulk_edit.html   |  5 +-
 .../templates/generic/object_bulk_remove.html |  5 +-
 netbox/templates/inc/panel_table.html         |  8 +-
 netbox/templates/inc/table.html               | 76 +++++++++----------
 netbox/templates/ipam/asn.html                |  5 +-
 netbox/templates/ipam/fhrpgroup.html          |  4 +-
 netbox/templates/ipam/ipaddress.html          |  4 +-
 netbox/templates/ipam/rir.html                |  5 +-
 netbox/templates/ipam/role.html               |  5 +-
 netbox/templates/ipam/vlangroup.html          |  2 +-
 netbox/templates/tenancy/contact.html         |  2 +-
 netbox/templates/tenancy/contactgroup.html    |  9 ++-
 netbox/templates/tenancy/contactrole.html     |  5 +-
 netbox/templates/tenancy/tenantgroup.html     |  5 +-
 .../virtualization/clustergroup.html          |  5 +-
 .../templates/virtualization/clustertype.html |  5 +-
 .../virtualmachine/interfaces.html            |  4 +-
 .../templates/virtualization/vminterface.html |  2 +-
 netbox/templates/wireless/wirelesslan.html    |  5 +-
 .../templates/wireless/wirelesslangroup.html  |  5 +-
 45 files changed, 167 insertions(+), 115 deletions(-)

diff --git a/netbox/templates/circuits/circuittype.html b/netbox/templates/circuits/circuittype.html
index 57737a6d1..67b6d2d86 100644
--- a/netbox/templates/circuits/circuittype.html
+++ b/netbox/templates/circuits/circuittype.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row mb-3">
@@ -42,8 +43,8 @@
       <h5 class="card-header">
         Circuits
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=circuits_table %}
+      <div class="card-body table-responsive">
+        {% render_table circuits_table 'inc/table.html' %}
       </div>
       {% if perms.circuits.add_circuit %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index c16afa421..bf0037690 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -2,6 +2,7 @@
 {% load static %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row">
@@ -61,8 +62,8 @@
             <h5 class="card-header">
                 Circuits
             </h5>
-            <div class="card-body">
-            {% include 'inc/table.html' with table=circuits_table %}
+            <div class="card-body table-responsive">
+              {% render_table circuits_table 'inc/table.html' %}
             </div>
             {% if perms.circuits.add_circuit %}
             <div class="card-footer text-end noprint">
diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html
index 9641c9934..ffe56915f 100644
--- a/netbox/templates/circuits/providernetwork.html
+++ b/netbox/templates/circuits/providernetwork.html
@@ -2,6 +2,7 @@
 {% load static %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -49,8 +50,8 @@
             <h5 class="card-header">
                 Circuits
             </h5>
-            <div class="card-body">
-                {% include 'inc/table.html' with table=circuits_table %}
+            <div class="card-body table-responsive">
+              {% render_table circuits_table 'inc/table.html' %}
             </div>
         </div>
         {% include 'inc/paginator.html' with paginator=circuits_table.paginator page=circuits_table.page %}
diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html
index 6cf736523..066c19b73 100644
--- a/netbox/templates/dcim/device/consoleports.html
+++ b/netbox/templates/dcim/device/consoleports.html
@@ -7,7 +7,9 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls.html' with table_modal="DeviceConsolePortTable_config" %}
-    {% render_table table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
     <div class="noprint bulk-buttons">
         <div class="bulk-button-group">
             {% if perms.dcim.change_consoleport %}
diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html
index ca159029e..97c98bb9f 100644
--- a/netbox/templates/dcim/device/consoleserverports.html
+++ b/netbox/templates/dcim/device/consoleserverports.html
@@ -7,7 +7,9 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls.html' with table_modal="DeviceConsoleServerPortTable_config" %}
-    {% render_table table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
     <div class="noprint bulk-buttons">
         <div class="bulk-button-group">
             {% if perms.dcim.change_consoleserverport %}
diff --git a/netbox/templates/dcim/device/devicebays.html b/netbox/templates/dcim/device/devicebays.html
index b72625005..572e8d110 100644
--- a/netbox/templates/dcim/device/devicebays.html
+++ b/netbox/templates/dcim/device/devicebays.html
@@ -7,7 +7,9 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls.html' with table_modal="DeviceDeviceBayTable_config" %}
-    {% render_table table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
     <div class="noprint bulk-buttons">
         <div class="bulk-button-group">
             {% if perms.dcim.change_devicebay %}
diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html
index 5833a1c78..83dd2dc65 100644
--- a/netbox/templates/dcim/device/frontports.html
+++ b/netbox/templates/dcim/device/frontports.html
@@ -7,7 +7,9 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls.html' with table_modal="DeviceFrontPortTable_config" %}
-    {% render_table table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
     <div class="noprint bulk-buttons">
         <div class="bulk-button-group">
             {% if perms.dcim.change_frontport %}
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index 1d1e7e81b..7d9926fce 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -34,7 +34,9 @@
         </div>
       </div>
     </div>
-    {% render_table table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
     <div class="noprint bulk-buttons">
         <div class="bulk-button-group">
         {% if perms.dcim.change_interface %}
diff --git a/netbox/templates/dcim/device/inventory.html b/netbox/templates/dcim/device/inventory.html
index 2aad68984..ee1ce9f52 100644
--- a/netbox/templates/dcim/device/inventory.html
+++ b/netbox/templates/dcim/device/inventory.html
@@ -7,7 +7,9 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls.html' with table_modal="DeviceInventoryItemTable_config" %}
-    {% render_table table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
     <div class="noprint bulk-buttons">
         <div class="bulk-button-group">
             {% if perms.dcim.change_inventoryitem %}
diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html
index df936742e..ed49d24b8 100644
--- a/netbox/templates/dcim/device/poweroutlets.html
+++ b/netbox/templates/dcim/device/poweroutlets.html
@@ -7,7 +7,9 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls.html' with table_modal="DevicePowerOutletTable_config" %}
-    {% render_table table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
     <div class="noprint bulk-buttons">
         <div class="bulk-button-group">
             {% if perms.dcim.change_powerport %}
diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html
index 5a502dc57..453c5f5b0 100644
--- a/netbox/templates/dcim/device/powerports.html
+++ b/netbox/templates/dcim/device/powerports.html
@@ -7,7 +7,9 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls.html' with table_modal="DevicePowerPortTable_config" %}
-    {% render_table table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
     <div class="noprint bulk-buttons">
         <div class="bulk-button-group">
             {% if perms.dcim.change_powerport %}
diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html
index d0ff55ec9..37807cd14 100644
--- a/netbox/templates/dcim/device/rearports.html
+++ b/netbox/templates/dcim/device/rearports.html
@@ -7,7 +7,9 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls.html' with table_modal="DeviceRearPortTable_config" %}
-    {% render_table table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
     <div class="noprint bulk-buttons">
         <div class="bulk-button-group">
             {% if perms.dcim.change_rearport %}
diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html
index 22385ae27..c422a5eec 100644
--- a/netbox/templates/dcim/devicerole.html
+++ b/netbox/templates/dcim/devicerole.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   <li class="breadcrumb-item"><a href="{% url 'dcim:devicerole_list' %}">Device Roles</a></li>
@@ -72,8 +73,8 @@
       <h5 class="card-header">
         Devices
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=devices_table %}
+      <div class="card-body table-responsive">
+        {% render_table devices_table 'inc/table.html' %}
       </div>
       {% if perms.dcim.add_device %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 811bf6257..353bfe115 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -450,7 +450,7 @@
                 <h5 class="card-header">
                     IP Addresses
                 </h5>
-                <div class="card-body">
+                <div class="card-body table-responsive">
                     {% if ipaddress_table.rows %}
                         {% render_table ipaddress_table 'inc/table.html' %}
                     {% else %}
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index bb0763875..515aa7ff7 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -91,8 +92,8 @@
       <h5 class="card-header">
         Locations
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=child_locations_table %}
+      <div class="card-body table-responsive">
+        {% render_table child_locations_table 'inc/table.html' %}
       </div>
       {% if perms.dcim.add_location %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html
index d43a206c6..c3458eae1 100644
--- a/netbox/templates/dcim/manufacturer.html
+++ b/netbox/templates/dcim/manufacturer.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row mb-3">
@@ -49,8 +50,8 @@
       <h5 class="card-header">
         Device Types
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=devicetypes_table %}
+      <div class="card-body table-responsive">
+        {% render_table devicetypes_table 'inc/table.html' %}
       </div>
       {% if perms.dcim.add_devicetype %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index a926c4ed4..91ed63358 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -77,8 +78,8 @@
       <h5 class="card-header">
         Devices
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=devices_table %}
+      <div class="card-body table-responsive">
+        {% render_table devices_table 'inc/table.html' %}
       </div>
       {% if perms.dcim.add_device %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index 021fa1133..02db0e56f 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -54,7 +54,7 @@
         <form method="post">
             {% csrf_token %}
             <div class="card">
-                <div class="card-body">
+                <div class="card-body table-responsive">
                     {% render_table powerfeed_table 'inc/table.html' %}
                 </div>
                 <div class="card-footer noprint">
diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html
index 2f4661c9f..35b690ccb 100644
--- a/netbox/templates/dcim/rackrole.html
+++ b/netbox/templates/dcim/rackrole.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row mb-3">
@@ -48,8 +49,8 @@
       <h5 class="card-header">
         Racks
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=racks_table %}
+      <div class="card-body table-responsive">
+        {% render_table racks_table 'inc/table.html' %}
       </div>
       {% if perms.dcim.add_rack %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html
index 7452e594e..4bc2b5638 100644
--- a/netbox/templates/dcim/region.html
+++ b/netbox/templates/dcim/region.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -55,8 +56,8 @@
       <h5 class="card-header">
         Child Regions
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=child_regions_table %}
+      <div class="card-body table-responsive">
+        {% render_table child_regions_table 'inc/table.html' %}
       </div>
       {% if perms.dcim.add_region %}
         <div class="card-footer text-end noprint">
@@ -75,8 +76,8 @@
       <h5 class="card-header">
         Sites
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=sites_table %}
+      <div class="card-body table-responsive">
+        {% render_table sites_table 'inc/table.html' %}
       </div>
       {% if perms.dcim.add_site %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html
index d04330413..129b2789b 100644
--- a/netbox/templates/dcim/sitegroup.html
+++ b/netbox/templates/dcim/sitegroup.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -55,8 +56,8 @@
       <h5 class="card-header">
         Child Groups
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=child_groups_table %}
+      <div class="card-body table-responsive">
+        {% render_table child_groups_table 'inc/table.html' %}
       </div>
       {% if perms.dcim.add_sitegroup %}
         <div class="card-footer text-end noprint">
@@ -75,8 +76,8 @@
       <h5 class="card-header">
         Sites
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=sites_table %}
+      <div class="card-body table-responsive">
+        {% render_table sites_table 'inc/table.html' %}
       </div>
       {% if perms.dcim.add_site %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/extras/object_changelog.html b/netbox/templates/extras/object_changelog.html
index ab7f835c3..df4a0f73b 100644
--- a/netbox/templates/extras/object_changelog.html
+++ b/netbox/templates/extras/object_changelog.html
@@ -2,7 +2,9 @@
 {% load render_table from django_tables2 %}
 
 {% block content %}
-    {% render_table table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
     {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
     <div class="text-muted">
         Change log retention: {% if settings.CHANGELOG_RETENTION %}{{ settings.CHANGELOG_RETENTION }} days{% else %}Indefinite{% endif %}
diff --git a/netbox/templates/extras/object_journal.html b/netbox/templates/extras/object_journal.html
index d5d83193f..28dd4ec93 100644
--- a/netbox/templates/extras/object_journal.html
+++ b/netbox/templates/extras/object_journal.html
@@ -24,6 +24,8 @@
       </div>
     </form>
   {% endif %}
-  {% render_table table 'inc/table.html' %}
+  <div class="table-responsive">
+    {% render_table table 'inc/table.html' %}
+  </div>
   {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
 {% endblock %}
diff --git a/netbox/templates/generic/object_bulk_add_component.html b/netbox/templates/generic/object_bulk_add_component.html
index e9eadf92c..191b62211 100644
--- a/netbox/templates/generic/object_bulk_add_component.html
+++ b/netbox/templates/generic/object_bulk_add_component.html
@@ -1,5 +1,6 @@
 {% extends 'base/layout.html' %}
 {% load form_helpers %}
+{% load render_table from django_tables2 %}
 
 {% block title %}Add {{ model_name|title }}{% endblock %}
 
@@ -15,8 +16,8 @@
     {% endfor %}
     <div class="row">
         <div class="col col-md-7">
-            <div class="card">
-                {% include 'inc/table.html' %}
+            <div class="table-responsive">
+              {% render_table table 'inc/table.html' %}
             </div>
         </div>
         <div class="col col-md-5">
diff --git a/netbox/templates/generic/object_bulk_delete.html b/netbox/templates/generic/object_bulk_delete.html
index c6e363f2d..413b39a26 100644
--- a/netbox/templates/generic/object_bulk_delete.html
+++ b/netbox/templates/generic/object_bulk_delete.html
@@ -1,5 +1,6 @@
 {% extends 'base/layout.html' %}
 {% load helpers %}
+{% load render_table from django_tables2 %}
 
 {% block title %}Delete {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?{% endblock %}
 
@@ -15,7 +16,9 @@
         </div>
     </div>
     <div class="container-xl px-0">
-      {% include 'inc/table.html' %}
+      <div class="table-responsive">
+        {% render_table table 'inc/table.html' %}
+      </div>
       <div class="row mt-3">
         <form action="" method="post">
             {% csrf_token %}
diff --git a/netbox/templates/generic/object_bulk_edit.html b/netbox/templates/generic/object_bulk_edit.html
index aecfc4e71..cf5897184 100644
--- a/netbox/templates/generic/object_bulk_edit.html
+++ b/netbox/templates/generic/object_bulk_edit.html
@@ -1,6 +1,7 @@
 {% extends 'base/layout.html' %}
 {% load helpers %}
 {% load form_helpers %}
+{% load render_table from django_tables2 %}
 
 {% block title %}Editing {{ table.rows|length }} {{ obj_type_plural|bettertitle }}{% endblock %}
 
@@ -59,7 +60,9 @@
 
       {# Selected objects list #}
       <div class="tab-pane" id="object-list" role="tabpanel" aria-labelledby="object-list-tab">
-        {% include 'inc/table.html' %}
+        <div class="table-responsive">
+          {% render_table table 'inc/table.html' %}
+        </div>
       </div>
 
     {% endblock %}
diff --git a/netbox/templates/generic/object_bulk_remove.html b/netbox/templates/generic/object_bulk_remove.html
index 04be91f2d..0bda6adbc 100644
--- a/netbox/templates/generic/object_bulk_remove.html
+++ b/netbox/templates/generic/object_bulk_remove.html
@@ -1,5 +1,6 @@
 {% extends 'base/layout.html' %}
 {% load helpers %}
+{% load render_table from django_tables2 %}
 
 {% block title %}Remove {{ table.rows|length }} {{ obj_type_plural|bettertitle }}?{% endblock %}
 
@@ -13,7 +14,9 @@
   </div>
 </div>
 <div class="container-xl px-0">
-  {% include 'inc/table.html' %}
+  <div class="table-responsive">
+    {% render_table table 'inc/table.html' %}
+  </div>
   <form action="." method="post" class="form">
     {% csrf_token %}
     {% for field in form.hidden_fields %}
diff --git a/netbox/templates/inc/panel_table.html b/netbox/templates/inc/panel_table.html
index 599f6030a..f8b66647e 100644
--- a/netbox/templates/inc/panel_table.html
+++ b/netbox/templates/inc/panel_table.html
@@ -6,11 +6,11 @@
         {{ heading }}
     </h5>
     {% endif %}
-    <div class="card-body">
-    {% if table.rows %}
+    <div class="card-body table-responsive">
+      {% if table.rows %}
         {% render_table table 'inc/table.html' %}
-    {% else %}
+      {% else %}
         <div class="text-muted">None</div>
-    {% endif %}
+      {% endif %}
     </div>
 </div>
diff --git a/netbox/templates/inc/table.html b/netbox/templates/inc/table.html
index c38f50222..0cfa7c2b2 100644
--- a/netbox/templates/inc/table.html
+++ b/netbox/templates/inc/table.html
@@ -1,43 +1,41 @@
 {% load django_tables2 %}
 
-<div class="table-responsive">
-  <table{% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
-    {% if table.show_header %}
-      <thead>
+<table{% if table.attrs %} {{ table.attrs.as_html }}{% endif %}>
+  {% if table.show_header %}
+    <thead>
+      <tr>
+        {% for column in table.columns %}
+          {% if column.orderable %}
+            <th {{ column.attrs.th.as_html }}><a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a></th>
+          {% else %}
+            <th {{ column.attrs.th.as_html }}>{{ column.header }}</th>
+          {% endif %}
+        {% endfor %}
+      </tr>
+    </thead>
+  {% endif %}
+  <tbody>
+    {% for row in table.page.object_list|default:table.rows %}
+      <tr {{ row.attrs.as_html }}>
+        {% for column, cell in row.items %}
+          <td {{ column.attrs.td.as_html }}>{{ cell }}</td>
+        {% endfor %}
+      </tr>
+    {% empty %}
+      {% if table.empty_text %}
         <tr>
-          {% for column in table.columns %}
-            {% if column.orderable %}
-              <th {{ column.attrs.th.as_html }}><a href="{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}">{{ column.header }}</a></th>
-            {% else %}
-              <th {{ column.attrs.th.as_html }}>{{ column.header }}</th>
-            {% endif %}
-          {% endfor %}
+          <td colspan="{{ table.columns|length }}" class="text-center text-muted">&mdash; {{ table.empty_text }} &mdash;</td>
         </tr>
-      </thead>
-    {% endif %}
-    <tbody>
-      {% for row in table.page.object_list|default:table.rows %}
-        <tr {{ row.attrs.as_html }}>
-          {% for column, cell in row.items %}
-            <td {{ column.attrs.td.as_html }}>{{ cell }}</td>
-          {% endfor %}
-        </tr>
-      {% empty %}
-        {% if table.empty_text %}
-          <tr>
-            <td colspan="{{ table.columns|length }}" class="text-center text-muted">&mdash; {{ table.empty_text }} &mdash;</td>
-          </tr>
-        {% endif %}
-      {% endfor %}
-    </tbody>
-    {% if table.has_footer %}
-      <tfoot>
-        <tr>
-          {% for column in table.columns %}
-            <td>{{ column.footer }}</td>
-          {% endfor %}
-        </tr>
-      </tfoot>
-    {% endif %}
-  </table>
-</div>
+      {% endif %}
+    {% endfor %}
+  </tbody>
+  {% if table.has_footer %}
+    <tfoot>
+      <tr>
+        {% for column in table.columns %}
+          <td>{{ column.footer }}</td>
+        {% endfor %}
+      </tr>
+    </tfoot>
+  {% endif %}
+</table>
diff --git a/netbox/templates/ipam/asn.html b/netbox/templates/ipam/asn.html
index ad828c32e..8d8daccff 100644
--- a/netbox/templates/ipam/asn.html
+++ b/netbox/templates/ipam/asn.html
@@ -2,6 +2,7 @@
 {% load buttons %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -67,8 +68,8 @@
     <div class="col col-md-12">
       <div class="card">
         <h5 class="card-header">Sites</h5>
-        <div class="card-body">
-          {% include 'inc/table.html' with table=sites_table %}
+        <div class="card-body table-responsive">
+          {% render_table sites_table 'inc/table.html' %}
         </div>
       </div>
       {% include 'inc/paginator.html' with paginator=sites_table.paginator page=sites_table.page %}
diff --git a/netbox/templates/ipam/fhrpgroup.html b/netbox/templates/ipam/fhrpgroup.html
index 32ed1fc1c..b4911ce44 100644
--- a/netbox/templates/ipam/fhrpgroup.html
+++ b/netbox/templates/ipam/fhrpgroup.html
@@ -64,7 +64,7 @@
     <div class="col col-md-12">
       <div class="card">
         <h5 class="card-header">Virtual IP Addresses</h5>
-        <div class="card-body">
+        <div class="card-body table-responsive">
           {% if ipaddress_table.rows %}
             {% render_table ipaddress_table 'inc/table.html' %}
           {% else %}
@@ -81,7 +81,7 @@
       </div>
       <div class="card">
         <h5 class="card-header">Members</h5>
-        <div class="card-body">
+        <div class="card-body table-responsive">
           {% if members_table.rows %}
             {% render_table members_table 'inc/table.html' %}
           {% else %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index c39f4398a..93a4ef2e9 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -133,8 +133,8 @@
                       </div>
                     {% endif %}
                 </h5>
-                <div class="card-body">
-                {% render_table duplicate_ips_table 'inc/table.html' %}
+                <div class="card-body table-responsive">
+                  {% render_table duplicate_ips_table 'inc/table.html' %}
                 </div>
             </div>
         {% endif %}
diff --git a/netbox/templates/ipam/rir.html b/netbox/templates/ipam/rir.html
index c2f88c278..774b90b6b 100644
--- a/netbox/templates/ipam/rir.html
+++ b/netbox/templates/ipam/rir.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row mb-3">
@@ -52,8 +53,8 @@
       <h5 class="card-header">
         Aggregates
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=aggregates_table %}
+      <div class="card-body table-responsive">
+        {% render_table aggregates_table 'inc/table.html' %}
       </div>
       {% if perms.ipam.add_aggregate %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html
index 5579010fa..2a43e61df 100644
--- a/netbox/templates/ipam/role.html
+++ b/netbox/templates/ipam/role.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row mb-3">
@@ -46,8 +47,8 @@
       <h5 class="card-header">
         Prefixes
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=prefixes_table %}
+      <div class="card-body table-responsive">
+        {% render_table prefixes_table 'inc/table.html' %}
       </div>
       {% if perms.ipam.add_prefix %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html
index d51253b62..278872781 100644
--- a/netbox/templates/ipam/vlangroup.html
+++ b/netbox/templates/ipam/vlangroup.html
@@ -69,7 +69,7 @@
       <h5 class="card-header">
         VLANs
       </h5>
-      <div class="card-body">
+      <div class="card-body table-responsive">
         {% render_table vlans_table 'inc/table.html' %}
       </div>
       {% if perms.ipam.add_vlan %}
diff --git a/netbox/templates/tenancy/contact.html b/netbox/templates/tenancy/contact.html
index 7349a9e16..5b817e1bc 100644
--- a/netbox/templates/tenancy/contact.html
+++ b/netbox/templates/tenancy/contact.html
@@ -79,7 +79,7 @@
     <div class="col col-md-12">
       <div class="card">
         <h5 class="card-header">Assignments</h5>
-        <div class="card-body">
+        <div class="card-body table-responsive">
           {% if assignments_table.rows %}
             {% render_table assignments_table 'inc/table.html' %}
           {% else %}
diff --git a/netbox/templates/tenancy/contactgroup.html b/netbox/templates/tenancy/contactgroup.html
index 05ec88022..6271d8e17 100644
--- a/netbox/templates/tenancy/contactgroup.html
+++ b/netbox/templates/tenancy/contactgroup.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -54,8 +55,8 @@
         <h5 class="card-header">
           Child Groups
         </h5>
-        <div class="card-body">
-          {% include 'inc/table.html' with table=child_groups_table %}
+        <div class="card-body table-responsive">
+          {% render_table child_groups_table 'inc/table.html' %}
         </div>
         {% if perms.tenancy.add_contactgroup %}
           <div class="card-footer text-end noprint">
@@ -74,8 +75,8 @@
         <h5 class="card-header">
           Contacts
         </h5>
-        <div class="card-body">
-          {% include 'inc/table.html' with table=contacts_table %}
+        <div class="card-body table-responsive">
+          {% render_table contacts_table 'inc/table.html' %}
         </div>
         {% if perms.tenancy.add_contact %}
           <div class="card-footer text-end noprint">
diff --git a/netbox/templates/tenancy/contactrole.html b/netbox/templates/tenancy/contactrole.html
index 3272728f2..f21ee7637 100644
--- a/netbox/templates/tenancy/contactrole.html
+++ b/netbox/templates/tenancy/contactrole.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   <li class="breadcrumb-item"><a href="{% url 'tenancy:contactrole_list' %}">Contact Roles</a></li>
@@ -42,8 +43,8 @@
     <div class="col col-md-12">
       <div class="card">
         <h5 class="card-header">Assigned Contacts</h5>
-        <div class="card-body">
-          {% include 'inc/table.html' with table=contacts_table %}
+        <div class="card-body table-responsive">
+          {% render_table contacts_table 'inc/table.html' %}
         </div>
       </div>
       {% include 'inc/paginator.html' with paginator=contacts_table.paginator page=contacts_table.page %}
diff --git a/netbox/templates/tenancy/tenantgroup.html b/netbox/templates/tenancy/tenantgroup.html
index 75d2c5a27..a928ef2e8 100644
--- a/netbox/templates/tenancy/tenantgroup.html
+++ b/netbox/templates/tenancy/tenantgroup.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -59,8 +60,8 @@
       <div class="card-header">
         Tenants
       </div>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=tenants_table %}
+      <div class="card-body table-responsive">
+        {% render_table tenants_table 'inc/table.html' %}
       </div>
       {% if perms.tenancy.add_tenant %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/virtualization/clustergroup.html b/netbox/templates/virtualization/clustergroup.html
index 3979fa0e6..65568296e 100644
--- a/netbox/templates/virtualization/clustergroup.html
+++ b/netbox/templates/virtualization/clustergroup.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row mb-3">
@@ -43,8 +44,8 @@
       <h5 class="card-header">
         Clusters
       </h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=clusters_table %}
+      <div class="card-body table-responsive">
+        {% render_table clusters_table 'inc/table.html' %}
       </div>
       {% if perms.virtualization.add_cluster %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/virtualization/clustertype.html b/netbox/templates/virtualization/clustertype.html
index de5f3c519..c5c33fbcc 100644
--- a/netbox/templates/virtualization/clustertype.html
+++ b/netbox/templates/virtualization/clustertype.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row mb-3">
@@ -42,8 +43,8 @@
       <h5 class="card-header">
         Clusters
       </h5>
-      <div class="card-body">
-      {% include 'inc/table.html' with table=clusters_table %}
+      <div class="card-body table-responsive">
+        {% render_table clusters_table 'inc/table.html' %}
       </div>
       {% if perms.virtualization.add_cluster %}
         <div class="card-footer text-end noprint">
diff --git a/netbox/templates/virtualization/virtualmachine/interfaces.html b/netbox/templates/virtualization/virtualmachine/interfaces.html
index 143c8c70b..fe9e00435 100644
--- a/netbox/templates/virtualization/virtualmachine/interfaces.html
+++ b/netbox/templates/virtualization/virtualmachine/interfaces.html
@@ -7,7 +7,9 @@
   <form method="post">
     {% csrf_token %}
     {% include 'inc/table_controls.html' with table_modal="VirtualMachineVMInterfaceTable_config" %}
-    {% render_table interface_table 'inc/table.html' %}
+    <div class="table-responsive">
+      {% render_table interface_table 'inc/table.html' %}
+    </div>
     <div class="noprint">
         {% if perms.virtualization.change_vminterface %}
             <button type="submit" name="_rename" formaction="{% url 'virtualization:vminterface_bulk_rename' %}?return_url={% url 'virtualization:virtualmachine_interfaces' pk=object.pk %}" class="btn btn-warning btn-sm">
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index 105adb6b7..68b036950 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -91,7 +91,7 @@
             <h5 class="card-header">
                 IP Addresses
             </h5>
-            <div class="card-body">
+            <div class="card-body table-responsive">
                 {% if ipaddress_table.rows %}
                     {% render_table ipaddress_table 'inc/table.html' %}
                 {% else %}
diff --git a/netbox/templates/wireless/wirelesslan.html b/netbox/templates/wireless/wirelesslan.html
index 370102ed1..babb8a10d 100644
--- a/netbox/templates/wireless/wirelesslan.html
+++ b/netbox/templates/wireless/wirelesslan.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row">
@@ -53,8 +54,8 @@
   <div class="col col-md-12">
     <div class="card">
       <h5 class="card-header">Attached Interfaces</h5>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=interfaces_table %}
+      <div class="card-body table-responsive">
+        {% render_table interfaces_table 'inc/table.html' %}
       </div>
     </div>
     {% include 'inc/paginator.html' with paginator=interfaces_table.paginator page=interfaces_table.page %}
diff --git a/netbox/templates/wireless/wirelesslangroup.html b/netbox/templates/wireless/wirelesslangroup.html
index 3e6bc382e..9b73d1908 100644
--- a/netbox/templates/wireless/wirelesslangroup.html
+++ b/netbox/templates/wireless/wirelesslangroup.html
@@ -1,6 +1,7 @@
 {% extends 'generic/object.html' %}
 {% load helpers %}
 {% load plugins %}
+{% load render_table from django_tables2 %}
 
 {% block breadcrumbs %}
   {{ block.super }}
@@ -55,8 +56,8 @@
 	<div class="col col-md-12">
     <div class="card">
       <div class="card-header">Wireless LANs</div>
-      <div class="card-body">
-        {% include 'inc/table.html' with table=wirelesslans_table %}
+      <div class="card-body table-responsive">
+        {% render_table wirelesslans_table 'inc/table.html' %}
       </div>
       {% if perms.wireless.add_wirelesslan %}
         <div class="card-footer text-end noprint">