diff --git a/netbox/extras/plugins/__init__.py b/netbox/extras/plugins/__init__.py index b16f70b1a..dbfee45e4 100644 --- a/netbox/extras/plugins/__init__.py +++ b/netbox/extras/plugins/__init__.py @@ -11,7 +11,7 @@ from utilities.choices import ButtonColorChoices # Initialize plugin registry stores registry['plugin_template_extensions'] = collections.defaultdict(list) -registry['plugin_nav_menu_links'] = {} +registry['plugin_menu_items'] = {} # @@ -154,7 +154,7 @@ def register_template_extensions(class_list): class PluginMenuItem: """ - This class represents a nav menu item. This constitutes primary link and its text, but also allows for + This class represents a navigation menu item. This constitutes primary link and its text, but also allows for specifying additional link buttons that appear to the right of the item in the van menu. Links are specified as Django reverse URL strings. @@ -172,8 +172,8 @@ class PluginMenuItem: class PluginMenuButton: """ - This class represents a button which is a part of the nav menu link item. - Note that button colors should come from ButtonColorChoices + This class represents a button within a PluginMenuItem. Note that button colors should come from + ButtonColorChoices. """ color = ButtonColorChoices.DEFAULT @@ -199,4 +199,4 @@ def register_menu_items(section_name, class_list): if not isinstance(button, PluginMenuButton): raise TypeError(f"{button} must be an instance of extras.plugins.PluginMenuButton") - registry['plugin_nav_menu_links'][section_name] = class_list + registry['plugin_menu_items'][section_name] = class_list diff --git a/netbox/extras/plugins/context_processors.py b/netbox/extras/plugins/context_processors.py index fbb4e8c03..026c724c7 100644 --- a/netbox/extras/plugins/context_processors.py +++ b/netbox/extras/plugins/context_processors.py @@ -1,10 +1,10 @@ from extras.registry import registry -def nav_menu_links(request): +def plugin_menu_items(request): """ - Retrieve and expose all plugin registered nav links + Retrieve and expose all plugin registered navigation menu items. """ return { - 'plugin_nav_menu_links': registry['plugin_nav_menu_links'] + 'plugin_menu_items': registry['plugin_menu_items'] } diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index fb8d760fc..932b22611 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -326,7 +326,7 @@ TEMPLATES = [ 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', 'utilities.context_processors.settings', - 'extras.plugins.context_processors.nav_menu_links', + 'extras.plugins.context_processors.plugin_menu_items', ], }, }, diff --git a/netbox/templates/inc/nav_menu.html b/netbox/templates/inc/nav_menu.html index d42bb7737..8d06ae19f 100644 --- a/netbox/templates/inc/nav_menu.html +++ b/netbox/templates/inc/nav_menu.html @@ -504,8 +504,8 @@ - {% if plugin_nav_menu_links %} - {% include 'inc/plugin_nav_menu_items.html' %} + {% if plugin_menu_items %} + {% include 'inc/plugin_menu_items.html' %} {% endif %} {% endif %} diff --git a/netbox/templates/inc/plugin_nav_menu_items.html b/netbox/templates/inc/plugin_menu_items.html similarity index 71% rename from netbox/templates/inc/plugin_nav_menu_items.html rename to netbox/templates/inc/plugin_menu_items.html index 55aab84c1..5639d39c7 100644 --- a/netbox/templates/inc/plugin_nav_menu_items.html +++ b/netbox/templates/inc/plugin_menu_items.html @@ -1,24 +1,24 @@