ovpnmain.cgi: Unify the error message box

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

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 1d1146978ccec8a0ab9363d9af2908f8646994d9..4b7672efbce5b7e4e9ceffd7210fe6ee98c7618d 100644 (file)
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -368,7 +368,9 @@ sub openbox {
 
        my $title = shift;
 
-       print "<section class=\"section is-box\">\n";
+       my @classes = ("section", "is-box", @_);
+
+       print "<section class=\"@classes\">\n";
 
        # Show the title
        if ($title) {
@@ -383,6 +385,26 @@ sub closebox {
        print "</section>";
 }
 
+sub errorbox($) {
+       my @errors = grep { $_ ne "" } @_;
+
+       # Do nothing if there are no errors
+       return unless (@errors);
+
+       # Open a new box
+       &openbox('100%', 'left', $Lang::tr{'oops something went wrong'}, "is-error");
+
+       # Print all error messages
+       print "<ul>\n";
+       foreach my $error (@errors) {
+               print "<li>$error</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 9227a02fc8fb5cb7193996cce5c60bfa58cdf31f..a10102a031f555663a1e8d5acd80106753c1cfee 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -964,6 +964,7 @@ WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hos
 WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
 WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
 WARNING: untranslated string: no entries = No entries at the moment.
+WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: optional = Optional
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: pakfire invalid tree = Invalid repository selected

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 7cd36aff37ba2c1ca990c2811d3984bd474abab7..7ae1a19bbd28bf92db81c4c458181353e5ae2838 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1407,6 +1407,7 @@ WARNING: untranslated string: online help en = Online help (in english)
 WARNING: untranslated string: only digits allowed in holdoff field = Only digits allowed in holdoff field
 WARNING: untranslated string: only digits allowed in max retries field = Only digits allowed in max retries field.
 WARNING: untranslated string: only digits allowed in the idle timeout = Only digits allowed in the idle timeout.
+WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: open connections = Open Connections
 WARNING: untranslated string: openssl produced an error = OpenSSL produced an error
 WARNING: untranslated string: openvpn cert expires soon = Expires Soon

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 4b04f49a12ded8cda52ef8e21472cbe16604d21a..259c3a9c3ee5f2d37c0c38ea152a0052fe596cbd 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1023,6 +1023,7 @@ WARNING: untranslated string: load average = Load Average
 WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
 WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
 WARNING: untranslated string: no data = unknown string
+WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: openvpn cert expires soon = Expires Soon
 WARNING: untranslated string: openvpn cert has expired = Expired
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index b9c7c429e39946f6834e02688525eb4e3f81244d..41e39f18b5ae431bd36f36af19824564545a158c 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -971,6 +971,7 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hostile networks total = Total Hostile Networks
 WARNING: untranslated string: ids provider eol = (EOL)
 WARNING: untranslated string: load average = Load Average
+WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
 WARNING: untranslated string: pakfire ago = ago.
 WARNING: untranslated string: processors = Processors

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 6a6acf00b97801b83cc133695bee8b45f83833d5..f900bced12a78a9e6b3ced65e4d014e70690c9a4 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1209,6 +1209,7 @@ WARNING: untranslated string: one hour = One Hour
 WARNING: untranslated string: one month = One Month
 WARNING: untranslated string: one week = One Week
 WARNING: untranslated string: one year = One Year
+WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: open connections = Open Connections
 WARNING: untranslated string: openvpn cert expires soon = Expires Soon
 WARNING: untranslated string: openvpn cert has expired = Expired

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 5d15b7f58ac2f60da600be5a8883cb5e0721524f..dadcbaea2bf574ff095568bfd28736c0910fd216 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1233,6 +1233,7 @@ WARNING: untranslated string: one hour = One Hour
 WARNING: untranslated string: one month = One Month
 WARNING: untranslated string: one week = One Week
 WARNING: untranslated string: one year = One Year
+WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: open connections = Open Connections
 WARNING: untranslated string: openvpn cert expires soon = Expires Soon
 WARNING: untranslated string: openvpn cert has expired = Expired

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index b4fc5df68a907af18234de99eb33527f33096300..2f8d0e50146f8706e227c5c5c56bbbcb6b9b26c9 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1387,6 +1387,7 @@ WARNING: untranslated string: one hour = One Hour
 WARNING: untranslated string: one month = One Month
 WARNING: untranslated string: one week = One Week
 WARNING: untranslated string: one year = One Year
+WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: open connections = Open Connections
 WARNING: untranslated string: openvpn cert expires soon = Expires Soon
 WARNING: untranslated string: openvpn cert has expired = Expired

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 9cb5e2a150064be8ca1e87a7186dba69e07b9cad..e57d2199cf2bc15c8860bc9a49226ca008497890 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1383,6 +1383,7 @@ WARNING: untranslated string: one hour = One Hour
 WARNING: untranslated string: one month = One Month
 WARNING: untranslated string: one week = One Week
 WARNING: untranslated string: one year = One Year
+WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: open connections = Open Connections
 WARNING: untranslated string: openvpn cert expires soon = Expires Soon
 WARNING: untranslated string: openvpn cert has expired = Expired

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 4f9792a1a0d0aa35dccc89366c2b4a36ae19e98a..b5197e10888b4f46322b21a61ea8a7791c4b45ad 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1126,6 +1126,7 @@ WARNING: untranslated string: no data = unknown string
 WARNING: untranslated string: no entries = No entries at the moment.
 WARNING: untranslated string: not affected = Not Affected
 WARNING: untranslated string: not validating = Not validating
+WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
 WARNING: untranslated string: open connections = Open Connections
 WARNING: untranslated string: openvpn cert expires soon = Expires Soon
 WARNING: untranslated string: openvpn cert has expired = Expired

diff --git a/doc/language_missings b/doc/language_missings
index 4f166b440d98b2697543e550ba7590f1e0bb50c2..ef5c58ff167f96a7fb25ff9a14b62c82885ef51b 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -78,6 +78,7 @@
 < no entries
 < notes
 < okay
+< oops something went wrong
 < optional
 < ovpn roadwarrior server
 < quick control
@@ -137,6 +138,7 @@
 < load average
 < log drop hostile in
 < log drop hostile out
+< oops something went wrong
 < openvpn cert expires soon
 < openvpn cert has expired
 < ovpn roadwarrior server
@@ -168,6 +170,7 @@
 < ids provider eol
 < ids unsupported provider
 < load average
+< oops something went wrong
 < ovpn roadwarrior server
 < processors
 < reg_file_data_sampling
@@ -531,6 +534,7 @@
 < one month
 < one week
 < one year
+< oops something went wrong
 < open connections
 < openvpn cert expires soon
 < openvpn cert has expired
@@ -1084,6 +1088,7 @@
 < one month
 < one week
 < one year
+< oops something went wrong
 < open connections
 < openvpn cert expires soon
 < openvpn cert has expired
@@ -1943,6 +1948,7 @@
 < one month
 < one week
 < one year
+< oops something went wrong
 < open connections
 < openvpn cert expires soon
 < openvpn cert has expired
@@ -2953,6 +2959,7 @@
 < one month
 < one week
 < one year
+< oops something went wrong
 < open connections
 < openvpn cert expires soon
 < openvpn cert has expired
@@ -3484,6 +3491,7 @@
 < not affected
 < not validating
 < okay
+< oops something went wrong
 < open connections
 < openvpn cert expires soon
 < openvpn cert has expired

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index b89fe432da681e6238a4833fa9ad3d59e5bb01e3..72695f892f3dfb24c0ff51ce2c6930d87d93e1a8 100755 (executable)
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -1931,12 +1931,10 @@ END
        &Header::showhttpheaders();
        &Header::openpage($Lang::tr{'ovpn'}, 1, '');
        &Header::openbigbox('100%', 'LEFT', '', '');
-       if ($errormessage) {
-           &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
-           print "<class name='base'>$errormessage";
-           print "&nbsp;</class>";
-           &Header::closebox();
-       }
+
+       # Show any errors
+       &Header::errorbox($errormessage);
+
        &Header::openbox('100%', 'LEFT', "$Lang::tr{'generate root/host certificates'}:");
        print <<END;
        <form method='post' enctype='multipart/form-data'>
@@ -2699,13 +2697,12 @@ ADV_ERROR:
     &Header::showhttpheaders();
     &Header::openpage($Lang::tr{'status ovpn'}, 1, '');
     &Header::openbigbox('100%', 'LEFT', '', $errormessage);
-    if ($errormessage) {
-       &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
-       print "<class name='base'>$errormessage\n";
-       print "&nbsp;</class>\n";
-       &Header::closebox();
-    }
-    &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'});
+
+       # Show any errors
+       &Header::errorbox($errormessage);
+
+    &Header::opensection();
+
     print <<END;
     <form method='post' enctype='multipart/form-data'>
 <table width='100%' border=0>
@@ -5205,12 +5202,8 @@ END
     &Header::openpage($Lang::tr{'status ovpn'}, 1, '');
     &Header::openbigbox('100%', 'LEFT', '', $errormessage);
 
-    if ($errormessage) {
-       &Header::openbox('100%', 'LEFT', $Lang::tr{'error messages'});
-       print "<class name='base'>$errormessage\n";
-       print "&nbsp;</class>\n";
-       &Header::closebox();
-    }
+       # Show any errors and warnings
+       &Header::errorbox($errormessage);
 
        if ($cryptoerror) {
                &Header::openbox('100%', 'LEFT', $Lang::tr{'crypto error'});

diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css
index c935f2ff4a4ea4d65db3c970beaf39ea2f1cc940..1602ecd433d6b4fc5e06c1155c6fe66b35fbc8d4 100644 (file)
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -194,6 +194,15 @@ section.is-box {
        border: 1px solid var(--color-grey);
 }
 
+section.is-error {
+       color: var(--color-red);
+       border: 1px solid var(--color-red);
+}
+
+section.is-error ul {
+       margin-bottom: 0 !important;
+}
+
 section .title {
        margin-bottom: 1rem;
        border-bottom: 1px solid var(--color-grey);

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 26c11b2f6a9708343184e9b1273ff4608b170276..89bef62f08fcf118f25b76e44cd7dd668f05ca22 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1953,6 +1953,7 @@
 'only digits allowed in max retries field' => 'Only digits allowed in max retries field.',
 'only digits allowed in the idle timeout' => 'Only digits allowed in the idle timeout.',
 'only red' => 'Only RED',
+'oops something went wrong' => 'Oops, something went wrong...',
 'open connections' => 'Open Connections',
 'open to all' => 'Override external access to ALL',
 'openssl produced an error' => 'OpenSSL produced an error',