From 1e0f6be4ab19a72d259a35501925205322d9418e Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Sat, 16 Mar 2024 15:41:56 +0200 Subject: [PATCH 1/3] Fix class leak for disabled features in GPL mode --- gray-theme/unauthenticated/gray-theme.css | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/gray-theme/unauthenticated/gray-theme.css b/gray-theme/unauthenticated/gray-theme.css index bdc9e0a1a..2b52509c1 100644 --- a/gray-theme/unauthenticated/gray-theme.css +++ b/gray-theme/unauthenticated/gray-theme.css @@ -715,36 +715,41 @@ body > .mode > b[data-mode="server-manager"] > a > .ff-cloudmin { filter: grayscale(1) contrast(0.1); opacity: 1; } -.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair > .ui_form_label:not([data-pro-disabled="cell"]) > b > label > a, -.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_heads b, + +.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_label:not([data-pro-disabled="cell"]) > b > label > a, +.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_heads b, [data-pro-disabled="cell"], +[data-pro-disabled="cell"] + .ui_form_value textarea, [data-pro-disabled$="-elem"] { filter:grayscale(1); opacity: .73; } -.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair > .ui_form_value:not([data-pro-disabled="cell"]) > .ui_multi_select .ui_multi_select_heads b { +.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value:not([data-pro-disabled="cell"]) > .ui_multi_select .ui_multi_select_heads b { opacity: .61; } -.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row input[type="button"], -.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row select { +[data-pro-disabled="cell"] + .ui_form_value textarea, +.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row input[type="button"], +.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row select { color: rgba(118, 118, 118, 0.4); pointer-events: none; opacity: 0.8; } -.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row input[type="button"] { +[data-pro-disabled="cell"] + .ui_form_value textarea, +.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row input[type="button"] { opacity: 0.3; } -.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair > .ui_form_value:only-child { +.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value:only-child { color: rgba(18, 18, 18, 0.7); filter: grayscale(1) contrast(0.9); pointer-events: none; } -.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row select { +.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row select { background-color: rgba(239, 239, 239, 0.3); border-color: rgba(118, 118, 118, 0.3); box-shadow: none; } -.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row > td, +[data-pro-disabled="cell"] + .ui_form_value, +.ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row > td, .shrinkwrapper:has([data-pro-disabled="cell"]) ~ .ui_form_end_buttons { cursor: not-allowed; } From 7fc71adeccc8e44f0cb8d8720948a5a2decfd916 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Sat, 16 Mar 2024 18:41:18 +0200 Subject: [PATCH 2/3] Fix not to disable already disabled textfield in GPL mode --- gray-theme/unauthenticated/gray-theme.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/gray-theme/unauthenticated/gray-theme.css b/gray-theme/unauthenticated/gray-theme.css index 2b52509c1..43b93b628 100644 --- a/gray-theme/unauthenticated/gray-theme.css +++ b/gray-theme/unauthenticated/gray-theme.css @@ -719,7 +719,6 @@ body > .mode > b[data-mode="server-manager"] > a > .ff-cloudmin { .ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_label:not([data-pro-disabled="cell"]) > b > label > a, .ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_heads b, [data-pro-disabled="cell"], -[data-pro-disabled="cell"] + .ui_form_value textarea, [data-pro-disabled$="-elem"] { filter:grayscale(1); opacity: .73; @@ -727,14 +726,12 @@ body > .mode > b[data-mode="server-manager"] > a > .ff-cloudmin { .ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value:not([data-pro-disabled="cell"]) > .ui_multi_select .ui_multi_select_heads b { opacity: .61; } -[data-pro-disabled="cell"] + .ui_form_value textarea, .ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row input[type="button"], .ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row select { color: rgba(118, 118, 118, 0.4); pointer-events: none; opacity: 0.8; } -[data-pro-disabled="cell"] + .ui_form_value textarea, .ui_form_pair:has([data-pro-disabled="cell"]) ~ .ui_form_pair:has(hr) ~ .ui_form_pair > .ui_form_value > .ui_multi_select .ui_multi_select_row input[type="button"] { opacity: 0.3; } From 44f6361c5cff010e123199e306270c9b7afc6e3e Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Mon, 18 Mar 2024 18:58:45 +0200 Subject: [PATCH 3/3] Add Ubuntu 24.04 support [build] --- os_list.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/os_list.txt b/os_list.txt index 09c9b80e6..d4b3c81a8 100644 --- a/os_list.txt +++ b/os_list.txt @@ -125,6 +125,7 @@ Ubuntu Linux $1 debian-linux 9.0 $os_release =~ /Ubuntu\s+(18\.[0-9\.]+)/ || $ Ubuntu Linux $1 debian-linux 11.0 $os_release =~ /Ubuntu\s+(20\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(20\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+focal/i Ubuntu Linux $1 debian-linux 12.0 $os_release =~ /Ubuntu\s+(21\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(21\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+(hirsute|impish)/i Ubuntu Linux $1 debian-linux 13.0 $os_release =~ /Ubuntu\s+(22\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(22\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+jammy/i +Ubuntu Linux $1 debian-linux 14.0 $os_release =~ /Ubuntu\s+(24\.[0-9\.]+)/ || $etc_issue =~ /Ubuntu.*\s(24\.[0-9\.]+)\s/i || $etc_issue =~ /Ubuntu\s+noble/i Ubuntu Linux $1 debian-linux 3.1 $etc_issue =~ /Ubuntu.*\s([0-9\.]+)\s/i Mepis Linux $1 debian-linux $1 $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /([0-9\.]+)/ Mepis Linux $1 debian-linux 4.0 $etc_issue =~ /MEPIS/ && `cat /etc/debian_version 2>/dev/null` =~ /(stable)/