nautobot 2.1.7__py3-none-any.whl → 2.1.9__py3-none-any.whl

nautobot/apps/api.py

@@ -19,7 +19,7 @@ from nautobot.core.api.fields import (
 )
 from nautobot.core.api.mixins import WritableSerializerMixin
 from nautobot.core.api.parsers import NautobotCSVParser
-from nautobot.core.api.routers import OrderedDefaultRouter
+from nautobot.core.api.routers import AuthenticatedAPIRootView as APIRootView, OrderedDefaultRouter
 from nautobot.core.api.schema import NautobotAutoSchema
 from nautobot.core.api.serializers import (
     OptInFieldsMixin,
@@ -36,7 +36,6 @@ from nautobot.core.api.utils import (
     versioned_serializer_selector,
 )
 from nautobot.core.api.views import (
-    APIRootView,
     BulkDestroyModelMixin,
     BulkUpdateModelMixin,
     GetObjectCountsView,

nautobot/apps/utils.py

@@ -32,6 +32,8 @@ from nautobot.core.utils.lookup import (
     get_related_class_for_model,
     get_route_for_model,
     get_table_for_model,
+    get_url_for_url_pattern,
+    get_url_patterns,
 )
 from nautobot.core.utils.navigation import (
     get_all_new_ui_ready_routes,
@@ -110,6 +112,8 @@ __all__ = (
     "get_route_for_model",
     "get_settings_or_config",
     "get_table_for_model",
+    "get_url_for_url_pattern",
+    "get_url_patterns",
     "get_worker_count",
     "GitRepo",
     "hex_to_rgb",

nautobot/apps/views.py

@@ -8,6 +8,7 @@ from nautobot.core.views.generic import (
     BulkImportView,
     BulkRenameView,
     ComponentCreateView,
+    GenericView,
     ObjectDeleteView,
     ObjectEditView,
     ObjectImportView,
@@ -57,6 +58,7 @@ __all__ = (
     "csv_format",
     "EnhancedPage",
     "EnhancedPaginator",
+    "GenericView",
     "get_csv_form_fields_from_serializer_class",
     "get_paginate_count",
     "GetReturnURLMixin",

nautobot/circuits/api/urls.py

@@ -2,8 +2,7 @@ from nautobot.core.api.routers import OrderedDefaultRouter
 
 from . import views
 
-router = OrderedDefaultRouter()
-router.APIRootView = views.CircuitsRootView
+router = OrderedDefaultRouter(view_name="Circuits")
 
 # Providers
 router.register("providers", views.ProviderViewSet)

nautobot/circuits/api/views.py

@@ -1,5 +1,3 @@
-from rest_framework.routers import APIRootView
-
 from nautobot.circuits import filters
 from nautobot.circuits.models import Circuit, CircuitTermination, CircuitType, Provider, ProviderNetwork
 from nautobot.core.models.querysets import count_related
@@ -8,16 +6,6 @@ from nautobot.extras.api.views import NautobotModelViewSet
 
 from . import serializers
 
-
-class CircuitsRootView(APIRootView):
-    """
-    Circuits API root view
-    """
-
-    def get_view_name(self):
-        return "Circuits"
-
-
 #
 # Providers
 #

nautobot/circuits/tests/integration/test_relationships.py

@@ -110,10 +110,6 @@ class CircuitRelationshipsTestCase(SeleniumTestCase):
             destination_type=fake_ct,
             destination_id=uuid.uuid4(),
         )
-        # Clear the server-side cache of relationship information to make sure it gets refreshed properly
-        Relationship.objects.get_for_model.cache_clear()
-        Relationship.objects.get_for_model_source.cache_clear()
-        Relationship.objects.get_for_model_destination.cache_clear()
 
     def tearDown(self):
         self.logout()

nautobot/core/api/routers.py

@@ -1,12 +1,23 @@
-from collections import OrderedDict
+import logging
 
 from rest_framework.routers import DefaultRouter
 
+from nautobot.core.api.views import AuthenticatedAPIRootView
+
+logger = logging.getLogger(__name__)
+
 
 class OrderedDefaultRouter(DefaultRouter):
-    def __init__(self, *args, **kwargs):
+    APIRootView = AuthenticatedAPIRootView
+
+    def __init__(self, *args, view_name=None, view_description=None, **kwargs):
         super().__init__(*args, **kwargs)
 
+        self.view_name = view_name
+        if view_name and not view_description:
+            view_description = f"{view_name} API root view"
+        self.view_description = view_description
+
         # Extend the list view mappings to support the DELETE operation
         self.routes[0].mapping.update(
             {
@@ -20,9 +31,20 @@ class OrderedDefaultRouter(DefaultRouter):
         """
         Wrap DRF's DefaultRouter to return an alphabetized list of endpoints.
         """
-        api_root_dict = OrderedDict()
+        api_root_dict = {}
         list_name = self.routes[0].name
+
         for prefix, _viewset, basename in sorted(self.registry, key=lambda x: x[0]):
             api_root_dict[prefix] = list_name.format(basename=basename)
 
+        if issubclass(self.APIRootView, AuthenticatedAPIRootView):
+            return self.APIRootView.as_view(
+                api_root_dict=api_root_dict, name=self.view_name, description=self.view_description
+            )
+        # Fallback for the established practice of overriding self.APIRootView with a custom class
+        logger.warning(
+            "Something has changed an OrderedDefaultRouter's APIRootView attribute to a custom class. "
+            "Please verify that class %s implements appropriate authentication controls.",
+            self.APIRootView.__name__,
+        )
         return self.APIRootView.as_view(api_root_dict=api_root_dict)

nautobot/core/api/utils.py

@@ -178,6 +178,10 @@ def get_view_name(view, suffix=None):
 
     else:
         # Replicate DRF's built-in behavior.
+        name = getattr(view, "name", None)
+        if name is not None:
+            return view.name
+
         name = view.__class__.__name__
         name = formatting.remove_trailing_string(name, "View")
         name = formatting.remove_trailing_string(name, "ViewSet")

nautobot/core/api/views.py

@@ -22,9 +22,9 @@ from graphql import get_default_backend
 from graphql.execution import ExecutionResult
 from graphql.execution.middleware import MiddlewareManager
 from graphql.type.schema import GraphQLSchema
-from rest_framework import status
+from rest_framework import routers, status
 from rest_framework.exceptions import ParseError, PermissionDenied
-from rest_framework.permissions import AllowAny, IsAuthenticated
+from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 from rest_framework.reverse import reverse
 from rest_framework.views import APIView
@@ -341,15 +341,25 @@ class ReadOnlyModelViewSet(NautobotAPIVersionMixin, ModelViewSetMixin, ReadOnlyM
 #
 
 
-class APIRootView(NautobotAPIVersionMixin, APIView):
+class AuthenticatedAPIRootView(NautobotAPIVersionMixin, routers.APIRootView):
     """
-    This is the root of the REST API. API endpoints are arranged by app and model name; e.g. `/api/dcim/locations/`.
+    Extends DRF's base APIRootView class to enforce user authentication.
     """
 
-    _ignore_model_permissions = True
+    permission_classes = [IsAuthenticated]
+
+    name = None
+    description = None
+
+
+class APIRootView(AuthenticatedAPIRootView):
+    """
+    This is the root of the REST API.
 
-    def get_view_name(self):
-        return "API Root"
+    API endpoints are arranged by app and model name; e.g. `/api/dcim/locations/`.
+    """
+
+    name = "API Root"
 
     @extend_schema(exclude=True)
     def get(self, request, format=None):  # pylint: disable=redefined-builtin
@@ -492,11 +502,6 @@ class NautobotSpectacularSwaggerView(APIVersioningGetSchemaURLMixin, Spectacular
     @extend_schema(exclude=True)
     def get(self, request, *args, **kwargs):
         """Fix up the rendering of the Swagger UI to work with Nautobot's UI."""
-        if not request.user.is_authenticated:
-            doc_url = reverse("api_docs")
-            login_url = reverse(settings.LOGIN_URL)
-            return redirect(f"{login_url}?next={doc_url}")
-
         # For backward compatibility wtih drf-yasg, `/api/docs/?format=openapi` is a redirect to the JSON schema.
         if request.GET.get("format") == "openapi":
             return redirect("schema_json", permanent=True)
@@ -525,11 +530,12 @@ class NautobotSpectacularRedocView(APIVersioningGetSchemaURLMixin, SpectacularRe
 class GraphQLDRFAPIView(NautobotAPIVersionMixin, APIView):
     """
     API View for GraphQL to integrate properly with DRF authentication mechanism.
-    The code is a stripped down version of graphene-django default View
-    https://github.com/graphql-python/graphene-django/blob/main/graphene_django/views.py#L57
     """
 
-    permission_classes = [AllowAny]
+    # The code is a stripped down version of graphene-django default View
+    # https://github.com/graphql-python/graphene-django/blob/main/graphene_django/views.py#L57
+
+    permission_classes = [IsAuthenticated]
     graphql_schema = None
     executor = None
     backend = None

nautobot/core/celery/schedulers.py

@@ -1,7 +1,9 @@
 from collections.abc import Mapping
 import logging
+from pathlib import Path
 
 from celery import current_app
+from django.conf import settings
 from django_celery_beat.schedulers import DatabaseScheduler, ModelEntry
 from kombu.utils.json import loads
 
@@ -94,3 +96,14 @@ class NautobotDatabaseScheduler(DatabaseScheduler):
             entry.total_run_count = entry.model.total_run_count
             entry.model.save()
         return resp
+
+    def tick(self, *args, **kwargs):
+        """
+        Run a tick - one iteration of the scheduler.
+
+        This is an extension of `celery.beat.Scheduler.tick()` to touch the `CELERY_BEAT_HEARTBEAT_FILE` file.
+        """
+        interval = super().tick(*args, **kwargs)
+        if settings.CELERY_BEAT_HEARTBEAT_FILE:
+            Path(settings.CELERY_BEAT_HEARTBEAT_FILE).touch(exist_ok=True)
+        return interval

nautobot/core/choices.py

@@ -11,27 +11,6 @@ class ChoiceSetMeta(type):
         choices = getattr(cls, "CHOICES", ())
         return iter(choices)
 
-    def __getattribute__(cls, attr):
-        """
-        Overrides the default __getattribute__ method to provide custom behavior when accessing attributes of a ChoiceSet
-        instance. If the attribute name is an uppercase string and not equal to 'CHOICES', this method returns a new class
-        instance of the same type as the original attribute value, but with an additional 'label' property. This 'label'
-        property looks up the choice label for the given attribute value in the 'CHOICES' sequence and returns it.
-        """
-        value = super().__getattribute__(attr)
-        # Check if the attribute is a member of the CHOICES sequence and is uppercase;
-        # Mostly only ChoiceSet choices are uppercase
-        if attr != "CHOICES" and attr.isupper():
-            choices = cls.as_dict()
-
-            class Choice(value.__class__):
-                @property
-                def label(self):
-                    return choices.get(self)
-
-            return Choice(value)
-        return value
-
 
 class ChoiceSet(metaclass=ChoiceSetMeta):
     """

nautobot/core/models/__init__.py

@@ -94,7 +94,7 @@ class BaseModel(models.Model):
 
         Necessary for use with _content_type_cached and management commands.
         """
-        return f"{cls._meta.label_lower}._content_type"
+        return f"nautobot.{cls._meta.label_lower}._content_type"
 
     @classproperty  # https://github.com/PyCQA/pylint-django/issues/240
     def _content_type_cached(cls):  # pylint: disable=no-self-argument

nautobot/core/models/tree_queries.py

@@ -1,5 +1,3 @@
-from functools import cached_property
-
 from django.core.cache import cache
 from django.db.models import Case, When
 from tree_queries.models import TreeNode
@@ -41,8 +39,20 @@ class TreeQuerySet(TreeQuerySet_, querysets.RestrictedQuerySet):
         return model_class.objects.without_tree_fields().filter(pk__in=ancestor_pks).order_by(preserve_order)
 
     def max_tree_depth(self):
-        """
-        Get the maximum depth of any tree in this queryset.
+        r"""
+        Get the maximum tree depth of any node in this queryset.
+
+        In most cases you should use TreeManager.max_depth instead as it's cached and this is not.
+
+        root  - depth 0
+         \
+          branch  - depth 1
+            \
+            leaf  - depth 2
+
+        Note that a queryset with only root nodes will return zero, and an empty queryset will also return zero.
+        This is probably a bug, we should really return -1 in the case of an empty queryset, but this is
+        "working as implemented" and changing it would possibly be a breaking change at this point.
         """
         deepest = self.with_tree_fields().extra(order_by=["-__tree.tree_depth"]).first()
         if deepest is not None:
@@ -58,9 +68,21 @@ class TreeManager(TreeManager_, BaseManager.from_queryset(TreeQuerySet)):
     _with_tree_fields = True
     use_in_migrations = True
 
-    @cached_property
+    @property
+    def max_depth_cache_key(self):
+        return f"nautobot.{self.model._meta.concrete_model._meta.label_lower}.max_depth"
+
+    @property
     def max_depth(self):
-        return self.max_tree_depth()
+        """Cacheable version of `TreeQuerySet.max_tree_depth()`.
+
+        Generally TreeManagers are persistent objects while TreeQuerySets are not, hence the difference in behavior.
+        """
+        max_depth = cache.get(self.max_depth_cache_key)
+        if max_depth is None:
+            max_depth = self.max_tree_depth()
+            cache.set(self.max_depth_cache_key, max_depth)
+        return max_depth
 
 
 class TreeModel(TreeNode):
@@ -82,7 +104,7 @@ class TreeModel(TreeNode):
         """
         if not hasattr(self, "name"):
             raise NotImplementedError("default TreeModel.display implementation requires a `name` attribute!")
-        cache_key = f"{self.__class__.__name__}.{self.id}.display"
+        cache_key = f"nautobot.{self._meta.concrete_model._meta.label_lower}.{self.id}.display"
         display_str = cache.get(cache_key, "")
         if display_str:
             return display_str

nautobot/core/releases.py

@@ -18,7 +18,7 @@ def get_latest_release(pre_releases=False):
     """
     if get_settings_or_config("RELEASE_CHECK_URL"):
         logger.debug("Checking for most recent release")
-        latest_release = cache.get("latest_release")
+        latest_release = cache.get("nautobot.core.releases.get_latest_release")
         if latest_release is not None:
             logger.debug(f"Found cached release: {latest_release}")
             return latest_release

nautobot/core/settings.py

@@ -1,7 +1,9 @@
 import os
+import os.path
 import platform
 import re
 import sys
+import tempfile
 
 from django.contrib.messages import constants as messages
 import django.forms
@@ -240,6 +242,7 @@ SPECTACULAR_SETTINGS = {
     # trim it from all of the individual paths correspondingly.
     # See also https://github.com/nautobot/nautobot-ansible/pull/135 for an example of why this is desirable.
     "SERVERS": [{"url": "/api"}],
+    "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAuthenticated"],
     "SCHEMA_PATH_PREFIX": "/api",
     "SCHEMA_PATH_PREFIX_TRIM": True,
     # use sidecar - locally packaged UI files, not CDN
@@ -767,6 +770,12 @@ CONTENT_TYPE_CACHE_TIMEOUT = int(os.getenv("NAUTOBOT_CONTENT_TYPE_CACHE_TIMEOUT"
 # Celery (used for background processing)
 #
 
+# Celery Beat heartbeat file path - will be touched by Beat each time it wakes up as a proof-of-health.
+CELERY_BEAT_HEARTBEAT_FILE = os.getenv(
+    "NAUTOBOT_CELERY_BEAT_HEARTBEAT_FILE",
+    os.path.join(tempfile.gettempdir(), "nautobot_celery_beat_heartbeat"),
+)
+
 # Celery broker URL used to tell workers where queues are located
 CELERY_BROKER_URL = os.getenv("NAUTOBOT_CELERY_BROKER_URL", parse_redis_connection(redis_database=0))
 

nautobot/core/settings_funcs.py

@@ -1,7 +1,6 @@
 """Helper functions to detect settings after app initialization (AKA 'dynamic settings')."""
 
 from collections import namedtuple
-from functools import lru_cache
 import os
 
 from django.conf import settings
@@ -10,26 +9,14 @@ ConstanceConfigItem = namedtuple("ConstanceConfigItem", ["default", "help_text",
 
 #
 # X_auth_enabled checks to see if a backend has been specified, thus assuming it is enabled.
-# Leverages `lru_cache` since these are called per user session.  The wrappers are a
-# workaround to pass `lru_cache` a hashable data structure.
 #
 
 
 def remote_auth_enabled(auth_backends):
-    return _remote_auth_enabled(tuple(auth_backends))
-
-
-@lru_cache(maxsize=5)
-def _remote_auth_enabled(auth_backends):
     return "nautobot.core.authentication.RemoteUserBackend" in auth_backends
 
 
 def sso_auth_enabled(auth_backends):
-    return _sso_auth_enabled(tuple(auth_backends))
-
-
-@lru_cache(maxsize=5)
-def _sso_auth_enabled(auth_backends):
     for backend in auth_backends:
         if backend.startswith(settings.SOCIAL_AUTH_BACKEND_PREFIX):
             return True
@@ -37,11 +24,6 @@ def _sso_auth_enabled(auth_backends):
 
 
 def ldap_auth_enabled(auth_backends):
-    return _ldap_auth_enabled(tuple(auth_backends))
-
-
-@lru_cache(maxsize=5)
-def _ldap_auth_enabled(auth_backends):
     return "django_auth_ldap.backend.LDAPBackend" in auth_backends
 
 

nautobot/core/signals.py

@@ -1,11 +1,14 @@
 """Custom signals and handlers for the core Nautobot application."""
+import contextlib
 from functools import wraps
 import inspect
 import logging
 
 from django.contrib.auth.signals import user_logged_in, user_logged_out
+from django.core.cache import cache
 from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver, Signal
+import redis.exceptions
 
 nautobot_database_ready = Signal()
 """
@@ -67,8 +70,5 @@ def invalidate_max_depth_cache(sender, **kwargs):
     if not isinstance(sender.objects, TreeManager):
         return
 
-    # Note that we can't use `hasattr`, because this will trigger `max_depth` to be calculated if it doesn't exist
-    try:
-        del sender.objects.max_depth
-    except AttributeError:
-        pass
+    with contextlib.suppress(redis.exceptions.ConnectionError):
+        cache.delete(sender.objects.max_depth_cache_key)

nautobot/core/tasks.py

@@ -21,7 +21,7 @@ def get_releases(pre_releases=False):
     releases = []
 
     # Check whether this URL has failed recently and shouldn't be retried yet
-    if url == cache.get("latest_release_no_retry"):
+    if url == cache.get("nautobot.core.releases.get_releases.no_retry"):
         logger.info(f"Skipping release check; URL failed recently: {url}")
         return []
 
@@ -42,11 +42,15 @@ def get_releases(pre_releases=False):
     except requests.exceptions.RequestException:
         # The request failed. Set a flag in the cache to disable future checks to this URL for 15 minutes.
         logger.exception(f"Error while fetching {url}. Disabling checks for 15 minutes.")
-        cache.set("latest_release_no_retry", url, 900)
+        cache.set("nautobot.core.releases.get_releases.no_retry", url, 900)
         return []
 
     # Cache the most recent release
-    cache.set("latest_release", max(releases), config.get_settings_or_config("RELEASE_CHECK_TIMEOUT"))
+    cache.set(
+        "nautobot.core.releases.get_latest_release",
+        max(releases),
+        config.get_settings_or_config("RELEASE_CHECK_TIMEOUT"),
+    )
 
     # Since this is a Celery task, we can't return Version objects as they are not JSON serializable.
     return [(str(version), url) for version, url in releases]

nautobot/core/templates/admin/base.html

@@ -8,55 +8,7 @@
 <html lang="en"{% if request.COOKIES|get_item:"theme" == 'dark' %} data-theme="dark"{% endif %}>
 <head>
     <title>{% block title %}Admin Home{% endblock %} - Nautobot</title>
-    <link rel="stylesheet"
-          href="{% static 'bootstrap-3.4.1-dist/css/bootstrap.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/css/bootstrap.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'materialdesignicons-6.5.95/css/materialdesignicons.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=materialdesignicons-6.5.95/css/materialdesignicons.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'jquery-ui-1.13.1/jquery-ui.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'select2-4.0.13/select2.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=select2-bootstrap-0.1.0-beta.10/select2-bootstrap.min.css'">
-    <link rel="stylesheet"
-          href="{% static 'flatpickr-4.6.9/themes/light.min.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.9/themes/light.min.css'">
-    <link rel="stylesheet" id="dark-theme"
-          href="{% versioned_static 'css/dark.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=css/dark.css'"{% if request.COOKIES|get_item:"theme" != 'dark' %} disabled="disabled"{% endif %} />
-    <link rel="stylesheet" id="base-theme"
-          href="{% versioned_static 'css/base.css' %}"
-          onerror="window.location='{% url 'media_failure' %}?filename=css/base.css'">
-    <link rel="apple-touch-icon" sizes="180x180" href="{%  custom_branding_or_static 'icon_180' 'img/nautobot_icon_180x180.png' %}">
-    <link rel="icon" type="image/png" sizes="32x32" href="{% custom_branding_or_static 'icon_32' 'img/nautobot_icon_32x32.png' %}">
-    <link rel="icon" type="image/png" sizes="16x16" href="{% custom_branding_or_static 'icon_16' 'img/nautobot_icon_16x16.png' %}">
-    <link rel="icon" type="image/png" href="{% custom_branding_or_static 'icon_192' 'img/nautobot_icon_192x192.png' %}" sizes="192x192">
-    <link rel="mask-icon" href="{% custom_branding_or_static 'icon_mask' 'img/nautobot_icon_monochrome.svg' %}" color="#0097ff">
-    <link rel="shortcut icon" href="{% custom_branding_or_static 'favicon' 'img/favicon.ico' %}">
-
-    <script src="{% static 'jquery/jquery-3.6.0.min.js' %}"
-        onerror="window.location='{% url 'media_failure' %}?filename=jquery/jquery-3.6.0.min.js'"></script>
-    <script src="{% static 'jquery-ui-1.13.1/jquery-ui.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=jquery-ui-1.13.1/jquery-ui.min.js'"></script>
-    <script src="{% static 'bootstrap-3.4.1-dist/js/bootstrap.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=bootstrap-3.4.1-dist/js/bootstrap.min.js'"></script>
-    <script src="{% static 'select2-4.0.13/select2.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=select2-4.0.13/select2.min.js'"></script>
-    <script src="{% static 'flatpickr-4.6.9/flatpickr.min.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=flatpickr-4.6.9/flatpickr.min.js'"></script>
-    <script src="{% static 'js/forms.js' %}"
-            onerror="window.location='{% url 'media_failure' %}?filename=js/forms.js'"></script>
-
-    <meta name="msapplication-TileColor" content="#2d89ef">
-    <meta name="theme-color" content="#ffffff">
-    <meta charset="UTF-8">
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
-
+    {% include 'inc/media.html' %}
     {% block extrahead %}{% endblock %}
     {% block extrastyle %}{% endblock %}
 
@@ -94,23 +46,27 @@
         }
     </style>
 </head>
-<body {% if is_popup %}style="padding-top: 0px;"{% endif %}>
+<body {% if is_popup %}style="padding-left: 0px;"{% endif %}>
+
 {% if not is_popup %}
     {% include 'inc/nav_menu.html' %}
 {% endif %}
-<div class="container-fluid wrapper" {% if is_popup %}style="padding-bottom: 0px;"{% endif %}>
-    {% if "BANNER_TOP"|settings_or_config %}
-        <div class="alert alert-info text-center" role="alert">
-            {{ "BANNER_TOP"|settings_or_config|safe }}
-        </div>
-    {% endif %}
-    {% if settings.MAINTENANCE_MODE %}
-        <div class="alert alert-warning text-center" role="alert">
-            <h4><i class="mdi mdi-alert"></i> Maintenance Mode</h4>
-            <p>Nautobot is currently in maintenance mode. Functionality may be limited.</p>
-        </div>
+
+<div class="container-fluid wrapper" id="main-content" {% if is_popup %}style="padding-bottom: 0px;"{% endif %}>
+    {% if not is_popup %}
+        {% if "BANNER_TOP"|settings_or_config %}
+            <div class="alert alert-info text-center" role="alert">
+                {{ "BANNER_TOP"|settings_or_config|safe }}
+            </div>
+        {% endif %}
+        {% if settings.MAINTENANCE_MODE %}
+            <div class="alert alert-warning text-center" role="alert">
+                <h4><i class="mdi mdi-alert"></i> Maintenance Mode</h4>
+                <p>Nautobot is currently in maintenance mode. Functionality may be limited.</p>
+            </div>
+        {% endif %}
+        {% plugin_banners %}
     {% endif %}
-    {% plugin_banners %}
     {% for message in messages %}
         <div class="alert alert-{{ message.tags }} alert-dismissable" role="alert">
             <button type="button" class="close" data-dismiss="alert" aria-label="Close">
@@ -148,8 +104,6 @@
             {% block content %}{{ content }}{% endblock %}
         </div>
     </div>
-
-    {% block footer %}<footer id="footer"></footer>{% endblock %}
     <div class="push"></div>
     {% if "BANNER_BOTTOM"|settings_or_config %}
         <div class="alert alert-info text-center banner-bottom" role="alert">
@@ -158,37 +112,12 @@
     {% endif %}
 </div>
 {% if not is_popup %}
-    <footer class="footer">
-        <div class="container-fluid">
-            <div class="row">
-                <div class="col-xs-4">
-                    <p class="text-muted">{{ settings.HOSTNAME }} (v{{ settings.VERSION }})</p>
-                </div>
-                <div class="col-xs-4 text-center">
-                    <p class="text-muted">{% now 'Y-m-d H:i:s T' %}</p>
-                </div>
-                <div class="col-xs-4 text-right noprint">
-                    <p class="text-muted">
-                        <a href="#theme_modal" data-toggle="modal" data-target="#theme_modal" id="btn-theme-modal"><i class="mdi mdi-theme-light-dark text-primary"></i>Theme</a> &middot;
-                        <i class="mdi mdi-book-open-page-variant text-primary"></i>
-                        {% if settings.BRANDING_URLS.docs %}
-                            <a href="{{ settings.BRANDING_URLS.docs }}">Docs</a>
-                        {% else %}
-                            <a href="{% static 'docs/index.html' %}">Docs</a>
-                        {% endif %}
-                        &middot;
-                        <i class="mdi mdi-cloud-braces text-primary"></i> <a href="{% url 'api_docs' %}">API</a> &middot;
-                        <i class="mdi mdi-graphql text-primary"></i> <a href="{% url 'graphql' %}">GraphQL</a> &middot;
-                        <i class="mdi mdi-xml text-primary"></i> <a href="{{ settings.BRANDING_URLS.code }}">Code</a> &middot;
-                        <i class="mdi mdi-lifebuoy text-primary"></i> <a href="{{ settings.BRANDING_URLS.help }}">Help</a>
-                    </p>
-                </div>
-            </div>
-        </div>
-    </footer>
+    {% include 'inc/footer.html' %}
 {% endif %}
 {% include 'modals/modal_theme.html' with name='theme'%}
-<script src="{% versioned_static 'js/theme.js' %}"></script>
-{% block javascript %}{% endblock %}
+
+{% block javascript %}
+    {% include 'inc/javascript.html' %}
+{% endblock %}
 </body>
 </html>