GUI: Some simple FW-Log cosmetics

Fixed the 'details'-Button in 'firewalllogcountry.dat' by adding missing
translation string.

Each 'Loggraphs'-Page got a unique title and a new heading for the corresponding
diagram.

Just cosmetics...

Best,
Matthias

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
index 26920b5da0dd97b2831da177cd70c418018f5e27..f2b6048f7930ff7d7aca7262ed270e300be83d70 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
@@ -213,7 +213,7 @@ if ($multifile) {
 my $MODNAME="fwlogs";
 
 &Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log country'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 
@@ -281,7 +281,7 @@ END
 
 &Header::closebox();
 
-&Header::openbox('100%', 'left', 'Firewall Logs');
+&Header::openbox('100%', 'left', $Lang::tr{'firewall graph country'});
 print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
 
 my $red_interface = &General::get_red_interface();
@@ -471,7 +471,7 @@ for($s=0;$s<$lines;$s++)
                print"<input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'>";
                print"<input type='hidden' name='DAY' value='$cgiparams{'DAY'}'>";
                print"<input type='hidden' name='country' value='$key[$s]'>";
-               print"<input type='submit' value='details'></form>";
+               print"<input type='submit' value='$Lang::tr{'details'}'></form>";
        }
        elsif ($key[$s] eq 'unknown') {
                print "unknown";

diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat
index 08ef1c4be1425246971658939cb9c73171b63d45..9e366745de1a2e366fdcb7000224b4d3fe8bfe19 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllogip.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogip.dat
@@ -212,7 +212,7 @@ if ($multifile) {
 my $MODNAME="fwlogs";
 
 &Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log ip'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 
@@ -283,7 +283,7 @@ END
 
 &Header::closebox();
 
-&Header::openbox('100%', 'left', 'Firewall Logs');
+&Header::openbox('100%', 'left', $Lang::tr{'firewall graph ip'});
 print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
 
 my $linesjc = 0;

diff --git a/html/cgi-bin/logs.cgi/firewalllogport.dat b/html/cgi-bin/logs.cgi/firewalllogport.dat
index fbc92e43bbc09173ebb5ad59f9c26365698a24b0..67fe6aa6e3875e050d29adf6b082dc4f248bc94f 100644 (file)
--- a/html/cgi-bin/logs.cgi/firewalllogport.dat
+++ b/html/cgi-bin/logs.cgi/firewalllogport.dat
@@ -213,7 +213,7 @@ if ($multifile) {
 my $MODNAME="fwlogs";
 
 &Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log port'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ($errormessage) {
@@ -281,7 +281,7 @@ END
 
 &Header::closebox();
 
-&Header::openbox('100%', 'left', 'Firewall Logs');
+&Header::openbox('100%', 'left', $Lang::tr{'firewall graph port'});
 print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>";
 
 my $linesjc = 0;

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 68d925d8c24f0ff40d9863b60473690f8d8684d1..6443abe7ea9f1247707abd3b342269bfb0206a16 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -948,11 +948,15 @@
 'fireinfo why read more' => 'Mehr über die Gründe.',
 'fireinfo your profile id' => 'Profil-ID',
 'firewall' => 'Firewall',
-'firewall graphs' => 'Firewall-Diagramme',
+'firewall graph country' => 'Firewall-Diagramm (Land)',
+'firewall graph ip' => 'Firewall-Diagramm (IP)',
+'firewall graph port' => 'Firewall-Diagramm (Port)',
 'firewall hits' => 'Gesamtanzahl der Firewall-Treffer für',
 'firewall hits per' => 'Firewalltreffer pro',
 'firewall log' => 'Firewall-Protokoll',
-'firewall log viewer' => 'Betrachter der Firewall-Logdateien',
+'firewall log country' => 'Firewall-Protokoll (Land)',
+'firewall log ip' => 'Firewall-Protokoll (IP)',
+'firewall log port' => 'Firewall-Protokoll (Port)',
 'firewall logs' => 'Firewall-Logdateien',
 'firewall logs country' => 'Fw-Logdiagramme (Land)',
 'firewall logs ip' => 'Fw-Logdiagramme (IP)',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 4f30f562dc85a1fc945c49f188d907e42f66c2c9..4c62471f717ea2a9d9164560e43a3d81a514e8bb 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -975,11 +975,15 @@
 'fireinfo why read more' => 'Read more about the reasons.',
 'fireinfo your profile id' => 'Your profile ID',
 'firewall' => 'Firewall',
-'firewall graphs' => 'Firewall Graphs',
+'firewall graph country' => 'Firewall-Diagram (Country)',
+'firewall graph ip' => 'Firewall-Diagram (IP)',
+'firewall graph port' => 'Firewall-Diagram (Port)',
 'firewall hits' => 'Total number of firewall hits for',
 'firewall hits per' => 'firewallhits per',
 'firewall log' => 'Firewall log',
-'firewall log viewer' => 'Firewall Log Viewer',
+'firewall log country' => 'Firewall log (Country)',
+'firewall log ip' => 'Firewall log (IP)',
+'firewall log port' => 'Firewall log (Port)',
 'firewall logs' => 'Firewall Logs',
 'firewall logs country' => 'Fw-Loggraphs (Country)',
 'firewall logs ip' => 'Fw-Loggraphs (IP)',