nautobot 3.0.0a2__py3-none-any.whl → 3.0.0rc1__py3-none-any.whl

nautobot/core/templates/graphene/graphiql.html

@@ -49,13 +49,13 @@ add "&raw" to the end of the URL within a browser.
             [data-bs-theme="dark"] .graphiql-dialog-overlay,
             [data-bs-theme="dark"] .graphiql-tooltip,
             [data-bs-theme="dark"] [data-radix-popper-content-wrapper] {
-                --color-primary: 211, 96%, 36% !important; /* $blue-0-dark: #045ab4; */
-                --color-secondary: 218, 14%, 36% !important; /* $gray-3-dark: #4f5868; */
-                --color-tertiary: 0, 0%, 80% !important; /* $black-0-dark: #cbcbcb; */
-                --color-success: 126, 100%, 18% !important; /* $green-0-dark: #005c09; */
-                --color-warning: 31, 94%, 45% !important; /* $orange-0-dark: #e07807; */
-                --color-error: 0, 92%, 31% !important; /* $red-0-dark: #960606; */
-                --color-base: 222, 20%, 10% !important; /* $gray-0-dark: #14171e; */
+                --color-primary: 209, 100%, 60% !important; /* $blue-0-dark: #339dff; */
+                --color-secondary: 0, 0%, 71% !important; /* $gray-3-dark: #b5b5b5; */
+                --color-tertiary: 0, 0%, 100% !important; /* $black-0-dark: #ffffff; */
+                --color-success: 27, 63%, 49% !important; /* $green-0-dark: #2ecc40; */
+                --color-warning: 30, 100%, 60% !important; /* $orange-0-dark: #ff9933; */
+                --color-error: 0, 100%, 65% !important; /* $red-0-dark: #ff4c4c; */
+                --color-base: 0, 0%, 12% !important; /* $gray-0-dark: #1e1e1e; */
             }
 
             #main-content {
@@ -108,7 +108,6 @@ add "&raw" to the end of the URL within a browser.
             </div>
             {% block header %}{% endblock header %}
         </header>
-        {% include 'modals/modal_theme.html' with name='theme'%}
         {% include 'inc/javascript.html' %}
         <main class="container-fluid wrapper" id="main-content" tabindex="-1">
             <!-- GraphiQL page contents -->

nautobot/core/templates/home.html

@@ -2,7 +2,7 @@
 {% load helpers %}
 {% load registry %}
 
-{# TODO: Figure out better solution: this is a quick hack to remove "chevrons" from homepage because in this commit I'm adding the cheverons in base_django.html #}
+{# TODO: Figure out better solution: this is a quick hack to remove "chevrons" from homepage because in this commit I'm adding the chevrons in base_django.html #}
 {% block page_title %}{% endblock %}
 
 {% block header %}

nautobot/core/templates/import_success.html

@@ -1,7 +1,8 @@
 {% extends 'base.html' %}
 
+{% block title %}Import Completed{% endblock %}
+
 {% block content %}
-    <h1>{% block title %}Import Completed{% endblock %}</h1>
     {% include 'responsive_table.html' %}
     <a href="{{ request.path }}" class="btn btn-primary">
         <span class="mdi mdi-database-import-outline" aria-hidden="true"></span>

nautobot/core/templates/inc/computed_fields/panel_data.html

@@ -10,7 +10,7 @@
                 data-nb-toggle="collapse-all"
                 type="button"
             >
-                Collapse All
+                Collapse All Groups
             </button>
         </div>
         <table id="computed_fields_accordion_{{ advanced_ui }}" class="table table-hover card-body attr-table">

nautobot/core/templates/inc/created_updated.html

@@ -2,10 +2,14 @@
     {% if object.last_updated %}
         <small class="align-items-center d-inline-flex gap-4 text-secondary">
             {% if object.created %}
-                <span class="mdi mdi-bookmark-plus"></span> {{ object.created }}
-                <span class="vr mx-4"></span>
+                <span data-bs-toggle="tooltip" title="Created at">
+                    <span class="mdi mdi-bookmark-plus"></span> {{ object.created }}
+                    <span class="vr mx-4"></span>
+                </span>
             {% endif %}
-            <span class="mdi mdi-clock"></span> {{ object.last_updated|timesince }} ago
+            <span data-bs-toggle="tooltip" title="Last updated">
+                <span class="mdi mdi-clock"></span> {{ object.last_updated|timesince }} ago
+            </span>
         </small>
     {% endif %}
 </p>

nautobot/core/templates/inc/custom_fields/panel_data.html

@@ -10,7 +10,7 @@
                 data-nb-toggle="collapse-all"
                 type="button"
             >
-                Collapse All
+                Collapse All Groups
             </button>
         </div>
         <table id="custom_fields_accordion_{{ advanced_ui }}" class="table table-hover card-body attr-table">

nautobot/core/templates/inc/footer.html

@@ -9,7 +9,7 @@
                 {% if request.user.is_authenticated %}
                     {% if settings.BRANDING_FILEPATHS.logo and settings.BRANDING_POWERED_BY_URL %}
                         <a
-                            class="align-items-center d-inline-flex gap-4 my-n4 text-decoration-none"
+                            class="align-items-center d-inline-flex fs-5 gap-4 my-n4 text-decoration-none"
                             href="{{ settings.BRANDING_POWERED_BY_URL }}"
                             target="_blank"
                         >
@@ -102,3 +102,5 @@
         </div>
     </div>
 </footer>
+
+{% include 'modals/modal_theme.html' with name='theme'%}

nautobot/core/templates/inc/form_static_field.html

@@ -0,0 +1,6 @@
+<div class="mb-10 d-md-flex">
+    <label class="col-md-3 col-form-label{% if required %} nb-required{% endif %}">{{ label }}</label>
+    <div class="col-md-9">
+        <p class="form-control-plaintext">{{ value }}</p>
+    </div>
+</div>

nautobot/core/templates/inc/header.html

@@ -1,4 +1,5 @@
 {% load helpers %}
+{% load static %}
 
 {% if request.user.is_authenticated %}
     {% with is_apple_os=request.META.HTTP_USER_AGENT|split:'Mac OS X'|length|divisibleby:'2' %}
@@ -60,7 +61,7 @@
                 {% firstof request.user.get_full_name request.user.username %}
             </button>
             <ul class="dropdown-menu dropdown-menu-end">
-                <li><a class="dropdown-item" href="{% url 'about' %}"><span class="mdi mdi-information"></span>About</a></li>
+                <li><a class="dropdown-item" href="{% url 'about' %}"><span class="mdi mdi-information"></span>About Nautobot</a></li>
                 <li><a class="dropdown-item" href="{% url 'user:profile' %}"><span class="mdi mdi-account-box"></span>Profile</a></li>
                 <li><a class="dropdown-item" href="{% url 'extras:approver_dashboard' %}"><span class="mdi mdi-check-bold"></span>Approval Dashboard</a></li>
                 {% if request.user.is_staff %}
@@ -72,4 +73,13 @@
             </ul>
         </div>
     </div>
+{% else %}
+    {% url settings.LOGIN_URL as login_url %}
+    {% if request.path != login_url %}
+        <div class="col-4 offset-4 text-end">
+            <a class="btn btn-primary" href="{{ login_url }}?next={{ request.get_full_path | urlencode }}">
+                <span aria-hidden="true" class="mdi mdi-login me-4"></span>Log in
+            </a>
+        </div>
+    {% endif %}
 {% endif %}

nautobot/core/templates/inc/image_attachments.html

@@ -1,3 +1,4 @@
+{% comment %}3.0 TODO: Potentially remove this template pending no other references to it.{% endcomment %}
 {% if images %}
     <table class="table table-hover card-body">
         <tr>
@@ -33,4 +34,4 @@
     <div class="card-body">
         <span class="text-secondary">None</span>
     </div>
-{% endif %}
+{% endif %}

nautobot/core/templates/inc/media.html

@@ -9,6 +9,20 @@
 <link rel="stylesheet"
       href="{% static 'dist/css/materialdesignicons.css' %}"
       onerror="window.location='{% url 'media_failure' %}?filename=dist/css/materialdesignicons.css'">
+{% with cookie_theme=request.COOKIES|get_item:'theme' %}
+    {% if not cookie_theme or cookie_theme == 'light' %}
+        <link rel="stylesheet"
+              href="{% static 'dist/css/github.min.css' %}"
+              onerror="window.location='{% url 'media_failure' %}?filename=dist/css/github.min.css'"
+              {% if not cookie_theme %}media="not (prefers-color-scheme: dark)"{% endif %}>
+    {% endif %}
+    {% if not cookie_theme or cookie_theme == 'dark' %}
+        <link rel="stylesheet"
+              href="{% static 'dist/css/github-dark.min.css' %}"
+              onerror="window.location='{% url 'media_failure' %}?filename=dist/css/github-dark.min.css'"
+              {% if not cookie_theme %}media="(prefers-color-scheme: dark)"{% endif %}>
+    {% endif %}
+{% endwith %}
 {% if settings.BRANDING_FILEPATHS.css %}
     <link rel="stylesheet" id="custom-css" href="{% custom_branding_or_static 'css' None %}">
 {% endif %}

nautobot/core/templates/inc/nav_menu.html

@@ -10,17 +10,18 @@
             aria-expanded="{% if cookie_sidenav_collapsed == 'true' %}false{% else %}true{% endif %}"
             aria-label="Collapse sidenav"
             class="bg-warning btn btm-sm btn-warning overflow-hidden p-4 position-absolute nb-sidenav-toggler"
+            data-bs-theme="dark"
             type="button"
         ></button>
 
         <a class="nb-sidenav-brand" href="{% url 'home' %}">
-            <img src="{% custom_branding_or_static 'icon' 'img/nautobot_icon.svg' %}"/>
+            <img src="{% custom_branding_or_static 'icon_32' 'img/nautobot_icon.svg' %}"/>
         </a>
         <a class="position-absolute nb-sidenav-brand" href="{% url 'home' %}">
             <img src="{% custom_branding_or_static 'logo' 'img/nautobot_logo.svg' %}"/>
         </a>
 
-        <ul class="list-unstyled my-0 overflow-auto pt-10 w-100">
+        <ul class="list-unstyled my-0 overflow-x-hidden overflow-y-auto pt-10 w-100">
             {% if request.user.is_authenticated %}
                 {% if nav_menu_version_control %}
                     <li>
@@ -148,13 +149,6 @@
                         </li>
                     {% endfor %}
                 {% endwith %}
-            {% else %}
-                <li class="nb-sidenav-link-wrapper">
-                    <a class="nb-sidenav-link flat" href="{% url settings.LOGIN_URL %}?next={{ request.get_full_path | urlencode }}">
-                        <span class="mdi mdi-login"></span>
-                        <span class="ms-10">Log in</span>
-                    </a>
-                </li>
             {% endif %}
         </ul>
     </nav>

nautobot/core/templates/inc/object_details_advanced_panel.html

@@ -68,13 +68,13 @@
                     {% if object.created %}
                         <tr>
                             <td>Created</td>
-                            <td>{{ object.created }}</td>
+                            <td><span data-bs-toggle="tooltip" title="Created at">{{ object.created }}</span></td>
                         </tr>
                     {% endif %}
                     {% if object.last_updated %}
                         <tr>
                             <td>Updated</td>
-                            <td>{{ object.last_updated }}</td>
+                            <td><span data-bs-toggle="tooltip" title="Last updated">{{ object.last_updated }}</span></td>
                         </tr>
                     {% endif %}
                     <tr>

nautobot/core/templates/inc/search_panel.html

@@ -21,13 +21,13 @@
         {% endfor %}
     </div>
     <div class="justify-content-between mb-n20 nb-form-sticky-footer">
-        <button type="reset" class="btn btn-secondary">
-            <span aria-hidden="true" class="mdi mdi-close me-4"></span><!--
-            -->Clear All
-        </button>
         <button type="submit" class="btn btn-primary">
             <span class="mdi mdi-check me-4" aria-hidden="true"></span><!--
             -->Apply Specified
         </button>
+        <button type="reset" class="btn btn-secondary">
+            <span aria-hidden="true" class="mdi mdi-close me-4"></span><!--
+            -->Clear All
+        </button>
     </div>
 </form>

nautobot/core/templates/login.html

@@ -2,9 +2,11 @@
 {% load helpers %}
 {% load form_helpers %}
 
+{% block title %}Home{% endblock title %}
+
 {% block content %}
-    <div class="row" style="margin-block-start: {% if 'BANNER_LOGIN'|settings_or_config %}6.25{% else %}9.375{% endif %}rem;">
-        <div class="col-md-4 offset-md-4">
+    <div class="row justify-content-center" style="margin-block-start: {% if 'BANNER_LOGIN'|settings_or_config %}6.25{% else %}9.375{% endif %}rem;">
+        <div class="col-sm-12 col-md-9 col-lg-7 nb-lg-max-width">
             {% if "BANNER_LOGIN"|settings_or_config %}
                 <div class="alert alert-info text-center" role="alert">
                     {{ "BANNER_LOGIN"|settings_or_config|render_markdown }}

nautobot/core/templates/nautobot_config.py.j2

@@ -261,12 +261,6 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 #     "icon_mask": os.getenv(
 #         "NAUTOBOT_BRANDING_FILEPATHS_ICON_MASK", None
 #     ),  # mono-chrome icon used for the mask-icon header
-#     "header_bullet": os.getenv(
-#         "NAUTOBOT_BRANDING_FILEPATHS_HEADER_BULLET", None
-#     ),  # bullet image used for various view headers
-#     "nav_bullet": os.getenv("NAUTOBOT_BRANDING_FILEPATHS_NAV_BULLET", None),  # bullet image used for nav menu headers
-#     "css": os.getenv("NAUTOBOT_BRANDING_FILEPATHS_CSS", None),  # Custom global CSS
-#     "javascript": os.getenv("NAUTOBOT_BRANDING_FILEPATHS_JAVASCRIPT", None),  # Custom global JavaScript
 # }
 
 # Prepended to CSV, YAML and export template filenames (i.e. `nautobot_device.yml`)
@@ -358,11 +352,12 @@ SECRET_KEY = os.getenv("NAUTOBOT_SECRET_KEY", "{{ secret_key }}")
 #     DEPLOYMENT_ID = os.environ["NAUTOBOT_DEPLOYMENT_ID"]
 
 # Device names are not guaranteed globally-unique by Nautobot but in practice they often are.
-# Set this to True to use the device name alone as the natural key for Device objects.
-# Set this to False to use the sequence (name, tenant, location) as the natural key instead.
-#
-# if "NAUTOBOT_DEVICE_NAME_AS_NATURAL_KEY" in os.environ and os.environ["NAUTOBOT_DEVICE_NAME_AS_NATURAL_KEY"] != "":
-#     DEVICE_NAME_AS_NATURAL_KEY = is_truthy(os.environ["NAUTOBOT_DEVICE_NAME_AS_NATURAL_KEY"])
+# Select how Devices are uniquely identified:
+#   - 'location_tenant_name': combination of Location + Tenant + Name
+#   - 'name': Device name must be globally unique
+#   - 'none': No enforced uniqueness (rely on other validation rules or custom validators)
+# if "NAUTOBOT_DEVICE_UNIQUENESS" in os.environ and os.environ["NAUTOBOT_DEVICE_UNIQUENESS"] != "":
+#     DEVICE_UNIQUENESS = os.environ["NAUTOBOT_DEVICE_UNIQUENESS"]
 
 # Event Brokers
 # EVENT_BROKERS = {}

nautobot/core/templates/redoc_ui.html

@@ -51,6 +51,13 @@
 
         {# Redoc doesn't change outer page styles. #}
         body { margin: 0; padding: 0; }
+
+        [data-bs-theme="dark"] .redoc-wrap,
+        [data-bs-theme="dark"] .redoc-wrap > :last-child,
+        [data-bs-theme="dark"] .redoc-wrap .api-content > [data-section-id] > [data-section-id] > :last-child,
+        [data-bs-theme="dark"] .redoc-wrap .menu-content .operation-type {
+            filter: hue-rotate(180deg) invert(1);
+        }
     </style>
 {% endblock extra_styles %}
 

nautobot/core/templates/rest_framework/api.html

@@ -2,6 +2,8 @@
 {% load helpers %}
 {% load plugins %}
 {% load static %}
+{% load i18n %}
+{% load rest_framework %}
 {% load ui_framework %}
 
 {% block bootstrap_theme %}
@@ -37,7 +39,83 @@
     </header>
     <main class="container-fluid wrapper" id="main-content" tabindex="-1">
         {% block content %}
-            {{ block.super }}
+            <div class="region" aria-label="{% trans "request form" %}">
+                {% block request_forms %}
+
+                    {% if 'GET' in allowed_methods %}
+                        <form id="get-form" class="button-form">
+                            <fieldset>
+                                {% if api_settings.URL_FORMAT_OVERRIDE %}
+                                    <div class="btn-group format-selection">
+                                        <a class="btn btn-primary js-tooltip" href="{{ request.get_full_path }}" rel="nofollow" title="Make a GET request on the {{ name }} resource">GET</a>
+
+                                        <button class="btn btn-primary dropdown-toggle js-tooltip" data-bs-toggle="dropdown" title="Specify a format for the GET request">
+                                            <span class="mdi mdi-chevron-down"></span>
+                                        </button>
+                                        <ul class="dropdown-menu">
+                                            {% for format in available_formats %}
+                                                <li>
+                                                    <a class="js-tooltip format-option dropdown-item" href="{% add_query_param request api_settings.URL_FORMAT_OVERRIDE format %}" rel="nofollow" title="Make a GET request on the {{ name }} resource with the format set to `{{ format }}`">{{ format }}</a>
+                                                </li>
+                                            {% endfor %}
+                                        </ul>
+                                    </div>
+                                {% else %}
+                                    <a class="btn btn-primary js-tooltip" href="{{ request.get_full_path }}" rel="nofollow" title="Make a GET request on the {{ name }} resource">GET</a>
+                                {% endif %}
+                            </fieldset>
+                        </form>
+                    {% endif %}
+
+                    {% if options_form %}
+                        {# djlint:off H029 OPTIONS is an HTTP method #}
+                        <form class="button-form" action="{{ request.get_full_path }}" data-method="OPTIONS">
+                            <button class="btn btn-primary js-tooltip" title="Make an OPTIONS request on the {{ name }} resource">OPTIONS</button>
+                        </form>
+                        {# djlint:on H029 #}
+                    {% endif %}
+
+                    {% if extra_actions %}
+                        <div class="dropdown" style="float: right; margin-right: 10px">
+                            <button class="btn btn-secondary" id="extra-actions-menu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                                {% trans "Extra Actions" %}
+                                <span class="mdi mdi-chevron-down"></span>
+                            </button>
+                            <ul class="dropdown-menu" aria-labelledby="extra-actions-menu">
+                                {% for action_name, url in extra_actions|items %}
+                                    <li><a href="{{ url }}" class="dropdown-item">{{ action_name }}</a></li>
+                                {% endfor %}
+                            </ul>
+                        </div>
+                    {% endif %}
+
+                {% endblock request_forms %}
+            </div>
+
+            <div class="content-main" role="main"  aria-label="{% trans "main content" %}">
+                <div class="float-start">
+                    {% block description %}
+                        {{ description }}
+                    {% endblock %}
+                </div>
+
+                {% if paginator %}
+                    <nav class="float-end">
+                        {% get_pagination_html paginator %}
+                    </nav>
+                {% endif %}
+
+                <div class="request-info pt-4" aria-label="{% trans "request info" %}">
+                    <pre class="language-json"><b>{{ request.method }}</b> {{ request.get_full_path }}</pre>
+                </div>
+
+                <div class="response-info" aria-label="{% trans "response info" %}">
+                    <pre class="language-json"><span class="meta nocode"><b>HTTP {{ response.status_code }} {{ response.status_text }}</b>{% for key, val in response_headers|items %}
+                        <b>{{ key }}:</b> <span class="lit">{{ val|urlize }}</span>{% endfor %}
+                        
+                    </span>{{ content|urlize }}</pre>
+                </div>
+            </div>
         {% endblock %}
     </main>
     {% include 'inc/footer.html' %}
@@ -49,12 +127,35 @@
 
     {% block script %}
         {% include 'inc/javascript.html' %}
-        <script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
         <script src="{% static "rest_framework/js/ajax-form.js" %}"></script>
         <script src="{% static "rest_framework/js/default.js" %}"></script>
         <script>
+            function linkifyHighlightedUrls() {
+                // Find all hljs-string spans
+                const stringSpans = document.querySelectorAll('span.hljs-string');
+
+                stringSpans.forEach(span => {
+                    const text = span.textContent;
+
+                    // Check if the string starts with "http
+                    if (text.match(/^["']https?:\/\/.*["']$/)) {
+                        // Extract the URL (remove quotes)
+                        const url = text.slice(1, -1); // Remove opening and closing quotes
+
+                        // Create a clickable link while preserving the syntax highlighting
+                        const link = document.createElement('a');
+                        link.href = url;
+                        link.className = 'hljs-string'; // Maintain the syntax highlighting class
+                        link.textContent = text; // Keep the original text with quotes
+
+                        // Replace the span with the link
+                        span.parentNode.replaceChild(link, span);
+                    }
+                });
+            }
             $(document).ready(function() {
                 $('form').ajaxForm();
+                linkifyHighlightedUrls();
             });
         </script>
     {% endblock script %}

nautobot/core/templates/search.html

@@ -32,7 +32,7 @@
                             {% for obj_type in results %}
                                 <a href="#{{ obj_type.name|lower }}" class="list-group-item">
                                     {{ obj_type.name|bettertitle }}
-                                    <span class="badge">{{ obj_type.table.page.paginator.count }}</span>
+                                    <span class="badge bg-primary">{{ obj_type.table.page.paginator.count }}</span>
                                 </a>
                             {% endfor %}
                         </div>

nautobot/core/templates/swagger_ui.html

@@ -7,13 +7,27 @@
 {% block extra_styles %}
     <link rel="stylesheet" href="{% static 'drf_spectacular_sidecar/swagger-ui-dist/swagger-ui.css' %}">
     <style>
-      /* Manual styling inherited from drf-spectacular */
+        /* Manual styling inherited from drf-spectacular */
         html { box-sizing: border-box; overflow-y: scroll; }
         *, *:after, *:before { box-sizing: inherit; }
-        body { background: #fafafa; margin: 0; }
-      /* Style overrides to address conflicts between Swagger styling and Nautobot/Bootstrap styling */
+        body { background: var(--bs-body-bg); margin: 0; }
+        /* Style overrides to address conflicts between Swagger styling and Nautobot/Bootstrap styling */
         pre.version { border: none; background: none; }
         .loading-container .loading { display: block; }
+        /* Dark theme support */
+        [data-bs-theme="dark"] .swagger-ui,
+        [data-bs-theme="dark"] .swagger-ui .backdrop-ux,
+        [data-bs-theme="dark"] .swagger-ui .microlight,
+        [data-bs-theme="dark"] .swagger-ui .opblock .opblock-summary-method {
+            filter: hue-rotate(180deg) invert(1);
+        }
+        [data-bs-theme="dark"] .swagger-ui input:is([type="email"], [type="file"], [type="password"], [type="search"], [type="text"]),
+        [data-bs-theme="dark"] .swagger-ui textarea {
+            color: var(--bs-body-bg);
+        }
+        [data-bs-theme="dark"] .swagger-ui .scheme-container {
+            background: transparent;
+        }
     </style>
 {% endblock extra_styles %}
 

nautobot/core/templates/system_jobs/import_objects.html

@@ -164,10 +164,9 @@
                             <div class="modal-dialog" role="document">
                                 <div class="modal-content">
                                     <div class="modal-header">
+                                        <h4 class="modal-title">${field.name} Choices</h4>
                                         <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close">
-                                            <span aria-hidden="true">&times;</span>
                                         </button>
-                                        <h4 class="modal-title"><code>${field.name}</code> Choices</h4>
                                     </div>
                                     <table class="table table-hover modal-body">
                                         <tr><th>Import Value</th><th>Label</th></tr>

nautobot/core/templates/utilities/confirmation_form.html

@@ -3,7 +3,7 @@
 
 {% block content %}
     <div class="row">
-        <div class="col-md-6 mx-auto">
+        <div class="col-md-8 col-lg-6 mx-auto nb-lg-max-width">
             <form action="" method="post">
                 {% csrf_token %}
                 {% for field in form.hidden_fields %}
@@ -14,7 +14,7 @@
                         {% block title %}{% endblock %}
                     </div>
                     <div class="card-body">
-                        {% block message %}<p>Are you sure?</p>{% endblock %}
+                        <div class="mb-16">{% block message %}<p>Are you sure?</p>{% endblock %}</div>
                         <div class="gap-8 hstack justify-content-end">
                             <button type="submit" name="_confirm" class="btn btn-{{ button_class|default:'danger' }}">
                                 <span aria-hidden="true" class="mdi mdi-check me-4"></span><!--

nautobot/core/templates/utilities/obj_table.html

@@ -14,12 +14,20 @@
                     </div>
                     <div class="hstack gap-8">
                         {% if bulk_edit_url and permissions.change %}
-                            <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if bulk_querystring %}?{{ bulk_querystring }}{% elif request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-warning btn-sm" disabled="disabled">
+                            <button type="submit"
+                                    name="_edit"
+                                    formaction="{% url bulk_edit_url %}{% if bulk_querystring %}?{{ bulk_querystring }}{% elif request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                                    class="btn btn-warning btn-sm"
+                                    disabled>
                                 <span class="mdi mdi-pencil me-4" aria-hidden="true"></span>Edit All
                             </button>
                         {% endif %}
                         {% if bulk_delete_url and permissions.delete %}
-                            <button type="submit" name="_delete" formaction="{% url bulk_delete_url %}{% if bulk_querystring %}?{{ bulk_querystring }}{% elif request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-danger btn-sm" disabled="disabled">
+                            <button type="submit"
+                                    name="_delete"
+                                    formaction="{% url bulk_delete_url %}{% if bulk_querystring %}?{{ bulk_querystring }}{% elif request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                                    class="btn btn-danger btn-sm"
+                                    disabled>
                                 <span class="mdi mdi-trash-can-outline me-4" aria-hidden="true"></span>Delete All
                             </button>
                         {% endif %}

nautobot/core/templates/utilities/render_field.html

@@ -1,15 +1,12 @@
 {% load form_helpers %}
 
-<div class="mb-10 d-flex justify-content-center{% if field.errors %} has-error{% endif %}">
+<div class="mb-10 d-md-flex justify-content-center{% if field.errors %} has-error{% endif %}">
     {% if field|widget_type == 'checkboxinput' %}
         <div class="col-md-9 offset-md-3">
             <div class="form-check mt-6{% if field.errors %} has-error{% endif %}">
                 {{ field }}
                 <label class="form-check-label" for="{{ field.id_for_label }}">
                     {{ field.label }}
-                    {% if field.help_text %}
-                        <span class="form-text">{{ field.help_text|safe }}</span>
-                    {% endif %}
                 </label>
             </div>
             {% if bulk_nullable %}
@@ -18,6 +15,9 @@
                     <label class="form-check-label" for="{{ field.id_for_label }}_nullify">Set null</label>
                 </div>
             {% endif %}
+            {% if field.help_text %}
+                <span class="form-text">{{ field.help_text|safe }}</span>
+            {% endif %}
     {% elif field|widget_type == 'textarea' and not field.label %}
         <div class="col-md-12">
             {{ field }}
@@ -33,9 +33,6 @@
     {% else %}
         <label class="col-md-3 col-form-label{% if field.field.required %} nb-required{% endif %}" for="{{ field.id_for_label }}">
             {{ field.label }}
-            {% if field.help_text %}
-                <span class="form-text">{{ field.help_text|safe }}</span>
-            {% endif %}
         </label>
         <div class="col-md-9">
             {{ field }}
@@ -45,6 +42,9 @@
                     <label class="form-check-label" for="{{ field.id_for_label }}_nullify">Set null</label>
                 </div>
             {% endif %}
+            {% if field.help_text %}
+                <span class="form-text">{{ field.help_text|safe }}</span>
+            {% endif %}
     {% endif %}
     {% if field.errors %}
         <ul class="mb-0 mt-4">

nautobot/core/templates/utilities/render_jinja2.html

@@ -26,13 +26,13 @@
                 <div class="card">
                     <div class="card-header"><strong>Template</strong></div>
                     <div class="card-body">
-                        <div class="mb-10 d-flex justify-content-center">
+                        <div class="mb-10 d-lg-flex">
                             <label class="col-lg-3 col-form-label nb-required" for="id_template_code">Jinja Template</label>
                             <div class="col-lg-9">
                                 <textarea cols="40" rows="10" class="form-control" id="id_template_code" required=""></textarea>
                             </div>
                         </div>
-                        <div class="mb-10 d-flex justify-content-center">
+                        <div class="mb-10 d-lg-flex">
                             <label class="col-lg-3 col-form-label" for="id_context">Data</label>
                             <div class="col-lg-9">
                                 <textarea cols="40" rows="10" class="form-control" placeholder="{}" id="id_context">{}</textarea>