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

nautobot/core/settings.yaml

@@ -758,16 +758,22 @@ properties:
       "`nautobot-server send_installation_metrics`": "../tools/nautobot-server.md#send_installation_metrics"
     type: "string"
     version_added: "1.6.0"
-  DEVICE_NAME_AS_NATURAL_KEY:
-    default: false
+  DEVICE_UNIQUENESS:
+    default: "location_tenant_name"
     description: >-
       `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.
-    environment_variable: "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)
+      The `DEVICE_UNIQUENESS` setting also determines which fields Nautobot treats as the natural key for a Device.
+        - If set to "location_tenant_name", the natural key is the combination of Name, Tenant, and Location.
+        - If set to "name", the natural key is the device name alone.
+        - If set to "none", Nautobot falls back to using the primary key for uniqueness.
+    environment_variable: "NAUTOBOT_DEVICE_UNIQUENESS"
     is_constance_config: true
-    type: "boolean"
-    version_added: "2.0.0"
+    type: "string"
+    version_added: "3.0.0"
   EVENT_BROKERS:
     default: {}
     description: >-

nautobot/core/signals.py

@@ -67,10 +67,21 @@ def invalidate_max_depth_cache(sender, **kwargs):
 
     Note that this signal is connected in `TreeModel.__init_subclass__()` so as to only apply to those models.
     """
-    from nautobot.core.models.tree_queries import TreeManager
+    from nautobot.core.models.tree_queries import TreeManager, TreeNode
 
     if not isinstance(sender.objects, TreeManager):
         return
 
+    # If the instance is a TreeNode, and it has siblings, skip invalidating the cache.
+    instance = kwargs.get("instance", None)
+    if isinstance(instance, TreeNode):
+        try:
+            parent = getattr(instance, "parent", None)
+        except instance.DoesNotExist:
+            parent = None
+        if parent and getattr(parent, "children", None) and parent.children.count() > 1:
+            # TreeNode has siblings, depth can't change
+            return
+
     with contextlib.suppress(redis.exceptions.ConnectionError):
         cache.delete(sender.objects.max_depth_cache_key)

nautobot/core/tables.py

@@ -370,12 +370,17 @@ class ToggleColumn(django_tables2.CheckBoxColumn):
         default = kwargs.pop("default", "")
         visible = kwargs.pop("visible", False)
         if "attrs" not in kwargs:
-            kwargs["attrs"] = {"td": {"class": "nb-w-0"}}
+            kwargs["attrs"] = {
+                "input": {"class": "form-check-input nb-form-check-input-sm mt-2"},
+                "td": {"class": "nb-w-0"},
+            }
         super().__init__(*args, default=default, visible=visible, **kwargs)
 
     @property
     def header(self):
-        return mark_safe('<input type="checkbox" class="toggle" title="Toggle all" />')
+        return mark_safe(
+            '<input type="checkbox" class="toggle form-check-input nb-form-check-input-sm mt-2" title="Toggle all" />'
+        )
 
 
 class BooleanColumn(django_tables2.Column):
@@ -405,7 +410,8 @@ class ButtonsColumn(django_tables2.TemplateColumn):
         "th": {"class": "nb-actionable nb-w-0"},
     }
     # Note that braces are escaped to allow for string formatting prior to template rendering
-    template_code = """
+    template_code = """\
+{{% if record.present_in_database %}}
     <div class="dropdown">
         <button class="btn dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
             <span class="mdi mdi-dots-vertical" aria-hidden="true"></span>
@@ -439,6 +445,7 @@ class ButtonsColumn(django_tables2.TemplateColumn):
             {{% endif %}}
         </ul>
     </div>
+{{% endif %}}
     """
 
     def __init__(
@@ -490,7 +497,7 @@ class ApprovalButtonsColumn(django_tables2.TemplateColumn):
     """
 
     buttons = ("detail", "changelog", "approve", "deny")
-    attrs = {"td": {"class": "d-print-none text-right text-nowrap"}}
+    attrs = {"td": {"class": "d-print-none text-end text-nowrap"}}
     template_name = "extras/inc/approval_buttons_column.html"
 
     def __init__(
@@ -652,11 +659,11 @@ class LinkedCountColumn(django_tables2.Column):
                 {k: (getattr(record, v) or settings.FILTERS_NULL_CHOICE_VALUE) for k, v in self.url_params.items()}
             )
         if value > 1:
-            return format_html('<a href="{}" class="badge">{}</a>', url, value)
+            return format_html('<a href="{}" class="badge bg-primary">{}</a>', url, value)
         if related_record is not None:
             return helpers.hyperlinked_object(related_record, self.display_field)
         if value == 1:
-            return format_html('<a href="{}" class="badge">{}</a>', url, value)
+            return format_html('<a href="{}" class="badge bg-primary">{}</a>', url, value)
         return helpers.placeholder(value)
 
 

nautobot/core/templates/40x.html

@@ -3,7 +3,7 @@
 
 {% block content %}
     <div class="row justify-content-center" style="margin-top: 9.375rem;">
-        <div class="col-md-4 offset-md-4">
+        <div class="col-sm-12 col-md-9 col-lg-7 nb-lg-max-width">
             <div class="card">
                 <div class="card-header">
                     <strong class="hstack gap-4">{% block icon %}{% endblock %}{% block title %}{% endblock %}</strong>

nautobot/core/templates/500.html

@@ -5,7 +5,7 @@
 
 {% block content %}
     <div class="row justify-content-center" style="margin-top: 9.375rem;">
-        <div class="col-md-4 offset-md-4">
+        <div class="col-sm-12 col-md-9 col-lg-7 nb-lg-max-width">
             <div class="card">
                 <div class="card-header">
                     <strong class="hstack gap-4"><span class="mdi mdi-alert"></span>Server Error</strong>
@@ -16,7 +16,7 @@
                             There was a problem with your request. Please contact an administrator.
                         </p>
                     {% endblock %}
-                    <hr />
+                    <hr class="border-top" />
                     <p>
                         The complete exception is provided below:
                     </p>

nautobot/core/templates/admin/config/config.html

@@ -13,8 +13,8 @@
 {% block content %}
     <form action="" method="post" enctype="multipart/form-data" id="changelist-form" class="form form-horizontal">
         {% csrf_token %}
-        <div class="row">
-            <div class="col-lg-6 offset-lg-3">
+        <div class="row justify-content-center">
+            <div class="col-lg-8">
                 {% if form.non_field_errors %}
                     <div class="card border-danger">
                         <div class="card-header bg-danger-subtle border-danger text-body"><strong>Errors</strong></div>
@@ -59,14 +59,14 @@
                                                 </div>
                                                 {{ item.form_field.as_hidden }}
                                             {% else %}
-                                                <div class="mb-10 d-flex justify-content-center{% if item.form_field.errors %} has-error{% endif %}">
-                                                    <label class="col-lg-3 col-form-label" for="{{ item.form_field.id_for_label }}">
+                                                <div class="mb-10 d-md-flex align-content-start justify-content-between{% if item.form_field.errors %} has-error{% endif %}">
+                                                    <label class="col-12 col-md-3 col-form-label" for="{{ item.form_field.id_for_label }}">
                                                         {{ name | split:"_" | join:" " }}
-                                                        <span class="form-text">
+                                                        <span class="form-text ps-2">
                                                             (default: <code>{{ item.default }}</code>)
                                                         </span>
                                                     </label>
-                                                    <div class="col-lg-9">
+                                                    <div class="col-12 col-md-9">
                                                         {{ item.form_field.errors }}
                                                         {% if item.is_file %}{% trans "Current file" %}: <a href="{% get_media_prefix as MEDIA_URL %}{{ MEDIA_URL }}{{ item.value }}" target="_blank">{{ item.value }}</a>{% endif %}
                                                         {{ item.form_field }}
@@ -89,14 +89,14 @@
                                             </div>
                                             {{ item.form_field.as_hidden }}
                                         {% else %}
-                                            <div class="mb-10 d-flex justify-content-center{% if item.form_field.errors %} has-error{% endif %}">
-                                                <label class="col-lg-3 col-form-label" for="{{ item.form_field.id_for_label }}">
+                                            <div class="mb-10 d-md-flex align-content-start justify-content-between{% if item.form_field.errors %} has-error{% endif %}">
+                                                <label class="col-12 col-md-3 d-flex d-md-block col-form-label" for="{{ item.form_field.id_for_label }}">
                                                     {{ item.name | split:"_" | join:" " }}
-                                                    <span class="form-text">
+                                                    <span class="form-text ps-2">
                                                         (default: <code>{{ item.default }}</code>)
                                                     </span>
                                                 </label>
-                                                <div class="col-lg-9">
+                                                <div class="col-12 col-md-9">
                                                     {{ item.form_field.errors }}
                                                     {% if item.is_file %}{% trans "Current file" %}: <a href="{% get_media_prefix as MEDIA_URL %}{{ MEDIA_URL }}{{ item.value }}" target="_blank">{{ item.value }}</a>{% endif %}
                                                     {{ item.form_field }}
@@ -112,8 +112,8 @@
                 </div>
             </div>
         </div>
-        <div class="row">
-            <div class="col-lg-6 offset-lg-3 text-end">
+        <div class="row justify-content-center">
+            <div class="col-lg-8 text-end">
                 <input type="submit" name="_save" class="btn btn-primary" value="{% trans 'Save' %}"/>
             </div>
         </div>

nautobot/core/templates/admin/index.html

@@ -14,19 +14,19 @@
             <ul class="dropdown-menu" role="menu">
                 {% for app in app_list %}
                     <li>
-                        <a href="#"><strong>{% render_app_name app %}</strong></a>
+                        <a class="dropdown-item" href="#"><strong>{% render_app_name app %}</strong></a>
                     </li>
                     {% for model in app.models %}
                         <li>
                             {% if model.admin_url %}
-                                <a href="{{ model.admin_url }}">{{ model.name }}</a>
+                                <a class="dropdown-item" href="{{ model.admin_url }}">{{ model.name }}</a>
                             {% else %}
                                 {{ model.name }}
                             {% endif %}
                         </li>
                     {% endfor %}
                     {% if not forloop.last %}
-                        <li role="presentation" class="divider"></li>
+                        <li><hr class="dropdown-divider"></li>
                     {% endif %}
                 {% endfor %}
             </ul>

nautobot/core/templates/buttons/export.html

@@ -1,7 +1,7 @@
 {% if export_url %}
     {% if list_element %}
         {% if export_templates %}
-            <li class="text-center">Export Templates</li>
+            <li class="dropdown-header fs-5">Export Templates</li>
         {% endif %}
         {% if include_yaml_option %}
             <li>

nautobot/core/templates/components/button/dropdown.html

@@ -1,4 +1,4 @@
-<div class="btn-group">
+<div class="dropdown d-inline-flex">
     <button type="button" class="btn btn-{{ color }} dropdown-toggle" data-bs-toggle="dropdown"
             aria-haspopup="true" aria-expanded="false"
             {% for key, value in attributes.items %}{{ key }}="{{ value }}" {% endfor %}
@@ -9,12 +9,14 @@
     </button>
     <ul class="dropdown-menu">
         {% for child in children %}
-            <li><a href="{{ child.link }}" class="text-{{ child.color }}"
+            <li>
+                <a href="{{ child.link }}" class="dropdown-item text-{{ child.color }}"
                    {% for key, value in child.attributes.items %}{{ key }}="{{ value }}" {% endfor %}
                 >
                     {% if child.icon %}<span class="mdi {{ child.icon }}" aria-hidden="true"></span>{% endif %}
                     {{ child.label }}
-                </a></li>
+                </a>
+            </li>
         {% endfor %}
     </ul>
 </div>

nautobot/core/templates/components/panel/body_wrapper_generic_table.html

@@ -1,3 +1,3 @@
-<table class="table table-hover card-body"{% if body_id %} id="{{ body_id }}"{% endif %}>
+<table class="collapse show table table-hover card-body"{% if body_id %} id="{{ body_id }}"{% endif %}>
     {{ body_content }}
 </table>

nautobot/core/templates/components/panel/panel.html

@@ -1,6 +1,6 @@
-<div class="card">
+<div class="card{% if css_class %} border-{{ css_class }}{% endif %}">
     {% if label.strip or header_extra_content.strip %}
-        <div class="card-header">
+        <div class="card-header{% if css_class %} bg-{{ css_class }}-subtle border-{{ css_class }}{% endif %}">
             {% if label %}
                 <strong>{{ label }}</strong>
             {% endif %}
@@ -12,7 +12,7 @@
     {% endif %}
     {{ body }}
     {% if footer_content.strip %}
-        <div class="card-footer">
+        <div class="card-footer{% if css_class %} bg-{{ css_class }}-subtle border-{{ css_class }}{% endif %}">
             {{ footer_content }}
         </div>
     {% endif %}

nautobot/core/templates/components/tab/content_wrapper.html

@@ -9,15 +9,14 @@
         <div class="align-items-center d-flex flex-wrap mb-16">
             {% include 'inc/created_updated.html' %}
             <div class="flex-grow-0 flex-shrink-0 d-print-none">
+                {% custom_links object %}
+                {% job_buttons object %}
                 {% block buttons %}
                     {% plugin_buttons object %}
                     {% render_detail_view_extra_buttons %}
                     {% block extra_buttons %}{% endblock extra_buttons %}
                     {% consolidate_detail_view_action_buttons %}
                 {% endblock buttons %}
-                {% custom_links object %}
-                {% job_buttons object %}
-                {% block panel_buttons %}{% endblock panel_buttons %}
             </div>
         </div>
     {% else %}

nautobot/core/templates/components/tab/label_wrapper_distinct_view.html

@@ -1,7 +1,7 @@
 {% comment %}disabled_message is not part of the default render context but a tab can define it if needed.{% endcomment %}
 {% if disabled_message %}
     <li class="nav-item" role="presentation" title="{{ disabled_message }}">
-        <a class="nav-link disabled" href="#">{{ label }}</a>
+        <a aria-disabled="true" class="nav-link disabled">{{ label }}</a>
     </li>
 {% else %}
     <li class="nav-item" role="presentation">

nautobot/core/templates/echarts/echarts.html

@@ -1,4 +1,4 @@
-<div id="{{ chart_container_id }}" style="width: {{ chart_width }}; height: {{ chart_height }};"></div>
+<div class="collapse show" id="{{ chart_container_id }}" style="width: {{ chart_width }}; height: {{ chart_height }};"></div>
 <!-- Safe JSON export from Django -->
 {% with "echarts-config-"|add:chart_container_id as chart_config_id %}
     {{ chart_config|json_script:chart_config_id }}

nautobot/core/templates/generic/object_bulk_add_component.html

@@ -1,6 +1,8 @@
 {% extends 'base.html' %}
 {% load form_helpers %}
 
+{% block title %}Add {{ model_name|title }}{% endblock %}
+
 {% block content %}
     <form action="." method="post" class="h-100 vstack">
         {% csrf_token %}
@@ -11,7 +13,6 @@
             {{ field }}
         {% endfor %}
         <div class="row align-content-start flex-fill">
-            <h1 class="mb-16">{% block title %}Add {{ model_name|title }}{% endblock %}</h1>
             <p class="mb-16">{{ table.rows|length }} {{ parent_model_name }} selected</p>
             <div class="col-lg-7">
                 <div class="card">

nautobot/core/templates/generic/object_bulk_create.html

@@ -25,11 +25,12 @@ Leaving it here for now in case apps are making use of it.
     </style>
 {% endblock %}
 
+{% block title %}{{ obj_type|bettertitle }} Bulk Import{% endblock %}
+
 {% block content %}
     {% block tabs %}{% endblock %}
-    <div class="row">
-        <div class="col-md-8 offset-md-2">
-            <h1 class="mb-16">{% block title %}{{ obj_type|bettertitle }} Bulk Import{% endblock %}</h1>
+    <div class="row justify-content-center">
+        <div class="col-lg-8 col-md-10">
             {% if form.non_field_errors %}
                 <div class="card border-danger">
                     <div class="card-header bg-danger-subtle border-danger text-body">

nautobot/core/templates/generic/object_bulk_destroy.html

@@ -13,8 +13,8 @@
         {% for field in form.hidden_fields %}
             {{ field }}
         {% endfor %}
-        <div class="row align-content-start flex-fill">
-            <div class="col-md-8 offset-md-2">
+        <div class="row align-content-start justify-content-center flex-fill">
+            <div class="col-lg-8 col-md-10 d-flex justify-content-center">
                 <div class="card border-danger" id="confirm-bulk-deletion">
                     <div class="card-header bg-danger-subtle border-danger text-body">
                         <strong>Confirm Bulk Deletion</strong>
@@ -26,7 +26,7 @@
                 </div>
             </div>
             {% if table %}
-                <div class="col-md-8 offset-md-2">
+                <div class="col-lg-8 col-md-10">
                     <div class="card">
                         <div class="table-responsive">
                             {% render_table table 'inc/table.html' %}

nautobot/core/templates/generic/object_bulk_remove.html

@@ -9,8 +9,8 @@
         {% for field in form.hidden_fields %}
             {{ field }}
         {% endfor %}
-        <div class="row align-content-start flex-fill">
-            <div class="col-md-8 offset-md-2">
+        <div class="row align-content-start justify-content-center flex-fill">
+            <div class="col-lg-8 col-md-10 d-flex justify-content-center">
                 <div class="card border-danger">
                     <div class="card-header bg-danger-subtle border-danger text-body">
                         <strong>Confirm Bulk Removal</strong>

nautobot/core/templates/generic/object_bulk_update.html

@@ -3,6 +3,8 @@
 {% load form_helpers %}
 {% load render_table from django_tables2 %}
 
+{% block title %}Editing {{ objs_count }} {{ obj_type_plural|bettertitle }}{% endblock %}
+
 {% block content %}
     <form action="" method="post" class="h-100 vstack">
         {% csrf_token %}
@@ -12,8 +14,7 @@
         {% for field in form.hidden_fields %}
             {{ field }}
         {% endfor %}
-        <div class="row align-content-start flex-fill">
-            <h1 class="mb-16">{% block title %}Editing {{ objs_count }} {{ obj_type_plural|bettertitle }}{% endblock %}</h1>
+        <div class="row justify-content-center align-content-start flex-fill">
             {% if form.errors %}
                 <div class="card border-danger">
                     <div class="card-header bg-danger-subtle border-danger text-body">
@@ -30,7 +31,7 @@
                 </div>
             {% endif %}
             {% if table %}
-                <div class="col-md-8">
+                <div class="col-lg-8">
                     <div class="card">
                         <div class="table-responsive">
                             {% render_table table 'inc/table.html' %}
@@ -38,7 +39,7 @@
                     </div>
                 </div>
             {% endif %}
-            <div class="{% if table %}col-md-4{% else %}col-lg-8 offset-lg-2 col-md-10 offset-md-1{% endif %}">
+            <div class="{% if table %}col-lg-4{% else %}col-lg-8 col-md-12{% endif %}">
                 <div class="card">
                     <div class="card-header"><strong>{% block form_title %}Attributes{% endblock %}</strong></div>
                     <div class="card-body">

nautobot/core/templates/generic/object_create.html

@@ -2,14 +2,16 @@
 {% load form_helpers %}
 {% load helpers %}
 
+{% block title %}{% if editing %}Editing {{ obj_type }} {{ obj }}{% else %}Add a new {{ obj_type }}{% endif %}{% endblock %}
+
 {% block content %}
     <form action="" method="post" enctype="multipart/form-data" class="h-100 vstack">
         {% csrf_token %}
         {% for field in form.hidden_fields %}
             {{ field }}
         {% endfor %}
-        <div class="row align-content-start flex-fill">
-            <div class="col-lg-8 offset-lg-2 col-md-10 offset-md-1 mb-10">
+        <div class="row justify-content-center align-content-start flex-fill">
+            <div class="col-lg-8 col-md-10 mb-10">
                 <h3>
                     {% if obj %}
                         {% with obj|get_docs_url as docs_url %}
@@ -20,10 +22,9 @@
                             {% endif %}
                         {% endwith %}
                     {% endif %}
-                    {% block title %}{% if editing %}Editing {{ obj_type }} {{ obj }}{% else %}Add a new {{ obj_type }}{% endif %}{% endblock %}
                 </h3>
             </div>
-            <div class="col-lg-8 offset-lg-2 col-md-10 offset-md-1">
+            <div class="col-lg-8 col-md-10">
                 {% block tabs %}{% endblock %}
                 {% block form_errors %}
                     {% if form.non_field_errors or model_form.non_field_errors %}

nautobot/core/templates/generic/object_import.html

@@ -2,13 +2,14 @@
 {% load helpers %}
 {% load form_helpers %}
 
+{% block title %}{{ obj_type|bettertitle }} Import{% endblock %}
+
 {% block content %}
     {% block tabs %}{% endblock %}
     <form action="" method="post" class="object-import-form h-100 vstack">
         {% csrf_token %}
         <div class="row align-content-start flex-fill">
             <div class="col-md-8 offset-md-2">
-                <h1>{% block title %}{{ obj_type|bettertitle }} Import{% endblock %}</h1>
                 {% if form.non_field_errors %}
                     <div class="card border-danger">
                         <div class="card-header bg-danger-subtle border-danger text-body">

nautobot/core/templates/generic/object_list.html

@@ -156,17 +156,25 @@
                                                         data-bs-target="#dynamic_group_assignment_modal"
                                                         data-objects="all"
                                                         class="btn btn-primary btn-sm"
-                                                        disabled="disabled">
+                                                        disabled>
                                                     <span class="mdi mdi-group me-4" aria-hidden="true"></span>Update Group Assignment for All
                                                 </button>
                                             {% endif %}
                                             {% if bulk_edit_url and permissions.change %}
-                                                <button type="submit" name="_edit" formaction="{% url bulk_edit_url %}{% if 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 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 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 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 %}
@@ -297,7 +305,7 @@
                 </a>
                 {% if current_saved_view %}
                     {% if current_saved_view.owner == user %}
-                        <a class="btn btn-danger" href="{% url 'extras:savedview_delete' pk=current_saved_view.pk %}">
+                        <a class="btn btn-danger" href="{% url 'extras:savedview_delete' pk=current_saved_view.pk %}?return_url={{ request.path }}">
                             <span class="mdi mdi-trash-can-outline me-4" aria-hidden="true"></span>Delete Current
                         </a>
                     {% else %}

nautobot/core/templates/generic/object_notes.html

@@ -5,8 +5,8 @@
 {% block content %}
     {% if perms.extras.add_note %}
         <form action="{% url 'extras:note_add' %}?return_url={{ request.path }}?tab=notes" method="post" enctype="multipart/form-data">
-            <div class="row">
-                <div class="col-md-6 offset-md-3">
+            <div class="row justify-content-center">
+                <div class="col-md-10 col-lg-8">
                     <h3 class="mb-16">Add a new note</h3>
                     <div class="card">
                         <div class="card-header">
@@ -18,7 +18,9 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-md-6 offset-md-3 gap-8 hstack justify-content-end mb-16">
+            </div>
+            <div class="row justify-content-center">
+                <div class="col-md-10 col-lg-8 gap-8 hstack justify-content-end mb-16">
                     <button id="createNote" type="submit" class="btn btn-primary">
                         <span aria-hidden="true" class="mdi mdi-check me-4"></span><!--
                         -->Create

nautobot/core/templates/generic/object_retrieve.html

@@ -132,15 +132,14 @@
                 <div class="align-items-center d-flex flex-wrap mb-16">
                     {% include 'inc/created_updated.html' %}
                     <div class="flex-grow-0 flex-shrink-0 d-print-none">
+                        {% custom_links object %}
+                        {% job_buttons object %}
                         {% block buttons %}
                             {% plugin_buttons object %}
                             {% render_detail_view_extra_buttons %}
                             {% block extra_buttons %}{% endblock extra_buttons %}
                             {% consolidate_detail_view_action_buttons %}
                         {% endblock buttons %}
-                        {% custom_links object %}
-                        {% job_buttons object %}
-                        {% block panel_buttons %}{% endblock panel_buttons %}
                     </div>
                 </div>
                 <div class="row">

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 {

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">