diff --git a/docs/features/user-preferences.md b/docs/features/user-preferences.md index 6c0a2884fe5..c8670bb6950 100644 --- a/docs/features/user-preferences.md +++ b/docs/features/user-preferences.md @@ -34,9 +34,6 @@ Sets the default number of rows displayed on paginated tables. ### Paginator placement Controls where pagination controls are rendered relative to a table. -### HTMX navigation (experimental) -Enables partial‑page navigation for supported views. Disable this preference if unexpected behavior is observed. - ### Striped table rows Toggles alternating row backgrounds on tables. diff --git a/netbox/netbox/context_processors.py b/netbox/netbox/context_processors.py index 3065855e6bd..199db9ee266 100644 --- a/netbox/netbox/context_processors.py +++ b/netbox/netbox/context_processors.py @@ -28,7 +28,6 @@ def preferences(request): user_preferences = request.user.config if request.user.is_authenticated else {} return { 'preferences': user_preferences, - 'htmx_navigation': user_preferences.get('ui.htmx_navigation', False) == 'true' } diff --git a/netbox/netbox/preferences.py b/netbox/netbox/preferences.py index d8fb130f4ac..49978b8c6f1 100644 --- a/netbox/netbox/preferences.py +++ b/netbox/netbox/preferences.py @@ -26,16 +26,6 @@ def get_csv_delimiters(): PREFERENCES = { # User interface - 'ui.htmx_navigation': UserPreference( - label=_('HTMX Navigation'), - choices=( - ('', _('Disabled')), - ('true', _('Enabled')), - ), - description=_('Enable dynamic UI navigation'), - default=False, - warning=_('Experimental feature') - ), 'locale.language': UserPreference( label=_('Language'), choices=( diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html index c31896256c5..c305d1a7082 100644 --- a/netbox/templates/base/layout.html +++ b/netbox/templates/base/layout.html @@ -95,7 +95,7 @@

{# Page content #}
-
+
{# Page header #} {% block header %} diff --git a/netbox/templates/inc/user_menu.html b/netbox/templates/inc/user_menu.html index 50173ea562b..ecafc1f390f 100644 --- a/netbox/templates/inc/user_menu.html +++ b/netbox/templates/inc/user_menu.html @@ -33,7 +33,7 @@
-
+
{% trans "Profile" %} diff --git a/netbox/users/forms/model_forms.py b/netbox/users/forms/model_forms.py index 582062ebbec..bcd0819a215 100644 --- a/netbox/users/forms/model_forms.py +++ b/netbox/users/forms/model_forms.py @@ -61,8 +61,7 @@ def __new__(mcs, name, bases, attrs): class UserConfigForm(forms.ModelForm, metaclass=UserConfigFormMetaclass): fieldsets = ( FieldSet( - 'locale.language', 'pagination.per_page', 'pagination.placement', 'ui.htmx_navigation', - 'ui.tables.striping', + 'locale.language', 'pagination.per_page', 'pagination.placement', 'ui.tables.striping', name=_('User Interface') ), FieldSet('data_format', 'csv_delimiter', name=_('Miscellaneous')), diff --git a/netbox/utilities/templates/navigation/menu.html b/netbox/utilities/templates/navigation/menu.html index 8becc568b1b..cd542cb4177 100644 --- a/netbox/utilities/templates/navigation/menu.html +++ b/netbox/utilities/templates/navigation/menu.html @@ -2,7 +2,7 @@ {% load i18n %} {% load navigation %} -
    +
    • diff --git a/netbox/utilities/templatetags/builtins/tags.py b/netbox/utilities/templatetags/builtins/tags.py index d1dd1a55a46..f29e8f87eb8 100644 --- a/netbox/utilities/templatetags/builtins/tags.py +++ b/netbox/utilities/templatetags/builtins/tags.py @@ -1,5 +1,4 @@ from django import template -from django.utils.safestring import mark_safe from extras.choices import CustomFieldTypeChoices from utilities.querydict import dict_to_querydict @@ -121,9 +120,7 @@ def htmx_table(context, viewname, return_url=None, **kwargs): @register.simple_tag(takes_context=True) def formaction(context): """ - Replace the 'formaction' attribute on an HTML element with the appropriate HTMX attributes - if HTMX navigation is enabled (per the user's preferences). + A hook for overriding the 'formaction' attribute on an HTML element, for example to replace + with 'hx-push-url="true" hx-post' for HTMX navigation. """ - if context.get('htmx_navigation', False): - return mark_safe('hx-push-url="true" hx-post') return 'formaction' diff --git a/netbox/utilities/templatetags/buttons.py b/netbox/utilities/templatetags/buttons.py index 0d1fb5f440d..e28653c50b2 100644 --- a/netbox/utilities/templatetags/buttons.py +++ b/netbox/utilities/templatetags/buttons.py @@ -226,7 +226,6 @@ def bulk_edit_button(context, model, action='bulk_edit', query_params=None): return { 'label': _('Edit Selected'), 'url': url, - 'htmx_navigation': context.get('htmx_navigation'), } @@ -243,5 +242,4 @@ def bulk_delete_button(context, model, action='bulk_delete', query_params=None): return { 'label': _('Delete Selected'), 'url': url, - 'htmx_navigation': context.get('htmx_navigation'), } diff --git a/netbox/utilities/templatetags/navigation.py b/netbox/utilities/templatetags/navigation.py index 2c7ce18dd07..3c3c4899512 100644 --- a/netbox/utilities/templatetags/navigation.py +++ b/netbox/utilities/templatetags/navigation.py @@ -1,11 +1,9 @@ from django import template -from django.utils.safestring import mark_safe from netbox.navigation.menu import MENUS __all__ = ( 'nav', - 'htmx_boost', ) @@ -43,30 +41,4 @@ def nav(context): return { 'nav_items': nav_items, - 'htmx_navigation': context['htmx_navigation'] } - - -@register.simple_tag(takes_context=True) -def htmx_boost(context, target='#page-content', select='#page-content'): - """ - Renders the HTML attributes needed to effect HTMX boosting within an element if - HTMX navigation is enabled for the request. The target and select parameters are - rendered as `hx-target` and `hx-select`, respectively. For example: - -
      - - If HTMX navigation is not enabled, the tag renders no content. - """ - if not context.get('htmx_navigation', False): - return '' - hx_params = { - 'hx-boost': 'true', - 'hx-target': target, - 'hx-select': select, - 'hx-swap': 'outerHTML show:window:top', - } - htmx_params = ' '.join([ - f'{k}="{v}"' for k, v in hx_params.items() - ]) - return mark_safe(htmx_params)