From 415cbcecfae2330a8c4211dc4c17e8a98ee4f64b Mon Sep 17 00:00:00 2001
From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Sun, 30 Apr 2017 12:59:23 +0200
Subject: [PATCH] GUI: Some simple FW-Log cosmetics

I altered 'showrequestfromcountry.dat', 'showrequestfromip.dat' and 'showrequestfromport.dat'
in the same manner as the 'Loggraphs'-Pages in commit

Each 'Details'-page got a unique title.

Furthermore, I added a 'Back'-Button to go back to the previous page. For this, I used
'back.png' from 'wio' (thanks Stephan! ;-) ) since I found no other appropriate image.

'ipinfo.cgi' got a centered 'Back'-Button, too.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 html/cgi-bin/ipinfo.cgi                          |   2 +-
 html/cgi-bin/logs.cgi/showrequestfromcountry.dat |   6 ++++--
 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
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 html/html/images/back.png

diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi
index 8cefe6e853..16541f1262 100644
--- a/html/cgi-bin/ipinfo.cgi
+++ b/html/cgi-bin/ipinfo.cgi
@@ -102,7 +102,7 @@ print <<END
 <div align='center'>
 <table width='80%'>
 <tr>
-	<td align='center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></td>
+	<td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td>
 </tr>
 </table>
 </div>
diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
index cd97f87807..b6383ed59b 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat
@@ -233,7 +233,7 @@ if ($multifile) {
 }
 
 &Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log country'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ($errormessage) {
@@ -292,7 +292,7 @@ END
 
 &Header::closebox();
 
-&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>";
 
 if ($start == -1) {
@@ -415,6 +415,8 @@ END
 
 &oldernewer();
 
+	print"<table width='100%'><tr><td align='center'><a href='/cgi-bin/logs.cgi/firewalllogcountry.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>";
+
 &Header::closebox();
 
 &Header::closebigbox();
diff --git a/html/cgi-bin/logs.cgi/showrequestfromip.dat b/html/cgi-bin/logs.cgi/showrequestfromip.dat
index 154fa40309..31cd42c33f 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromip.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromip.dat
@@ -194,7 +194,7 @@ if ($multifile) {
 }
 
 &Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log ip'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ($errormessage) {
@@ -252,7 +252,7 @@ END
 
 &Header::closebox();
 
-&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>";
 
 if ($start == -1) {
@@ -357,6 +357,8 @@ END
 
 &oldernewer();
 
+	print"<table width='100%'><tr><td align='center'><a href='/cgi-bin/logs.cgi/firewalllogip.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>";
+
 &Header::closebox();
 
 &Header::closebigbox();
diff --git a/html/cgi-bin/logs.cgi/showrequestfromport.dat b/html/cgi-bin/logs.cgi/showrequestfromport.dat
index e1f00aed8f..004a00e6a3 100644
--- a/html/cgi-bin/logs.cgi/showrequestfromport.dat
+++ b/html/cgi-bin/logs.cgi/showrequestfromport.dat
@@ -202,7 +202,7 @@ if ($multifile) {
 }
 
 &Header::showhttpheaders();
-&Header::openpage($Lang::tr{'firewall log'}, 1, '');
+&Header::openpage($Lang::tr{'firewall log port'}, 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ($errormessage) {
@@ -260,7 +260,7 @@ END
 
 &Header::closebox();
 
-&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>";
 
 if ($start == -1) {
@@ -367,6 +367,8 @@ END
 
 &oldernewer();
 
+	print"<table width='100%'><tr><td align='center'><a href='/cgi-bin/logs.cgi/firewalllogport.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>";
+
 &Header::closebox();
 
 &Header::closebigbox();
diff --git a/html/html/images/back.png b/html/html/images/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..66921afb2ab5d73312b3498d0b5a2a2a28a6a657
GIT binary patch
literal 315
zc-rd>@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj>?NMQuI%?&_&NCG=N~`J4;11o
z@Q5sCU|>xIVMfLqwI6|kEa{HEjtmSN`?>!lvI6<1JY5_^DsH`<V#w8EAmU;h%;J2B
zW1a(x;ym9C7Y^N%UgF2a&HunR?V?jm@9y{;Dbn39@11FO5kC7_=4a3KkM0lL4S1NR
z1xSASV9^&Cdws<!uBhx70}G@0_T`yQmrYK5mgzBEl368Glcd+)YnX9c%r#J<FS+2H
zVvEDH)aaRq=CrNd`eGMfYGj_O=F?fVGY{?Ioc3_v`-M}Yygeu7sD{rxw1(-_hSffa
zhdB1g2X64@`!<v9_eG8K2mI%CB~N=a^}x|PVt39e|JeV4HOP6=!~YXmRe`=@@O1Ta
JS?83{1ON-SdV2r>

literal 0
Hc-jL100001

-- 
2.39.5