From fcbc8a709f297838e763310f4dccc81cf53b7bc4 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Mon, 23 Dec 2024 12:37:17 +0100 Subject: [PATCH 1/5] Add possibility to assign groups to newly added entries from the beginning Signed-off-by: DL6ER --- groups-clients.lp | 6 +++++- groups-domains.lp | 12 ++++++++++-- groups-lists.lp | 6 +++++- scripts/js/groups-clients.js | 6 ++++-- scripts/js/groups-common.js | 38 ++++++++++++++++++++++++++++++++++-- scripts/js/groups-domains.js | 7 ++++++- scripts/js/groups-lists.js | 4 +++- 7 files changed, 69 insertions(+), 10 deletions(-) diff --git a/groups-clients.lp b/groups-clients.lp index 2ffbea9b3..d01e2b9ef 100644 --- a/groups-clients.lp +++ b/groups-clients.lp @@ -34,10 +34,14 @@ mg.include('scripts/lua/header_authenticated.lp','r') -
+
+
+ +
+
diff --git a/groups-domains.lp b/groups-domains.lp index 59d460f1b..e9cafe3be 100644 --- a/groups-domains.lp +++ b/groups-domains.lp @@ -46,10 +46,14 @@ mg.include('scripts/lua/header_authenticated.lp','r')
-
+
+
+ +
+
@@ -75,10 +79,14 @@ mg.include('scripts/lua/header_authenticated.lp','r') regular expressions tutorial.
-
+
+
+ +
+
diff --git a/groups-lists.lp b/groups-lists.lp index 4803e37f4..364bf4421 100644 --- a/groups-lists.lp +++ b/groups-lists.lp @@ -32,10 +32,14 @@ mg.include('scripts/lua/header_authenticated.lp','r') -
+
+
+ +
+
-
+
-
+
-
+
diff --git a/groups-domains.lp b/groups-domains.lp index e9cafe3be..c1aa01fa9 100644 --- a/groups-domains.lp +++ b/groups-domains.lp @@ -46,13 +46,13 @@ mg.include('scripts/lua/header_authenticated.lp','r')
-
+
-
+
-
+
@@ -79,13 +79,13 @@ mg.include('scripts/lua/header_authenticated.lp','r') regular expressions tutorial.
-
+
-
+
-
+
diff --git a/groups-lists.lp b/groups-lists.lp index 364bf4421..59e5a402f 100644 --- a/groups-lists.lp +++ b/groups-lists.lp @@ -32,13 +32,13 @@ mg.include('scripts/lua/header_authenticated.lp','r') -
+
-
+
-
+
From 46092a4ba37eac5b978da7ec4a34fed2cb8503eb Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Tue, 24 Dec 2024 17:48:39 -0300 Subject: [PATCH 4/5] Adjust style for the "group assignment" control Signed-off-by: RD WebDesign --- style/themes/default-dark.css | 20 ++++++++++++++++++++ style/themes/default-darker.css | 11 ++++++++--- style/themes/default-light.css | 10 ++++++++++ style/themes/high-contrast-dark.css | 16 ++++++++++++++++ style/themes/high-contrast.css | 10 ++++++++++ style/themes/lcars.css | 22 ++++++++++++++++++---- 6 files changed, 82 insertions(+), 7 deletions(-) diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css index a67a67915..1f86c0820 100644 --- a/style/themes/default-dark.css +++ b/style/themes/default-dark.css @@ -654,3 +654,23 @@ input[type="password"]::-webkit-caps-lock-indicator { background: none; border-color: rgb(120, 127, 133); } + +/* Group assignment select */ +.bootstrap-select > .dropdown-toggle { + border-radius: 0; + background-color: #353c42; + border-color: #3d444b; +} +.bootstrap-select > .dropdown-toggle:hover, +.bootstrap-select > .dropdown-toggle:focus { + color: #fff; +} +.open > .dropdown-toggle.btn-default, +.open > .dropdown-toggle.btn-default:active { + background-color: #353c42; + color: #bec5cb; + border: 1px solid #3d444b; +} +.open > .dropdown-toggle.btn-default:hover { + color: #fff; +} diff --git a/style/themes/default-darker.css b/style/themes/default-darker.css index b52943979..ae333002f 100644 --- a/style/themes/default-darker.css +++ b/style/themes/default-darker.css @@ -692,8 +692,7 @@ fieldset[disabled] .btn { .btn-default:active, .open > .dropdown-toggle.btn-default { color: rgb(200, 195, 188); - background-color: rgb(38, 41, 43); - background-image: none; + background: rgb(24, 26, 27); border-color: rgb(71, 77, 80); } .btn-default.active.focus, @@ -706,9 +705,15 @@ fieldset[disabled] .btn { .open > .dropdown-toggle.btn-default:focus, .open > .dropdown-toggle.btn-default:hover { color: rgb(200, 195, 188); - background-color: rgb(48, 52, 54); + background: rgb(24, 26, 27); border-color: rgb(80, 87, 91); } + +.bootstrap-select > .dropdown-toggle { + border-radius: 0; + background: rgb(24, 26, 27); +} + .btn-default.disabled.focus, .btn-default.disabled:focus, .btn-default.disabled:hover, diff --git a/style/themes/default-light.css b/style/themes/default-light.css index 0f33e64ac..345e20cc0 100644 --- a/style/themes/default-light.css +++ b/style/themes/default-light.css @@ -311,3 +311,13 @@ select:-webkit-autofill { .page-header { border-color: #ddd; } + +/* Group assignment select */ +.bootstrap-select > .dropdown-toggle { + border-radius: 0; + background-color: #fff; +} +.open > .dropdown-toggle.btn-default, +.open > .dropdown-toggle.btn-default:active { + background-color: #fff; +} diff --git a/style/themes/high-contrast-dark.css b/style/themes/high-contrast-dark.css index 1705f9ba7..0c6422bb2 100644 --- a/style/themes/high-contrast-dark.css +++ b/style/themes/high-contrast-dark.css @@ -985,3 +985,19 @@ td.highlight { animation: none; border-radius: 6px; } + +/* Group assignment select */ +.bootstrap-select > .dropdown-toggle { + border-radius: 0; + background-color: #2d363f; + border: 1px solid #3c4652; +} + +.open > .dropdown-toggle.btn-default:active, +.bootstrap-select > .dropdown-toggle:hover { + color: var(--main-text-color); +} +.bootstrap-select > .dropdown-toggle:focus { + border-color: #3c8dbc; + color: var(--main-text-color); +} diff --git a/style/themes/high-contrast.css b/style/themes/high-contrast.css index df8280594..76fa79c49 100644 --- a/style/themes/high-contrast.css +++ b/style/themes/high-contrast.css @@ -574,3 +574,13 @@ table.dataTable thead th:hover.sorting_desc_disabled::after { animation: none; border-radius: 6px; } + +/* Group assignment select */ +.bootstrap-select > .dropdown-toggle { + border-radius: 0; + background-color: #fff; +} +.bootstrap-select > .dropdown-toggle:hover { + color: #000; + background-color: #eee; +} diff --git a/style/themes/lcars.css b/style/themes/lcars.css index c95761b5c..b4db3627f 100644 --- a/style/themes/lcars.css +++ b/style/themes/lcars.css @@ -287,13 +287,19 @@ div.dataTables_wrapper div.dataTables_length select { border-radius: 8px; } +/* Remove border from group assignment select */ +.form-control:has(.selectpicker) { + border: none; + color: #246; +} + /*** Overwrite chrome's input field auto-filling ***/ input:-webkit-autofill, input:-webkit-autofill:focus, textarea:-webkit-autofill, select:-webkit-autofill { -webkit-text-fill-color: #fff !important; - -webkit-box-shadow: 0 0 0px 1000px #000 inset; + -webkit-box-shadow: 0 0 0 1000px #000 inset; transition: background-color 1s ease-in-out 0s; } @@ -528,15 +534,23 @@ p.login-box-msg, color: #456; } -.bootstrap-select.bs-container .dropdown-menu { +.bootstrap-select.bs-container .dropdown-menu, +.open > .dropdown-menu { border-radius: 12px; border-width: 2px; } -.bootstrap-select.bs-container .dropdown-menu.open { +.bootstrap-select.bs-container .dropdown-menu.open, +.open > .dropdown-menu.open { filter: invert(0.88) hue-rotate(180deg); } +.open > .dropdown-toggle.btn-default, +.open > .dropdown-toggle.btn-default:active { + background-color: #353c42; + color: #bec5cb; +} + /*** Set .dropdown-toggle width to fill the whole table cell ***/ @media screen and (min-width: 661px) and (max-width: 767px), screen and (min-width: 960px) { .bootstrap-select.fit-width { @@ -1163,7 +1177,7 @@ footer a:focus { } .modal-body .overlay { - padding: 0px; + padding: 0; border-radius: 3px; } From 0e3c6804701fee6eb1f998dd94b5341c135caf60 Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Tue, 24 Dec 2024 18:08:02 -0300 Subject: [PATCH 5/5] Fix "Query Log" button color (LCARS theme) Signed-off-by: RD WebDesign --- style/themes/lcars.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/style/themes/lcars.css b/style/themes/lcars.css index b4db3627f..9b0306f42 100644 --- a/style/themes/lcars.css +++ b/style/themes/lcars.css @@ -1161,6 +1161,10 @@ footer a:focus { color: #9ab; } +.btn .box-title { + color: inherit; +} + .box { margin-bottom: 1.8em; background: #111;