public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] GUI: Some simple FW-Log cosmetics
Date: Fri, 21 Apr 2017 22:37:28 +0200	[thread overview]
Message-ID: <20170421203728.18196-1-matthias.fischer@ipfire.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 5579 bytes --]

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(a)ipfire.org>
---
 html/cgi-bin/logs.cgi/firewalllogcountry.dat | 6 +++---
 html/cgi-bin/logs.cgi/firewalllogip.dat      | 4 ++--
 html/cgi-bin/logs.cgi/firewalllogport.dat    | 4 ++--
 langs/de/cgi-bin/de.pl                       | 8 ++++++--
 langs/en/cgi-bin/en.pl                       | 8 ++++++--
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat
index 26920b5da..f2b6048f7 100644
--- 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 08ef1c4be..9e366745d 100644
--- 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 fbc92e43b..67fe6aa6e 100644
--- 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 68d925d8c..6443abe7e 100644
--- 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 4f30f562d..4c62471f7 100644
--- 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)',
-- 
2.11.0


                 reply	other threads:[~2017-04-21 20:37 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170421203728.18196-1-matthias.fischer@ipfire.org \
    --to=matthias.fischer@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox