From f69446d2fa5fc519c223faeb9506842e191e46ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alf=20H=C3=B8gemark?= Date: Sat, 8 Feb 2014 08:12:53 +0100 Subject: [PATCH 1/3] firewalllog.dat: Add First and Last links, for fast navigation in log lines Add two links for navigating in log pages, one for going to the first page and one for goint to the last page. Introduce variable which points to the first log line to display on the last possible page. The commit contains hardcoded text for Last and First, and I am also uncertain how spaces between links should be handled. So this should be improved based on feedback. --- html/cgi-bin/logs.cgi/firewalllog.dat | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 73e62eab0..2711eba3b 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -285,7 +285,8 @@ END &Header::openbox('100%', 'left', $Lang::tr{'log'}); print "

$Lang::tr{'firewall hits'} $date: $lines

"; -$start = $lines - ${Header::viewsize} if ($start >= $lines - ${Header::viewsize}); +my $lastPageIndex = $lines - ${Header::viewsize}; +$start = $lastPageIndex if ($start >= $lastPageIndex); $start = 0 if ($start < 0); my $prev; @@ -297,7 +298,7 @@ my $prev; } my $next; - if ($start == $lines - ${Header::viewsize}) { + if ($start == $lastPageIndex) { $next = -1; } else { $next = $start + ${Header::viewsize}; @@ -402,16 +403,18 @@ END print ""; if ($prev != -1) { + print "First "; print "$Lang::tr{'older'}"; } else { - print "$Lang::tr{'older'}"; } + print "First $Lang::tr{'older'}"; } print "\n"; print ""; if ($next >= 0) { - print "$Lang::tr{'newer'}"; } + print "$Lang::tr{'newer'} "; + print "Last"; } else { - print "$Lang::tr{'newer'}"; } + print "$Lang::tr{'newer'} Last"; } print "\n"; print < Date: Wed, 12 Feb 2014 21:26:26 +0100 Subject: [PATCH 2/3] firewalllog.dat: Use language string for First and Last links --- html/cgi-bin/logs.cgi/firewalllog.dat | 4 ++-- langs/de/cgi-bin/de.pl | 2 ++ langs/en/cgi-bin/en.pl | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 2711eba3b..66e7cc1ae 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -403,7 +403,7 @@ END print ""; if ($prev != -1) { - print "First "; + print "$Lang::tr{'first'} "; print "$Lang::tr{'older'}"; } else { print "First $Lang::tr{'older'}"; } @@ -412,7 +412,7 @@ print "\n"; print ""; if ($next >= 0) { print "$Lang::tr{'newer'} "; - print "Last"; } + print "$Lang::tr{'last'}"; } else { print "$Lang::tr{'newer'} Last"; } print "\n"; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index e32ee9448..3f22341c4 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -890,6 +890,7 @@ 'firewall rules' => 'Firewallregeln', 'firewallhits' => 'Firewalltreffer', 'firmware' => 'Firmware', +'first' => 'Erste', 'firmware upload' => 'Hochladen der Firmware/Treiber', 'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt', 'fixed ip lease modified' => 'Feste IP-Zuordnung geändert', @@ -1299,6 +1300,7 @@ 'lan' => 'LAN', 'lang' => 'de', 'languagepurpose' => 'Wählen Sie eine Sprache, in der IPFire angezeigt werden soll:', +'last' => 'Letzte', 'last activity' => 'Letzte Aktivität', 'lateprompting' => 'Late prompting', 'lease expires' => 'Zuordnung verfällt', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index d3c87743d..3a4c5a5c0 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -917,6 +917,7 @@ 'firewallhits' => 'firewallhits', 'firmware' => 'Firmware', 'firmware upload' => 'Upload Firmware/Drivers', +'first' => 'First', 'fixed ip lease added' => 'Fixed IP lease added', 'fixed ip lease modified' => 'Fixed IP lease modified', 'fixed ip lease removed' => 'Fixed IP lease removed', @@ -1328,6 +1329,7 @@ 'lan' => 'LAN', 'lang' => 'en', 'languagepurpose' => 'Select the language you wish IPFire to display in:', +'last' => 'Last', 'last activity' => 'Last Activity', 'lateprompting' => 'Lateprompting', 'lease expires' => 'Lease expires', From 44bd254c674be8324affca02bd29674371c36f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alf=20H=C3=B8gemark?= Date: Sat, 15 Feb 2014 15:16:06 +0100 Subject: [PATCH 3/3] firewalllog.dat: Use language string for First and Last text --- html/cgi-bin/logs.cgi/firewalllog.dat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 66e7cc1ae..75340881d 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -406,7 +406,7 @@ if ($prev != -1) { print "$Lang::tr{'first'} "; print "$Lang::tr{'older'}"; } else { - print "First $Lang::tr{'older'}"; } + print "$Lang::tr{'first'} $Lang::tr{'older'}"; } print "\n"; print ""; @@ -414,7 +414,7 @@ if ($next >= 0) { print "$Lang::tr{'newer'} "; print "$Lang::tr{'last'}"; } else { - print "$Lang::tr{'newer'} Last"; } + print "$Lang::tr{'newer'} $Lang::tr{'last'} "; } print "\n"; print <