diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 4b7672efb..21c63c51e 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -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 "\n"; + + # Close the box again + &closebox(); +} + sub graph($) { my $title = shift; diff --git a/doc/language_issues.de b/doc/language_issues.de index bdedb13c5..3241f8dea 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -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 diff --git a/doc/language_issues.en b/doc/language_issues.en index e196bd640..a1a1e15dd 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -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 diff --git a/doc/language_issues.es b/doc/language_issues.es index 4ff53b155..42652aea6 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -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 diff --git a/doc/language_issues.fr b/doc/language_issues.fr index c21cb0067..212f2abb7 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -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 diff --git a/doc/language_issues.it b/doc/language_issues.it index 9974b34f3..d5e7b3e89 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -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 diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 452dd5b33..607bfc9f1 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -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 diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 8afc26cab..d6fbb79cf 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -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 diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 3719cd63a..6b7253718 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -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 diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 5d5c13cf8..df9eb58bb 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -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 diff --git a/doc/language_missings b/doc/language_missings index de2217c60..98856b0e8 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -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 diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index ed186cd1f..a3b1589aa 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -588,19 +588,7 @@ if ( `/bin/grep -c "reiserfs" /proc/self/mounts` > 0 ) { } # Show any warnings -if (@warnings) { - &Header::opensection(); - - print "\n"; - - &Header::closesection(); -} +&Header::warningbox(@warnings); &Header::closebigbox(); &Header::closepage(); diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css index 875064399..56e6f26df 100644 --- a/html/html/themes/ipfire/include/css/style.css +++ b/html/html/themes/ipfire/include/css/style.css @@ -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; } diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 3888ef743..a718228bc 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -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', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0004685a7..dca9f1645 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -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',