Firewall: Language changes, JQuery code cleanup

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 3e7b9a8f460adf3039903e7a0a7187673af41c0c..35fbdc7ff1b65a69a93e0a4b496005db744c0cb3 100755 (executable)
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -1729,9 +1729,9 @@ END
                </div>
 
                <div id="PROTOCOL_ICMP_TYPES">
-                       <table width='30%' border='0' style="float:left;">
+                       <table width='50%' border='0' style="float:left;">
                                <tr>
-                                       <td>$Lang::tr{'fwhost icmptype'}</td>
+                                       <td width='20%'>$Lang::tr{'fwhost icmptype'}</td>
                                        <td colspan='2'>
                                                <select name='ICMP_TYPES' style='min-width:230px;'>
 END

diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 8803ab859c8832afc48ebd21c97d46f74aee618d..cbe325c1d066e61afe0b928a51a76924f868a865 100755 (executable)
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -98,29 +98,15 @@ print<<END;
                // Check if we are dealing with a protocol, that knows ports.
                if (\$.inArray(protocol, PROTOCOLS_WITH_PORTS) >= 0) {
                        \$("#PORT").show();
+                       \$("#PROTOKOLL").hide();
                } else {
                        \$("#PORT").hide();
-               }
-
-               // Handle ICMP.
-               if (protocol === "ICMP") {
                        \$("#PROTOKOLL").show();
-               } else {
-                       \$("#PROTOKOLL").hide();
                }
        };
 
        \$(document).ready(function() {
                var protocol = \$("#protocol").val();
-
-               // Handle ICMP.
-               if (protocol === "ICMP") {
-                       \$("#PROTOKOLL").show();
-                       \$("#PORT").hide();
-               } else {
-                       \$("#PROTOKOLL").hide();
-                       \$("#PORT").show();
-               }
                \$("#protocol").change(update_protocol);
                update_protocol();
        });

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 48ee78b30b81e9e6b534bb492e35072302588901..94a755b9694644640c193d5693b85056d3f25259 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -912,6 +912,7 @@
 'fw settings dropdown' => 'Alle Netzwerke auf Regelerstellungsseite anzeigen',
 'fw settings remark' => 'Anmerkungen in Regeltabelle anzeigen',
 'fw settings ruletable' => 'Leere Regeltabellen anzeigen',
+'fwdfw all icmp' => 'Alle ICMP-Typen',
 'fwdfw ACCEPT' => 'Akzeptieren (ACCEPT)',
 'fwdfw DROP' => 'Verwerfen (DROP)',
 'fwdfw MODE1' => 'Alle Pakete verwerfen',
@@ -920,7 +921,6 @@
 'fwdfw action' => 'Aktion',
 'fwdfw additional' => 'Weitere Einstellungen',
 'fwdfw addrule' => 'Regel hinzufügen/ändern:',
-'fwdfw all icmp' => 'Alle ICMP-Typen',
 'fwdfw change' => 'Aktualisieren',
 'fwdfw copy' => 'Kopieren',
 'fwdfw delete' => 'Löschen',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index d76f76c55c8a43c3f9e4fd5e8fdb970cb4a715ad..8d64fa42666f4ad8d21bde5ddb18416d803595b9 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -937,6 +937,7 @@
 'fw settings dropdown' => 'Show all networks on rulecreation site',
 'fw settings remark' => 'Show remarks in ruletable',
 'fw settings ruletable' => 'Show empty ruletables',
+'fwdfw all icmp' => 'All ICMP types',
 'fwdfw ACCEPT' => 'ACCEPT',
 'fwdfw DROP' => 'DROP',
 'fwdfw MODE1' => 'Drop all packets',
@@ -945,7 +946,6 @@
 'fwdfw action' => 'Action',
 'fwdfw additional' => 'Additional settings',
 'fwdfw addrule' => 'Add/Edit rule:',
-'fwdfw all icmp' => 'All ICMP-Types',
 'fwdfw change' => 'Update',
 'fwdfw copy' => 'Copy',
 'fwdfw delete' => 'Delete',