From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 7 Aug 2024 13:45:24 +0000 (+0200)
Subject: ovpnmain.cgi: Fix connection status colours
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=21cef199759a75bfe0d9ea26d7d3f6480fcf126a;p=people%2Fmfischer%2Fipfire-2.x.git

ovpnmain.cgi: Fix connection status colours

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 5cf2f5eab..b89fe432d 100755
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -5462,12 +5462,12 @@ END
 	print "</td>";
 	print "<td align='center' nowrap='nowrap' $col>" . $Lang::tr{"$confighash{$key}[3]"} . " (" . $Lang::tr{"$confighash{$key}[4]"} . ")</td>";
 	print "<td align='center' $col>$confighash{$key}[25]</td>";
-	$col1="bgcolor='${Header::colourred}'";
-	my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
+	$col1="class='status is-disconnected'";
+	my $active = "$Lang::tr{'capsclosed'}";
 
 	if ($confighash{$key}[0] eq 'off') {
-		$col1="bgcolor='${Header::colourblue}'";
-		$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>";
+		$col1="class='status is-disabled'";
+		$active = "$Lang::tr{'capsclosed'}";
 	} else {
 
 ###
@@ -5498,11 +5498,11 @@ END
 ####
 
 		if (($tustate[1] eq 'CONNECTED') || ($tustate[1] eq 'WAIT')) {
-			$col1="bgcolor='${Header::colourgreen}'";
-			$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
+			$col1="class='status is-connected'";
+			$active = "$Lang::tr{'capsopen'}";
 		}else {
-			$col1="bgcolor='${Header::colourred}'";
-			$active = "<b><font color='#FFFFFF'>$tustate[1]</font></b>";
+			$col1="class='status is-disconnected'";
+			$active = "$tustate[1]";
 		}
            }
            }
@@ -5518,8 +5518,8 @@ END
 					$cn = $match[1];
 				}
 				if ($cn eq "$confighash{$key}[2]") {
-					$col1="bgcolor='${Header::colourgreen}'";
-					$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>";
+					$col1="class='status is-connected'";
+					$active = "$Lang::tr{'capsopen'}";
 				}
 			}
 		}
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index 5b1f84b3e..2d4338892 100644
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -392,7 +392,7 @@ table {
 	color: var(--color-green-invert);
 }
 
-.tbl .status.is-stopped {
+.tbl .status.is-stopped, .tbl .status.is-disconnected {
 	background-color: var(--color-red);
 	color: var(--color-red-invert);