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

nautobot/dcim/templates/dcim/cable_connect.html

@@ -3,6 +3,16 @@
 {% load helpers %}
 {% load form_helpers %}
 
+{% block title %}
+    {% with termination_a=form.instance.termination_a %}
+        {% if termination_a.module %}
+            Connect {{ termination_a.module.display }} {{ termination_a }} to {{ termination_b_type|bettertitle }}
+        {% else %}
+            Connect {{ termination_a.device }} {{ termination_a }} to {{ termination_b_type|bettertitle }}
+        {% endif %}
+    {% endwith %}
+{% endblock %}
+
 {% block content %}
     <form method="post" class="h-100 vstack">
         {% csrf_token %}
@@ -21,15 +31,6 @@
                 </div>
             {% endif %}
             {% with termination_a=form.instance.termination_a %}
-                <h3 class="mb-16">
-                    {% block title %}
-                        {% if termination_a.module %}
-                            Connect {{ termination_a.module.display }} {{ termination_a }} to {{ termination_b_type|bettertitle }}
-                        {% else %}
-                            Connect {{ termination_a.device }} {{ termination_a }} to {{ termination_b_type|bettertitle }}
-                        {% endif %}
-                    {% endblock %}
-                </h3>
                 <div class="col-lg-5">
                     <div class="card">
                         <div class="card-header">
@@ -38,36 +39,11 @@
                         <div class="card-body">
                             {% if termination_a.device %}
                             {# Device component #}
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Location</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.device.location }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Rack</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.device.rack|default:"None" }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Device</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.device }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Type</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a|meta:"verbose_name"|bettertitle }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Name</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a }}</p>
-                                    </div>
-                                </div>
+                                {% include "inc/form_static_field.html" with label="Location" value=termination_a.device.location required=True %}
+                                {% include "inc/form_static_field.html" with label="Rack" value=termination_a.device.rack|default:"None" required=True %}
+                                {% include "inc/form_static_field.html" with label="Device" value=termination_a.device required=True %}
+                                {% include "inc/form_static_field.html" with label="Type" value=termination_a|meta:"verbose_name"|bettertitle required=True %}
+                                {% include "inc/form_static_field.html" with label="Name" value=termination_a required=True %}
                             {% elif termination_a.module %}
                             {# Module component #}
                                 {% if not termination_a.module.device %}
@@ -75,76 +51,21 @@
                                         This {{ termination_a|meta:"verbose_name"|bettertitle }} belongs
                                         to a module not installed in any device.
                                     </div>
-                                    <div class="mb-10 d-flex justify-content-center">
-                                        <label class="col-lg-3 col-form-label nb-required">Location</label>
-                                        <div class="col-lg-9">
-                                            <p class="form-control-plaintext">{{ termination_a.module.location }}</p>
-                                        </div>
-                                    </div>
+                                    {% include "inc/form_static_field.html" with label="Location" value=termination_a.module.location required=True %}
                                 {% else %}
-                                    <div class="mb-10 d-flex justify-content-center">
-                                        <label class="col-lg-3 col-form-label nb-required">Location</label>
-                                        <div class="col-lg-9">
-                                            <p class="form-control-plaintext">{{ termination_a.module.device.location }}</p>
-                                        </div>
-                                    </div>
-                                    <div class="mb-10 d-flex justify-content-center">
-                                        <label class="col-lg-3 col-form-label nb-required">Rack</label>
-                                        <div class="col-lg-9">
-                                            <p class="form-control-plaintext">{{ termination_a.module.device.rack|default:"None" }}</p>
-                                        </div>
-                                    </div>
-                                    <div class="mb-10 d-flex justify-content-center">
-                                        <label class="col-lg-3 col-form-label nb-required">Device</label>
-                                        <div class="col-lg-9">
-                                            <p class="form-control-plaintext">{{ termination_a.module.device }}</p>
-                                        </div>
-                                    </div>
-                                    <div class="mb-10 d-flex justify-content-center">
-                                        <label class="col-lg-3 col-form-label nb-required">Module</label>
-                                        <div class="col-lg-9">
-                                            <p class="form-control-plaintext">{{ termination_a.module.display }}</p>
-                                        </div>
-                                    </div>
+                                    {% include "inc/form_static_field.html" with label="Location" value=termination_a.module.device.location required=True %}
+                                    {% include "inc/form_static_field.html" with label="Rack" value=termination_a.module.device.rack|default:"None" required=True %}
+                                    {% include "inc/form_static_field.html" with label="Device" value=termination_a.module.device required=True %}
+                                    {% include "inc/form_static_field.html" with label="Module" value=termination_a.module.display required=True %}
                                 {% endif %}
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Type</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a|meta:"verbose_name"|bettertitle }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Name</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a }}</p>
-                                    </div>
-                                </div>
+                                {% include "inc/form_static_field.html" with label="Type" value=termination_a|meta:"verbose_name"|bettertitle required=True %}
+                                {% include "inc/form_static_field.html" with label="Name" value=termination_a required=True %}
                             {% else %}
                             {# Circuit termination #}
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Location</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.location }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Provider</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.circuit.provider }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Circuit</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.circuit.cid }}</p>
-                                    </div>
-                                </div>
-                                <div class="mb-10 d-flex justify-content-center">
-                                    <label class="col-lg-3 col-form-label nb-required">Side</label>
-                                    <div class="col-lg-9">
-                                        <p class="form-control-plaintext">{{ termination_a.term_side }}</p>
-                                    </div>
-                                </div>
+                                {% include "inc/form_static_field.html" with label="Location" value=termination_a.location required=True %}
+                                {% include "inc/form_static_field.html" with label="Provider" value=termination_a.circuit.provider required=True %}
+                                {% include "inc/form_static_field.html" with label="Circuit" value=termination_a.circuit.cid required=True %}
+                                {% include "inc/form_static_field.html" with label="Side" value=termination_a.term_side required=True %}
                             {% endif %}
                         </div>
                     </div>
@@ -192,17 +113,12 @@
                             {% if 'termination_b_circuit' in form.fields %}
                                 {% render_field form.termination_b_circuit %}
                             {% endif %}
-                            <div class="mb-10 d-flex justify-content-center">
-                                <label class="col-lg-3 col-form-label nb-required">Type</label>
-                                <div class="col-lg-9">
-                                    <p class="form-control-plaintext">{{ termination_b_type|bettertitle }}</p>
-                                </div>
-                            </div>
+                            {% include "inc/form_static_field.html" with label="Type" value=termination_b_type|bettertitle required=True %}
                             {% render_field form.termination_b_id %}
                         </div>
                     </div>
                 </div>
-                <div class="col-lg-6 offset-md-3">
+                <div class="col-lg-6 offset-lg-3">
                     {% include 'dcim/inc/cable_form.html' %}
                 </div>
             {% endwith %}

nautobot/dcim/templates/dcim/cable_trace.html

@@ -1,10 +1,6 @@
 {% extends 'base.html' %}
 {% load helpers %}
 
-{% block header %}
-    <h1>{% block title %}Cable Trace for {{ object|meta:"verbose_name"|bettertitle }} {{ object }}{% endblock %}</h1>
-{% endblock %}
-
 {% block content %}
     <div class="row">
         <div class="col-lg-5 col-md-12">

nautobot/dcim/templates/dcim/{cable_edit.html → cable_update.html}

@@ -2,4 +2,4 @@
 
 {% block form %}
     {% include 'dcim/inc/cable_form.html' %}
-{% endblock %}
+{% endblock %}

nautobot/dcim/templates/dcim/consoleport.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}
@@ -91,13 +91,14 @@
                 Not connected
                 {% if perms.dcim.add_cable %}
                     <span class="dropdown float-end">
-                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        {# comment The "fixed" strategy allows the dropdown to break out of the containing card #}
+                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-popper-config='{"strategy": "fixed"}'>
                             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
                         </button>
-                        <ul class="dropdown-menu dropdown-menu-right">
-                            <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=object.pk termination_b_type='console-server-port' %}?return_url={{ object.get_absolute_url }}">Console Server Port</a></li>
-                            <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=object.pk termination_b_type='front-port' %}?return_url={{ object.get_absolute_url }}">Front Port</a></li>
-                            <li><a href="{% url 'dcim:consoleport_connect' termination_a_id=object.pk termination_b_type='rear-port' %}?return_url={{ object.get_absolute_url }}">Rear Port</a></li>
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            <li><a class="dropdown-item" href="{% url 'dcim:consoleport_connect' termination_a_id=object.pk termination_b_type='console-server-port' %}?return_url={{ object.get_absolute_url }}">Console Server Port</a></li>
+                            <li><a class="dropdown-item" href="{% url 'dcim:consoleport_connect' termination_a_id=object.pk termination_b_type='front-port' %}?return_url={{ object.get_absolute_url }}">Front Port</a></li>
+                            <li><a class="dropdown-item" href="{% url 'dcim:consoleport_connect' termination_a_id=object.pk termination_b_type='rear-port' %}?return_url={{ object.get_absolute_url }}">Rear Port</a></li>
                         </ul>
                     </span>
                 {% endif %}

nautobot/dcim/templates/dcim/consoleserverport.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}
@@ -91,13 +91,14 @@
                 Not connected
                 {% if perms.dcim.add_cable %}
                     <span class="dropdown float-end">
-                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        {# comment The "fixed" strategy allows the dropdown to break out of the containing card #}
+                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-popper-config='{"strategy": "fixed"}'>
                             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
                         </button>
-                        <ul class="dropdown-menu dropdown-menu-right">
-                            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=object.pk termination_b_type='console-port' %}?return_url={{ object.get_absolute_url }}">Console Port</a></li>
-                            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=object.pk termination_b_type='front-port' %}?return_url={{ object.get_absolute_url }}">Front Port</a></li>
-                            <li><a href="{% url 'dcim:consoleserverport_connect' termination_a_id=object.pk termination_b_type='rear-port' %}?return_url={{ object.get_absolute_url }}">Rear Port</a></li>
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            <li><a class="dropdown-item" href="{% url 'dcim:consoleserverport_connect' termination_a_id=object.pk termination_b_type='console-port' %}?return_url={{ object.get_absolute_url }}">Console Port</a></li>
+                            <li><a class="dropdown-item" href="{% url 'dcim:consoleserverport_connect' termination_a_id=object.pk termination_b_type='front-port' %}?return_url={{ object.get_absolute_url }}">Front Port</a></li>
+                            <li><a class="dropdown-item" href="{% url 'dcim:consoleserverport_connect' termination_a_id=object.pk termination_b_type='rear-port' %}?return_url={{ object.get_absolute_url }}">Rear Port</a></li>
                         </ul>
                     </span>
                 {% endif %}

nautobot/dcim/templates/dcim/device/config.html

@@ -1,11 +1,11 @@
-{% extends 'dcim/device/base.html' %}
+{% extends 'generic/object_retrieve.html' %}
 
 {% block title %}{{ object }} - Config{% endblock %}
 
 {% block content %}
     {% include 'inc/ajax_loader.html' %}
     <div class="row">
-        <div class="col-lg-10 offset-md-1">
+        <div class="col-lg-10 offset-lg-1">
             <div class="card">
                 <div class="card-header"><strong>Device Configuration</strong></div>
                 <ul class="nav nav-tabs mt-16" role="tablist">

nautobot/dcim/templates/dcim/device/lldp_neighbors.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device/base.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block title %}{{ object }} - LLDP Neighbors{% endblock %}

nautobot/dcim/templates/dcim/device/status.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device/base.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block title %}{{ object }} - Status{% endblock %}
@@ -101,11 +101,11 @@
                             memory.after("<tr><td>Available</td><td>" + json['get_environment']['memory']['available_ram'] + "</td></tr>");
                         }
                         $.each(json['get_environment']['temperature'], function(name, obj) {
-                            var style = "success";
+                            var style = "table-success";
                             if (obj['is_alert']) {
-                                style = "warning";
+                                style = "table-warning";
                             } else if (obj['is_critical']) {
-                                style = "danger";
+                                style = "table-danger";
                             }
                             var row="<tr class=\"" + style +"\"><td>" + name + "</td><td>" + obj['temperature'] + "°C</td></tr>";
                             $("#temperature").after(row)
@@ -113,18 +113,18 @@
                         $.each(json['get_environment']['fans'], function(name, obj) {
                             var row;
                             if (obj['status']) {
-                                row = `<tr class="success"><td>${name}</td><td>{{ True | render_boolean }}</td></tr>`;
+                                row = `<tr class="table-success"><td>${name}</td><td>{{ True | render_boolean }}</td></tr>`;
                             } else {
-                                row = `<tr class="error"><td>${name}</td><td>{{ False | render_boolean }}</td></tr>`;
+                                row = `<tr class="table-danger"><td>${name}</td><td>{{ False | render_boolean }}</td></tr>`;
                             }
                             $("#fans").after(row)
                         });
                         $.each(json['get_environment']['power'], function(name, obj) {
                             var row;
                             if (obj['status']) {
-                                row = `<tr class="success"><td>${name}</td><td>{{ True | render_boolean }}</td></tr>`;
+                                row = `<tr class="table-success"><td>${name}</td><td>{{ True | render_boolean }}</td></tr>`;
                             } else {
-                                row = `<tr class="danger"><td>${name}</td><td>{{ False | render_boolean }}</td></tr>`;
+                                row = `<tr class="table-danger"><td>${name}</td><td>{{ False | render_boolean }}</td></tr>`;
                             }
                             $("#power").after(row)
                         });

nautobot/dcim/templates/dcim/device.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device/base.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block javascript %}

nautobot/dcim/templates/dcim/device_component_add.html

@@ -6,8 +6,8 @@
 {% block content %}
     <form action="" method="post" 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 align-content-start flex-fill">
+            <div class="col-xl-8 col-lg-10">
                 {% if form.non_field_errors %}
                     <div class="card border-danger">
                         <div class="card-header bg-danger-subtle border-danger text-body">

nautobot/dcim/templates/dcim/device_create.html

@@ -61,7 +61,9 @@
         <div class="card-body">
             {% render_field form.platform %}
             {% render_field form.software_version %}
-            <div class="mb-10 d-flex justify-content-center" id="software_version_image_container" style="display:none">
+            <div class="mb-10 d-flex justify-content-center"
+                 id="software_version_image_container"
+                 style="display:none !important">{# !important is required to override d-flex #}
                 <div class="col-lg-3"></div>
                 <div class="col-lg-9">
                     <span class="form-text">
@@ -185,7 +187,7 @@
         }
 
         function hide_software_image_container(){
-            software_version_image_container.style.display = 'none';
+            software_version_image_container.style.setProperty('display', 'none', 'important');
             software_version_image_description.innerHTML = '';
             clear_software_image_list();
         }
@@ -194,7 +196,7 @@
             clear_software_image_list();
             software_version_image_description.innerHTML = '<img src="{% static 'img/ajax-loader.gif' %}">';
             software_version_image_list.style.visibility = 'hidden'; // prevent flicker when changing values
-            software_version_image_container.style.display = 'block';
+            software_version_image_container.style.setProperty('display', 'flex', 'important');
             let device_type_id = $('select#id_device_type').find(':selected')[0].value;
             if (!device_type_id) {
                 software_version_image_description.innerHTML = '<b>Unable to display software image list. Select a device type first.</b>';

nautobot/dcim/templates/dcim/device_interface_delete.html

@@ -1,3 +1,3 @@
-{% extends 'generic/object_delete.html' %}
+{% extends 'generic/object_destroy.html' %}
 
 {% block message_extra %}This would also delete any/all child interfaces of this interface.{% endblock %}

nautobot/dcim/templates/dcim/device_list.html

@@ -2,20 +2,83 @@
 
 {% block bulk_buttons %}
     {% if perms.dcim.change_device %}
-        <div class="btn-group dropup">
+        <div class="dropdown dropup d-inline-flex">
             <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="device-bulk-add-components-button">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add Components <span class="mdi mdi-chevron-down"></span>
             </button>
             <ul class="dropdown-menu">
-                {% if perms.dcim.add_consoleport %}<li><a href="{% url 'dcim:device_bulk_add_consoleport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction dropdown-item">Console Ports</a></li>{% endif %}
-                {% if perms.dcim.add_consoleserverport %}<li><a href="{% url 'dcim:device_bulk_add_consoleserverport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction dropdown-item">Console Server Ports</a></li>{% endif %}
-                {% if perms.dcim.add_powerport %}<li><a href="{% url 'dcim:device_bulk_add_powerport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction dropdown-item">Power Ports</a></li>{% endif %}
-                {% if perms.dcim.add_poweroutlet %}<li><a href="{% url 'dcim:device_bulk_add_poweroutlet' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction dropdown-item">Power Outlets</a></li>{% endif %}
-                {% if perms.dcim.add_interface %}<li><a href="{% url 'dcim:device_bulk_add_interface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction dropdown-item">Interfaces</a></li>{% endif %}
-                {% if perms.dcim.add_rearport %}<li><a href="{% url 'dcim:device_bulk_add_rearport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction dropdown-item">Rear Ports</a></li>{% endif %}
-                {% if perms.dcim.add_devicebay %}<li><a href="{% url 'dcim:device_bulk_add_devicebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction dropdown-item">Device Bays</a></li>{% endif %}
-                {% if perms.dcim.add_modulebay %}<li><a href="{% url 'dcim:device_bulk_add_modulebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction dropdown-item">Module Bays</a></li>{% endif %}
-                {% if perms.dcim.add_inventoryitem %}<li><a href="{% url 'dcim:device_bulk_add_inventoryitem' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction dropdown-item">Inventory Items</a></li>{% endif %}
+                {% if perms.dcim.add_consoleport %}
+                    <li>
+                        <a href="{% url 'dcim:device_bulk_add_consoleport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="formaction dropdown-item">
+                            <span class="mdi mdi-console" aria-hidden="true"></span> Console Ports
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_consoleserverport %}
+                    <li>
+                        <a href="{% url 'dcim:device_bulk_add_consoleserverport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="formaction dropdown-item">
+                            <span class="mdi mdi-console-network-outline" aria-hidden="true"></span> Console Server Ports
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_powerport %}
+                    <li>
+                        <a href="{% url 'dcim:device_bulk_add_powerport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="formaction dropdown-item">
+                            <span class="mdi mdi-power-plug-outline" aria-hidden="true"></span> Power Ports
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_poweroutlet %}
+                    <li>
+                        <a href="{% url 'dcim:device_bulk_add_poweroutlet' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="formaction dropdown-item">
+                            <span class="mdi mdi-power-socket" aria-hidden="true"></span> Power Outlets
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_interface %}
+                    <li>
+                        <a href="{% url 'dcim:device_bulk_add_interface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="formaction dropdown-item">
+                            <span class="mdi mdi-ethernet" aria-hidden="true"></span> Interfaces
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_rearport %}
+                    <li>
+                        <a href="{% url 'dcim:device_bulk_add_rearport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="formaction dropdown-item">
+                            <span class="mdi mdi-square-rounded-outline" aria-hidden="true"></span> Rear Ports
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_devicebay %}
+                    <li>
+                        <a href="{% url 'dcim:device_bulk_add_devicebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="formaction dropdown-item">
+                            <span class="mdi mdi-circle-outline" aria-hidden="true"></span> Device Bays
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_modulebay %}
+                    <li>
+                        <a href="{% url 'dcim:device_bulk_add_modulebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="formaction dropdown-item">
+                            <span class="mdi mdi-tray" aria-hidden="true"></span> Module Bays
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_inventoryitem %}
+                    <li>
+                        <a href="{% url 'dcim:device_bulk_add_inventoryitem' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="formaction dropdown-item">
+                            <span class="mdi mdi-invoice-list-outline" aria-hidden="true"></span> Inventory Items
+                        </a>
+                    </li>
+                {% endif %}
             </ul>
         </div>
     {% endif %}

nautobot/dcim/templates/dcim/devicebay.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}

nautobot/dcim/templates/dcim/devicebay_populate.html

@@ -4,8 +4,8 @@
 {% block content %}
     <form action="." method="post" class="h-100 vstack">
         {% csrf_token %}
-        <div class="row align-content-start flex-fill">
-            <div class="col-lg-6 offset-md-3">
+        <div class="row justify-content-center align-content-start flex-fill">
+            <div class="col-lg-6">
                 {% if form.non_field_errors %}
                     <div class="card border-danger">
                         <div class="card-header bg-danger-subtle border-danger text-body">

nautobot/dcim/templates/dcim/devicetype_component_add.html

@@ -6,8 +6,8 @@
 {% block content %}
     <form action="." method="post" class="h-100 vstack">
         {% csrf_token %}
-        <div class="row align-content-start flex-fill">
-            <div class="col-lg-6 offset-md-3">
+        <div class="row justify-content-center align-content-start flex-fill">
+            <div class="col-xl-8 col-lg-10">
                 {% if form.non_field_errors %}
                     <div class="card border-danger">
                         <div class="card-header bg-danger-subtle border-danger text-body">

nautobot/dcim/templates/dcim/footer_convert_to_contact_or_team_record.html

@@ -0,0 +1,14 @@
+{% load perms %}
+{% load helpers %}
+{% if perms.dcim.contact_association %}
+    {% if object.contact_name or object.contact_phone or object.contact_email %}
+        {% with request.path|add:"?tab=contacts"|urlencode as return_url %}
+            <div class="float-end d-print-none">
+                <a href="{% url 'dcim:location_migrate_data_to_contact' pk=object.pk %}?return_url={{ return_url }}" class="btn btn-primary btn-sm">
+                    <span class="mdi mdi-account-edit" aria-hidden="true"></span>
+                    Convert to contact/team record
+                </a>
+            </div>
+        {% endwith %}
+    {% endif %}
+{% endif %}

nautobot/dcim/templates/dcim/frontport.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}
@@ -76,16 +76,17 @@
                 Not connected
                 {% if perms.dcim.add_cable %}
                     <span class="dropdown float-end">
-                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        {# comment The "fixed" strategy allows the dropdown to break out of the containing card #}
+                        <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-popper-config='{"strategy": "fixed"}'>
                             <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> Connect
                         </button>
-                        <ul class="dropdown-menu dropdown-menu-right">
-                            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='interface' %}?return_url={{ object.get_absolute_url }}">Interface</a></li>
-                            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='console-server-port' %}?return_url={{ object.get_absolute_url }}">Console Server Port</a></li>
-                            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='console-port' %}?return_url={{ object.get_absolute_url }}">Console Port</a></li>
-                            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='front-port' %}?return_url={{ object.get_absolute_url }}">Front Port</a></li>
-                            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='rear-port' %}?return_url={{ object.get_absolute_url }}">Rear Port</a></li>
-                            <li><a href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='circuit-termination' %}?return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            <li><a class="dropdown-item" href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='interface' %}?return_url={{ object.get_absolute_url }}">Interface</a></li>
+                            <li><a class="dropdown-item" href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='console-server-port' %}?return_url={{ object.get_absolute_url }}">Console Server Port</a></li>
+                            <li><a class="dropdown-item" href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='console-port' %}?return_url={{ object.get_absolute_url }}">Console Port</a></li>
+                            <li><a class="dropdown-item" href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='front-port' %}?return_url={{ object.get_absolute_url }}">Front Port</a></li>
+                            <li><a class="dropdown-item" href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='rear-port' %}?return_url={{ object.get_absolute_url }}">Rear Port</a></li>
+                            <li><a class="dropdown-item" href="{% url 'dcim:frontport_connect' termination_a_id=object.pk termination_b_type='circuit-termination' %}?return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
                         </ul>
                     </span>
                 {% endif %}

nautobot/dcim/templates/dcim/inc/devicetype_component_table.html

@@ -10,7 +10,7 @@
             <div class="card-footer d-print-none">
                 {% if table.rows %}
                     <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_rename" %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-warning">
-                        <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
+                        <span class="mdi mdi-rename" aria-hidden="true"></span> Rename
                     </button>
                     <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_edit" %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-warning">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit

nautobot/dcim/templates/dcim/inc/edit_form_softwareversion_js.html

@@ -46,7 +46,7 @@
     }
 
     function hide_software_image_container(){
-        software_version_image_container.style.display = 'none';
+        software_version_image_container.style.setProperty('display', 'none', 'important');
         software_version_image_description.innerHTML = '';
         clear_software_image_list();
     }
@@ -55,7 +55,7 @@
         clear_software_image_list();
         software_version_image_description.innerHTML = '<img src="{% static 'img/ajax-loader.gif' %}">';
         software_version_image_list.style.visibility = 'hidden'; // prevent flicker when changing values
-        software_version_image_container.style.display = 'block';
+        software_version_image_container.style.setProperty('display', 'flex', 'important');
         retrieve_software_images(software_image_url, {'software_version': version_id});
         software_version_image_list.style.visibility = 'visible';
     }

nautobot/dcim/templates/dcim/inc/moduletype_component_table.html

@@ -10,7 +10,7 @@
             <div class="card-footer d-print-none">
                 {% if table.rows %}
                     <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_rename" %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-warning">
-                        <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
+                        <span class="mdi mdi-rename" aria-hidden="true"></span> Rename
                     </button>
                     <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_edit" %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-warning">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit