diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index bbb399dd3..0129c218c 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -2956,7 +2956,6 @@ class InventoryItemBulkDeleteView(generic.BulkDeleteView): queryset = InventoryItem.objects.all() filterset = filtersets.InventoryItemFilterSet table = tables.InventoryItemTable - template_name = 'dcim/inventoryitem_bulk_delete.html' @register_model_view(InventoryItem, 'children') diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index 5fc874a09..194e79351 100644 Binary files a/netbox/project-static/dist/netbox.css and b/netbox/project-static/dist/netbox.css differ diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index fcf2ddfa3..5146f855f 100644 Binary files a/netbox/project-static/dist/netbox.js and b/netbox/project-static/dist/netbox.js differ diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map index 64093d66b..c28525be9 100644 Binary files a/netbox/project-static/dist/netbox.js.map and b/netbox/project-static/dist/netbox.js.map differ diff --git a/netbox/project-static/src/search.ts b/netbox/project-static/src/search.ts index e3bdc18dc..8275b126e 100644 --- a/netbox/project-static/src/search.ts +++ b/netbox/project-static/src/search.ts @@ -7,12 +7,12 @@ import { isTruthy } from './util'; */ function quickSearchEventHandler(event: Event): void { const quicksearch = event.currentTarget as HTMLInputElement; - const inputgroup = quicksearch.parentElement as HTMLDivElement; - if (isTruthy(inputgroup)) { + const clearbtn = document.getElementById("quicksearch_clear") as HTMLAnchorElement; + if (isTruthy(clearbtn)) { if (quicksearch.value === "") { - inputgroup.classList.add("hide-last-child"); + clearbtn.classList.add("d-none"); } else { - inputgroup.classList.remove("hide-last-child"); + clearbtn.classList.remove("d-none"); } } } @@ -22,7 +22,7 @@ function quickSearchEventHandler(event: Event): void { */ export function initQuickSearch(): void { const quicksearch = document.getElementById("quicksearch") as HTMLInputElement; - const clearbtn = document.getElementById("quicksearch_clear") as HTMLButtonElement; + const clearbtn = document.getElementById("quicksearch_clear") as HTMLAnchorElement; if (isTruthy(quicksearch)) { quicksearch.addEventListener("keyup", quickSearchEventHandler, { passive: true diff --git a/netbox/project-static/styles/_variables.scss b/netbox/project-static/styles/_variables.scss index f2e2f9ed4..6ac3c4896 100644 --- a/netbox/project-static/styles/_variables.scss +++ b/netbox/project-static/styles/_variables.scss @@ -18,3 +18,6 @@ $table-cell-padding-y: 0.5rem; // Fix Tabler bug #1694 in 1.0.0-beta20 $hover-bg: rgba(var(--tblr-secondary-rgb), 0.08); + +// Ensure active nav-pill has a background color in dark mode +$nav-pills-link-active-bg: rgba(var(--tblr-secondary-rgb), 0.15); diff --git a/netbox/project-static/styles/custom/_markdown.scss b/netbox/project-static/styles/custom/_markdown.scss new file mode 100644 index 000000000..08de23581 --- /dev/null +++ b/netbox/project-static/styles/custom/_markdown.scss @@ -0,0 +1,38 @@ +// Rendered Markdown +.rendered-markdown { + + table { + width: 100%; + + // Apply a border + th { + border-bottom: 2px solid #dddddd; + padding: 8px; + } + td { + border-top: 1px solid #dddddd; + padding: 8px; + } + + // Map "align" attr of column headings + th[align="left"] { + text-align: left; + } + th[align="center"] { + text-align: center; + } + th[align="right"] { + text-align: right; + } + } + +} + +// Markdown preview +.markdown-widget { + .preview { + border: 1px solid $border-color; + border-radius: $border-radius; + min-height: 200px; + } +} diff --git a/netbox/project-static/styles/custom/_misc.scss b/netbox/project-static/styles/custom/_misc.scss index 42ea9a8c6..ebf66d547 100644 --- a/netbox/project-static/styles/custom/_misc.scss +++ b/netbox/project-static/styles/custom/_misc.scss @@ -10,36 +10,6 @@ span.color-label { border-radius: $border-radius; } -// Rendered Markdown -.rendered-markdown { - - table { - width: 100%; - - // Apply a border - th { - border-bottom: 2px solid #dddddd; - padding: 8px; - } - td { - border-top: 1px solid #dddddd; - padding: 8px; - } - - // Map "align" attr of column headings - th[align="left"] { - text-align: left; - } - th[align="center"] { - text-align: center; - } - th[align="right"] { - text-align: right; - } - } - -} - // Object hierarchy depth indicators .record-depth { display: inline; diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss index f86c4433f..17c6d88c9 100644 --- a/netbox/project-static/styles/netbox.scss +++ b/netbox/project-static/styles/netbox.scss @@ -19,4 +19,5 @@ // Custom styling @import 'custom/code'; +@import 'custom/markdown'; @import 'custom/misc'; diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index 56c2eb6e4..18198cb72 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -15,7 +15,7 @@ {% with providernetwork_tab_active=form.initial.provider_network %}
-
{% if request.user.is_authenticated and table_modal %} diff --git a/netbox/templates/inc/user_menu.html b/netbox/templates/inc/user_menu.html index e5c560b11..5beca96dc 100644 --- a/netbox/templates/inc/user_menu.html +++ b/netbox/templates/inc/user_menu.html @@ -33,7 +33,7 @@
{% else %} -
+
{% trans "Log In" %} diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html index 93045761f..d9157f5ef 100644 --- a/netbox/templates/ipam/ipaddress_edit.html +++ b/netbox/templates/ipam/ipaddress_edit.html @@ -36,7 +36,7 @@
-
    +
{# SSO login #} {% if auth_backends %} -
or
+
{% trans "Or" context "Denotes an alternative option" %}
-
{% trans "Or use a single sign-on (SSO) provider" %}:
- {% for backend in auth_backends %} -
- {% if backend.icon_name %}{% endif %} - {{ backend.display_name }} -
- {% endfor %} +
+ {% for backend in auth_backends %} +
+ + {% if backend.icon_name %}{% endif %} + {{ backend.display_name }} + +
+ {% endfor %} +
{% endif %} diff --git a/netbox/templates/vpn/l2vpntermination_edit.html b/netbox/templates/vpn/l2vpntermination_edit.html index a4bc44d12..5ecae3055 100644 --- a/netbox/templates/vpn/l2vpntermination_edit.html +++ b/netbox/templates/vpn/l2vpntermination_edit.html @@ -9,9 +9,9 @@
{% trans "L2VPN Termination" %}
{% render_field form.l2vpn %} -
+
-
    +
{# Render checkbox labels to the right of the field #} {% elif field|widget_type == 'checkboxinput' %} -
+
{{ field }} + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %}
{# Include a copy-to-clipboard button #} {% elif 'data-clipboard' in field.field.widget.attrs %} @@ -54,7 +57,7 @@ {% endif %} {# Help text #} - {% if field.help_text %} + {% if field.help_text and field|widget_type != 'checkboxinput' %} {{ field.help_text|safe }} {% endif %} diff --git a/netbox/utilities/templates/navigation/menu.html b/netbox/utilities/templates/navigation/menu.html index 6b9c52e7b..6e70edb33 100644 --- a/netbox/utilities/templates/navigation/menu.html +++ b/netbox/utilities/templates/navigation/menu.html @@ -28,7 +28,7 @@ {% if buttons %}
{% for button in buttons %} - + {% endfor %} diff --git a/netbox/utilities/templates/widgets/markdown_input.html b/netbox/utilities/templates/widgets/markdown_input.html index 6d69fe6dc..b56526344 100644 --- a/netbox/utilities/templates/widgets/markdown_input.html +++ b/netbox/utilities/templates/widgets/markdown_input.html @@ -1,23 +1,23 @@ {% load i18n %} -
-
    - - -
-
-
- {% include "django/forms/widgets/textarea.html" %} -
-
-
{% trans "Testing" %}
-
+
+
    + + +
+
+
+ {% include "django/forms/widgets/textarea.html" %}
+
+
+
+