From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 9 May 2019 15:16:35 +0000 (+0200)
Subject: zoneconf: Remove red warning
X-Git-Tag: v2.23-core133~145
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=1d6bc7a0dc528eda73e7b4c2a2cd5112c25ad304

zoneconf: Remove red warning

This is a bit shouty and there are various places where we do not
warn about this problem, so this patch makes it more consistent.

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

diff --git a/doc/language_issues.de b/doc/language_issues.de
index be76f6d240..3e8d198974 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -746,7 +746,6 @@ WARNING: translation string unused: zoneconf val native assignment error
 WARNING: translation string unused: zoneconf val ppp assignment error
 WARNING: translation string unused: zoneconf val vlan amount assignment error
 WARNING: translation string unused: zoneconf val vlan tag assignment error
-WARNING: translation string unused: zoneconf warning incorrect configuration
 WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: bytes = unknown string
diff --git a/doc/language_missings b/doc/language_missings
index 0f3c2a7249..0be1accbfc 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -859,7 +859,6 @@
 < zoneconf val ppp assignment error
 < zoneconf val vlan amount assignment error
 < zoneconf val vlan tag assignment error
-< zoneconf warning incorrect configuration
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
@@ -939,7 +938,6 @@
 < zoneconf val ppp assignment error
 < zoneconf val vlan amount assignment error
 < zoneconf val vlan tag assignment error
-< zoneconf warning incorrect configuration
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
 ############################################################################
@@ -1230,7 +1228,6 @@
 < zoneconf val ppp assignment error
 < zoneconf val vlan amount assignment error
 < zoneconf val vlan tag assignment error
-< zoneconf warning incorrect configuration
 ############################################################################
 # Checking cgi-bin translations for language: nl                           #
 ############################################################################
@@ -1579,7 +1576,6 @@
 < zoneconf val ppp assignment error
 < zoneconf val vlan amount assignment error
 < zoneconf val vlan tag assignment error
-< zoneconf warning incorrect configuration
 ############################################################################
 # Checking cgi-bin translations for language: pl                           #
 ############################################################################
@@ -2368,7 +2364,6 @@
 < zoneconf val ppp assignment error
 < zoneconf val vlan amount assignment error
 < zoneconf val vlan tag assignment error
-< zoneconf warning incorrect configuration
 ############################################################################
 # Checking cgi-bin translations for language: ru                           #
 ############################################################################
@@ -3164,7 +3159,6 @@
 < zoneconf val ppp assignment error
 < zoneconf val vlan amount assignment error
 < zoneconf val vlan tag assignment error
-< zoneconf warning incorrect configuration
 ############################################################################
 # Checking cgi-bin translations for language: tr                           #
 ############################################################################
@@ -3260,4 +3254,3 @@
 < zoneconf val ppp assignment error
 < zoneconf val vlan amount assignment error
 < zoneconf val vlan tag assignment error
-< zoneconf warning incorrect configuration
diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi
index e1ece8a925..3b711d5209 100644
--- a/html/cgi-bin/zoneconf.cgi
+++ b/html/cgi-bin/zoneconf.cgi
@@ -88,11 +88,9 @@ my $css = <<END
 	}
 
 	#submit-container {
-		display: flex;
 		width: 100%;
-		justify-content: space-between;
 		padding-top: 20px;
-		text-align: left;
+		text-align: right;
 	}
 
 	#submit-container.input {
@@ -429,11 +427,11 @@ END
 
 print <<END
 	</table>
-		<div id="submit-container">
-			<font color="red">$Lang::tr{"zoneconf warning incorrect configuration"}</font>
-			<input type="submit" name="ACTION" value="$Lang::tr{"save"}">
-		</div>
-	</form>
+
+	<div id="submit-container">
+		<input type="submit" name="ACTION" value="$Lang::tr{"save"}">
+	</div>
+</form>
 END
 ;
 
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 51e8fe58de..305776dd66 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2892,7 +2892,6 @@
 'zoneconf val ppp assignment error' => 'Die Netzwerkkarte, die von RED im PPP-Modus verwendet wird, kann keiner anderen Zone zugeordnet werden.',
 'zoneconf val vlan amount assignment error' => 'Pro Zone kann nur ein VLAN verwendet werden.',
 'zoneconf val vlan tag assignment error' => 'Pro Netzwerkkarte kann derselbe VLAN-Tag nur einmal verwendet werden.',
-'zoneconf warning incorrect configuration' => 'Achtung: Fehlerhafte Einstellungen können dazu führen, dass diese Webseite nicht mehr erreichbar ist!',
 );
 
 #EOF
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 81963f3a07..5667d2004a 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2941,7 +2941,6 @@
 'zoneconf val ppp assignment error' => 'The NIC used for RED in PPP mode cannot be accessed by any other zone.',
 'zoneconf val vlan amount assignment error' => 'A zone cannot have more than one VLAN assigned.',
 'zoneconf val vlan tag assignment error' => 'You cannot use the same VLAN tag more than once per NIC.',
-'zoneconf warning incorrect configuration' => 'Warning: Incorrect configuration may render this web interface unreachable!',
 );
 
 #EOF