webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

vpnmain.cgi: Fix connection status colours

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2024-08-07 15:39:40 +02:00
parent 4f0f0a9d2a
commit 3cfe40fa65
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
html/cgi-bin/vpnmain.cgi
View File

@@ -3402,21 +3402,21 @@ END
foreach my $line (@status) { foreach my $line (@status) {
if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) || if (($line =~ /\"$confighash{$key}[1]\".*IPsec SA established/) ||
($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) { ($line =~ /$confighash{$key}[1]\{.*INSTALLED/)) {
$col1="bgcolor='${Header::colourgreen}'"; $col1="class='status is-connected'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsopen'}</font></b>"; $active = "$Lang::tr{'capsopen'}";
last; last;
} elsif ($line =~ /$confighash{$key}[1]\[.*CONNECTING/) { } elsif ($line =~ /$confighash{$key}[1]\[.*CONNECTING/) {
$col1="bgcolor='${Header::colourorange}'"; $col1="class='status is-connecting'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn connecting'}</font></b>"; $active = "$Lang::tr{'vpn connecting'}";
} elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) { } elsif ($line =~ /$confighash{$key}[1]\{.*ROUTED/) {
$col1="bgcolor='${Header::colourorange}'"; $col1="class='status is-connecting'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'vpn on-demand'}</font></b>"; $active = "$Lang::tr{'vpn on-demand'}";
} }
} }
# move to blue if really down # move to blue if really down
if ($confighash{$key}[0] eq 'off' && $col1 =~ /${Header::colourred}/ ) { if ($confighash{$key}[0] eq 'off' && $col1 =~ /${Header::colourred}/ ) {
$col1="bgcolor='${Header::colourblue}'"; $col1="class='status is-disabled'";
$active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>"; $active = "$Lang::tr{'capsclosed'}";
} }
print <<END print <<END
<td align='center' $col1>$active</td> <td align='center' $col1>$active</td>

11
html/html/themes/ipfire/include/css/style.css
View File

@@ -5,6 +5,8 @@
--color-red-invert : #ffffff; --color-red-invert : #ffffff;
--color-blue : #333399; --color-blue : #333399;
--color-blue-invert : #ffffff; --color-blue-invert : #ffffff;
--color-orange : #ff9933;
--color-orange-invert : #ffffff;
--color-grey : #d6d6d6; --color-grey : #d6d6d6;
--color-light-grey : #f0f0f0; --color-light-grey : #f0f0f0;
@@ -385,7 +387,7 @@ table {
font-weight: bold; font-weight: bold;
} }
.tbl .status.is-running { .tbl .status.is-running, .tbl .status.is-connected {
background-color: var(--color-green); background-color: var(--color-green);
color: var(--color-green-invert); color: var(--color-green-invert);
} }
@@ -397,12 +399,17 @@ table {
width: 33%; width: 33%;
} }
.tbl .status.is-connecting {
background-color: var(--color-orange);
color: var(--color-orange-invert);
}
.tbl .status.is-vulnerable { .tbl .status.is-vulnerable {
background-color: var(--color-red); background-color: var(--color-red);
color: var(--color-red-invert); color: var(--color-red-invert);
} }
.tbl .status.is-mitigation { .tbl .status.is-disabled, .tbl .status.is-mitigation {
background-color: var(--color-blue); background-color: var(--color-blue);
color: var(--color-blue-invert); color: var(--color-blue-invert);
} }