From faa993acfb6ea2a1ef048574abb70305291cec65 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Mon, 12 Jul 2021 15:36:51 -0400
Subject: [PATCH] Use non-card tables for all tabbed views

---
 netbox/templates/extras/object_changelog.html  | 3 ++-
 netbox/templates/extras/object_journal.html    | 5 ++---
 netbox/templates/ipam/aggregate.html           | 2 +-
 netbox/templates/ipam/ipaddress.html           | 2 +-
 netbox/templates/ipam/ipaddress_assign.html    | 2 +-
 netbox/templates/ipam/prefix/ip_addresses.html | 2 +-
 netbox/templates/ipam/prefix/prefixes.html     | 2 +-
 netbox/templates/ipam/vlan/interfaces.html     | 2 +-
 netbox/templates/ipam/vlan/vminterfaces.html   | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/netbox/templates/extras/object_changelog.html b/netbox/templates/extras/object_changelog.html
index 9aee57a8a..ab7f835c3 100644
--- a/netbox/templates/extras/object_changelog.html
+++ b/netbox/templates/extras/object_changelog.html
@@ -1,7 +1,8 @@
 {% extends base_template %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
-    {% include 'inc/panel_table.html' %}
+    {% render_table table 'inc/table.html' %}
     {% 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 7cbb70e49..654d68e7c 100644
--- a/netbox/templates/extras/object_journal.html
+++ b/netbox/templates/extras/object_journal.html
@@ -1,5 +1,6 @@
 {% extends base_template %}
 {% load form_helpers %}
+{% load render_table from django_tables2 %}
 
 {% render_errors form %}
 
@@ -23,8 +24,6 @@
         </div>
     </form>
     {% endif %}
-    <div class="col col-md-9 mb-3">
-        {% include 'inc/panel_table.html' %}
-    </div>
+    {% render_table table 'inc/table.html' %}
     {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
 {% endblock %}
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index d8fb04558..4696465c7 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -77,7 +77,7 @@
 </div>
 <div class="row mb-3">
     <div class="col col-md-12">
-        {% include 'utilities/obj_table.html' with table=prefix_table table_template='inc/panel_table.html' heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
+        {% include 'utilities/obj_table.html' with table=prefix_table heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
 	</div>
 </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html
index ae31979d9..effdbfab7 100644
--- a/netbox/templates/ipam/ipaddress.html
+++ b/netbox/templates/ipam/ipaddress.html
@@ -138,7 +138,7 @@
             </div>
         {% endif %}
         <div class="my-3">
-        {% include 'utilities/obj_table.html' with table=related_ips_table table_template='inc/panel_table.html' heading='Related IP Addresses' %}
+        {% include 'utilities/obj_table.html' with table=related_ips_table heading='Related IP Addresses' %}
         </div>
         {% plugin_right_page object %}
 	</div>
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html
index 4df17b53b..2aa195073 100644
--- a/netbox/templates/ipam/ipaddress_assign.html
+++ b/netbox/templates/ipam/ipaddress_assign.html
@@ -34,7 +34,7 @@
         <div class="row mb-3">
             <div class="col col-md-12">
                 <h3>Search Results</h3>
-                {% include 'utilities/obj_table.html' with table_template='inc/panel_table.html' %}
+                {% include 'utilities/obj_table.html' %}
             </div>
         </div>
     {% endif %}
diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html
index 09c800b01..d67e136f0 100644
--- a/netbox/templates/ipam/prefix/ip_addresses.html
+++ b/netbox/templates/ipam/prefix/ip_addresses.html
@@ -12,7 +12,7 @@
 {% block content %}
   <div class="row">
     <div class="col col-md-12">
-      {% include 'utilities/obj_table.html' with table=ip_table table_template='inc/panel_table.html' heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
+      {% include 'utilities/obj_table.html' with table=ip_table heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
     </div>
   </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/prefix/prefixes.html b/netbox/templates/ipam/prefix/prefixes.html
index b33288768..4f18c476c 100644
--- a/netbox/templates/ipam/prefix/prefixes.html
+++ b/netbox/templates/ipam/prefix/prefixes.html
@@ -19,7 +19,7 @@
 {% block content %}
   <div class="row">
     <div class="col col-md-12">
-      {% include 'utilities/obj_table.html' with table=prefix_table table_template='inc/panel_table.html' heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' parent=prefix %}
+      {% include 'utilities/obj_table.html' with table=prefix_table heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' parent=prefix %}
     </div>
   </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/vlan/interfaces.html b/netbox/templates/ipam/vlan/interfaces.html
index a114c9c74..d0eff51e5 100644
--- a/netbox/templates/ipam/vlan/interfaces.html
+++ b/netbox/templates/ipam/vlan/interfaces.html
@@ -3,7 +3,7 @@
 {% block content %}
   <div class="row">
     <div class="col col-md-12">
-      {% include 'utilities/obj_table.html' with table=members_table table_template='inc/panel_table.html' heading='Device Interfaces' parent=vlan %}
+      {% include 'utilities/obj_table.html' with table=members_table heading='Device Interfaces' parent=vlan %}
     </div>
   </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/vlan/vminterfaces.html b/netbox/templates/ipam/vlan/vminterfaces.html
index 68cde9d1e..33e78a39f 100644
--- a/netbox/templates/ipam/vlan/vminterfaces.html
+++ b/netbox/templates/ipam/vlan/vminterfaces.html
@@ -3,7 +3,7 @@
 {% block content %}
   <div class="row">
     <div class="col col-md-12">
-      {% include 'utilities/obj_table.html' with table=members_table table_template='inc/panel_table.html' heading='Virtual Machine Interfaces' parent=vlan %}
+      {% include 'utilities/obj_table.html' with table=members_table heading='Virtual Machine Interfaces' parent=vlan %}
     </div>
   </div>
 {% endblock %}