From e37c943d2b7541a77ccd74e4138130dd5267fcf5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 25 Mar 2024 13:23:30 -0400 Subject: [PATCH] Introduce htmx_boost template tag; enable HTMX for user menu --- netbox/templates/base/layout.html | 44 ++++++++++++++++++- netbox/templates/inc/user_menu.html | 41 ----------------- .../utilities/templates/navigation/menu.html | 3 +- netbox/utilities/templatetags/navigation.py | 22 ++++++++-- 4 files changed, 63 insertions(+), 47 deletions(-) delete mode 100644 netbox/templates/inc/user_menu.html diff --git a/netbox/templates/base/layout.html b/netbox/templates/base/layout.html index ec80c40cb..6bcdd0e79 100644 --- a/netbox/templates/base/layout.html +++ b/netbox/templates/base/layout.html @@ -58,8 +58,48 @@ Blocks: + {# User menu #} - {% include 'inc/user_menu.html' %} + {% if request.user.is_authenticated %} +
+ +
+
{{ request.user }}
+
{% if request.user.is_staff %}Staff{% else %}User{% endif %}
+
+ +
+ {% if config.DJANGO_ADMIN_ENABLED and request.user.is_staff %} + + {% trans "Django Admin" %} + + {% endif %} + + {% trans "Profile" %} + + + {% trans "Bookmarks" %} + + + {% trans "Preferences" %} + + + {% trans "API Tokens" %} + +
+ + {% trans "Log Out" %} + +
+
+ {% else %} +
+ + {% trans "Log In" %} + +
+ {% endif %} + {# /User menu #} {# Search box #} @@ -79,7 +119,7 @@ Blocks: {# Page content #}
-
+
{# Page header #} {% block header %} diff --git a/netbox/templates/inc/user_menu.html b/netbox/templates/inc/user_menu.html deleted file mode 100644 index 95bc639c0..000000000 --- a/netbox/templates/inc/user_menu.html +++ /dev/null @@ -1,41 +0,0 @@ -{% load i18n %} - -{% if request.user.is_authenticated %} -
- -
-
{{ request.user }}
-
{% if request.user.is_staff %}Staff{% else %}User{% endif %}
-
- -
- {% if config.DJANGO_ADMIN_ENABLED and request.user.is_staff %} - - {% trans "Django Admin" %} - - {% endif %} - - {% trans "Profile" %} - - - {% trans "Bookmarks" %} - - - {% trans "Preferences" %} - - - {% trans "API Tokens" %} - -
- - {% trans "Log Out" %} - -
-
-{% else %} -
- - {% trans "Log In" %} - -
-{% endif %} diff --git a/netbox/utilities/templates/navigation/menu.html b/netbox/utilities/templates/navigation/menu.html index f32e3d678..6f902bc20 100644 --- a/netbox/utilities/templates/navigation/menu.html +++ b/netbox/utilities/templates/navigation/menu.html @@ -1,6 +1,7 @@ {% load helpers %} +{% load navigation %} -
    +
      {% for menu, groups in nav_items %}
    • diff --git a/netbox/utilities/templatetags/navigation.py b/netbox/utilities/templatetags/navigation.py index 088e3b9af..b34b584c1 100644 --- a/netbox/utilities/templatetags/navigation.py +++ b/netbox/utilities/templatetags/navigation.py @@ -1,11 +1,11 @@ -from typing import Dict from django import template -from django.template import Context +from django.utils.safestring import mark_safe from netbox.navigation.menu import MENUS __all__ = ( 'nav', + 'htmx_boost', ) @@ -13,7 +13,7 @@ register = template.Library() @register.inclusion_tag("navigation/menu.html", takes_context=True) -def nav(context: Context) -> Dict: +def nav(context): """ Render the navigation menu. """ @@ -43,3 +43,19 @@ def nav(context: Context) -> Dict: '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'): + if not context.get('htmx_navigation'): + 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)