From 91f33d328936f85569e796ca0a1ba95f51ffe355 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 13 Dec 2021 16:51:59 -0500 Subject: [PATCH 01/13] #8057: Enable dynamic tables for object list views --- netbox/netbox/views/generic.py | 7 ++++ netbox/templates/base/base.html | 3 ++ netbox/templates/generic/object_list.html | 7 ++-- netbox/templates/htmx/table.html | 5 +++ netbox/templates/inc/paginator_htmx.html | 43 +++++++++++++++++++++++ netbox/templates/inc/table_htmx.html | 41 +++++++++++++++++++++ netbox/utilities/htmx.py | 5 +++ 7 files changed, 107 insertions(+), 4 deletions(-) create mode 100644 netbox/templates/htmx/table.html create mode 100644 netbox/templates/inc/paginator_htmx.html create mode 100644 netbox/templates/inc/table_htmx.html create mode 100644 netbox/utilities/htmx.py diff --git a/netbox/netbox/views/generic.py b/netbox/netbox/views/generic.py index 1c2ff9917..9b6ae691b 100644 --- a/netbox/netbox/views/generic.py +++ b/netbox/netbox/views/generic.py @@ -23,6 +23,7 @@ from utilities.exceptions import AbortTransaction, PermissionsViolation from utilities.forms import ( BootstrapMixin, BulkRenameForm, ConfirmationForm, CSVDataField, CSVFileField, ImportForm, restrict_form_fields, ) +from utilities.htmx import is_htmx from utilities.permissions import get_permission_for_model from utilities.tables import paginate_table from utilities.utils import normalize_querydict, prepare_cloned_fields @@ -185,6 +186,12 @@ class ObjectListView(ObjectPermissionRequiredMixin, View): table = self.get_table(request, permissions) paginate_table(table, request) + # If this is an HTMX request, return only the rendered table HTML + if is_htmx(request): + return render(request, 'htmx/table.html', { + 'table': table, + }) + context = { 'content_type': content_type, 'table': table, diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html index 43e5c2dfb..52d9c6603 100644 --- a/netbox/templates/base/base.html +++ b/netbox/templates/base/base.html @@ -160,6 +160,9 @@ })(); + {# TODO: Package HTMX JS locally #} + + {# Page layout #} {% block layout %}{% endblock %} diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html index 61e799eee..1436958d7 100644 --- a/netbox/templates/generic/object_list.html +++ b/netbox/templates/generic/object_list.html @@ -95,10 +95,11 @@ {# Object table #}
-
+
- {% render_table table 'inc/table.html' %} + {% render_table table 'inc/table_htmx.html' %}
+ {% include 'inc/paginator_htmx.html' with paginator=table.paginator page=table.page %}
@@ -125,8 +126,6 @@ - {# Paginator #} - {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
{# Filter form #} diff --git a/netbox/templates/htmx/table.html b/netbox/templates/htmx/table.html new file mode 100644 index 000000000..711708e32 --- /dev/null +++ b/netbox/templates/htmx/table.html @@ -0,0 +1,5 @@ +{# Render an HTML table element #} +{% load render_table from django_tables2 %} + +{% render_table table 'inc/table_htmx.html' %} +{% include 'inc/paginator_htmx.html' with paginator=table.paginator page=table.page %} diff --git a/netbox/templates/inc/paginator_htmx.html b/netbox/templates/inc/paginator_htmx.html new file mode 100644 index 000000000..c3b50cbd4 --- /dev/null +++ b/netbox/templates/inc/paginator_htmx.html @@ -0,0 +1,43 @@ +{% load helpers %} + +
+
+ {% if paginator.num_pages > 1 %} +
+ {% if page.has_previous %} + + + + {% endif %} + {% for p in page.smart_pages %} + {% if p %} + + {{ p }} + + {% else %} + + {% endif %} + {% endfor %} + {% if page.has_next %} + + + + {% endif %} +
+ {% endif %} +
+
+
+ +
    + {% for n in page.paginator.get_page_lengths %} +
  • {{ n }}
    • + {% endfor %} +
+
+
+
diff --git a/netbox/templates/inc/table_htmx.html b/netbox/templates/inc/table_htmx.html new file mode 100644 index 000000000..58b5e7294 --- /dev/null +++ b/netbox/templates/inc/table_htmx.html @@ -0,0 +1,41 @@ +{% load django_tables2 %} + + + {% if table.show_header %} + + + {% for column in table.columns %} + {% if column.orderable %} + {{ column.header }} + {% else %} + {{ column.header }} + {% endif %} + {% endfor %} + + + {% endif %} + + {% for row in table.page.object_list|default:table.rows %} + + {% for column, cell in row.items %} + {{ cell }} + {% endfor %} + + {% empty %} + {% if table.empty_text %} + + — {{ table.empty_text }} — + + {% endif %} + {% endfor %} + + {% if table.has_footer %} + + + {% for column in table.columns %} + {{ column.footer }} + {% endfor %} + + + {% endif %} + diff --git a/netbox/utilities/htmx.py b/netbox/utilities/htmx.py new file mode 100644 index 000000000..8fc568e2b --- /dev/null +++ b/netbox/utilities/htmx.py @@ -0,0 +1,5 @@ +def is_htmx(request): + """ + Returns True if the request was made by HTMX; False otherwise. + """ + return 'Hx-Request' in request.headers From 5c34a7503216dffe86c8072142384cf182cb4a6b Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 13 Dec 2021 20:13:06 -0500 Subject: [PATCH 02/13] Enable HTMX for quick table search --- netbox/templates/generic/object_list.html | 2 +- netbox/templates/inc/table_controls_htmx.html | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 netbox/templates/inc/table_controls_htmx.html diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html index 1436958d7..f05cc3f4d 100644 --- a/netbox/templates/generic/object_list.html +++ b/netbox/templates/generic/object_list.html @@ -87,7 +87,7 @@ {% endif %} {# Object table controls #} - {% include 'inc/table_controls.html' with table_modal="ObjectTable_config" %} + {% include 'inc/table_controls_htmx.html' with table_modal="ObjectTable_config" %}
{% csrf_token %} diff --git a/netbox/templates/inc/table_controls_htmx.html b/netbox/templates/inc/table_controls_htmx.html new file mode 100644 index 000000000..ab8167bc0 --- /dev/null +++ b/netbox/templates/inc/table_controls_htmx.html @@ -0,0 +1,32 @@ +{% load helpers %} + +
+
+
+ +
+
+
+ {% if request.user.is_authenticated and table_modal %} +
+ +
+ {% endif %} +
+
From 6dd6094088bc483508a776e84a809c688f29449c Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 14 Dec 2021 08:25:17 -0500 Subject: [PATCH 03/13] Push HTMX URL to browser location --- netbox/templates/inc/paginator_htmx.html | 30 ++++++++++++++++++++---- netbox/templates/inc/table_htmx.html | 8 ++++++- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/netbox/templates/inc/paginator_htmx.html b/netbox/templates/inc/paginator_htmx.html index c3b50cbd4..75a904a15 100644 --- a/netbox/templates/inc/paginator_htmx.html +++ b/netbox/templates/inc/paginator_htmx.html @@ -5,13 +5,23 @@ {% if paginator.num_pages > 1 %}
{% if page.has_previous %} - + {% endif %} {% for p in page.smart_pages %} {% if p %} - + {{ p }} {% else %} @@ -21,7 +31,12 @@ {% endif %} {% endfor %} {% if page.has_next %} - + {% endif %} @@ -35,7 +50,14 @@
    {% for n in page.paginator.get_page_lengths %} -
  • {{ n }}
    • +
  • + {{ n }} +
    • {% endfor %}
diff --git a/netbox/templates/inc/table_htmx.html b/netbox/templates/inc/table_htmx.html index 58b5e7294..7a20debae 100644 --- a/netbox/templates/inc/table_htmx.html +++ b/netbox/templates/inc/table_htmx.html @@ -6,7 +6,13 @@ {% for column in table.columns %} {% if column.orderable %} - {{ column.header }} + + {{ column.header }} + {% else %} {{ column.header }} {% endif %} From 414d33eb2635d8fa18c0938d0ea11e080f2f2b36 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 14 Dec 2021 11:41:39 -0500 Subject: [PATCH 04/13] Refactor HTMX table template --- netbox/templates/generic/object_list.html | 5 +- netbox/templates/htmx/table.html | 2 +- netbox/templates/inc/table_htmx.html | 88 ++++++++++++----------- 3 files changed, 47 insertions(+), 48 deletions(-) diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html index f05cc3f4d..1de818ef6 100644 --- a/netbox/templates/generic/object_list.html +++ b/netbox/templates/generic/object_list.html @@ -96,10 +96,7 @@ {# Object table #}
-
- {% render_table table 'inc/table_htmx.html' %} -
- {% include 'inc/paginator_htmx.html' with paginator=table.paginator page=table.page %} + {% include 'htmx/table.html' %}
diff --git a/netbox/templates/htmx/table.html b/netbox/templates/htmx/table.html index 711708e32..c5d0ac46b 100644 --- a/netbox/templates/htmx/table.html +++ b/netbox/templates/htmx/table.html @@ -1,4 +1,4 @@ -{# Render an HTML table element #} +{# Render an HTMX-enabled table with paginator #} {% load render_table from django_tables2 %} {% render_table table 'inc/table_htmx.html' %} diff --git a/netbox/templates/inc/table_htmx.html b/netbox/templates/inc/table_htmx.html index 7a20debae..bf8156c2b 100644 --- a/netbox/templates/inc/table_htmx.html +++ b/netbox/templates/inc/table_htmx.html @@ -1,47 +1,49 @@ {% load django_tables2 %} - - {% if table.show_header %} - - - {% for column in table.columns %} - {% if column.orderable %} - - {{ column.header }} - - {% else %} - {{ column.header }} - {% endif %} - {% endfor %} - - - {% endif %} - - {% for row in table.page.object_list|default:table.rows %} - - {% for column, cell in row.items %} - {{ cell }} - {% endfor %} - - {% empty %} - {% if table.empty_text %} +
+ + {% if table.show_header %} + - — {{ table.empty_text }} — + {% for column in table.columns %} + {% if column.orderable %} + + {{ column.header }} + + {% else %} + {{ column.header }} + {% endif %} + {% endfor %} - {% endif %} - {% endfor %} - - {% if table.has_footer %} - - - {% for column in table.columns %} - {{ column.footer }} - {% endfor %} - - - {% endif %} - + + {% endif %} + + {% for row in table.page.object_list|default:table.rows %} + + {% for column, cell in row.items %} + {{ cell }} + {% endfor %} + + {% empty %} + {% if table.empty_text %} + + — {{ table.empty_text }} — + + {% endif %} + {% endfor %} + + {% if table.has_footer %} + + + {% for column in table.columns %} + {{ column.footer }} + {% endfor %} + + + {% endif %} + +
From 491eac184ec2f9183b61c97578ea30ce068a0cd3 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 14 Dec 2021 11:53:16 -0500 Subject: [PATCH 05/13] Enable HTMX for connections lists --- netbox/templates/dcim/connections_list.html | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/netbox/templates/dcim/connections_list.html b/netbox/templates/dcim/connections_list.html index 5dbea9129..ef8bef828 100644 --- a/netbox/templates/dcim/connections_list.html +++ b/netbox/templates/dcim/connections_list.html @@ -8,19 +8,14 @@ {% block content-wrapper %}
- {# Conncetions list #} + {# Connections list #}
- {% include 'inc/table_controls.html' %} - + {% include 'inc/table_controls_htmx.html' %}
-
-
- {% render_table table 'inc/table.html' %} -
+
+ {% include 'htmx/table.html' %}
- - {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %}
{# Filter form #} From 4ffa823ab80d82e675b1d3dca9753d60c944e95b Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 14 Dec 2021 15:31:42 -0500 Subject: [PATCH 06/13] Enable HTMX for all ObjectChildrenViews --- netbox/dcim/views.py | 17 ++++++++++ netbox/ipam/views.py | 11 +++++-- netbox/netbox/views/generic.py | 13 +++++++- .../templates/dcim/device/consoleports.html | 11 ++++--- .../dcim/device/consoleserverports.html | 10 ++++-- netbox/templates/dcim/device/devicebays.html | 10 ++++-- netbox/templates/dcim/device/frontports.html | 10 ++++-- netbox/templates/dcim/device/interfaces.html | 18 +++++++++-- netbox/templates/dcim/device/inventory.html | 10 ++++-- .../templates/dcim/device/poweroutlets.html | 10 ++++-- netbox/templates/dcim/device/powerports.html | 10 ++++-- netbox/templates/dcim/device/rearports.html | 10 ++++-- .../dcim/devicetype/component_templates.html | 18 ++++------- .../templates/ipam/iprange/ip_addresses.html | 30 ++++++++++++++--- .../templates/ipam/prefix/ip_addresses.html | 32 +++++++++++++++---- netbox/templates/ipam/prefix/ip_ranges.html | 32 +++++++++++++++---- netbox/templates/ipam/prefix/prefixes.html | 32 +++++++++++++++---- netbox/templates/ipam/vlan/interfaces.html | 16 +++++++--- netbox/templates/ipam/vlan/vminterfaces.html | 16 +++++++--- .../virtualization/cluster/devices.html | 31 +++++++++--------- .../cluster/virtual_machines.html | 32 +++++++++++++------ .../virtualmachine/interfaces.html | 11 ++++--- netbox/virtualization/views.py | 4 +++ 23 files changed, 290 insertions(+), 104 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index b4096973a..a1d1102de 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -797,41 +797,49 @@ class DeviceTypeView(generic.ObjectView): class DeviceTypeConsolePortsView(DeviceTypeComponentsView): child_model = ConsolePortTemplate table = tables.ConsolePortTemplateTable + filterset = filtersets.ConsolePortTemplateFilterSet class DeviceTypeConsoleServerPortsView(DeviceTypeComponentsView): child_model = ConsoleServerPortTemplate table = tables.ConsoleServerPortTemplateTable + filterset = filtersets.ConsoleServerPortTemplateFilterSet class DeviceTypePowerPortsView(DeviceTypeComponentsView): child_model = PowerPortTemplate table = tables.PowerPortTemplateTable + filterset = filtersets.PowerPortTemplateFilterSet class DeviceTypePowerOutletsView(DeviceTypeComponentsView): child_model = PowerOutletTemplate table = tables.PowerOutletTemplateTable + filterset = filtersets.PowerOutletTemplateFilterSet class DeviceTypeInterfacesView(DeviceTypeComponentsView): child_model = InterfaceTemplate table = tables.InterfaceTemplateTable + filterset = filtersets.InterfaceTemplateFilterSet class DeviceTypeFrontPortsView(DeviceTypeComponentsView): child_model = FrontPortTemplate table = tables.FrontPortTemplateTable + filterset = filtersets.FrontPortTemplateFilterSet class DeviceTypeRearPortsView(DeviceTypeComponentsView): child_model = RearPortTemplate table = tables.RearPortTemplateTable + filterset = filtersets.RearPortTemplateFilterSet class DeviceTypeDeviceBaysView(DeviceTypeComponentsView): child_model = DeviceBayTemplate table = tables.DeviceBayTemplateTable + filterset = filtersets.DeviceBayTemplateFilterSet class DeviceTypeEditView(generic.ObjectEditView): @@ -1328,30 +1336,35 @@ class DeviceView(generic.ObjectView): class DeviceConsolePortsView(DeviceComponentsView): child_model = ConsolePort table = tables.DeviceConsolePortTable + filterset = filtersets.ConsolePortFilterSet template_name = 'dcim/device/consoleports.html' class DeviceConsoleServerPortsView(DeviceComponentsView): child_model = ConsoleServerPort table = tables.DeviceConsoleServerPortTable + filterset = filtersets.ConsoleServerPortFilterSet template_name = 'dcim/device/consoleserverports.html' class DevicePowerPortsView(DeviceComponentsView): child_model = PowerPort table = tables.DevicePowerPortTable + filterset = filtersets.PowerPortFilterSet template_name = 'dcim/device/powerports.html' class DevicePowerOutletsView(DeviceComponentsView): child_model = PowerOutlet table = tables.DevicePowerOutletTable + filterset = filtersets.PowerOutletFilterSet template_name = 'dcim/device/poweroutlets.html' class DeviceInterfacesView(DeviceComponentsView): child_model = Interface table = tables.DeviceInterfaceTable + filterset = filtersets.InterfaceFilterSet template_name = 'dcim/device/interfaces.html' def get_children(self, request, parent): @@ -1364,24 +1377,28 @@ class DeviceInterfacesView(DeviceComponentsView): class DeviceFrontPortsView(DeviceComponentsView): child_model = FrontPort table = tables.DeviceFrontPortTable + filterset = filtersets.FrontPortFilterSet template_name = 'dcim/device/frontports.html' class DeviceRearPortsView(DeviceComponentsView): child_model = RearPort table = tables.DeviceRearPortTable + filterset = filtersets.RearPortFilterSet template_name = 'dcim/device/rearports.html' class DeviceDeviceBaysView(DeviceComponentsView): child_model = DeviceBay table = tables.DeviceDeviceBayTable + filterset = filtersets.DeviceBayFilterSet template_name = 'dcim/device/devicebays.html' class DeviceInventoryView(DeviceComponentsView): child_model = InventoryItem table = tables.DeviceInventoryItemTable + filterset = filtersets.InventoryItemFilterSet template_name = 'dcim/device/inventory.html' diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 08253c054..7e6e1725f 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -1,21 +1,22 @@ from django.contrib.contenttypes.models import ContentType from django.db.models import Prefetch from django.db.models.expressions import RawSQL -from django.http import Http404 from django.shortcuts import get_object_or_404, redirect, render from django.urls import reverse +from dcim.filtersets import InterfaceFilterSet from dcim.models import Device, Interface, Site from dcim.tables import SiteTable from netbox.views import generic from utilities.tables import paginate_table from utilities.utils import count_related +from virtualization.filtersets import VMInterfaceFilterSet from virtualization.models import VirtualMachine, VMInterface from . import filtersets, forms, tables from .constants import * from .models import * from .models import ASN -from .utils import add_available_ipaddresses, add_requested_prefixes, add_available_vlans +from .utils import add_requested_prefixes, add_available_vlans # @@ -457,6 +458,7 @@ class PrefixPrefixesView(generic.ObjectChildrenView): queryset = Prefix.objects.all() child_model = Prefix table = tables.PrefixTable + filterset = filtersets.PrefixFilterSet template_name = 'ipam/prefix/prefixes.html' def get_children(self, request, parent): @@ -483,6 +485,7 @@ class PrefixIPRangesView(generic.ObjectChildrenView): queryset = Prefix.objects.all() child_model = IPRange table = tables.IPRangeTable + filterset = filtersets.IPRangeFilterSet template_name = 'ipam/prefix/ip_ranges.html' def get_children(self, request, parent): @@ -499,6 +502,7 @@ class PrefixIPAddressesView(generic.ObjectChildrenView): queryset = Prefix.objects.all() child_model = IPAddress table = tables.IPAddressTable + filterset = filtersets.IPAddressFilterSet template_name = 'ipam/prefix/ip_addresses.html' def get_children(self, request, parent): @@ -560,6 +564,7 @@ class IPRangeIPAddressesView(generic.ObjectChildrenView): queryset = IPRange.objects.all() child_model = IPAddress table = tables.IPAddressTable + filterset = filtersets.IPAddressFilterSet template_name = 'ipam/iprange/ip_addresses.html' def get_children(self, request, parent): @@ -959,6 +964,7 @@ class VLANInterfacesView(generic.ObjectChildrenView): queryset = VLAN.objects.all() child_model = Interface table = tables.VLANDevicesTable + filterset = InterfaceFilterSet template_name = 'ipam/vlan/interfaces.html' def get_children(self, request, parent): @@ -974,6 +980,7 @@ class VLANVMInterfacesView(generic.ObjectChildrenView): queryset = VLAN.objects.all() child_model = VMInterface table = tables.VLANVirtualMachinesTable + filterset = VMInterfaceFilterSet template_name = 'ipam/vlan/vminterfaces.html' def get_children(self, request, parent): diff --git a/netbox/netbox/views/generic.py b/netbox/netbox/views/generic.py index 62d580bf5..84928dfff 100644 --- a/netbox/netbox/views/generic.py +++ b/netbox/netbox/views/generic.py @@ -84,11 +84,12 @@ class ObjectChildrenView(ObjectView): queryset = None child_model = None table = None + filterset = None template_name = None def get_children(self, request, parent): """ - Return a QuerySet or iterable of child objects. + Return a QuerySet of child objects. request: The current request parent: The parent object @@ -102,6 +103,9 @@ class ObjectChildrenView(ObjectView): instance = get_object_or_404(self.queryset, **kwargs) child_objects = self.get_children(request, instance) + if self.filterset: + child_objects = self.filterset(request.GET, child_objects).qs + permissions = {} for action in ('change', 'delete'): perm_name = get_permission_for_model(self.child_model, action) @@ -113,6 +117,13 @@ class ObjectChildrenView(ObjectView): table.columns.show('pk') paginate_table(table, request) + # If this is an HTMX request, return only the rendered table HTML + if is_htmx(request): + return render(request, 'htmx/table.html', { + 'object': instance, + 'table': table, + }) + return render(request, self.get_template_name(), { 'object': instance, 'table': table, diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html index 066c19b73..b5a8a0f39 100644 --- a/netbox/templates/dcim/device/consoleports.html +++ b/netbox/templates/dcim/device/consoleports.html @@ -6,10 +6,14 @@ {% block content %} {% csrf_token %} - {% include 'inc/table_controls.html' with table_modal="DeviceConsolePortTable_config" %} -
- {% render_table table 'inc/table.html' %} + {% include 'inc/table_controls_htmx.html' with table_modal="DeviceConsolePortTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
+
{% if perms.dcim.change_consoleport %} @@ -38,6 +42,5 @@ {% endif %}
- {% include 'inc/paginator.html' with paginator=table.paginator page=table.page %} {% table_config_form table %} {% endblock %} diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html index 97c98bb9f..f77ef0169 100644 --- a/netbox/templates/dcim/device/consoleserverports.html +++ b/netbox/templates/dcim/device/consoleserverports.html @@ -6,10 +6,14 @@ {% block content %}
{% csrf_token %} - {% include 'inc/table_controls.html' with table_modal="DeviceConsoleServerPortTable_config" %} -
- {% render_table table 'inc/table.html' %} + {% include 'inc/table_controls_htmx.html' with table_modal="DeviceConsoleServerPortTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
+
{% if perms.dcim.change_consoleserverport %} diff --git a/netbox/templates/dcim/device/devicebays.html b/netbox/templates/dcim/device/devicebays.html index 572e8d110..960610fa8 100644 --- a/netbox/templates/dcim/device/devicebays.html +++ b/netbox/templates/dcim/device/devicebays.html @@ -6,10 +6,14 @@ {% block content %} {% csrf_token %} - {% include 'inc/table_controls.html' with table_modal="DeviceDeviceBayTable_config" %} -
- {% render_table table 'inc/table.html' %} + {% include 'inc/table_controls_htmx.html' with table_modal="DeviceDeviceBayTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
+
{% if perms.dcim.change_devicebay %} diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html index 83dd2dc65..18c08abe4 100644 --- a/netbox/templates/dcim/device/frontports.html +++ b/netbox/templates/dcim/device/frontports.html @@ -6,10 +6,14 @@ {% block content %} {% csrf_token %} - {% include 'inc/table_controls.html' with table_modal="DeviceFrontPortTable_config" %} -
- {% render_table table 'inc/table.html' %} + {% include 'inc/table_controls_htmx.html' with table_modal="DeviceFrontPortTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
+
{% if perms.dcim.change_frontport %} diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html index 7d9926fce..c7d86ae89 100644 --- a/netbox/templates/dcim/device/interfaces.html +++ b/netbox/templates/dcim/device/interfaces.html @@ -9,7 +9,15 @@
- +
@@ -34,9 +42,13 @@
-
- {% render_table table 'inc/table.html' %} + +
+
+ {% include 'htmx/table.html' %} +
+
{% if perms.dcim.change_interface %} diff --git a/netbox/templates/dcim/device/inventory.html b/netbox/templates/dcim/device/inventory.html index ee1ce9f52..699ae378f 100644 --- a/netbox/templates/dcim/device/inventory.html +++ b/netbox/templates/dcim/device/inventory.html @@ -6,10 +6,14 @@ {% block content %} {% csrf_token %} - {% include 'inc/table_controls.html' with table_modal="DeviceInventoryItemTable_config" %} -
- {% render_table table 'inc/table.html' %} + {% include 'inc/table_controls_htmx.html' with table_modal="DeviceInventoryItemTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
+
{% if perms.dcim.change_inventoryitem %} diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html index ed49d24b8..af94e1264 100644 --- a/netbox/templates/dcim/device/poweroutlets.html +++ b/netbox/templates/dcim/device/poweroutlets.html @@ -6,10 +6,14 @@ {% block content %} {% csrf_token %} - {% include 'inc/table_controls.html' with table_modal="DevicePowerOutletTable_config" %} -
- {% render_table table 'inc/table.html' %} + {% include 'inc/table_controls_htmx.html' with table_modal="DevicePowerOutletTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
+
{% if perms.dcim.change_powerport %} diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html index 453c5f5b0..7b993bc73 100644 --- a/netbox/templates/dcim/device/powerports.html +++ b/netbox/templates/dcim/device/powerports.html @@ -6,10 +6,14 @@ {% block content %} {% csrf_token %} - {% include 'inc/table_controls.html' with table_modal="DevicePowerPortTable_config" %} -
- {% render_table table 'inc/table.html' %} + {% include 'inc/table_controls_htmx.html' with table_modal="DevicePowerPortTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
+
{% if perms.dcim.change_powerport %} diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html index 37807cd14..86f89e459 100644 --- a/netbox/templates/dcim/device/rearports.html +++ b/netbox/templates/dcim/device/rearports.html @@ -6,10 +6,14 @@ {% block content %} {% csrf_token %} - {% include 'inc/table_controls.html' with table_modal="DeviceRearPortTable_config" %} -
- {% render_table table 'inc/table.html' %} + {% include 'inc/table_controls_htmx.html' with table_modal="DeviceRearPortTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
+
{% if perms.dcim.change_rearport %} diff --git a/netbox/templates/dcim/devicetype/component_templates.html b/netbox/templates/dcim/devicetype/component_templates.html index d83a232cd..b1e0daf78 100644 --- a/netbox/templates/dcim/devicetype/component_templates.html +++ b/netbox/templates/dcim/devicetype/component_templates.html @@ -7,11 +7,9 @@ {% csrf_token %}
-
- {{ title }} -
-
- {% render_table table 'inc/table.html' %} +
{{ title }}
+
+ {% include 'htmx/table.html' %}
{% if table.rows %} @@ -37,12 +35,10 @@ {% else %}
-
- {{ title }} -
-
- {% render_table table 'inc/table.html' %} -
+
{{ title }}
+
+ {% include 'htmx/table.html' %} +
{% endif %} {% endblock content %} diff --git a/netbox/templates/ipam/iprange/ip_addresses.html b/netbox/templates/ipam/iprange/ip_addresses.html index f23db1a01..210cff812 100644 --- a/netbox/templates/ipam/iprange/ip_addresses.html +++ b/netbox/templates/ipam/iprange/ip_addresses.html @@ -1,4 +1,5 @@ {% extends 'ipam/iprange/base.html' %} +{% load helpers %} {% block extra_controls %} {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and object.first_available_ip %} @@ -9,9 +10,30 @@ {% endblock %} {% block content %} -
-
- {% include 'utilities/obj_table.html' with heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %} +
+ {% csrf_token %} + {% include 'inc/table_controls_htmx.html' with table_modal="IPAddressTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
-
+ +
+
+ {% if perms.ipam.change_ipaddress %} + + {% endif %} + {% if perms.ipam.delete_ipaddress %} + + {% endif %} +
+
+ + {% table_config_form table %} {% endblock %} diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html index bedd960d4..8e3f5b4d3 100644 --- a/netbox/templates/ipam/prefix/ip_addresses.html +++ b/netbox/templates/ipam/prefix/ip_addresses.html @@ -1,6 +1,5 @@ {% extends 'ipam/prefix/base.html' %} {% load helpers %} -{% load static %} {% block extra_controls %} {% if perms.ipam.add_ipaddress and first_available_ip %} @@ -11,11 +10,30 @@ {% endblock %} {% block content %} -
-
- {% include 'inc/table_controls.html' with table_modal="IPAddressTable_config" %} - {% include 'utilities/obj_table.html' with heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %} +
+ {% csrf_token %} + {% include 'inc/table_controls_htmx.html' with table_modal="IPAddressTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
-
- {% table_config_form table table_name="IPAddressTable" %} + +
+
+ {% if perms.ipam.change_ipaddress %} + + {% endif %} + {% if perms.ipam.delete_ipaddress %} + + {% endif %} +
+
+ + {% table_config_form table %} {% endblock %} diff --git a/netbox/templates/ipam/prefix/ip_ranges.html b/netbox/templates/ipam/prefix/ip_ranges.html index e43014042..e0765c023 100644 --- a/netbox/templates/ipam/prefix/ip_ranges.html +++ b/netbox/templates/ipam/prefix/ip_ranges.html @@ -1,13 +1,31 @@ {% extends 'ipam/prefix/base.html' %} {% load helpers %} -{% load static %} {% block content %} -
-
- {% include 'inc/table_controls.html' with table_modal="IPRangeTable_config" %} - {% include 'utilities/obj_table.html' with heading='Child IP Ranges' bulk_edit_url='ipam:iprange_bulk_edit' bulk_delete_url='ipam:iprange_bulk_delete' parent=prefix %} +
+ {% csrf_token %} + {% include 'inc/table_controls_htmx.html' with table_modal="IPRangeTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
-
- {% table_config_form table table_name="IPRangeTable" %} + +
+
+ {% if perms.ipam.change_iprange %} + + {% endif %} + {% if perms.ipam.delete_iprange %} + + {% endif %} +
+
+ + {% table_config_form table %} {% endblock %} diff --git a/netbox/templates/ipam/prefix/prefixes.html b/netbox/templates/ipam/prefix/prefixes.html index d10ca79db..21ba0f9f2 100644 --- a/netbox/templates/ipam/prefix/prefixes.html +++ b/netbox/templates/ipam/prefix/prefixes.html @@ -1,6 +1,5 @@ {% extends 'ipam/prefix/base.html' %} {% load helpers %} -{% load static %} {% block extra_controls %} {% include 'ipam/inc/toggle_available.html' %} @@ -13,11 +12,30 @@ {% endblock %} {% block content %} -
-
- {% include 'inc/table_controls.html' with table_modal="PrefixTable_config" %} - {% include 'utilities/obj_table.html' with heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' parent=prefix %} +
+ {% csrf_token %} + {% include 'inc/table_controls_htmx.html' with table_modal="PrefixTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
-
- {% table_config_form table table_name="PrefixTable" %} + +
+
+ {% if perms.ipam.change_prefix %} + + {% endif %} + {% if perms.ipam.delete_prefix %} + + {% endif %} +
+
+ + {% table_config_form table %} {% endblock %} diff --git a/netbox/templates/ipam/vlan/interfaces.html b/netbox/templates/ipam/vlan/interfaces.html index b115c39a3..acba983aa 100644 --- a/netbox/templates/ipam/vlan/interfaces.html +++ b/netbox/templates/ipam/vlan/interfaces.html @@ -1,9 +1,17 @@ {% extends 'ipam/vlan/base.html' %} +{% load helpers %} {% block content %} -
-
- {% include 'utilities/obj_table.html' with heading='Device Interfaces' parent=vlan %} +
+ {% csrf_token %} + {% include 'inc/table_controls_htmx.html' with table_modal="VLANDevicesTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
-
+ + + {% table_config_form table %} {% endblock %} diff --git a/netbox/templates/ipam/vlan/vminterfaces.html b/netbox/templates/ipam/vlan/vminterfaces.html index 024c14a30..aff559393 100644 --- a/netbox/templates/ipam/vlan/vminterfaces.html +++ b/netbox/templates/ipam/vlan/vminterfaces.html @@ -1,9 +1,17 @@ {% extends 'ipam/vlan/base.html' %} +{% load helpers %} {% block content %} -
-
- {% include 'utilities/obj_table.html' with heading='Virtual Machine Interfaces' parent=vlan %} +
+ {% csrf_token %} + {% include 'inc/table_controls_htmx.html' with table_modal="VLANVirtualMachinesTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
-
+ + + {% table_config_form table %} {% endblock %} diff --git a/netbox/templates/virtualization/cluster/devices.html b/netbox/templates/virtualization/cluster/devices.html index fbaabd8f1..ab774a29c 100644 --- a/netbox/templates/virtualization/cluster/devices.html +++ b/netbox/templates/virtualization/cluster/devices.html @@ -3,26 +3,25 @@ {% load render_table from django_tables2 %} {% block content %} -
-
+
+ {% csrf_token %} + {% include 'inc/table_controls_htmx.html' with table_modal="DeviceTable_config" %} +
-
- Host Devices -
- - {% csrf_token %} -
- {% render_table table 'inc/table.html' %} +
+ {% include 'htmx/table.html' %}
- {% if perms.virtualization.change_cluster %} -
+
+ +
+
+ {% if perms.virtualization.change_cluster %} -
- {% endif %} - + {% endif %} +
-
-
+ + {% table_config_form table %} {% endblock %} diff --git a/netbox/templates/virtualization/cluster/virtual_machines.html b/netbox/templates/virtualization/cluster/virtual_machines.html index d4ef65668..7681e3413 100644 --- a/netbox/templates/virtualization/cluster/virtual_machines.html +++ b/netbox/templates/virtualization/cluster/virtual_machines.html @@ -3,16 +3,30 @@ {% load render_table from django_tables2 %} {% block content %} -
-
+
+ {% csrf_token %} + {% include 'inc/table_controls_htmx.html' with table_modal="VirtualMachineTable_config" %} +
-
- Virtual Machines -
-
- {% render_table table 'inc/table.html' %} +
+ {% include 'htmx/table.html' %}
-
-
+ +
+
+ {% if perms.virtualization.change_virtualmachine %} + + {% endif %} + {% if perms.virtualization.delete_virtualmachine %} + + {% endif %} +
+
+ + {% table_config_form table %} {% endblock %} diff --git a/netbox/templates/virtualization/virtualmachine/interfaces.html b/netbox/templates/virtualization/virtualmachine/interfaces.html index 6a6f1d32a..cbfec8172 100644 --- a/netbox/templates/virtualization/virtualmachine/interfaces.html +++ b/netbox/templates/virtualization/virtualmachine/interfaces.html @@ -1,15 +1,18 @@ {% extends 'virtualization/virtualmachine/base.html' %} {% load render_table from django_tables2 %} {% load helpers %} -{% load static %} {% block content %}
{% csrf_token %} - {% include 'inc/table_controls.html' with table_modal="VirtualMachineVMInterfaceTable_config" %} -
- {% render_table table 'inc/table.html' %} + {% include 'inc/table_controls_htmx.html' with table_modal="VMInterfaceTable_config" %} + +
+
+ {% include 'htmx/table.html' %} +
+
{% if perms.virtualization.change_vminterface %} + {% endif %} + {% if perms.ipam.delete_prefix %} + + {% endif %} +
+
+ + {% table_config_form table %} +{% endblock %} From 8ed79d5973c77b489b27fe01ac70cd87ffeacbd5 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 14 Dec 2021 16:44:03 -0500 Subject: [PATCH 10/13] Remove obsolete templates --- netbox/templates/inc/table_controls.html | 27 --------- netbox/templates/ipam/ipaddress_assign.html | 5 +- netbox/templates/utilities/obj_table.html | 62 --------------------- 3 files changed, 4 insertions(+), 90 deletions(-) delete mode 100644 netbox/templates/inc/table_controls.html delete mode 100644 netbox/templates/utilities/obj_table.html diff --git a/netbox/templates/inc/table_controls.html b/netbox/templates/inc/table_controls.html deleted file mode 100644 index d6bd60077..000000000 --- a/netbox/templates/inc/table_controls.html +++ /dev/null @@ -1,27 +0,0 @@ -
-
-
- -
-
-
- {% if request.user.is_authenticated and table_modal %} -
- -
- {% endif %} -
-
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html index 9a052d966..3965feebc 100644 --- a/netbox/templates/ipam/ipaddress_assign.html +++ b/netbox/templates/ipam/ipaddress_assign.html @@ -2,6 +2,7 @@ {% load static %} {% load form_helpers %} {% load helpers %} +{% load render_table from django_tables2 %} {% block title %}Assign an IP Address{% endblock title %} @@ -35,7 +36,9 @@

Search Results

- {% include 'utilities/obj_table.html' %} +
+ {% render_table table 'inc/table.html' %} +
{% endif %} diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html deleted file mode 100644 index 10337ff43..000000000 --- a/netbox/templates/utilities/obj_table.html +++ /dev/null @@ -1,62 +0,0 @@ -{% load helpers %} -{% load render_table from django_tables2 %} - -{% if permissions.change or permissions.delete %} -
- {% csrf_token %} - - - {% if table.paginator.num_pages > 1 %} -
-
-
- {% if bulk_edit_url and permissions.change %} - - {% endif %} - {% if bulk_delete_url and permissions.delete %} - - {% endif %} -
-
- - -
-
-
- {% endif %} - -
- {% render_table table 'inc/table.html' %} -
- -
- {% block extra_actions %}{% endblock %} - - {% if bulk_edit_url and permissions.change %} - - {% endif %} - - {% if bulk_delete_url and permissions.delete %} - - {% endif %} -
-
-{% else %} - -
- {% render_table table 'inc/table.html' %} -
- -{% endif %} - -{% include 'inc/paginator.html' with paginator=table.paginator page=table.page %} From 298fb00a3e84f98025dfa29959a4296064c89535 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 14 Dec 2021 20:04:49 -0500 Subject: [PATCH 11/13] Remove obsolete "quick find" TS --- netbox/project-static/dist/netbox.js | Bin 376306 -> 374915 bytes netbox/project-static/dist/netbox.js.map | Bin 345536 -> 344398 bytes netbox/project-static/src/search.ts | 106 +---------------------- 3 files changed, 2 insertions(+), 104 deletions(-) diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index e4320b5ebabc0581a3fd9ea93cbf42105db01027..b15009e581d667a3c8c318a932ca30799da8c51d 100644 GIT binary patch delta 33040 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 delta 34180 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 A8vp
+
+
+ {# Page number carousel #} {% if paginator.num_pages > 1 %} -
- {% if page.has_previous %} - +
+ {% if page.has_previous %} + - - {% endif %} - {% for p in page.smart_pages %} - {% if p %} - - {{ p }} - - {% else %} - + {% endif %} - {% endfor %} - {% if page.has_next %} - - - - {% endif %} -
- {% endif %} -
- {% for k, v_list in request.GET.lists %} - {% if k != 'per_page' %} - {% for v in v_list %} - - {% endfor %} - {% endif %} + {% for p in page.smart_pages %} + {% if p %} + + {{ p }} + + {% else %} + + {% endif %} {% endfor %} -
- - -
-
- {% if page %} - - Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }} - + {% if page.has_next %} + + + + {% endif %} +
{% endif %} +
+
+ {# Per-page count selector #} +
+ +
    + {% for n in page.paginator.get_page_lengths %} +
  • + {{ n }} +
    • + {% endfor %} +
+
+ {% if page %} + + Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }} + + {% endif %} +
diff --git a/netbox/templates/inc/paginator_htmx.html b/netbox/templates/inc/paginator_htmx.html index 75a904a15..c78361490 100644 --- a/netbox/templates/inc/paginator_htmx.html +++ b/netbox/templates/inc/paginator_htmx.html @@ -2,6 +2,7 @@
+ {# Page number carousel #} {% if paginator.num_pages > 1 %}
{% if page.has_previous %} @@ -44,6 +45,7 @@ {% endif %}
+ {# Per-page count selector #}
+ {% if page %} + + Showing {{ page.start_index }}-{{ page.end_index }} of {{ page.paginator.count }} + + {% endif %}
From 0e50c964d5c72bbe1b733057a1a611e32254156f Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 14 Dec 2021 21:00:48 -0500 Subject: [PATCH 13/13] Remove obsolete pagination TS/CSS --- netbox/project-static/dist/netbox-dark.css | Bin 789095 -> 788892 bytes netbox/project-static/dist/netbox-light.css | Bin 493783 -> 493648 bytes netbox/project-static/dist/netbox-print.css | Bin 1624117 -> 1623714 bytes netbox/project-static/dist/netbox.js | Bin 374915 -> 374756 bytes netbox/project-static/dist/netbox.js.map | Bin 344398 -> 344228 bytes netbox/project-static/src/buttons/index.ts | 2 -- .../project-static/src/buttons/pagination.ts | 14 -------------- netbox/project-static/styles/netbox.scss | 12 ------------ 8 files changed, 28 deletions(-) delete mode 100644 netbox/project-static/src/buttons/pagination.ts diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css index 4def5c73e9cd8268cae13669b5a6239b73f21f16..25017505e04a3c541e8e65211b4287e20f1af581 100644 GIT binary patch delta 43 zcmaDp#bC~4gN7Ey7N!>F7M2#)7Pc1l7LFFq7OpMaYtL?HImc~bvV8*+&vteIT?Y?V delta 154 zcmV;L0A>H2lQ8F$Fo1*sgaU*Egam{Iga(8Mgb0KQgbK6^t<9Gpx(fs?aA9X@Zeet9 zaz18na&10jX?8AYZg6#UEoX9Xb#QxkX=HS0I%a8fEn{zPbe9oP116X5%?l2XF4%*Wo?sCwI-KPX$2Cu I_W=y02WM?LeEF7M2#)7Pc+y((&5^;@J-F7M2#)7Pc+y((xuKnPqwfiRqbni6!|(c4_%Vxpp9-%)Elq z65aHo{L+Hz^30Ty46C%v65Ztdypq(slI>FQ><5)OVA`fX*ubnh{kjvgpipXFigiI^ bN=jy4x|Ly3YOaF8^eA^`sqLSe*kf4%pusSS diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css index 3fda1a02699a2a0d8b170c4faeb4d452b4981a6b..a09f4922203efc024056c4451260fe9ca2fd7bd7 100644 GIT binary patch delta 124 zcmdlwA$d`6azhJa3sVbo3rh=Y3tJ0&3r7oQ3s(zw3r`Dg3ttO=i$IHDi%^Sji%5%T zi&%^J7KuXt={Ex;_@+;Jz@t1}AP~rMIl-nf-2=$lzBNF?F@1W#X>pe64LgA{Qp>oN brx)Dk=9+$PDYw9M>1Euu+nshweC7iHGde2g delta 299 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 delta 17416 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

=Y?yCtRWF_J8d)^Acw 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 OGN2LZq7y3boc{yJtANk| diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index a1fd9350ba518266ade9afaff31be141a2b04b92..6fbe0874b1025b63008a8cc41168eb25890d4295 100644 GIT binary patch delta 59 zcmX@tB)X(gbi+!!=96~qC+!%4mdbJ9x1&61jtD}y$ MbHw%oDy)4n0K+*I5&!@I delta 159 zcmZ3|D0;3*bi+!!$$#xQxC#=}GxHKlGV}AAXWO;UwqpchCLm_sKHH8(@wPyuqobLV zj=Q5{zLSo#qqF|>4N9ycYDG>uj*gC=AaQ>ke@Dk)9bZT19I!fn9dAcRZ=GOA&yeZA ztXZX|zp!H!;|g|k4At>;4k>fqzFU%2l8Z^-ZTdB3R*UHm>{(f-^Qo}1GbU{pQ(^6s F0RYxYF@XR8 diff --git a/netbox/project-static/src/buttons/index.ts b/netbox/project-static/src/buttons/index.ts index 1fcc7b87e..251e0feaf 100644 --- a/netbox/project-static/src/buttons/index.ts +++ b/netbox/project-static/src/buttons/index.ts @@ -1,7 +1,6 @@ import { initConnectionToggle } from './connectionToggle'; import { initDepthToggle } from './depthToggle'; import { initMoveButtons } from './moveOptions'; -import { initPerPage } from './pagination'; import { initPreferenceUpdate } from './preferences'; import { initReslug } from './reslug'; import { initSelectAll } from './selectAll'; @@ -13,7 +12,6 @@ export function initButtons(): void { initReslug, initSelectAll, initPreferenceUpdate, - initPerPage, initMoveButtons, ]) { func(); diff --git a/netbox/project-static/src/buttons/pagination.ts b/netbox/project-static/src/buttons/pagination.ts deleted file mode 100644 index 670dc7390..000000000 --- a/netbox/project-static/src/buttons/pagination.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { getElements } from '../util'; - -function handlePerPageSelect(event: Event): void { - const select = event.currentTarget as HTMLSelectElement; - if (select.form !== null) { - select.form.submit(); - } -} - -export function initPerPage(): void { - for (const element of getElements('select.per-page')) { - element.addEventListener('change', handlePerPageSelect); - } -} diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index 58bf18286..acbfa0646 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -737,10 +737,6 @@ nav.breadcrumb-container { } } -div.paginator > form > div.input-group { - width: fit-content; -} - label.required { font-weight: $font-weight-bold; @@ -900,14 +896,6 @@ div.card-overlay { } } -// Right-align the paginator element. -.paginator { - display: flex; - flex-direction: column; - align-items: flex-end; - padding: $spacer 0; -} - // Tabbed content .nav-tabs { .nav-link {