nautobot 2.4.21__py3-none-any.whl → 3.0.0a3__py3-none-any.whl

nautobot/extras/templates/extras/job_edit.html

@@ -3,90 +3,89 @@
 {% load helpers %}
 
 {% block form %}
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Job Source</strong></div>
-        <div class="panel-body">
-            <div class="form-group">
-                <label class="col-md-3 control-label">Module</label>
-                <div class="col-md-9" style="padding-top: 7px">
+    <div class="card">
+        <div class="card-header"><strong>Job Source</strong></div>
+        <div class="card-body">
+            <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 pt-6">
                     <code>{{ obj.module_name }}</code>
-                    <span class="help-block">Dotted name of the Python module providing this job</span>
+                    <span class="form-text">Dotted name of the Python module providing this job</span>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-md-3 control-label">Job Class</label>
-                <div class="col-md-9" style="padding-top: 7px">
+            <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 pt-6">
                     <code>{{ obj.job_class_name }}</code>
-                    <span class="help-block">Name of the Python class providing this job</span>
+                    <span class="form-text">Name of the Python class providing this job</span>
                 </div>
             </div>
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <div class="checkbox">
-                        <label>
-                            <input type="checkbox" disabled="true" {% if obj.installed %}checked="checked"{% endif %}>
+            <div class="mb-10 d-lg-flex justify-content-center">
+                <div class="col-lg-9 offset-lg-3">
+                    <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="help-block">
-                            Whether the Python class providing this job is presently installed and loadable
-                        </span>
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <div class="checkbox">
-                        <label>
-                            <input type="checkbox" disabled="true" {% if obj.supports_dryrun %}checked="checked"{% endif %}>
+            <div class="mb-10 d-lg-flex justify-content-center">
+                <div class="col-lg-9 offset-lg-3">
+                    <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="help-block">
-                            Whether this job supports bypassing approval when running with dryrun argument set to true
-                        </span>
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <div class="checkbox">
-                        <label>
-                            <input type="checkbox" disabled="true" {% if obj.is_job_hook_receiver %}checked="checked"{% endif %}>
+            <div class="mb-10 d-lg-flex justify-content-center">
+                <div class="col-lg-9 offset-lg-3">
+                    <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="help-block">
-                            Whether this job is a job hook receiver
-                        </span>
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <div class="col-md-9 col-md-offset-3">
-                    <div class="checkbox">
-                        <label>
-                            <input type="checkbox" disabled="true" {% if obj.is_job_button_receiver %}checked="checked"{% endif %}>
+            <div class="mb-10 d-lg-flex justify-content-center">
+                <div class="col-lg-9 offset-lg-3">
+                    <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="help-block">
-                            Whether this job is a job button receiver
-                        </span>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Job</strong></div>
-        <div class="panel-body">
+    <div class="card">
+        <div class="card-header"><strong>Job</strong></div>
+        <div class="card-body">
             {% render_field form.enabled %}
             {% include "extras/inc/overridable_field.html" with field=form.name override_field=form.name_override %}
             {% include "extras/inc/overridable_field.html" with field=form.grouping override_field=form.grouping_override %}
             {% include "extras/inc/overridable_field.html" with field=form.description override_field=form.description_override %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading"><strong>Properties</strong></div>
-        <div class="panel-body">
-            {% include "extras/inc/overridable_field.html" with field=form.approval_required override_field=form.approval_required_override %}
+    <div class="card">
+        <div class="card-header"><strong>Properties</strong></div>
+        <div class="card-body">
             {% include "extras/inc/overridable_field.html" with field=form.dryrun_default override_field=form.dryrun_default_override %}
             {% include "extras/inc/overridable_field.html" with field=form.hidden override_field=form.hidden_override %}
             {% include "extras/inc/overridable_field.html" with field=form.soft_time_limit override_field=form.soft_time_limit_override %}
@@ -104,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);
@@ -117,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") {
@@ -155,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 :last-child {
+            margin-bottom: 0;
         }
 
-        tr.disabled {
-            color: #7d7f7c;
+        tr.disabled td {
+            color: var(--bs-secondary-color);
         }
 
         tr.disabled a.job_run {
@@ -17,70 +27,37 @@
         }
 
         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-default set-job_list-display" data-display="tiles" href="" title="Tiles">
-            <i class="mdi mdi-view-grid{% if display == "list" %}-outline{% endif %}"></i>
+    <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-default set-job_list-display" data-display="list" href="" title="List">
-            <i class="mdi mdi-view-sequential{% if display == "tiles" %}-outline{% endif %}"></i>
+        {# 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 type="button"
-            class="btn btn-default accordion-toggle-all"
-            data-target="#job_accordion"
-            {% if display == "tiles" %} disabled="disabled"{% endif %}>Collapse All</button>
-{% endblock %}
-
-{% block table_config_button %}
-    <button type="button" class="btn btn-default" data-toggle="modal" data-target="#ObjectTable_config" title="Configure table"{% if display == "tiles" %} disabled="disabled"{% endif %}><i class="mdi mdi-cog"></i> Configure</button>
-{% endblock %}
-
-{% block javascript %}
-    {{ block.super }}
-    <script>
-        $("button.button-toggle").click(function() {
-            $(this).children("i").toggleClass("mdi-chevron-right mdi-chevron-down");
-        });
-        // Toggle v -. >
-        $("#job_accordion .accordion-toggle").click(function() {
-            $(this).toggleClass("mdi-chevron-down mdi-chevron-right");
-        });
-        $('.accordion-toggle-all').each(function () {
-            $(this).data("lastState", 0); // assume expanded by default
-        });
-        // Dynamically collapse/expand all when clicking the "Collapse All" button, and then update the button text.
-        $('.accordion-toggle-all').on('click', function () {
-            const $button = $(this);
-            const target = $button.data("target");
-            const isExpanded = $button.data("lastState") === 0;
-
-            if (isExpanded) {
-                // Collapse all
-                $(`${target} .collapse.in`).collapse('hide');
-                $(`${target} .accordion-toggle`).addClass("mdi-chevron-right").removeClass("mdi-chevron-down");
-                $button.text("Expand All");
-                $button.data("lastState", 1);
-            } else {
-                // Expand all
-                $(`${target} .collapse:not(.in)`).collapse('show');
-                $(`${target} .accordion-toggle`).addClass("mdi-chevron-down").removeClass("mdi-chevron-right");
-                $button.text("Collapse All");
-                $button.data("lastState", 0);
-            }
-        });
-
-        // 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>
+    <button
+        aria-expanded="true"
+        class="btn btn-secondary"
+        data-nb-toggle="collapse-all"
+        data-nb-target="#job_accordion .collapse"
+        type="button"
+        {% if display == "tiles" %}disabled{% endif %}
+    >
+        Collapse All Groups
+    </button>
 {% endblock %}

nautobot/extras/templates/extras/jobresult.html

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

nautobot/extras/templates/extras/jobresult_retrieve.html

@@ -42,8 +42,8 @@
 
 {% block extra_nav_tabs %}
     {% if result.data.output %}
-        <li role="presentation">
-            <a href="#output" role="tab" data-toggle="tab">Output</a>
+        <li role="presentation" class="nav-item">
+            <a href="#output" class="nav-link" role="tab" data-bs-toggle="tab">Output</a>
         </li>
     {% endif %}
 {% endblock %}
@@ -53,37 +53,37 @@
 {% endblock content_full_width_page %}
 
 {% block advanced_content_left_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
+    <div class="card">
+        <div class="card-header">
             <strong>Job Keyword Arguments</strong>
         </div>
-        <div class="panel-body">
+        <div class="card-body">
             {% include 'extras/inc/json_data.html' with data=result.task_kwargs format="json" %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
+    <div class="card">
+        <div class="card-header">
             <strong>Job Positional Arguments</strong>
         </div>
-        <div class="panel-body">
+        <div class="card-body">
             {% include 'extras/inc/json_data.html' with data=result.task_args format="json" %}
         </div>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
+    <div class="card">
+        <div class="card-header">
             <strong>Job Celery Keyword Arguments</strong>
         </div>
-        <div class="panel-body">
+        <div class="card-body">
             {% include 'extras/inc/json_data.html' with data=result.celery_kwargs format="json" %}
         </div>
     </div>
 {% endblock advanced_content_left_page %}
 {% block advanced_content_right_page %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
+    <div class="card">
+        <div class="card-header">
             <strong>Worker</strong>
         </div>
-        <table class="table table-hover panel-body attr-table">
+        <table class="table table-hover card-body attr-table">
             <tbody>
                 <tr>
                     <td>Worker Hostname</td>
@@ -104,11 +104,11 @@
             </tbody>
         </table>
     </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
+    <div class="card">
+        <div class="card-header">
             <strong>Traceback</strong>
         </div>
-        <div class="panel-body">
+        <div class="card-body">
             {% include 'extras/inc/json_data.html' with data=result.traceback format="python" %}
         </div>
     </div>