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

nautobot/extras/templates/extras/job_edit.html

@@ -6,69 +6,69 @@
     <div class="card">
         <div class="card-header"><strong>Job Source</strong></div>
         <div class="card-body">
-            <div class="mb-10 d-flex justify-content-center">
+            <div class="mb-10 d-lg-flex justify-content-center">
                 <label class="col-lg-3 col-form-label">Module</label>
-                <div class="col-lg-9" style="padding-top: 7px">
+                <div class="col-lg-9 pt-6">
                     <code>{{ obj.module_name }}</code>
                     <span class="form-text">Dotted name of the Python module providing this job</span>
                 </div>
             </div>
-            <div class="mb-10 d-flex justify-content-center">
+            <div class="mb-10 d-lg-flex justify-content-center">
                 <label class="col-lg-3 col-form-label">Job Class</label>
-                <div class="col-lg-9" style="padding-top: 7px">
+                <div class="col-lg-9 pt-6">
                     <code>{{ obj.job_class_name }}</code>
                     <span class="form-text">Name of the Python class providing this job</span>
                 </div>
             </div>
-            <div class="mb-10 d-flex justify-content-center">
+            <div class="mb-10 d-lg-flex justify-content-center">
                 <div class="col-lg-9 offset-lg-3">
-                    <div class="form-check">
-                        <label>
-                            <input type="checkbox" disabled="true" {% if obj.installed %}checked="checked"{% endif %}>
+                    <div class="form-check mt-6">
+                        <input class="form-check-input" id="id_installed" name="installed" type="checkbox" disabled {% if obj.installed %}checked{% endif %}>
+                        <label class="form-check-label" for="id_installed">
                             Installed
+                            <span class="form-text">
+                                Whether the Python class providing this job is presently installed and loadable
+                            </span>
                         </label>
-                        <span class="form-text">
-                            Whether the Python class providing this job is presently installed and loadable
-                        </span>
                     </div>
                 </div>
             </div>
-            <div class="mb-10 d-flex justify-content-center">
+            <div class="mb-10 d-lg-flex justify-content-center">
                 <div class="col-lg-9 offset-lg-3">
-                    <div class="form-check">
-                        <label>
-                            <input type="checkbox" disabled="true" {% if obj.supports_dryrun %}checked="checked"{% endif %}>
+                    <div class="form-check mt-6">
+                        <input class="form-check-input" id="id_supports_dryrun" name="supports_dryrun" type="checkbox" disabled {% if obj.supports_dryrun %}checked{% endif %}>
+                        <label class="form-check-label" for="id_supports_dryrun">
                             Supports dryrun
+                            <span class="form-text">
+                                Whether this job supports bypassing approval when running with dryrun argument set to true
+                            </span>
                         </label>
-                        <span class="form-text">
-                            Whether this job supports bypassing approval when running with dryrun argument set to true
-                        </span>
                     </div>
                 </div>
             </div>
-            <div class="mb-10 d-flex justify-content-center">
+            <div class="mb-10 d-lg-flex justify-content-center">
                 <div class="col-lg-9 offset-lg-3">
-                    <div class="form-check">
-                        <label>
-                            <input type="checkbox" disabled="true" {% if obj.is_job_hook_receiver %}checked="checked"{% endif %}>
+                    <div class="form-check mt-6">
+                        <input class="form-check-input" id="id_is_job_hook_receiver" name="is_job_hook_receiver" type="checkbox" disabled {% if obj.is_job_hook_receiver %}checked{% endif %}>
+                        <label class="form-check-label" for="id_is_job_hook_receiver">
                             Is job hook receiver
+                            <span class="form-text">
+                                Whether this job is a job hook receiver
+                            </span>
                         </label>
-                        <span class="form-text">
-                            Whether this job is a job hook receiver
-                        </span>
                     </div>
                 </div>
             </div>
-            <div class="mb-10 d-flex justify-content-center">
+            <div class="mb-10 d-lg-flex justify-content-center">
                 <div class="col-lg-9 offset-lg-3">
-                    <div class="form-check">
-                        <label>
-                            <input type="checkbox" disabled="true" {% if obj.is_job_button_receiver %}checked="checked"{% endif %}>
+                    <div class="form-check mt-6">
+                        <input class="form-check-input" id="id_is_job_button_receiver" name="is_job_button_receiver" type="checkbox" disabled {% if obj.is_job_button_receiver %}checked{% endif %}>
+                        <label class="form-check-label" for="id_is_job_button_receiver">
                             Is job button receiver
+                            <span class="form-text">
+                                Whether this job is a job button receiver
+                            </span>
                         </label>
-                        <span class="form-text">
-                            Whether this job is a job button receiver
-                        </span>
                     </div>
                 </div>
             </div>
@@ -103,12 +103,15 @@
     {{ block.super }}
     {{ obj.job_class.properties_dict | json_script:"job_class_properties" }}
     <script>
+        /*
+         * Because some of the form fields are Select2 widgets, we need to stick with jQuery here for now
+         */
         const job_class_properties = JSON.parse(document.getElementById("job_class_properties").textContent);
         const description_default = $("#id_description").val();
-    /* All id_*_override fields */
+        /* All id_*_override fields */
         $("[id^=id_][id$=_override]").change(function() {
             const override_id = $(this).attr("id");
-        /* What's the form field this is an override for? */
+            /* What's the form field this is an override for? */
             const field_id = override_id.slice(0, -9);
             const field = $("#" + field_id);
             const field_name = field_id.slice(3);
@@ -116,32 +119,32 @@
                 field.attr("readonly", null);
                 field.prop("disabled", false);
             } else {
-            /* Revert the field to its default value */
+                /* Revert the field to its default value */
                 if (field.attr("type") == "checkbox") {
-                /* Do we have a job class object to derive properties from? */
+                    /* Do we have a job class object to derive properties from? */
                     if (job_class_properties != "") {
                         field.prop("checked", job_class_properties[field_name]);
                     } else {
-                    /* No, we don't - it's probably not installed */
+                        /* No, we don't - it's probably not installed */
                         field.prop("checked", field.attr("checked"));
                     }
-                /*
-                 * Checkboxes can't be "readonly" in HTML :-(
-                 * Note that "disabled" fields aren't included in form submission, so we have to be sure to
-                 * re-enable them at form submission time.
-                 */
+                    /*
+                     * Checkboxes can't be "readonly" in HTML :-(
+                     * Note that "disabled" fields aren't included in form submission, so we have to be sure to
+                     * re-enable them at form submission time.
+                     */
                     field.prop("disabled", true);
                 } else {
-                /* Do we have a job class object to derive properties from? */
+                    /* Do we have a job class object to derive properties from? */
                     if (job_class_properties != "") {
                         if (field_name != "job_queues" && field_name != "default_job_queue") {
                             field.val(job_class_properties[field_name]);
                         }
                     } else if (field_name != "description") {
-                    /* No, we don't - it's probably not installed */
+                        /* No, we don't - it's probably not installed */
                         field.val(field.attr("value"));
                     } else {
-                    /* Textarea fields don't have a "value" attribute */
+                        /* Textarea fields don't have a "value" attribute */
                         field.val(description_default);
                     }
                     if (field_name == "job_queues" || field_name == "default_job_queue") {
@@ -154,7 +157,10 @@
         });
         $("[id^=id_][id$=_override]").change();
 
-    /* As mentioned above, we need to re-enable all checkboxes, job_queues and default_job_queue fields on form submission so they get included */
+        /*
+         * As mentioned above, we need to re-enable all checkboxes, job_queues and default_job_queue fields
+         * on form submission so they get included
+         */
         $("form").submit(function() {
             $('input[type="checkbox"]:disabled').each(function() {
                 $(this).prop("disabled", false);

nautobot/extras/templates/extras/job_list.html

@@ -3,12 +3,22 @@
 
 {% block extra_styles %}
     <style>
+        tr a.job_run {
+            display: inline-flex;
+            gap: 0.625rem; /* 10px */
+        }
+
         tr a.job_run .btn {
-            margin: -4px 10px 0 0;
+            align-self: flex-start;
+            margin-block: -0.09375rem; /* -1.5px */
         }
 
-        tr.disabled {
-            color: #7d7f7c;
+        tr :last-child {
+            margin-bottom: 0;
+        }
+
+        tr.disabled td {
+            color: var(--bs-secondary-color);
         }
 
         tr.disabled a.job_run {
@@ -17,19 +27,27 @@
         }
 
         tr.disabled a.job_run .btn {
-            cursor: not-allowed;
+            cursor: inherit;
+        }
+
+        tr.disabled p {
+            color: inherit;
         }
     </style>
 {% endblock %}
 
 {% block buttons %}
-    <div class="btn-group">
-        <a class="btn btn-secondary set-job_list-display" data-display="tiles" href="" title="Tiles">
-            <span class="mdi mdi-view-grid{% if display == "list" %}-outline{% endif %}"></span>
+    <div class="btn-group" role="group">
+        <a href="{% django_querystring display='list' %}"
+           class="btn btn-primary{% if display == 'list' %} bg-primary nb-text-body-bg{% endif %}">
+            <span class="mdi mdi-view-sequential" aria-hidden="true"></span> List
         </a>
-        <a class="btn btn-secondary set-job_list-display" data-display="list" href="" title="List">
-            <span class="mdi mdi-view-sequential{% if display == "tiles" %}-outline{% endif %}"></span>
+        {# djlint:off B123 #}
+        <a href="{% django_querystring display='tiles' %}"
+           class="btn btn-primary{% if display == 'tiles' %} bg-primary nb-text-body-bg{% endif %}">
+            <span class="mdi mdi-view-grid" aria-hidden="true"></span> Tiles
         </a>
+        {# djlint:on B123 #}
     </div>
 
     <button
@@ -38,22 +56,8 @@
         data-nb-toggle="collapse-all"
         data-nb-target="#job_accordion .collapse"
         type="button"
-        {% if display == "tiles" %}disabled="disabled"{% endif %}
+        {% if display == "tiles" %}disabled{% endif %}
     >
-        Collapse All
+        Collapse All Groups
     </button>
 {% endblock %}
-
-{% block javascript %}
-    {{ block.super }}
-    <script>
-        document.addEventListener('DOMContentLoaded', () => {
-            // Set display anchor links without losing other potentially active query params such as applied filters.
-            [...document.querySelectorAll('.set-job_list-display')].forEach((button) => {
-                const queryParams = new URLSearchParams(window.location.search);
-                queryParams.set('display', button.dataset.display);
-                button.setAttribute('href', `?${queryParams.toString()}`);
-            });
-        });
-    </script>
-{% endblock %}

nautobot/extras/templates/extras/marketplace.html

@@ -60,18 +60,14 @@
 {% block document_title %}{% render_title "plain" %}{% endblock %}
 
 {% block content %}
-    <div class="row d-print-none">
+    <div class="row d-print-none mb-16">
         <div class="col-lg-12">
-            {% render_breadcrumbs %}
+            <div class="float-end">
+                <a class="btn btn-primary" href="{% url 'apps:apps_list' %}">See Installed Apps</a>
+            </div>
         </div>
     </div>
 
-    <div class="float-end d-print-none">
-        <a class="btn btn-primary" href="{% url 'apps:apps_list' %}">See Installed Apps</a>
-    </div>
-
-    <h1>{% block page_heading %}{% render_title %}{% endblock page_heading %}</h1>
-
     <div class="row">
         <div class="col-lg-12">
             <section class="nb-tiles">
@@ -119,7 +115,7 @@
                             {% if app.docs|default:None != None %}
                                 <a href="{{ app.docs }}" class="btn btn-info btn-sm" target="_blank" data-bs-title="Docs">
                             {% else %}
-                                <a href="" class="btn btn-info btn-sm disabled" target="_blank" data-bs-title="No docs provided">
+                                <a aria-disabled="true" class="btn btn-info btn-sm disabled" data-bs-title="No docs provided">
                             {% endif %}
                             <span class="mdi mdi-book-open-page-variant"></span>
                         </a>

nautobot/extras/templates/extras/object_configcontext.html

@@ -8,7 +8,7 @@
             <div class="card">
                 <div class="card-header">
                     <strong>Rendered Context</strong>
-                    {% include 'extras/inc/configcontext_format.html' %}
+                    {% include 'extras/inc/configcontext_format.html' with data_format=format %}
                 </div>
                 <div class="card-body">
                     {% include 'extras/inc/json_data.html' with data=rendered_context format=format %}

nautobot/extras/templates/extras/object_dynamicgroups.html

@@ -7,8 +7,8 @@
 {% block content %}
     <div class="alert alert-warning">
         Dynamic group membership is cached for performance reasons, therefore this page may not always be up-to-date.
-        <br>You can refresh the membership of any specific group by viewing it from the list below or from the
-        <a href="{% url 'extras:dynamicgroup_list' %}">Dynamic Groups list view</a>.
+        <br>You can refresh the membership of any specific group by accessing it from the list below or from the
+        <a href="{% url 'extras:dynamicgroup_list' %}">Dynamic Groups list view</a> and clicking the "Refresh Members" button.
         <br>You can also refresh the membership of all groups by running the
         <a href="{% url 'extras:job_run_by_class_path' class_path='nautobot.core.jobs.groups.RefreshDynamicGroupCaches' %}">Refresh Dynamic Group Caches job</a>.
     </div>

nautobot/extras/templates/extras/objectchange_retrieve.html

@@ -4,36 +4,6 @@
 
 {% block title %}{{ object }} - Change Log{% endblock %}
 
-{% block header %}
-    <div class="row d-print-none">
-        <div class="col-md-8 col-lg-9">
-            <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="{% url 'extras:objectchange_list' %}">Change Log</a></li>
-                {% if object.related_object.get_absolute_url %}
-                    <li class="breadcrumb-item"><a href="{{ object.related_object.get_absolute_url }}changelog/">{{ object.related_object }}</a></li>
-                {% elif object.changed_object and object.changed_object.get_absolute_url %}
-                    <li class="breadcrumb-item"><a href="{{ object.changed_object.get_absolute_url }}changelog/">{{ object.changed_object }}</a></li>
-                {% elif object.changed_object is not None %}
-                    <li class="breadcrumb-item">{{ object.changed_object }}</li>
-                {% endif %}
-                <li class="breadcrumb-item">{{ object }}</li>
-            </ol>
-        </div>
-        <div class="col-md-4 col-lg-3">
-            <form action="{% url 'extras:objectchange_list' %}" method="get">
-                <div class="input-group">
-                    <input type="text" name="q" class="form-control" placeholder="Search change logs" />
-                    <span class="input-group-btn">
-                        <button type="submit" class="btn btn-primary">
-                            <span class="mdi mdi-magnify" aria-hidden="true"></span>
-                        </button>
-                    </span>
-                </div>
-            </form>
-        </div>
-    </div>
-{% endblock %}
-
 {% block content %}
     <div class="row">
         <div class="col-lg-5">
@@ -113,13 +83,25 @@
             <div class="card">
                 <div class="card-header">
                     <strong>Difference</strong>
-                    <div class="btn-group btn-group-xs float-end d-print-none">
-                        <a {% if prev_change %}href="{% url 'extras:objectchange' pk=prev_change.pk %}"{% else %}disabled{% endif %} class="btn btn-secondary">
-                            <span class="mdi mdi-chevron-left" aria-hidden="true"></span> Previous
-                        </a>
-                        <a {% if next_change %}href="{% url 'extras:objectchange' pk=next_change.pk %}"{% else %}disabled{% endif %} class="btn btn-secondary">
-                            Next <span class="mdi mdi-chevron-right" aria-hidden="true"></span>
-                        </a>
+                    <div class="btn-group btn-group-sm float-end d-print-none" role="group">
+                        {% if prev_change %}
+                            <a href="{% url 'extras:objectchange' pk=prev_change.pk %}" class="btn btn-secondary">
+                                <span class="mdi mdi-chevron-left" aria-hidden="true"></span> Previous
+                            </a>
+                        {% else %}
+                            <a aria-disabled="true" class="btn btn-secondary disabled">
+                                <span class="mdi mdi-chevron-left" aria-hidden="true"></span> Previous
+                            </a>
+                        {% endif %}
+                        {% if next_change %}
+                            <a href="{% url 'extras:objectchange' pk=next_change.pk %}" class="btn btn-secondary">
+                                Next <span class="mdi mdi-chevron-right" aria-hidden="true"></span>
+                            </a>
+                        {% else %}
+                            <a aria-disabled="true" class="btn btn-secondary disabled">
+                                Next <span class="mdi mdi-chevron-right" aria-hidden="true"></span>
+                            </a>
+                        {% endif %}
                     </div>
                 </div>
                 <div class="card-body">

nautobot/extras/templates/extras/plugin_detail.html

@@ -4,29 +4,34 @@
 
 {% block breadcrumbs_wrapper %}{% render_breadcrumbs %}{% endblock breadcrumbs_wrapper %}
 
-{% block header %}
-    <div class="float-end d-print-none">
-        {% block buttons %}
-            {% if app_data.home_url %}
-                <a href="{% url app_data.home_url %}" class="btn btn-primary">
-                    <span class="mdi mdi-home"></span> App Home
-                </a>
-            {% endif %}
-            {% if app_data.config_url %}
-                <a href="{% url app_data.config_url %}" class="btn btn-warning">
-                    <span class="mdi mdi-cog"></span> App Configuration
-                </a>
-            {% endif %}
-            {% if app_data.docs_url %}
-                <a href="{% url app_data.docs_url %}" class="btn btn-info">
-                    <span class="mdi mdi-cog"></span> App Documentation
-                </a>
-            {% endif %}
-        {% endblock buttons %}
-    </div>
-{% endblock header %}
+{% block header %}{% endblock header %}
 
 {% block content %}
+
+    <div class="row d-print-none mb-16">
+        <div class="col-lg-12">
+            <div class="float-end d-print-none">
+                {% block buttons %}
+                    {% if app_data.home_url %}
+                        <a href="{% url app_data.home_url %}" class="btn btn-primary">
+                            <span class="mdi mdi-home"></span> App Home
+                        </a>
+                    {% endif %}
+                    {% if app_data.config_url %}
+                        <a href="{% url app_data.config_url %}" class="btn btn-warning">
+                            <span class="mdi mdi-cog"></span> App Configuration
+                        </a>
+                    {% endif %}
+                    {% if app_data.docs_url %}
+                        <a href="{% url app_data.docs_url %}" class="btn btn-info">
+                            <span class="mdi mdi-cog"></span> App Documentation
+                        </a>
+                    {% endif %}
+                {% endblock buttons %}
+            </div>
+        </div>
+    </div>
+
     <div class="row">
         <div class="col-lg-6">
             {% block content_left_page %}

nautobot/extras/templates/extras/plugins_list.html

@@ -8,27 +8,26 @@
 {% endblock %}
 
 {% block content %}
-    <div class="row d-print-none">
+    <div class="row d-print-none mb-16">
         <div class="col-lg-12">
-            {% render_breadcrumbs %}
-        </div>
-    </div>
+            <div class="float-end d-print-none">
+                <div class="btn-group" role="group">
+                    <a href="{% django_querystring display='list' %}"
+                       class="btn btn-primary{% if display == 'list' %} bg-primary nb-text-body-bg{% endif %}">
+                        <span class="mdi mdi-view-sequential" aria-hidden="true"></span> List
+                    </a>
+                    {# djlint:off B123 #}
+                    <a href="{% django_querystring display='tiles' %}"
+                       class="btn btn-primary{% if display == 'tiles' %} bg-primary nb-text-body-bg{% endif %}">
+                        <span class="mdi mdi-view-grid" aria-hidden="true"></span> Tiles
+                    </a>
+                    {# djlint:on B123 #}
+                </div>
 
-    <div class="float-end d-print-none">
-        <div class="btn-group">
-            <a class="btn btn-secondary set-apps-display" data-display="tiles" href="" title="Tiles">
-                <span class="mdi mdi-view-grid{% if display == "list" %}-outline{% endif %}"></span>
-            </a>
-            <a class="btn btn-secondary set-apps-display" data-display="list" href="" title="List">
-                <span class="mdi mdi-view-sequential{% if display == "tiles" %}-outline{% endif %}"></span>
-            </a>
+                <a class="btn btn-primary" href="{% url 'apps:apps_marketplace' %}">Visit Apps Marketplace</a>
+            </div>
         </div>
-
-        <a class="btn btn-primary" href="{% url 'apps:apps_marketplace' %}">Visit Apps Marketplace</a>
     </div>
-
-    <h1>{% block page_heading %}{% render_title %}{% endblock %}</h1>
-
     <div class="row">
         <div class="col-lg-12">
             {% if filter_form %}
@@ -47,13 +46,4 @@
 {% block javascript %}
     {{ block.super }}
     <script src="{% static 'js/tableconfig.js' %}"></script>
-
-    <script>
-    // Set display anchor links without losing other potentially active query params such as applied filters.
-        [...document.querySelectorAll('.set-apps-display')].forEach(button => {
-            const queryParams = new URLSearchParams(window.location.search);
-            queryParams.set('display', button.dataset.display);
-            button.setAttribute('href', `?${queryParams.toString()}`);
-        });
-    </script>
 {% endblock %}

nautobot/extras/templates/extras/role_retrieve.html

@@ -223,4 +223,68 @@
         </div>
         {% include 'inc/paginator.html' with paginator=vdc_table.paginator page=vdc_table.page %}
     {% endif %}
+    {% if vpn_table %}
+        <div class="card">
+            <div class="card-header">
+                <strong>VPNs</strong>
+            </div>
+            {% include 'inc/table.html' with table=vpn_table %}
+            {% if perms.vpn.add_vpn %}
+                <div class="card-footer text-end d-print-none">
+                    <a href="{% url 'vpn:vpn_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add VPN
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+        {% include 'inc/paginator.html' with paginator=vpn_table.paginator page=vpn_table.page %}
+    {% endif %}
+    {% if vpn_profile_table %}
+        <div class="card">
+            <div class="card-header">
+                <strong>VPN Profiles</strong>
+            </div>
+            {% include 'inc/table.html' with table=vpn_profile_table %}
+            {% if perms.vpn.add_vpnprofile %}
+                <div class="card-footer text-end d-print-none">
+                    <a href="{% url 'vpn:vpnprofile_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add VPN Profile
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+        {% include 'inc/paginator.html' with paginator=vpn_profile_table.paginator page=vpn_profile_table.page %}
+    {% endif %}
+    {% if vpn_tunnel_table %}
+        <div class="card">
+            <div class="card-header">
+                <strong>VPN Tunnels</strong>
+            </div>
+            {% include 'inc/table.html' with table=vpn_tunnel_table %}
+            {% if perms.vpn.add_vpntunnel %}
+                <div class="card-footer text-end d-print-none">
+                    <a href="{% url 'vpn:vpntunnel_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add VPN Tunnel
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+        {% include 'inc/paginator.html' with paginator=vpn_tunnel_table.paginator page=vpn_tunnel_table.page %}
+    {% endif %}
+    {% if vpn_tunnel_endpoint_table %}
+        <div class="card">
+            <div class="card-header">
+                <strong>VPN Tunnel Endpoints</strong>
+            </div>
+            {% include 'inc/table.html' with table=vpn_tunnel_endpoint_table %}
+            {% if perms.vpn.add_vpntunnelendpoint %}
+                <div class="card-footer text-end d-print-none">
+                    <a href="{% url 'vpn:vpntunnelendpoint_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+                        <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add VPN Tunnel Endpoint
+                    </a>
+                </div>
+            {% endif %}
+        </div>
+        {% include 'inc/paginator.html' with paginator=vpn_tunnel_endpoint_table.paginator page=vpn_tunnel_endpoint_table.page %}
+    {% endif %}
 {% endblock content_full_width_page %}

nautobot/extras/templates/extras/scheduledjob.html

@@ -102,7 +102,8 @@
                 <td>
                     {{ object.start_time|timezone:object.time_zone|date:settings.SHORT_DATETIME_FORMAT }}
                     {% if default_time_zone != object.time_zone %}
-                        <br>{{ object.start_time|timezone:default_time_zone|date:settings.SHORT_DATETIME_FORMAT }}
+                        {{ object.time_zone }}
+                        <br>{{ object.start_time|timezone:default_time_zone|date:settings.SHORT_DATETIME_FORMAT }} {{ default_time_zone }}
                     {% endif %}
                 </td>
             </tr>
@@ -112,7 +113,8 @@
                     {% if object.last_run_at %}
                         {{ object.last_run_at|timezone:object.time_zone|date:settings.SHORT_DATETIME_FORMAT }}
                         {% if default_time_zone != object.time_zone %}
-                            <br>{{ object.last_run_at|timezone:default_time_zone|date:SHORT_DATETIME_FORMAT }}
+                            {{ object.time_zone }}
+                            <br>{{ object.last_run_at|timezone:default_time_zone|date:settings.SHORT_DATETIME_FORMAT }} {{ default_time_zone }}
                         {% endif %}
                     {% else %}
                         {{ object.last_run_at|placeholder }}

nautobot/extras/templates/extras/secretsgroup.html

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

nautobot/extras/templates/extras/tag.html

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