index.cgi: Improve the warning box

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

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 4b7672efbce5b7e4e9ceffd7210fe6ee98c7618d..21c63c51ede112515293d7a121c68f5b271786e2 100644 (file)
--- 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 "<ul>\n";
+       foreach my $warning (@warnings) {
+               print "<li>$warning</li>\n";
+       }
+       print "</ul>\n";
+
+       # Close the box again
+       &closebox();
+}
+
 sub graph($) {
        my $title = shift;
 

diff --git a/doc/language_issues.de b/doc/language_issues.de
index bdedb13c570d3d62a7390d13ddc5667064ae128a..3241f8dea193aef32ecf0e0c58cb0a7ed034fc10 100644 (file)
--- 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 e196bd640067af2eb3e0b73d82136d0ee8791c24..a1a1e15dd933db4cba0bbef4a08c6040d3714b73 100644 (file)
--- 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 4ff53b1559f75be6e99a215a443f99ab5f67d69c..42652aea695e4a249c5ee4e16ba234054e9ade6b 100644 (file)
--- 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 c21cb0067952c0a283889465723fb00d25a45433..212f2abb7cf0bb35fb4c35a5fa512526c44b972a 100644 (file)
--- 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 9974b34f3127ccc15969b670c73fd57e4ed83c9e..d5e7b3e89819afe28325dd298523e62c1e73b25e 100644 (file)
--- 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 452dd5b3350d137c4aec586c1f84d2c6a2414aa6..607bfc9f1b6289040479b564f2c069617fd24c34 100644 (file)
--- 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 8afc26cab390103dd1ee047411ec69bf78a336fb..d6fbb79cfc837ced4f1dbde96e38f8f0f17e16f1 100644 (file)
--- 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 3719cd63a7471e90df376c32c3164a577bef62d4..6b72537189a16c34a1a9fcc46cfb1e6a80d4166d 100644 (file)
--- 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 5d5c13cf8858051025db58db418c913163313806..df9eb58bb94328dffaf76bdbae4905617e6c15ac 100644 (file)
--- 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 de2217c601ab7b8114841610315d179811e285cf..98856b0e8a0eca0fd04f53ef10e74899222cd332 100644 (file)
--- 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 ed186cd1f0fa10fcfa754e8db469e90c668021d2..a3b1589aa90965e79ad84909ab526c3dea7cbb25 100644 (file)
--- 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 "<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();

diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index 875064399d1283702705df7181a12a23fe4f0109..56e6f26dffca087ef5274e1e00c723090ae5a659 100644 (file)
--- 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 3888ef74398e55e7fddae9d0ff7371fa393d65c9..a718228bc96449847b650baefd49503aa49992f8 100644 (file)
--- 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 0004685a730e15d2eb3ab62ea73f973011fc4d02..dca9f16457e817dc7845305697308f880b085719 100644 (file)
--- 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',