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

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/base.html

@@ -92,7 +92,7 @@
         </header>
 
         <main class="container-fluid wrapper{% if is_popup %} pb-0{% endif %}" id="main-content" tabindex="-1">
-            <div class="align-items-center d-flex gap-8 justify-content-end mb-16 d-print-none">
+            <div class="align-items-center d-flex gap-8 justify-content-end mb-16 d-print-none flex-wrap">
                 {% block object-tools %}{% endblock %}
             </div>
             <!-- Content -->
@@ -107,7 +107,6 @@
             {% endif %}
             {% include 'inc/footer.html' %}
         {% endif %}
-        {% include 'modals/modal_theme.html' with name='theme'%}
 
         {% block javascript %}
             {% include 'inc/javascript.html' %}

nautobot/core/templates/admin/change_list.html

@@ -1,5 +1,5 @@
 {% extends "admin/base_site.html" %}
-{% load i18n admin_urls static admin_list bootstrapped_goodies_tags %}
+{% load i18n admin_urls static admin_list bootstrapped_goodies_tags helpers %}
 
 {% block extrastyle %}
     {{ block.super }}
@@ -41,17 +41,14 @@
 
 {% block object-tools %}
     {% block search %}{% search_form cl %}{% endblock %}
-    <div id="content-navbar-collapse" class="navbar-collapse collapse">
-        {% block object-tools-items %}
-            {% if has_add_permission %}
-                {% url cl.opts|admin_urlname:'add' as add_url %}
-                <a role="button" href="{% add_preserved_filters add_url is_popup %}" class="btn btn-primary">
-                    <span class="glyphicon glyphicon-plus"></span> {% blocktrans with cl.opts.verbose_name as name %}Add{% endblocktrans %}
-                </a>
-                </li>
-            {% endif %}
-        {% endblock %}
-    </div>
+    {% block object-tools-items %}
+        {% if has_add_permission %}
+            {% url cl.opts|admin_urlname:'add' as add_url %}
+            <a role="button" href="{% add_preserved_filters add_url is_popup %}" class="btn btn-primary">
+                <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% blocktrans with cl.opts.verbose_name|bettertitle as name %}Add {{ name }}{% endblocktrans %}
+            </a>
+        {% endif %}
+    {% endblock %}
 {% endblock %}
 
 {% block content %}

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/base_django.html

@@ -26,7 +26,7 @@
             </div>
             <div class="container-fluid mb-12 mt-16">
                 <div class="row">
-                    <div class="col-4">
+                    <div id="page-title" class="col-4">
                         {% with copy_title=False %}
                             {% block page_title %}{% include "inc/page_title.html" with title=title_block_content copy_title=copy_title %}{% endblock %}
                         {% endwith %}
@@ -51,7 +51,6 @@
                 </div>
             {% endif %}
         {% endif %}
-        {% include 'modals/modal_theme.html' with name='theme'%}
         {% include 'inc/footer.html' %}
         {% include 'inc/javascript.html' %}
         {% block javascript %}{% endblock %}

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/header_extra_content_table.html

@@ -4,7 +4,7 @@
 {% if body_content_table_list_url %}
     <a href="{{ body_content_table_list_url }}" class="badge bg-primary">{% if badge_count_override %}{{ badge_count_override }}{% else %}{{ body_content_table.rows|length }}{% endif %}</a>
 {% elif body_content_table or badge_count_override %}
-    <span class="badge bg-primary">
+    <span class="badge bg-secondary">
         {% if badge_count_override %}
             {{ badge_count_override }}
         {% else %}

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

@@ -6,24 +6,23 @@
 
 <div id="{{ tab_id }}" role="tabpanel" class="tab-pane fade{% if active_tab == tab_id or request.GET.tab == tab_id %} show active{% endif %}">
     {% if include_timestamps_and_buttons %}
-        <div class="align-items-center d-flex flex-wrap mb-16">
+        <div class="align-items-center d-flex flex-wrap mb-16 gap-8">
             {% include 'inc/created_updated.html' %}
-            <div class="flex-grow-0 flex-shrink-0 d-print-none">
+            <div class="d-flex align-items-center gap-8 flex-grow-0 flex-wrap d-print-none ms-auto">
+                {% 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 %}
-        <div class="align-items-center d-flex flex-wrap mb-16">
+        <div class="align-items-center d-flex flex-wrap mb-16 gap-8">
             <div class="flex-grow-1 m-0"></div>
-            <div class="flex-grow-0 flex-shrink-0 d-print-none">
+            <div class="d-flex align-items-center gap-8 flex-grow-0 flex-wrap d-print-none ms-auto">
                 {% render_detail_view_extra_buttons %}
             </div>
         </div>

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 }}
@@ -6,15 +6,28 @@
 
 <script type="text/javascript">
     document.addEventListener('DOMContentLoaded', () => {
-        // Initialize the echarts instance based on the prepared dom
-        var myChart = window.echarts.init(document.getElementById("{{ chart_container_id }}"), null, { renderer: "{{ chart.renderer }}" });
+        setTimeout(() => {
+            // Initialize the echarts instance based on the prepared dom
+            var myChart = window.echarts.init(document.getElementById("{{ chart_container_id }}"), null, { renderer: "{{ chart.renderer }}" });
 
-        // Get config from JSON script
-        var options = JSON.parse(
-            document.getElementById("echarts-config-{{ chart_container_id }}").textContent
-        );
+            // Get config from JSON script
+            var options = JSON.parse(
+                document.getElementById("echarts-config-{{ chart_container_id }}").textContent
+            );
 
-        // Display the chart using the configuration items and data just specified.
-        myChart.setOption(options);
+            // Get current theme
+            var currentTheme = document.documentElement.dataset.bsTheme || 'light';
+
+            // Display the chart using the configuration items and data just specified.
+            myChart.setOption({
+                ...options,
+                // Enable dark mode if the current theme is dark
+                darkMode: currentTheme === 'dark',
+                // Update colors based on theme
+                color: Array.isArray(options.color)
+                    ? options.color.map((colorObj) => colorObj?.[currentTheme] || colorObj?.light || colorObj)
+                    : options.color,
+            });
+        });
     });
 </script>

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

@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 {% comment %}
-3.0 TODO: This file is not used in Nautobot any more as it's replaced by the 'system_jobs/import_objects.html' template.
-Leaving it here for now in case apps are making use of it.
+4.0 TODO: This file should be replaced by the 'system_jobs/import_objects.html' template eventually,
+but for now many CSV import views still exist which use this template.
 {% endcomment %}
 {% load helpers %}
 {% load form_helpers %}
@@ -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_delete.html

@@ -1,2 +1,2 @@
 {% extends 'generic/object_bulk_destroy.html' %}
-{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}
+{% comment %}4.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

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_edit.html

@@ -1,2 +1,2 @@
 {% extends 'generic/object_bulk_update.html' %}
-{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}
+{% comment %}4.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/core/templates/generic/object_bulk_import.html

@@ -1,2 +1,2 @@
 {% extends 'generic/object_bulk_create.html' %}
-{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}
+{% comment %}4.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

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_delete.html

@@ -1,2 +1,2 @@
 {% extends 'generic/object_destroy.html' %}
-{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}
+{% comment %}4.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/core/templates/generic/object_detail.html

@@ -1,2 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}
+{% comment %}4.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/core/templates/generic/object_edit.html

@@ -1,2 +1,2 @@
 {% extends 'generic/object_create.html' %}
-{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}
+{% comment %}4.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

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

@@ -129,18 +129,17 @@
             {% render_components object_detail_content.tabs %}
         {% else %}
             <div id="main" role="tabpanel" class="tab-pane {% if active_tab == "main" or request.GET.tab == "main" %}active{% else %}fade{% endif %}">
-                <div class="align-items-center d-flex flex-wrap mb-16">
+                <div class="align-items-center d-flex flex-wrap mb-16 gap-8">
                     {% include 'inc/created_updated.html' %}
-                    <div class="flex-grow-0 flex-shrink-0 d-print-none">
+                    <div class="d-flex align-items-center gap-8 flex-grow-0 flex-wrap d-print-none ms-auto">
+                        {% 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">