From mboxrd@z Thu Jan 1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] GUI: Some simple FW-Log cosmetics - Step 2
Date: Sat, 29 Apr 2017 17:00:53 +0200
Message-ID: <20170429150053.2453-1-matthias.fischer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6185377758603248654=="
List-Id: <development.lists.ipfire.org>
--===============6185377758603248654==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
I altered 'firewalllogcountry.dat', 'firewalllogip.dat', 'firewalllogport.dat'
in the same manner as the 'Loggraphs'-Pages in commit
http://git.ipfire.org/?p=3Dpeople/mfischer/ipfire-2.x.git;a=3Dcommit;h=3Df6a9=
5642404318cf1bda1942e33b8404dd467d71
Each 'Details'-page got a unique title.
Furthermore, I added a 'Back'-Button to go back to the page before. For this,=
I used
'back.png' from 'wio' (thanks Stephan! ;-) ) since I found no other appropria=
te image.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 7 +++++--
html/cgi-bin/logs.cgi/showrequestfromip.dat | 6 ++++--
html/cgi-bin/logs.cgi/showrequestfromport.dat | 6 ++++--
html/html/images/back.png | Bin 0 -> 315 bytes
4 files changed, 13 insertions(+), 6 deletions(-)
create mode 100644 html/html/images/back.png
diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/=
logs.cgi/showrequestfromcountry.dat
index cd97f8780..5a53fa6df 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
@@ -233,7 +233,7 @@ if ($multifile) {
}
=20
&Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log country'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
=20
if ($errormessage) {
@@ -292,7 +292,7 @@ END
=20
&Header::closebox();
=20
-&Header::openbox('100%', 'left', $Lang::tr{'firewall log'});
+&Header::openbox('100%', 'left', $Lang::tr{'firewall log country'});
print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p=
>";
=20
if ($start =3D=3D -1) {
@@ -415,6 +415,9 @@ END
=20
&oldernewer();
=20
+ print"<table width=3D'100%'><tr><td><a href=3D'/cgi-bin/logs.cgi/firewalllo=
gcountry.dat'><img src=3D'/images/back.png' alt=3D'$Lang::tr{'back'}' title=
=3D'$Lang::tr{'back'}' /></a></td></tr></table>";
+
+
&Header::closebox();
=20
&Header::closebigbox();
diff --git a/html/cgi-bin/logs.cgi/showrequestfromip.dat b/html/cgi-bin/logs.=
cgi/showrequestfromip.dat
index 154fa4030..c73724ad5 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromip.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromip.dat
@@ -194,7 +194,7 @@ if ($multifile) {
}
=20
&Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log ip'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
=20
if ($errormessage) {
@@ -252,7 +252,7 @@ END
=20
&Header::closebox();
=20
-&Header::openbox('100%', 'left', $Lang::tr{'firewall log'});
+&Header::openbox('100%', 'left', $Lang::tr{'firewall log ip'});
print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p=
>";
=20
if ($start =3D=3D -1) {
@@ -357,6 +357,8 @@ END
=20
&oldernewer();
=20
+ print"<table width=3D'100%'><tr><td><a href=3D'/cgi-bin/logs.cgi/firewalllo=
gip.dat'><img src=3D'/images/back.png' alt=3D'$Lang::tr{'back'}' title=3D'$La=
ng::tr{'back'}' /></a></td></tr></table>";
+
&Header::closebox();
=20
&Header::closebigbox();
diff --git a/html/cgi-bin/logs.cgi/showrequestfromport.dat b/html/cgi-bin/log=
s.cgi/showrequestfromport.dat
index e1f00aed8..777805078 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromport.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromport.dat
@@ -202,7 +202,7 @@ if ($multifile) {
}
=20
&Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log port'}, 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
=20
if ($errormessage) {
@@ -260,7 +260,7 @@ END
=20
&Header::closebox();
=20
-&Header::openbox('100%', 'left', $Lang::tr{'firewall log'});
+&Header::openbox('100%', 'left', $Lang::tr{'firewall log port'});
print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p=
>";
=20
if ($start =3D=3D -1) {
@@ -367,6 +367,8 @@ END
=20
&oldernewer();
=20
+ print"<table width=3D'100%'><tr><td><a href=3D'/cgi-bin/logs.cgi/firewalllo=
gport.dat'><img src=3D'/images/back.png' alt=3D'$Lang::tr{'back'}' title=3D'$=
Lang::tr{'back'}' /></a></td></tr></table>";
+
&Header::closebox();
=20
&Header::closebigbox();
diff --git a/html/html/images/back.png b/html/html/images/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..66921afb2ab5d73312b3498d0b5a2=
a2a28a6a657
GIT binary patch
literal 315
zcmeAS(a)N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj>?NMQuI%?&_&NCG=3DN~`J4;11o
z(a)Q5sCU|>xIVMfLqwI6|kEa{HEjtmSN`?>!lvI6<1JY5_^DsH`<V#w8EAmU;h%;J2B
zW1a(x;ym9C7Y^N%UgF2a&HunR?V?jm(a)9y{;Dbn39(a)11FO5kC7_=3D4a3KkM0lL4S1NR
z1xSASV9^&Cdws<!uBhx70}G(a)0_T`yQmrYK5mgzBEl368Glcd+)YnX9c%r#J<FS+2H
zVvEDH)aaRq=3DCrNd`eGMfYGj_O=3DF?fVGY{?Ioc3_v`-M}Yygeu7sD{rxw1(-_hSffa
zhdB1g2X64@`!<v9_eG8K2mI%CB~N=3Da^}x|PVt39e|JeV4HOP6=3D!~YXmRe`=3D@@O1Ta
JS?83{1ON-SdV2r>
literal 0
HcmV?d00001
--=20
2.11.0
--===============6185377758603248654==--