webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

index.cgi: Improve the warning box

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2024-08-21 15:47:08 +02:00
parent 590dcf8703
commit cc0304b7bd
15 changed files with 70 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
config/cfgroot/header.pl
View File

@@ -405,6 +405,26 @@ sub errorbox($) {
&closebox();
}
sub warningbox($) {
my @warnings = grep { $_ ne "" } @_;
# Do nothing if there are no errors
return unless (@warnings);
# Open a new box
&openbox('100%', 'left', $Lang::tr{'warning'}, "is-warning");
# Print all warning messages
print "<ul>\n";
foreach my $warning (@warnings) {
print "<li>$warning</li>\n";
}
print "</ul>\n";
# Close the box again
&closebox();
}
sub graph($) {
my $title = shift;

1
doc/language_issues.de
View File

@@ -113,6 +113,7 @@ WARNING: translation string unused: age ssecond
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
WARNING: translation string unused: all services
WARNING: translation string unused: all updates installed
WARNING: translation string unused: allmsg
WARNING: translation string unused: alt information

2
doc/language_issues.en
View File

@@ -313,7 +313,6 @@ WARNING: untranslated string: aliases = Aliases
WARNING: untranslated string: aliases default interface = - Default Interface -
WARNING: untranslated string: aliases not active = Aliases will not be active unless your RED interface is STATIC
WARNING: untranslated string: all = All
WARNING: untranslated string: all services = All Services
WARNING: untranslated string: alt dialup = Dialup
WARNING: untranslated string: alt home = Home
WARNING: untranslated string: alt logs = Logs
@@ -2148,6 +2147,7 @@ WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
WARNING: untranslated string: waiting to synchronize clock = Waiting to synchronize clock
WARNING: untranslated string: warning = Warning
WARNING: untranslated string: warning messages = Warning messages
WARNING: untranslated string: was deleted = was deleted
WARNING: untranslated string: web hits = Total number of websites matching selected criteria for

2
doc/language_issues.es
View File

@@ -115,6 +115,7 @@ WARNING: translation string unused: age ssecond
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
WARNING: translation string unused: all services
WARNING: translation string unused: all updates installed
WARNING: translation string unused: allmsg
WARNING: translation string unused: alt information
@@ -1053,6 +1054,7 @@ WARNING: untranslated string: spec rstack overflow = Speculative Return Stack Ov
WARNING: untranslated string: system time = System Time (as of last page load)
WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
WARNING: untranslated string: warning = Warning
WARNING: untranslated string: wio = unknown string
WARNING: untranslated string: wio checked = unknown string
WARNING: untranslated string: wio cron = unknown string

2
doc/language_issues.fr
View File

@@ -118,6 +118,7 @@ WARNING: translation string unused: age ssecond
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
WARNING: translation string unused: all services
WARNING: translation string unused: all updates installed
WARNING: translation string unused: allmsg
WARNING: translation string unused: alt information
@@ -991,6 +992,7 @@ WARNING: untranslated string: routing config added = unknown string
WARNING: untranslated string: routing config changed = unknown string
WARNING: untranslated string: system time = System Time (as of last page load)
WARNING: untranslated string: timeformat = %Y-%m-%d at %H:%M:%S %Z
WARNING: untranslated string: warning = Warning
WARNING: untranslated string: wio = unknown string
WARNING: untranslated string: wio checked = unknown string
WARNING: untranslated string: wio cron = unknown string

2
doc/language_issues.it
View File

@@ -88,6 +88,7 @@ WARNING: translation string unused: age ssecond
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
WARNING: translation string unused: all services
WARNING: translation string unused: all updates installed
WARNING: translation string unused: allmsg
WARNING: translation string unused: alt information
@@ -1341,6 +1342,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
WARNING: untranslated string: warning = Warning
WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wio = unknown string

2
doc/language_issues.nl
View File

@@ -88,6 +88,7 @@ WARNING: translation string unused: age ssecond
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
WARNING: translation string unused: all services
WARNING: translation string unused: all updates installed
WARNING: translation string unused: allmsg
WARNING: translation string unused: alt information
@@ -1364,6 +1365,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
WARNING: untranslated string: warning = Warning
WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wio = unknown string

2
doc/language_issues.pl
View File

@@ -83,6 +83,7 @@ WARNING: translation string unused: again
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
WARNING: translation string unused: all services
WARNING: translation string unused: all updates installed
WARNING: translation string unused: allmsg
WARNING: translation string unused: alt information
@@ -1605,6 +1606,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
WARNING: untranslated string: warning = Warning
WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wio = unknown string

2
doc/language_issues.ru
View File

@@ -83,6 +83,7 @@ WARNING: translation string unused: again
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
WARNING: translation string unused: all services
WARNING: translation string unused: all updates installed
WARNING: translation string unused: allmsg
WARNING: translation string unused: alt information
@@ -1598,6 +1599,7 @@ WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vpn weak = Weak
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
WARNING: untranslated string: warning = Warning
WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wio = unknown string

2
doc/language_issues.tr
View File

@@ -110,6 +110,7 @@ WARNING: translation string unused: age ssecond
WARNING: translation string unused: alcatelusb help
WARNING: translation string unused: alcatelusb upload
WARNING: translation string unused: all interfaces
WARNING: translation string unused: all services
WARNING: translation string unused: all updates installed
WARNING: translation string unused: allmsg
WARNING: translation string unused: alt information
@@ -1225,6 +1226,7 @@ WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeNam
WARNING: untranslated string: vpn wait = WAITING
WARNING: untranslated string: vulnerability = Vulnerability
WARNING: untranslated string: vulnerable = Vulnerable
WARNING: untranslated string: warning = Warning
WARNING: untranslated string: whois results from = WHOIS results from
WARNING: untranslated string: winbind daemon = Winbind Daemon
WARNING: untranslated string: wio = unknown string

7
doc/language_missings
View File

@@ -155,6 +155,7 @@
< system time
< timeformat
< transport mode does not support vti
< warning
< wireguard
< wlanap
< wlanap psk
@@ -183,6 +184,7 @@
< system time
< timeformat
< upload fcdsl.o
< warning
< wireguard
< wlanap psk
< wlanap wireless mode
@@ -664,6 +666,7 @@
< vpn weak
< vulnerability
< vulnerable
< warning
< Weekly
< whois results from
< winbind daemon
@@ -1224,6 +1227,7 @@
< vpn weak
< vulnerability
< vulnerable
< warning
< Weekly
< whois results from
< winbind daemon
@@ -2199,6 +2203,7 @@
< vpn weak
< vulnerability
< vulnerable
< warning
< Weekly
< whois results from
< winbind daemon
@@ -3210,6 +3215,7 @@
< vpn weak
< vulnerability
< vulnerable
< warning
< week-graph
< Weekly
< whois results from
@@ -3600,6 +3606,7 @@
< vpn wait
< vulnerability
< vulnerable
< warning
< Weekly
< whois results from
< winbind daemon

14
html/cgi-bin/index.cgi
View File

@@ -588,19 +588,7 @@ if ( `/bin/grep -c "reiserfs" /proc/self/mounts` > 0 ) {
}
# Show any warnings
if (@warnings) {
&Header::opensection();
print "<ul class=\"notes\">\n";
foreach my $warning (@warnings) {
print "<li class=\"is-warning\">$warning</li>\n";
}
print "</ul>\n";
&Header::closesection();
}
&Header::warningbox(@warnings);
&Header::closebigbox();
&Header::closepage();

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

@@ -7,7 +7,7 @@
--color-blue-invert : #ffffff;
--color-orange : #ff9933;
--color-orange-invert : #ffffff;
--color-yellow : #ffd700;
--color-yellow : #ffbe00;
--color-yellow-invert : #ffffff;
--color-black : #363636;
--color-black-invert : #ffffff;
@@ -205,15 +205,37 @@ section.is-error {
border: 1px solid var(--color-red);
}
section.is-error ul {
section.is-warning {
color: var(--color-yellow);
border: 1px solid var(--color-yellow);
}
section.is-error a, section.is-warning a {
color: inherit;
}
section.is-error ul, section.is-warning ul {
padding: 0;
margin-bottom: 0 !important;
}
section.is-error ul li, section.is-warning ul li {
list-style-type: none
}
section .title {
margin-bottom: 1rem;
border-bottom: 1px solid var(--color-grey);
}
section.is-error .title {
border-bottom: 1px solid var(--color-red);
}
section.is-warning .title {
border-bottom: 1px solid var(--color-yellow);
}
#main_inner {
padding-bottom: 1.5em;
}
@@ -541,16 +563,6 @@ table.form tr.action td form {
color: var(--color-black-invert);
}
/* Notes */
.notes .is-warning {
color: var(--color-yellow);
}
.notes a {
color: inherit;
}
table.fw-nat tbody tr td {
height: 2.25em;
}

1
langs/de/cgi-bin/de.pl
View File

@@ -2922,6 +2922,7 @@
'vulnerable' => 'Verwundbar',
'waiting to synchronize clock' => 'Bitte warten, die Uhr wird synchronisiert',
'warn when traffic reaches' => 'Warnen wenn Traffic x % erreicht',
'warning' => 'Warning',
'warning messages' => 'Warnhinweise',
'was deleted' => 'wurde gelöscht',
'web hits' => 'Gesamtanzahl der Websites zum ausgewählten Kriterium',

1
langs/en/cgi-bin/en.pl
View File

@@ -3006,6 +3006,7 @@
'vulnerable' => 'Vulnerable',
'waiting to synchronize clock' => 'Waiting to synchronize clock',
'warn when traffic reaches' => 'Warn when traffic reaches x %',
'warning' => 'Warning',
'warning messages' => 'Warning messages',
'was deleted' => 'was deleted',
'web hits' => 'Total number of websites matching selected criteria for',