From 4ebcdd2b8f740acb74d6de28793986928f216cdf Mon Sep 17 00:00:00 2001
From: Arthur Hanson
Date: Thu, 3 Nov 2022 06:29:45 -0700
Subject: [PATCH 01/25] 8072 move js code from template to static file (#10824)
---
netbox/netbox/settings.py | 1 +
netbox/project-static/js/setmode.js | 72 +++++++++++++++++++++++++++
netbox/templates/base/base.html | 77 +++--------------------------
3 files changed, 80 insertions(+), 70 deletions(-)
create mode 100644 netbox/project-static/js/setmode.js
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index e5a8b7dbd..c941f0672 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -407,6 +407,7 @@ STATIC_URL = f'/{BASE_PATH}static/'
STATICFILES_DIRS = (
os.path.join(BASE_DIR, 'project-static', 'dist'),
os.path.join(BASE_DIR, 'project-static', 'img'),
+ os.path.join(BASE_DIR, 'project-static', 'js'),
('docs', os.path.join(BASE_DIR, 'project-static', 'docs')), # Prefix with /docs
)
diff --git a/netbox/project-static/js/setmode.js b/netbox/project-static/js/setmode.js
new file mode 100644
index 000000000..8441a542f
--- /dev/null
+++ b/netbox/project-static/js/setmode.js
@@ -0,0 +1,72 @@
+/**
+ * Set the color mode on the `` element and in local storage.
+ *
+ * @param mode {"dark" | "light"} NetBox Color Mode.
+ * @param inferred {boolean} Value is inferred from browser/system preference.
+ */
+function setMode(mode, inferred) {
+ document.documentElement.setAttribute("data-netbox-color-mode", mode);
+ localStorage.setItem("netbox-color-mode", mode);
+ localStorage.setItem("netbox-color-mode-inferred", inferred);
+}
+/**
+ * Determine the best initial color mode to use prior to rendering.
+ */
+function initMode() {
+ try {
+ // Browser prefers dark color scheme.
+ var preferDark = window.matchMedia("(prefers-color-scheme: dark)").matches;
+ // Browser prefers light color scheme.
+ var preferLight = window.matchMedia("(prefers-color-scheme: light)").matches;
+ // Client NetBox color-mode override.
+ var clientMode = localStorage.getItem("netbox-color-mode");
+ // NetBox server-rendered value.
+ var serverMode = document.documentElement.getAttribute("data-netbox-color-mode");
+ // Color mode is inferred from browser/system preference and not deterministically set by
+ // the client or server.
+ var inferred = JSON.parse(localStorage.getItem("netbox-color-mode-inferred"));
+
+ if (inferred === true && (serverMode === "light" || serverMode === "dark")) {
+ // The color mode was previously inferred from browser/system preference, but
+ // the server now has a value, so we should use the server's value.
+ return setMode(serverMode, false);
+ }
+ if (clientMode === null && (serverMode === "light" || serverMode === "dark")) {
+ // If the client mode is not set but the server mode is, use the server mode.
+ return setMode(serverMode, false);
+ }
+ if (clientMode !== null && serverMode === "unset") {
+ // The color mode has been set, deterministically or otherwise, and the server
+ // has no preference or has not been set. Use the client mode, but allow it to
+ /// be overridden by the server if/when a server value exists.
+ return setMode(clientMode, true);
+ }
+ if (
+ clientMode !== null &&
+ (serverMode === "light" || serverMode === "dark") &&
+ clientMode !== serverMode
+ ) {
+ // If the client mode is set and is different than the server mode (which is also set),
+ // use the client mode over the server mode, as it should be more recent.
+ return setMode(clientMode, false);
+ }
+ if (clientMode === serverMode) {
+ // If the client and server modes match, use that value.
+ return setMode(clientMode, false);
+ }
+ if (preferDark && serverMode === "unset") {
+ // If the server mode is not set but the browser prefers dark mode, use dark mode, but
+ // allow it to be overridden by an explicit preference.
+ return setMode("dark", true);
+ }
+ if (preferLight && serverMode === "unset") {
+ // If the server mode is not set but the browser prefers light mode, use light mode,
+ // but allow it to be overridden by an explicit preference.
+ return setMode("light", true);
+ }
+ } catch (error) {
+ // In the event of an error, log it to the console and set the mode to light mode.
+ console.error(error);
+ }
+ return setMode("light", true);
+};
diff --git a/netbox/templates/base/base.html b/netbox/templates/base/base.html
index 8ba47dde3..138a92b6d 100644
--- a/netbox/templates/base/base.html
+++ b/netbox/templates/base/base.html
@@ -26,78 +26,15 @@
{# Page title #}
{% block title %}Home{% endblock %} | NetBox
+
+
From 271d524687728f803f8a55c918f77f87a93fed8f Mon Sep 17 00:00:00 2001
From: Arthur
Date: Wed, 2 Nov 2022 16:52:46 -0700
Subject: [PATCH 02/25] 10709 add AzureAD Tenant Oauth2
---
netbox/netbox/authentication.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/netbox/netbox/authentication.py b/netbox/netbox/authentication.py
index a7e56e279..89d71b815 100644
--- a/netbox/netbox/authentication.py
+++ b/netbox/netbox/authentication.py
@@ -24,6 +24,7 @@ AUTH_BACKEND_ATTRS = {
'azuread-oauth2': ('Microsoft Azure AD', 'microsoft'),
'azuread-b2c-oauth2': ('Microsoft Azure AD', 'microsoft'),
'azuread-tenant-oauth2': ('Microsoft Azure AD', 'microsoft'),
+ 'azuread-v2-tenant-oauth2': ('Microsoft Azure AD', 'microsoft'),
'bitbucket': ('BitBucket', 'bitbucket'),
'bitbucket-oauth2': ('BitBucket', 'bitbucket'),
'digitalocean': ('DigitalOcean', 'digital-ocean'),
From 43da786016f5bfb1f58026d620106fc24aa38ecb Mon Sep 17 00:00:00 2001
From: Arthur
Date: Fri, 4 Nov 2022 11:00:35 -0700
Subject: [PATCH 03/25] 10829 fix top edit selected button
---
netbox/templates/generic/object_list.html | 99 ++++++++++++-----------
1 file changed, 50 insertions(+), 49 deletions(-)
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 60eba6097..272c1598e 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -67,64 +67,65 @@ Context:
{% applied_filters filter_form request.GET %}
{% endif %}
- {# "Select all" form #}
- {% if table.paginator.num_pages > 1 %}
-