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

nautobot/extras/templates/extras/approvalworkflowdefinition_update.html

@@ -9,7 +9,7 @@
             {% render_field form.name %}
             {% render_field form.model_content_type %}
             {% render_field form.model_constraints %}
-            {% render_field form.priority %}
+            {% render_field form.weight %}
         </div>
     </div>
     <div class="card">
@@ -22,7 +22,9 @@
                         <thead>
                             <tr>
                                 {% for field in stage.visible_fields %}
-                                    <th>{{ field.label|capfirst }}</th>
+                                    <th>
+                                        <span data-bs-toggle="tooltip" data-bs-placement="top" title="{{ field.help_text }}">{{ field.label|capfirst }}</span>
+                                    </th>
                                 {% endfor %}
                             </tr>
                         </thead>

nautobot/extras/templates/extras/approvalworkflowstage_retrieve.html

@@ -3,19 +3,27 @@
 
 {% block buttons %}
     <span title="{% if not object.is_active_stage %}This stage is not active{% elif request.user in object.users_that_already_approved %}You already approved this stage{% else %}Approve this stage{% endif %}">
-        <a
-            href="{% url 'extras:approvalworkflowstage_approve' object.pk %}?return_url={{request.path}}"
-            class="btn btn-success{% if not object.is_active_stage or request.user in object.users_that_already_approved %} disabled{% endif %}"
-        >
-            <span class="mdi mdi-check"></span> Approve
-        </a>
+        {% if object.is_active_stage and request.user not in object.users_that_already_approved %}
+            <a href="{% url 'extras:approvalworkflowstage_approve' object.pk %}?return_url={{request.path}}"
+               class="btn btn-success">
+                <span class="mdi mdi-check"></span> Approve
+            </a>
+        {% else %}
+            <a aria-disabled="true" class="btn btn-success disabled">
+                <span class="mdi mdi-check"></span> Approve
+            </a>
+        {% endif %}
     </span>
     <span title="{% if not object.is_active_stage %}This stage is not active{% elif request.user in object.users_that_already_approved %}You already approved this stage{% else %}Deny this stage{% endif %}">
-        <a
-            href="{% url 'extras:approvalworkflowstage_deny' object.pk %}?return_url={{request.path}}"
-            class="btn btn-danger {% if not object.is_active_stage or request.user in object.users_that_already_approved %} disabled{% endif %}"
-        >
-            <span class="mdi mdi-close"></span> Deny
-        </a>
+        {% if object.is_active_stage and request.user not in object.users_that_already_approved %}
+            <a href="{% url 'extras:approvalworkflowstage_deny' object.pk %}?return_url={{request.path}}"
+               class="btn btn-danger">
+                <span class="mdi mdi-close"></span> Deny
+            </a>
+        {% else %}
+            <a aria-disabled="true" class="btn btn-danger disabled">
+                <span class="mdi mdi-close"></span> Deny
+            </a>
+        {% endif %}
     </span>
 {% endblock buttons %}

nautobot/extras/templates/extras/computedfield.html

@@ -1,2 +1,2 @@
-{% extends 'extras/computedfield_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/configcontext.html

@@ -1,2 +1,2 @@
-{% extends 'extras/configcontext_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/configcontextschema_validation.html

@@ -1,6 +1,6 @@
-{% extends 'extras/configcontextschema.html' %}
+{% extends 'extras/configcontextschema_retrieve.html' %}
 
-<h1>{% block title %}{{ object }} - Validation{% endblock %}</h1>
+{% block title %}{{ object }} - Validation{% endblock %}
 
 {% block content %}
     <div class="row">

nautobot/extras/templates/extras/customfield.html

@@ -1,2 +1,2 @@
-{% extends 'extras/customfield_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/dynamicgroup_retrieve.html

@@ -11,15 +11,21 @@
 
 {% block extra_tab_content %}
     <div id="members" role="tabpanel" class="tab-pane {% if not active_tab and not request.GET.tab or request.GET.tab == "members" %}active{% else %}fade{% endif %}">
-        {% if members_list_url %}
-            <div class="row">
-                <div class="col-lg-12">
+        <div class="row">
+            <div class="col-lg-12">
+                {% if members_list_url %}
                     <div class="alert alert-success" role="alert">
                         You can bulk-add and bulk-remove members of this group from the <a href="{{ members_list_url }}">{{ members_verbose_name_plural|bettertitle }} list view</a>.
                     </div>
-                </div>
+                {% else %}
+                    <div class="alert alert-warning" role="alert">
+                        Dynamic group membership is cached for performance reasons, therefore this listing may not always
+                        be up-to-date.<br>You can refresh the membership of this group asynchronously by clicking the
+                        "Refresh Members" button above.
+                    </div>
+                {% endif %}
             </div>
-        {% endif %}
+        </div>
         <div class="row">
             <div class="col-lg-12">
                 {% include 'utilities/obj_table.html' with table=members_table table_template='panel_table.html' heading='Dynamic Group members' %}

nautobot/extras/templates/extras/dynamicgroup_update.html

@@ -43,7 +43,7 @@
             <div class="tab-content">
                 <div class="tab-pane active" id="filter-form">
                     {% if filter_form %}
-                        <span class="form-text">
+                        <span class="form-text py-6">
                             Select the filtering criteria to determine membership of objects matching
                             the Content Type for this Dynamic Group. Fields that are not a dropdown are
                             expected to have string inputs and do not support multiple values.

nautobot/extras/templates/extras/gitrepository_result.html

@@ -3,8 +3,6 @@
 {% load log_levels %}
 {% load static %}
 
-{% block title %}{{ block.super }} - Synchronization Status{% endblock %}
-
 {% block content %}
     <div class="row">
         <div class="col-lg-12">

nautobot/extras/templates/extras/graphqlquery_retrieve.html

@@ -1,97 +1,2 @@
 {% extends 'generic/object_retrieve.html' %}
-{% load helpers %}
-
-{% block content_left_page %}
-    <div class="card">
-        <div class="card-header">
-            <strong>Query</strong>
-        </div>
-        <table class="table table-hover card-body attr-table">
-            <tr>
-                <td>Name</td>
-                <td><span>{{ object.name }}</span></td>
-            </tr>
-            <tr>
-                <td>Query</td>
-                <td><pre id="query"><code class="language-graphql">{{ object.query }}</code></pre></td>
-            </tr>
-            <tr>
-                <td>Query Variables</td>
-                <td><pre>{{ object.variables|render_json }}</pre></td>
-            </tr>
-        </table>
-    </div>
-{% endblock content_left_page %}
-
-{% block content_right_page %}
-    <div class="card">
-        <div class="card-header">
-            <strong>Response</strong>
-            <button class="btn btn-primary btn-sm float-end" onclick="test_query()">Execute</button>
-        </div>
-        {% if object.variables %}
-            <table class="table table-hover card-body attr-table">
-                <tr>
-                    <td>Variables:</td>
-                    <td><textarea id="query_variables" class="form-control">{{ object.variables|render_json:False }}</textarea></td>
-                </tr>
-            </table>
-        {% endif %}
-        <div class="card-footer">
-                <pre id="query_output">
-
-                </pre>
-        </div>
-    </div>
-{% endblock content_right_page %}
-
-{% block javascript %}
-    {{ block.super }}
-    <script>
-        function fillQueryOutput(data) {
-            const queryOutput = document.querySelector('#query_output');
-
-            [...queryOutput.childNodes].forEach(childNode => childNode.remove());
-
-            const code = document.createElement('code');
-            code.classList.add('language-json');
-            code.textContent = JSON.stringify(data, undefined, 2);
-
-            queryOutput.appendChild(code);
-
-            hljs.highlightElement(code);
-        }
-
-        function test_query() {
-            const variables = document.querySelector('#query_variables')?.value;
-
-            $.ajax({
-                url: "{% url 'graphql' %}",
-                method: "POST",
-                headers: {"X-CSRFTOKEN": "{{ csrf_token }}"},
-                dataType: "json",
-                data: {
-                    "query": `{{ object.query | escapejs }}`,
-                    "variables": variables,
-                },
-                success: function(data) {
-                    fillQueryOutput(data);
-                },
-                error: function(error) {
-                    console.log(error);
-                    fillQueryOutput(error.responseJSON);
-                }
-            });
-        };
-
-        textarea = document.querySelector("#query_variables");
-        textarea.addEventListener('input', autoResize, false);
-        textarea.style.height = 'auto';
-        textarea.style.height = textarea.scrollHeight + 'px';
-
-        function autoResize() {
-            this.style.height = 'auto';
-            this.style.height = this.scrollHeight + 'px';
-        }
-    </script>
-{% endblock javascript %}
+{% comment %}3.0 TODO: remove this template, which only exists for backward compatibility with 2.4 and earlier{% endcomment %}

nautobot/extras/templates/extras/inc/approval_buttons_column.html

@@ -10,15 +10,29 @@
 {% endif %}
 {% if "approve" in buttons and have_permission and record.is_active_stage %}
     <span title='{% if request.user in record.users_that_already_approved %}You already approved this stage{% else %}Approve this stage{% endif %}'>
-        <a href="{% url approval_route pk=record.pk %}?return_url={{ request.path }}{{ return_url_extra }}" class="btn btn-success btn-sm{% if request.user in record.users_that_already_approved %} disabled{% endif %}">
-            <span class="mdi mdi-check"></span>
-        </a>
+        {% if request.user not in record.users_that_already_approved %}
+            <a href="{% url approval_route pk=record.pk %}?return_url={{ request.path }}{{ return_url_extra }}"
+               class="btn btn-success btn-sm">
+                <span class="mdi mdi-check"></span>
+            </a>
+        {% else %}
+            <a aria-disabled="true" class="btn btn-success btn-sm disabled">
+                <span class="mdi mdi-check"></span>
+            </a>
+        {% endif %}
     </span>
 {% endif %}
 {% if "deny" in buttons and have_permission and record.is_active_stage and request.user not in record.users_that_already_approved %}
     <span title='{%if request.user in record.users_that_already_approved %}You already approved this stage{% else %}Deny this stage{% endif %}'>
-        <a href="{% url deny_route pk=record.pk %}?return_url={{ request.path }}{{ return_url_extra }}" class="btn btn-sm btn-danger {% if request.user in record.users_that_already_approved %} disabled{% endif %}">
-            <span class="mdi mdi-close"></span>
-        </a>
+        {% if request.user not in record.users_that_already_approved %}
+            <a href="{% url deny_route pk=record.pk %}?return_url={{ request.path }}{{ return_url_extra }}"
+               class="btn btn-danger btn-sm">
+                <span class="mdi mdi-close"></span>
+            </a>
+        {% else %}
+            <a aria-disabled="true" class="btn btn-danger btn-sm disabled">
+                <span class="mdi mdi-close"></span>
+            </a>
+        {% endif %}
     </span>
 {% endif %}

nautobot/extras/templates/extras/inc/bulk_edit_overridable_field.html

@@ -1,7 +1,8 @@
 {% load form_helpers %}
 
-<hr>
-<div class="mb-10 d-flex justify-content-center{% if field.errors %} has-error{% endif %}">
+
+<hr class="border-top">
+<div class="mb-10 d-lg-flex justify-content-center{% if field.errors %} has-error{% endif %}">
     <label class="col-lg-3 col-form-label{% if field.field.required %} nb-required{% endif %}" for="{{ field.id_for_label }}">
         {{ field.label }}
     </label>
@@ -19,17 +20,17 @@
         {% endif %}
     </div>
 </div>
-<div class="mb-10 d-flex justify-content-center">
+<div class="mb-10 d-lg-flex justify-content-center">
     <span class="col-lg-3 col-form-label">
     </span>
     <div class="col-lg-9">
-        <div>
-            <label for="{{ override_field.id_for_label }}">
-                {{ override_field }}
+        <div class="form-check flex-wrap">
+            {{ override_field }}
+            <label class="form-check-label" for="{{ override_field.id_for_label }}">
                 <i>Clear override</i>
             </label>
             {% if override_field.help_text %}
-                <span class="form-text">{{ override_field.help_text|safe }}</span>
+                <span class="form-text w-100">{{ override_field.help_text|safe }}</span>
             {% endif %}
         </div>
     </div>

nautobot/extras/templates/extras/inc/configcontext_format.html

@@ -1,6 +1,13 @@
+{% load helpers %}
 <div class="float-end">
-    <div class="btn-group btn-group-xs" role="group">
-        <a href="?data_format=json" class="btn {% if format == 'json' %}btn-primary{% else %}btn-secondary{% endif %}">JSON</a>
-        <a href="?data_format=yaml" class="btn {% if format == 'yaml' %}btn-primary{% else %}btn-secondary{% endif %}">YAML</a>
+    <div class="btn-group btn-group-sm" role="group">
+        <a href="{% django_querystring data_format='json' %}"
+           class="btn btn-primary {% if data_format == 'json' %}bg-primary nb-text-body-bg{% endif %}">
+            <span class="mdi mdi-code-json" aria-hidden="true"></span> JSON
+        </a>
+        <a href="{% django_querystring data_format='yaml' %}"
+           class="btn btn-primary {% if data_format == 'yaml' %}bg-primary nb-text-body-bg{% endif %}">
+            <span class="mdi mdi-format-list-group" aria-hidden="true"></span> YAML
+        </a>
     </div>
 </div>

nautobot/extras/templates/extras/inc/graphqlquery_execute.html

@@ -0,0 +1,71 @@
+{% load helpers %}
+
+<div class="card">
+    <div class="card-header">
+        <strong>Response</strong>
+        <button class="btn btn-primary btn-sm float-end" onclick="test_query()">Execute</button>
+    </div>
+    {% if object.variables %}
+        <table class="table table-hover card-body attr-table">
+            <tr>
+                <td>Variables:</td>
+                <td><textarea id="query_variables" class="form-control">{{ object.variables|render_json:False }}</textarea></td>
+            </tr>
+        </table>
+    {% endif %}
+    <div class="card-footer">
+        <pre id="query_output" class="p-5">
+
+        </pre>
+    </div>
+</div>
+
+<script>
+    function fillQueryOutput(data) {
+        const queryOutput = document.querySelector('#query_output');
+
+        [...queryOutput.childNodes].forEach(childNode => childNode.remove());
+
+        const code = document.createElement('code');
+        code.classList.add('language-json');
+        code.textContent = JSON.stringify(data, undefined, 2);
+
+        queryOutput.appendChild(code);
+
+        hljs.highlightElement(code);
+    }
+
+    function test_query() {
+        const variables = document.querySelector('#query_variables')?.value;
+
+        $.ajax({
+            url: "{% url 'graphql' %}",
+            method: "POST",
+            headers: {"X-CSRFTOKEN": "{{ csrf_token }}"},
+            dataType: "json",
+            data: {
+                "query": `{{ object.query | escapejs }}`,
+                "variables": variables,
+            },
+            success: function(data) {
+                fillQueryOutput(data);
+            },
+            error: function(error) {
+                console.log(error);
+                fillQueryOutput(error.responseJSON);
+            }
+        });
+    };
+
+    window.addEventListener("load", () => {
+        textarea = document.querySelector("#query_variables");
+        textarea.addEventListener('input', autoResize, false);
+        textarea.style.height = 'auto';
+        textarea.style.height = textarea.scrollHeight + 'px';
+    });
+
+    function autoResize() {
+        this.style.height = 'auto';
+        this.style.height = this.scrollHeight + 'px';
+    }
+</script>

nautobot/extras/templates/extras/inc/job_tiles.html

@@ -19,9 +19,21 @@
             <header class="nb-tile-header">
                 <h3>{{ row.record.grouping|bettertitle }}</h3>
 
-                <a href="{% url 'extras:job_run' pk=row.record.pk %}" class="btn btn-primary btn-sm" data-bs-toggle="tooltip" data-bs-title="Run/Schedule" {% if not perms.extras.run_job or not row.record.runnable %}disabled="disabled"{% endif %}>
-                    <span class="mdi mdi-play" aria-hidden="true"><span class="visually-hidden">Run/Schedule</span></span>
-                </a>
+                {% if perms.extras.run_job and row.record.runnable %}
+                    <a href="{% url 'extras:job_run' pk=row.record.pk %}"
+                       class="btn btn-primary btn-sm"
+                       data-bs-toggle="tooltip"
+                       data-bs-title="Run/Schedule">
+                        <span class="mdi mdi-play" aria-hidden="true"><span class="visually-hidden">Run/Schedule</span></span>
+                    </a>
+                {% else %}
+                    <a aria-disabled="true"
+                       class="btn btn-primary btn-sm disabled"
+                       data-bs-toggle="tooltip"
+                       data-bs-title="Run/Schedule">
+                        <span class="mdi mdi-play" aria-hidden="true"><span class="visually-hidden">Run/Schedule</span></span>
+                    </a>
+                {% endif %}
 
                 {% comment "TODO(norbert-mieczkowski-codilime): use the same buttons (actions) in tables and tiles when tables support dropdown menus" %}
                     {% for item in row.items %}

nautobot/extras/templates/extras/inc/json_format.html

@@ -1,6 +1,13 @@
+{% load helpers %}
 <div class="float-end">
-    <div class="btn-group btn-group-xs" role="group">
-        <a href="?format=json" class="btn btn-secondary{% if format == 'json' %} active{% endif %}">JSON</a>
-        <a href="?format=yaml" class="btn btn-secondary{% if format == 'yaml' %} active{% endif %}">YAML</a>
+    <div class="btn-group btn-group-sm" role="group">
+        <a href="{% django_querystring format='json' %}"
+           class="btn btn-primary{% if format == 'json' %} bg-primary nb-text-body-bg{% endif %}">
+            <span class="mdi mdi-code-json" aria-hidden="true"></span> JSON
+        </a>
+        <a href="{% django_querystring format='yaml' %}"
+           class="btn btn-primary{% if format == 'yaml' %} bg-primary nb-text-body-bg{% endif %}">
+            <span class="mdi mdi-format-list-group" aria-hidden="true"></span> YAML
+        </a>
     </div>
 </div>

nautobot/extras/templates/extras/inc/overridable_field.html

@@ -1,27 +1,28 @@
 {% load form_helpers %}
 
-<div class="mb-10 d-flex justify-content-center{% if field.errors %} has-error{% endif %}">
+<div class="mb-10 d-lg-flex justify-content-center{% if field.errors %} has-error{% endif %}">
     <label class="col-lg-3 col-form-label{% if field.field.required %} nb-required{% endif %}" for="{{ field.id_for_label }}">
         {{ field.label }}
     </label>
-    <div class="col-lg-3">
-        <div class="form-check{% if override_field.errors %} has-error{% endif %}">
-            <label for="{{ override_field.id_for_label }}">
-                {{ override_field }}
+    <div class="col-lg-3 pe-lg-10">
+        <div class="form-check my-6{% if override_field.errors %} has-error{% endif %}">
+            {{ override_field }}
+            <label class="form-check-label" for="{{ override_field.id_for_label }}">
                 <i>Override default value</i>
+                {% if override_field.help_text %}
+                    <span class="form-text">{{ override_field.help_text|safe }}</span>
+                {% endif %}
             </label>
-            {% if override_field.help_text %}
-                <span class="form-text">{{ override_field.help_text|safe }}</span>
-            {% endif %}
         </div>
     </div>
     <div class="col-lg-6">
         {% if field|widget_type == 'checkboxinput' %}
-            <div class="form-check{% if field.errors %} has-error{% endif %}">
-                <label for="{{ field.id_for_label }}">
-                    {{ field }} {{ field.label }}
+            <div class="form-check my-6{% if field.errors %} has-error{% endif %}">
+                {{ field }}
+                <label class="form-check-label" for="{{ field.id_for_label }}">
+                    {{ field.label }}
+                    {% if field.help_text %}<span class="form-text">{{ field.help_text|safe }}</span>{% endif %}
                 </label>
-                {% if field.help_text %}<span class="form-text">{{ field.help_text|safe }}</span>{% endif %}
             </div>
         {% else %}
             {{ field }}

nautobot/extras/templates/extras/job.html

@@ -14,17 +14,10 @@
                 <li class="breadcrumb-item">Submission and Scheduling</li>
             </ol>
         </div>
-        <div>
-            <h1 class="mb-16">{{ job_model }}</h1>
-            {% if job_model.read_only %}
-                <span class="badge bg-body-secondary border">Read-only</span>
-            {% endif %}
-            <p>{{ job_model.description | render_markdown }}</p>
-        </div>
         <form action="" method="post" enctype="multipart/form-data" class="h-100 vstack">
             {% csrf_token %}
-            <div class="row align-content-start flex-fill">
-                <div class="col-xl-8 offset-lg-2 col-lg-10 offset-md-1">
+            <div class="row justify-content-center flex-fill">
+                <div class="col-xl-8 col-lg-10">
                     {% if not perms.extras.run_job %}
                         <div class="alert alert-warning">
                             <span aria-hidden="true" class="mdi mdi-alert"></span>
@@ -40,6 +33,11 @@
                             <span aria-hidden="true" class="mdi mdi-alert"></span> This job is not enabled to be run.
                         </div>
                     {% endif %}
+                    {% if job_model.read_only %}
+                        <div class="alert alert-info">
+                            <span aria-hidden="true" class="mdi mdi-info"></span>This job is read-only in its operation.
+                        </div>
+                    {% endif %}
                     {% if job_form.non_field_errors or schedule_form.non_field_errors %}
                         <div class="card border-danger">
                             <div class="card-header bg-danger-subtle border-danger text-body">
@@ -88,7 +86,7 @@
                     id="id__run"
                     name="_run"
                     type="submit"
-                    {% if not perms.extras.run_job or not job_model.runnable %}disabled="disabled"{% endif %}
+                    {% if not perms.extras.run_job or not job_model.runnable %}disabled{% endif %}
                 >
                     <span aria-hidden="true" class="mdi mdi-play me-4"></span><!--
                 -->Run Job Now
@@ -147,13 +145,32 @@
 
                     // Toggle schedule name and schedule time field rows.
                     ['#id__schedule_name', '#id__schedule_start_time'].forEach((selector) => {
-                        const row = document.querySelector(selector).parentElement.parentElement;
+                        const input = document.querySelector(selector);
+                        const row = input?.parentElement.parentElement;
                         row.classList.toggle('d-none', immediately);
+                        const label = row.querySelector('label');
+
+                        label?.classList.toggle('nb-required', !immediately);
+                        if (immediately) {
+                            input.removeAttribute('required');
+                        } else {
+                            input.setAttribute('required', '');
+                        }
                     });
 
                     // Toggle custom crontab field row.
-                    const row = document.querySelector('#id__recurrence_custom_time').parentElement.parentElement;
+                    input = document.querySelector('#id__recurrence_custom_time')
+                    const row = input.parentElement.parentElement;
                     row.classList.toggle('d-none', !custom);
+                    const label = row.querySelector('label');
+
+                    label?.classList.toggle('nb-required', custom);
+                    if (!custom) {
+                        input.removeAttribute('required');
+                    } else {
+                        input.setAttribute('required', '');
+                    }
+
                 };
 
                 {% if job_model.has_sensitive_variables %}

nautobot/extras/templates/extras/job_bulk_edit.html

@@ -1,6 +1,24 @@
 {% extends 'generic/object_bulk_update.html' %}
 {% load form_helpers %}
 
+{% block extra_styles %}
+    <style>
+        tr a.job_run {
+            display: inline-flex;
+            gap: 0.625rem; /* 10px */
+        }
+
+        tr a.job_run .btn {
+            align-self: flex-start;
+            margin-block: -0.09375rem; /* -1.5px */
+        }
+
+        tr :last-child {
+            margin-bottom: 0;
+        }
+    </style>
+{% endblock %}
+
 {% block form_fields %}
     {% render_field form.enabled %}
     {% include "extras/inc/bulk_edit_overridable_field.html" with field=form.grouping override_field=form.clear_grouping_override %}