From: Michael Tremer Date: Wed, 10 Apr 2024 12:26:43 +0000 (+0200) Subject: ovpnmain.cgi: Unify the error message box X-Git-Tag: v2.29-core188~10^2~61 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9f3c37ab0c751dc39844549d425e4dfb026d805a;p=ipfire-2.x.git ovpnmain.cgi: Unify the error message box Signed-off-by: Michael Tremer --- diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index 1d1146978c..4b7672efbc 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -368,7 +368,9 @@ sub openbox { my $title = shift; - print "
\n"; + my @classes = ("section", "is-box", @_); + + print "
\n"; # Show the title if ($title) { @@ -383,6 +385,26 @@ sub closebox { print "
"; } +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 "
    \n"; + foreach my $error (@errors) { + print "
  • $error
    • \n"; + } + 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 9227a02fc8..a10102a031 100644 --- 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 7cd36aff37..7ae1a19bbd 100644 --- 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 4b04f49a12..259c3a9c3e 100644 --- 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 b9c7c429e3..41e39f18b5 100644 --- 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 6a6acf00b9..f900bced12 100644 --- 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 5d15b7f58a..dadcbaea2b 100644 --- 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 b4fc5df68a..2f8d0e5014 100644 --- 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 9cb5e2a150..e57d2199cf 100644 --- 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 4f9792a1a0..b5197e1088 100644 --- 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 4f166b440d..ef5c58ff16 100644 --- 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 b89fe432da..72695f892f 100755 --- 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 "$errormessage"; - print " "; - &Header::closebox(); - } + + # Show any errors + &Header::errorbox($errormessage); + &Header::openbox('100%', 'LEFT', "$Lang::tr{'generate root/host certificates'}:"); print < @@ -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 "$errormessage\n"; - print " \n"; - &Header::closebox(); - } - &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'}); + + # Show any errors + &Header::errorbox($errormessage); + + &Header::opensection(); + print < @@ -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 "$errormessage\n"; - print " \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 c935f2ff4a..1602ecd433 100644 --- 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 26c11b2f6a..89bef62f08 100644 --- 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',