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

nautobot/dcim/templates/dcim/inc/rack_elevation.html

@@ -1,5 +1,5 @@
 <div style="margin-left: -30px">
-    <object data="{% url 'dcim-api:rack-elevation' pk=object.pk %}?face={{face}}&render=svg" class="rack_elevation"></object>
+    <object data="{% url 'dcim-api:rack-elevation' pk=object.pk %}?face={{face}}&render=svg" class="rack_elevation invert-in-dark-mode"></object>
 </div>
 <div class="text-center text-small">
     <a href="{% url 'dcim-api:rack-elevation' pk=object.pk %}?face={{face}}&render=svg" class="rack_elevation_save_svg_link" download="rack_{{ face }}_{{ object }}.svg">

nautobot/dcim/templates/dcim/interface.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}
@@ -44,6 +44,14 @@
                 <td>Type</td>
                 <td>{{ object.get_type_display }}</td>
             </tr>
+            <tr>
+                <td>Speed</td>
+                <td>{{ object.speed|humanize_speed|placeholder }}</td>
+            </tr>
+            <tr>
+                <td>Duplex</td>
+                <td>{{ object.get_duplex_display|placeholder }}</td>
+            </tr>
             <tr>
                 <td>Enabled</td>
                 <td>{{ object.enabled | render_boolean }}</td>
@@ -177,14 +185,15 @@
                     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:interface_connect' termination_a_id=object.pk termination_b_type='interface' %}?return_url={{ object.get_absolute_url }}">Interface</a></li>
-                                <li><a href="{% url 'dcim:interface_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:interface_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:interface_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:interface_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:interface_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:interface_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:interface_connect' termination_a_id=object.pk termination_b_type='circuit-termination' %}?return_url={{ object.get_absolute_url }}">Circuit Termination</a></li>
                             </ul>
                         </span>
                     {% endif %}
@@ -221,6 +230,25 @@
             </table>
         </div>
     {% endif %}
+    {% if object.vpn_tunnel_endpoints_src_int %}
+        <div class="card">
+            <div class="card-header"><strong>VPN Endpoints</strong></div>
+            <table class="table table-hover nb-table-headings card-body">
+                <thead>
+                    <tr>
+                        <th>Name</th>
+                        <th>Role</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>{{ object.vpn_tunnel_endpoints_src_int|hyperlinked_object }}</td>
+                        <td>{{ object.vpn_tunnel_endpoints_src_int.role|placeholder }}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    {% endif %}
 {% endblock content_right_page %}
 
 {% block content_full_width_page %}

nautobot/dcim/templates/dcim/interface_bulk_delete.html

@@ -1,3 +1,3 @@
-{% extends 'generic/object_bulk_delete.html' %}
+{% extends 'generic/object_bulk_destroy.html' %}
 
 {% block message_extra %}This would also delete any/all child interfaces of these interfaces.{% endblock %}

nautobot/dcim/templates/dcim/interface_edit.html

@@ -12,6 +12,8 @@
             {% render_field form.status %}
             {% render_field form.role %}
             {% render_field form.type %}
+            {% render_field form.speed %}
+            {% render_field form.duplex %}
             {% render_field form.enabled %}
             {% render_field form.parent_interface %}
             {% render_field form.bridge %}

nautobot/dcim/templates/dcim/inventoryitem.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/inventoryitem_add.html

@@ -17,7 +17,9 @@
             {% render_field form.label_pattern %}
             {% render_field form.manufacturer %}
             {% 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">

nautobot/dcim/templates/dcim/inventoryitem_bulk_delete.html

@@ -1,4 +1,4 @@
-{% extends 'generic/object_bulk_delete.html' %}
+{% extends 'generic/object_bulk_destroy.html' %}
 
 {% block message_extra %}
     <p class="text-center text-danger"><span class="mdi mdi-alert"></span> This will also delete all child inventory items of those listed.</p>

nautobot/dcim/templates/dcim/inventoryitem_edit.html

@@ -10,7 +10,9 @@
     {% render_field form.label %}
     {% render_field form.manufacturer %}
     {% 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">

nautobot/dcim/templates/dcim/module/base.html

@@ -4,34 +4,74 @@
 
 {% block extra_buttons %}
     {% if perms.dcim.change_module %}
-        <div class="btn-group">
+        <div class="dropdown d-inline-flex">
             <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 <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:consoleport_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_consoleports' pk=object.pk %}">Console Ports</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:consoleport_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_consoleports' pk=object.pk %}">
+                            <span class="mdi mdi-console" aria-hidden="true"></span> Console Ports
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_consoleserverport %}
-                    <li><a href="{% url 'dcim:consoleserverport_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_consoleserverports' pk=object.pk %}">Console Server Ports</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:consoleserverport_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_consoleserverports' pk=object.pk %}">
+                            <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:powerport_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_powerports' pk=object.pk %}">Power Ports</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:powerport_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_powerports' pk=object.pk %}">
+                            <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:poweroutlet_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_poweroutlets' pk=object.pk %}">Power Outlets</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:poweroutlet_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_poweroutlets' pk=object.pk %}">
+                            <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:interface_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_interfaces' pk=object.pk %}">Interfaces</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:interface_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_interfaces' pk=object.pk %}">
+                            <span class="mdi mdi-ethernet" aria-hidden="true"></span> Interfaces
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_frontport %}
-                    <li><a href="{% url 'dcim:frontport_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_frontports' pk=object.pk %}">Front Ports</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:frontport_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_frontports' pk=object.pk %}">
+                            <span class="mdi mdi-square-rounded-outline" aria-hidden="true"></span> Front Ports
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_rearport %}
-                    <li><a href="{% url 'dcim:rearport_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_rearports' pk=object.pk %}">Rear Ports</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:rearport_add' %}?module={{ object.pk }}&return_url={% url 'dcim:module_rearports' pk=object.pk %}">
+                            <span class="mdi mdi-square-rounded-outline" aria-hidden="true"></span> Rear Ports
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_modulebay %}
-                    <li><a href="{% url 'dcim:modulebay_add' %}?parent_module={{ object.pk }}&return_url={% url 'dcim:module_modulebays' pk=object.pk %}">Module Bays</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:modulebay_add' %}?parent_module={{ object.pk }}&return_url={% url 'dcim:module_modulebays' pk=object.pk %}">
+                            <span class="mdi mdi-tray" aria-hidden="true"></span> Module Bays
+                        </a>
+                    </li>
                 {% endif %}
             </ul>
         </div>

nautobot/dcim/templates/dcim/module_consoleports.html

@@ -17,7 +17,7 @@
             <div class="card-footer d-print-none">
                 {% if perms.dcim.change_consoleport %}
                     <button type="submit" name="_rename" formaction="{% url 'dcim:consoleport_bulk_rename' %}?return_url={% url 'dcim:module_consoleports' pk=object.pk %}" class="btn btn-warning btn-sm">
-                        <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 'dcim:consoleport_bulk_edit' %}?module={{ object.pk }}&return_url={% url 'dcim:module_consoleports' pk=object.pk %}" class="btn btn-warning btn-sm">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit

nautobot/dcim/templates/dcim/module_consoleserverports.html

@@ -17,7 +17,7 @@
             <div class="card-footer d-print-none">
                 {% if perms.dcim.change_consoleserverport %}
                     <button type="submit" name="_rename" formaction="{% url 'dcim:consoleserverport_bulk_rename' %}?return_url={% url 'dcim:module_consoleserverports' pk=object.pk %}" class="btn btn-warning btn-sm">
-                        <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 'dcim:consoleserverport_bulk_edit' %}?module={{ object.pk }}&return_url={% url 'dcim:module_consoleserverports' pk=object.pk %}" class="btn btn-warning btn-sm">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit

nautobot/dcim/templates/dcim/module_frontports.html

@@ -17,7 +17,7 @@
             <div class="card-footer d-print-none">
                 {% if perms.dcim.change_frontport %}
                     <button type="submit" name="_rename" formaction="{% url 'dcim:frontport_bulk_rename' %}?return_url={% url 'dcim:module_frontports' pk=object.pk %}" class="btn btn-warning btn-sm">
-                        <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 'dcim:frontport_bulk_edit' %}?module={{ object.pk }}&return_url={% url 'dcim:module_frontports' pk=object.pk %}" class="btn btn-warning btn-sm">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit

nautobot/dcim/templates/dcim/module_interfaces.html

@@ -20,7 +20,7 @@
             <div class="card-footer d-print-none">
                 {% if perms.dcim.change_interface %}
                     <button type="submit" name="_rename" formaction="{% url 'dcim:interface_bulk_rename' %}?return_url={% url 'dcim:module_interfaces' pk=object.pk %}" class="btn btn-warning btn-sm">
-                        <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 'dcim:interface_bulk_edit' %}?return_url={% url 'dcim:module_interfaces' pk=object.pk %}" class="btn btn-warning btn-sm">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit

nautobot/dcim/templates/dcim/module_list.html

@@ -2,18 +2,67 @@
 
 {% block bulk_buttons %}
     {% if perms.dcim.change_module %}
-        <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="module-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:module_bulk_add_consoleport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Console Ports</a></li>{% endif %}
-                {% if perms.dcim.add_consoleserverport %}<li><a href="{% url 'dcim:module_bulk_add_consoleserverport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Console Server Ports</a></li>{% endif %}
-                {% if perms.dcim.add_powerport %}<li><a href="{% url 'dcim:module_bulk_add_powerport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Power Ports</a></li>{% endif %}
-                {% if perms.dcim.add_poweroutlet %}<li><a href="{% url 'dcim:module_bulk_add_poweroutlet' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Power Outlets</a></li>{% endif %}
-                {% if perms.dcim.add_interface %}<li><a href="{% url 'dcim:module_bulk_add_interface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Interfaces</a></li>{% endif %}
-                {% if perms.dcim.add_rearport %}<li><a href="{% url 'dcim:module_bulk_add_rearport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Rear Ports</a></li>{% endif %}
-                {% if perms.dcim.add_modulebay %}<li><a href="{% url 'dcim:module_bulk_add_modulebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="formaction">Module Bays</a></li>{% endif %}
+                {% if perms.dcim.add_consoleport %}
+                    <li>
+                        <a href="{% url 'dcim:module_bulk_add_consoleport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="dropdown-item formaction">
+                            <span class="mdi mdi-console" aria-hidden="true"></span> Console Ports
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_consoleserverport %}
+                    <li>
+                        <a href="{% url 'dcim:module_bulk_add_consoleserverport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="dropdown-item formaction">
+                            <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:module_bulk_add_powerport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="dropdown-item formaction">
+                            <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:module_bulk_add_poweroutlet' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="dropdown-item formaction">
+                            <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:module_bulk_add_interface' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="dropdown-item formaction">
+                            <span class="mdi mdi-ethernet" aria-hidden="true"></span> Interfaces
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_rearport %}
+                    <li>
+                        <a href="{% url 'dcim:module_bulk_add_rearport' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="dropdown-item formaction">
+                            <span class="mdi mdi-square-rounded-outline" aria-hidden="true"></span> Rear Ports
+                        </a>
+                    </li>
+                {% endif %}
+                {% if perms.dcim.add_modulebay %}
+                    <li>
+                        <a href="{% url 'dcim:module_bulk_add_modulebay' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}"
+                           class="dropdown-item formaction">
+                            <span class="mdi mdi-tray" aria-hidden="true"></span> Module Bays
+                        </a>
+                    </li>
+                {% endif %}
             </ul>
         </div>
     {% endif %}

nautobot/dcim/templates/dcim/module_modulebays.html

@@ -17,7 +17,7 @@
             <div class="card-footer d-print-none">
                 {% if perms.dcim.change_modulebay %}
                     <button type="submit" name="_rename" formaction="{% url 'dcim:modulebay_bulk_rename' %}?return_url={% url 'dcim:module_modulebays' pk=object.pk %}" class="btn btn-warning btn-sm">
-                        <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 'dcim:modulebay_bulk_edit' %}?parent_module={{ object.pk }}&return_url={% url 'dcim:module_modulebays' pk=object.pk %}" class="btn btn-warning btn-sm">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit

nautobot/dcim/templates/dcim/module_poweroutlets.html

@@ -17,7 +17,7 @@
             <div class="card-footer d-print-none">
                 {% if perms.dcim.change_poweroutlet %}
                     <button type="submit" name="_rename" formaction="{% url 'dcim:poweroutlet_bulk_rename' %}?return_url={% url 'dcim:module_poweroutlets' pk=object.pk %}" class="btn btn-warning btn-sm">
-                        <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 'dcim:poweroutlet_bulk_edit' %}?module={{ object.pk }}&return_url={% url 'dcim:module_poweroutlets' pk=object.pk %}" class="btn btn-warning btn-sm">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit

nautobot/dcim/templates/dcim/module_powerports.html

@@ -17,7 +17,7 @@
             <div class="card-footer d-print-none">
                 {% if perms.dcim.change_powerport %}
                     <button type="submit" name="_rename" formaction="{% url 'dcim:powerport_bulk_rename' %}?return_url={% url 'dcim:module_powerports' pk=object.pk %}" class="btn btn-warning btn-sm">
-                        <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 'dcim:powerport_bulk_edit' %}?module={{ object.pk }}&return_url={% url 'dcim:module_powerports' pk=object.pk %}" class="btn btn-warning btn-sm">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit

nautobot/dcim/templates/dcim/module_rearports.html

@@ -17,7 +17,7 @@
             <div class="card-footer d-print-none">
                 {% if perms.dcim.change_rearport %}
                     <button type="submit" name="_rename" formaction="{% url 'dcim:rearport_bulk_rename' %}?return_url={% url 'dcim:module_rearports' pk=object.pk %}" class="btn btn-warning btn-sm">
-                        <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 'dcim:rearport_bulk_edit' %}?module={{ object.pk }}&return_url={% url 'dcim:module_rearports' pk=object.pk %}" class="btn btn-warning btn-sm">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit

nautobot/dcim/templates/dcim/modulefamily_retrieve.html

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

nautobot/dcim/templates/dcim/moduletype_list.html

@@ -2,10 +2,10 @@
 {% load buttons %}
 
 {% block import_list_element %}
-    <li><a href="{% url 'dcim:moduletype_import' %}">
+    <li><a class="dropdown-item" href="{% url 'dcim:moduletype_import' %}">
         <span class="mdi mdi-database-import text-secondary" aria-hidden="true"></span> Import from JSON/YAML (single record)
     </a></li>
-    <li><a href="{% job_import_url content_type %}">
+    <li><a class="dropdown-item" href="{% job_import_url content_type %}">
         <span class="mdi mdi-database-import text-secondary" aria-hidden="true"></span> Import from CSV (multiple records)
     </a></li>
 {% endblock import_list_element %}

nautobot/dcim/templates/dcim/moduletype_retrieve.html

@@ -4,34 +4,74 @@
 
 {% block extra_buttons %}
     {% if perms.dcim.change_moduletype %}
-        <div class="btn-group">
+        <div class="dropdown d-inline-flex">
             <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="module-type-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_consoleporttemplate %}
-                    <li><a href="{% url 'dcim:consoleporttemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=consoleports">Console Ports</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:consoleporttemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=consoleports">
+                            <span class="mdi mdi-console" aria-hidden="true"></span> Console Ports
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_consoleserverporttemplate %}
-                    <li><a href="{% url 'dcim:consoleserverporttemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=consoleserverports">Console Server Ports</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:consoleserverporttemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=consoleserverports">
+                            <span class="mdi mdi-console-network-outline" aria-hidden="true"></span>Console Server Ports
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_powerporttemplate %}
-                    <li><a href="{% url 'dcim:powerporttemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=powerports">Power Ports</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:powerporttemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=powerports">
+                            <span class="mdi mdi-power-plug-outline" aria-hidden="true"></span> Power Ports
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_poweroutlettemplate %}
-                    <li><a href="{% url 'dcim:poweroutlettemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=poweroutlets">Power Outlets</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:poweroutlettemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=poweroutlets">
+                            <span class="mdi mdi-power-socket" aria-hidden="true"></span> Power Outlets
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_interfacetemplate %}
-                    <li><a href="{% url 'dcim:interfacetemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=interfaces">Interfaces</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:interfacetemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=interfaces">
+                            <span class="mdi mdi-ethernet" aria-hidden="true"></span> Interfaces
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_frontporttemplate %}
-                    <li><a href="{% url 'dcim:frontporttemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=frontports">Front Ports</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:frontporttemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=frontports">
+                            <span class="mdi mdi-square-rounded-outline" aria-hidden="true"></span> Front Ports
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_rearporttemplate %}
-                    <li><a href="{% url 'dcim:rearporttemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=rearports">Rear Ports</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:rearporttemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=rearports">
+                            <span class="mdi mdi-square-rounded-outline" aria-hidden="true"></span> Rear Ports
+                        </a>
+                    </li>
                 {% endif %}
                 {% if perms.dcim.add_modulebaytemplate %}
-                    <li><a href="{% url 'dcim:modulebaytemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=modulebays">Module Bays</a></li>
+                    <li>
+                        <a class="dropdown-item"
+                           href="{% url 'dcim:modulebaytemplate_add' %}?module_type={{ object.pk }}&return_url={{ object.get_absolute_url }}%3Ftab=modulebays">
+                            <span class="mdi mdi-tray" aria-hidden="true"></span> Module Bays
+                        </a>
+                    </li>
                 {% endif %}
             </ul>
         </div>

nautobot/dcim/templates/dcim/platform_create.html

@@ -32,7 +32,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h4 class="modal-title"><code>Network driver</code> Choices</h4>
+                    <h4 class="modal-title">Network Driver Choices</h4>
                     <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
                 </div>
                 <div class="modal-body">

nautobot/dcim/templates/dcim/poweroutlet.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/powerport.html

@@ -1,4 +1,4 @@
-{% extends 'dcim/device_component.html' %}
+{% extends 'generic/object_retrieve.html' %}
 {% load helpers %}
 
 {% block content_left_page %}
@@ -99,12 +99,13 @@
                 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:powerport_connect' termination_a_id=object.pk termination_b_type='power-outlet' %}?return_url={{ object.get_absolute_url }}">Power Outlet</a></li>
-                            <li><a href="{% url 'dcim:powerport_connect' termination_a_id=object.pk termination_b_type='power-feed' %}?return_url={{ object.get_absolute_url }}">Power Feed</a></li>
+                        <ul class="dropdown-menu dropdown-menu-end">
+                            <li><a class="dropdown-item" href="{% url 'dcim:powerport_connect' termination_a_id=object.pk termination_b_type='power-outlet' %}?return_url={{ object.get_absolute_url }}">Power Outlet</a></li>
+                            <li><a class="dropdown-item" href="{% url 'dcim:powerport_connect' termination_a_id=object.pk termination_b_type='power-feed' %}?return_url={{ object.get_absolute_url }}">Power Feed</a></li>
                         </ul>
                     </span>
                 {% endif %}

nautobot/dcim/templates/dcim/rack_elevation_list.html

@@ -10,12 +10,24 @@
         <span class="mdi mdi-checkbox-marked-circle-outline" aria-hidden="true"></span> Show Images
     </button>
     <div class="btn-group" role="group">
-        <a href="{% url 'dcim:rack_elevation_list' %}{% legacy_querystring request face='front' %}" class="btn btn-secondary{% if rack_face == 'front' %} active{% endif %}">Front</a>
-        <a href="{% url 'dcim:rack_elevation_list' %}{% legacy_querystring request face='rear' %}" class="btn btn-secondary{% if rack_face == 'rear' %} active{% endif %}">Rear</a>
+        <a href="{% django_querystring face='front' %}"
+           class="btn btn-primary{% if rack_face == 'front' %} bg-primary nb-text-body-bg{% endif %}">
+            <span class="mdi mdi-flip-to-front"></span> Front
+        </a>
+        <a href="{% django_querystring face='rear' %}"
+           class="btn btn-primary{% if rack_face == 'rear' %} bg-primary nb-text-body-bg{% endif %}">
+            <span class="mdi mdi-flip-to-back"></span> Rear
+        </a>
     </div>
     <div class="btn-group" role="group">
-        <a href="{% url 'dcim:rack_elevation_list' %}{% legacy_querystring request reverse=None %}" class="btn btn-secondary{% if not reverse %} active{% endif %}">Normal</a>
-        <a href="{% url 'dcim:rack_elevation_list' %}{% legacy_querystring request reverse='true' %}" class="btn btn-secondary{% if reverse %} active{% endif %}">Reversed</a>
+        <a href="{% django_querystring reverse=None %}"
+           class="btn btn-primary{% if not reverse %} bg-primary nb-text-body-bg{% endif %}">
+            <span class="mdi mdi-arrow-right"></span> Normal
+        </a>
+        <a href="{% django_querystring reverse='true' %}"
+           class="btn btn-primary{% if reverse %} bg-primary nb-text-body-bg{% endif %}">
+            <span class="mdi mdi-arrow-left"></span> Reversed
+        </a>
     </div>
 {% endblock %}
 
@@ -28,7 +40,7 @@
                         <div class="text-center">
                             <strong>{{ rack|hyperlinked_object }}</strong>
                             {% if rack.role %}
-                                <br /><small class="label" style="color: {{ rack.role.color|fgcolor }}; background-color: #{{ rack.role.color }}">{{ rack.role }}</small>
+                                <br /><small class="badge" style="color: {{ rack.role.color|fgcolor }}; background-color: #{{ rack.role.color }}">{{ rack.role }}</small>
                             {% endif %}
                             {% if rack.facility_id %}
                                 <br /><small class="text-secondary">{{ rack.facility_id }}</small>