From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 15/20] ids.cgi: Use new style tables for rulesets
Date: Tue, 10 Sep 2024 14:37:28 +0000 [thread overview]
Message-ID: <20240910143748.3469271-16-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20240910143748.3469271-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 20111 bytes --]
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
doc/language_issues.de | 1 +
doc/language_issues.en | 3 ++-
doc/language_issues.es | 3 +++
doc/language_issues.fr | 3 +++
doc/language_issues.it | 3 ++-
doc/language_issues.nl | 3 ++-
doc/language_issues.pl | 3 ++-
doc/language_issues.ru | 3 ++-
doc/language_issues.tr | 3 ++-
doc/language_missings | 14 ++++++++++++++
html/cgi-bin/ids.cgi | 26 ++++++++------------------
langs/de/cgi-bin/de.pl | 2 ++
langs/en/cgi-bin/en.pl | 2 ++
13 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/doc/language_issues.de b/doc/language_issues.de
index b3d7082df..bd335de41 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -400,6 +400,7 @@ WARNING: translation string unused: icmp type
WARNING: translation string unused: id
WARNING: translation string unused: ids oinkcode required
WARNING: translation string unused: ids rules update
+WARNING: translation string unused: ids ruleset settings
WARNING: translation string unused: ids unsupported provider
WARNING: translation string unused: ike encryption
WARNING: translation string unused: ike grouptype
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3aa4e9bd8..5063749c4 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1070,7 +1070,7 @@ WARNING: untranslated string: ids remove rule structures = Remove old rule struc
WARNING: untranslated string: ids reset provider = Reset provider
WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
-WARNING: untranslated string: ids ruleset settings = Ruleset Settings
+WARNING: untranslated string: ids rulesets = Rulesets
WARNING: untranslated string: ids show = Show
WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
@@ -1217,6 +1217,7 @@ WARNING: untranslated string: lan = LAN
WARNING: untranslated string: languagepurpose = Select the language you wish IPFire to display in:
WARNING: untranslated string: last = Last
WARNING: untranslated string: last activity = Last Activity
+WARNING: untranslated string: last updated = Last Updated
WARNING: untranslated string: lease expires = Lease expires
WARNING: untranslated string: least preferred = least preferred
WARNING: untranslated string: legend = Legend
diff --git a/doc/language_issues.es b/doc/language_issues.es
index fbbcd1e74..7e76d5dcf 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -444,6 +444,7 @@ WARNING: translation string unused: ids rules license1
WARNING: translation string unused: ids rules license2
WARNING: translation string unused: ids rules license3
WARNING: translation string unused: ids rules update
+WARNING: translation string unused: ids ruleset settings
WARNING: translation string unused: ike encryption
WARNING: translation string unused: ike grouptype
WARNING: translation string unused: ike integrity
@@ -1028,8 +1029,10 @@ WARNING: untranslated string: hostile networks in = >From Hostile Networks
WARNING: untranslated string: hostile networks out = To Hostile Networks
WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: ids provider eol = (EOL)
+WARNING: untranslated string: ids rulesets = Rulesets
WARNING: untranslated string: info messages = unknown string
WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
+WARNING: untranslated string: last updated = Last Updated
WARNING: untranslated string: load average = Load Average
WARNING: untranslated string: log drop hostile in = Log dropped packets FROM hostile networks
WARNING: untranslated string: log drop hostile out = Log dropped packets TO hostile networks
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 25193da6a..ab6eb0478 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -428,6 +428,7 @@ WARNING: translation string unused: id
WARNING: translation string unused: ids automatic rules update
WARNING: translation string unused: ids oinkcode required
WARNING: translation string unused: ids rules update
+WARNING: translation string unused: ids ruleset settings
WARNING: translation string unused: ike encryption
WARNING: translation string unused: ike grouptype
WARNING: translation string unused: ike integrity
@@ -981,6 +982,8 @@ WARNING: untranslated string: guardian no entries = unknown string
WARNING: untranslated string: guardian service = unknown string
WARNING: untranslated string: hostile networks total = Total Hostile Networks
WARNING: untranslated string: ids provider eol = (EOL)
+WARNING: untranslated string: ids rulesets = Rulesets
+WARNING: untranslated string: last updated = Last Updated
WARNING: untranslated string: load average = Load Average
WARNING: untranslated string: oops something went wrong = Oops, something went wrong...
WARNING: untranslated string: ovpn roadwarrior server = OpenVPN Roadwarrior Server
diff --git a/doc/language_issues.it b/doc/language_issues.it
index f00d959d5..ab6c95d68 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1132,7 +1132,7 @@ WARNING: untranslated string: ids remove rule structures = Remove old rule struc
WARNING: untranslated string: ids reset provider = Reset provider
WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
-WARNING: untranslated string: ids ruleset settings = Ruleset Settings
+WARNING: untranslated string: ids rulesets = Rulesets
WARNING: untranslated string: ids show = Show
WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
@@ -1185,6 +1185,7 @@ WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint
WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table Entries
WARNING: untranslated string: ipsec settings = IPsec Settings
WARNING: untranslated string: itlb multihit = iTLB MultiHit
+WARNING: untranslated string: last updated = Last Updated
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: load average = Load Average
WARNING: untranslated string: local ip address = Local IP Address
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 9607f98af..7f6c04e23 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1138,7 +1138,7 @@ WARNING: untranslated string: ids remove rule structures = Remove old rule struc
WARNING: untranslated string: ids reset provider = Reset provider
WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
-WARNING: untranslated string: ids ruleset settings = Ruleset Settings
+WARNING: untranslated string: ids rulesets = Rulesets
WARNING: untranslated string: ids show = Show
WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
@@ -1193,6 +1193,7 @@ WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint
WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table Entries
WARNING: untranslated string: ipsec settings = IPsec Settings
WARNING: untranslated string: itlb multihit = iTLB MultiHit
+WARNING: untranslated string: last updated = Last Updated
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: load average = Load Average
WARNING: untranslated string: local ip address = Local IP Address
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 92ad3b7be..d073e30b1 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1276,7 +1276,7 @@ WARNING: untranslated string: ids remove rule structures = Remove old rule struc
WARNING: untranslated string: ids reset provider = Reset provider
WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
-WARNING: untranslated string: ids ruleset settings = Ruleset Settings
+WARNING: untranslated string: ids rulesets = Rulesets
WARNING: untranslated string: ids show = Show
WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
@@ -1338,6 +1338,7 @@ WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table
WARNING: untranslated string: ipsec settings = IPsec Settings
WARNING: untranslated string: itlb multihit = iTLB MultiHit
WARNING: untranslated string: last = Last
+WARNING: untranslated string: last updated = Last Updated
WARNING: untranslated string: least preferred = least preferred
WARNING: untranslated string: lifetime = Lifetime:
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 35a590b6b..651f5266a 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1271,7 +1271,7 @@ WARNING: untranslated string: ids remove rule structures = Remove old rule struc
WARNING: untranslated string: ids reset provider = Reset provider
WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
-WARNING: untranslated string: ids ruleset settings = Ruleset Settings
+WARNING: untranslated string: ids rulesets = Rulesets
WARNING: untranslated string: ids show = Show
WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
@@ -1334,6 +1334,7 @@ WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table
WARNING: untranslated string: ipsec settings = IPsec Settings
WARNING: untranslated string: itlb multihit = iTLB MultiHit
WARNING: untranslated string: last = Last
+WARNING: untranslated string: last updated = Last Updated
WARNING: untranslated string: least preferred = least preferred
WARNING: untranslated string: lifetime = Lifetime:
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 3bf595efe..6c22f6d76 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1074,7 +1074,7 @@ WARNING: untranslated string: ids remove rule structures = Remove old rule struc
WARNING: untranslated string: ids reset provider = Reset provider
WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
-WARNING: untranslated string: ids ruleset settings = Ruleset Settings
+WARNING: untranslated string: ids rulesets = Rulesets
WARNING: untranslated string: ids show = Show
WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
@@ -1122,6 +1122,7 @@ WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint
WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table Entries
WARNING: untranslated string: ipsec settings = IPsec Settings
WARNING: untranslated string: itlb multihit = iTLB MultiHit
+WARNING: untranslated string: last updated = Last Updated
WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
WARNING: untranslated string: load average = Load Average
WARNING: untranslated string: local ip address = Local IP Address
diff --git a/doc/language_missings b/doc/language_missings
index 94adb28d8..7e3357df0 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -137,8 +137,10 @@
< hostile networks out
< hostile networks total
< ids provider eol
+< ids rulesets
< ids unsupported provider
< invalid ip or hostname
+< last updated
< load average
< log drop hostile in
< log drop hostile out
@@ -177,7 +179,9 @@
< g.lite
< hostile networks total
< ids provider eol
+< ids rulesets
< ids unsupported provider
+< last updated
< load average
< oops something went wrong
< ovpn roadwarrior server
@@ -447,6 +451,7 @@
< ids reset provider
< ids ruleset autoupdate in progress
< ids ruleset is up to date
+< ids rulesets
< ids ruleset settings
< ids show
< ids subscription code required
@@ -507,6 +512,7 @@
< ipsec routing table entries
< ipsec settings
< itlb multihit
+< last updated
< legacy architecture warning
< link-layer encapsulation
< load average
@@ -988,6 +994,7 @@
< ids reset provider
< ids ruleset autoupdate in progress
< ids ruleset is up to date
+< ids rulesets
< ids ruleset settings
< ids show
< ids subscription code required
@@ -1050,6 +1057,7 @@
< ipsec routing table entries
< ipsec settings
< itlb multihit
+< last updated
< legacy architecture warning
< link-layer encapsulation
< load average
@@ -1834,6 +1842,7 @@
< ids reset provider
< ids ruleset autoupdate in progress
< ids ruleset is up to date
+< ids rulesets
< ids ruleset settings
< ids show
< ids subscription code required
@@ -1904,6 +1913,7 @@
< ipsec settings
< itlb multihit
< last
+< last updated
< least preferred
< legacy architecture warning
< lifetime
@@ -2848,6 +2858,7 @@
< ids reset provider
< ids ruleset autoupdate in progress
< ids ruleset is up to date
+< ids rulesets
< ids ruleset settings
< ids show
< ids subscription code required
@@ -2919,6 +2930,7 @@
< ipsec settings
< itlb multihit
< last
+< last updated
< least preferred
< legacy architecture warning
< lifetime
@@ -3454,6 +3466,7 @@
< ids reset provider
< ids ruleset autoupdate in progress
< ids ruleset is up to date
+< ids rulesets
< ids ruleset settings
< ids show
< ids subscription code required
@@ -3509,6 +3522,7 @@
< ipsec routing table entries
< ipsec settings
< itlb multihit
+< last updated
< legacy architecture warning
< link-layer encapsulation
< load average
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index deebb3ad3..737826580 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -1103,16 +1103,15 @@ END
#
# Used Ruleset Providers section.
#
- &Header::openbox('100%', 'center', $Lang::tr{'ids ruleset settings'});
+ &Header::openbox('100%', 'center', $Lang::tr{'ids rulesets'});
print <<END;
- <table width='100%' border='0'>
+ <table width='100%' border='0' class='tbl'>
<tr>
- <td class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'ids provider'}</b></td>
- <td class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'date'}</b></td>
- <td class='base' bgcolor='$color{'color20'}' align='center'><b>$Lang::tr{'ids autoupdates'}</b></td>
- <td class='base' bgcolor='$color{'color20'}' align='center'><b>$Lang::tr{'action'}</b></td>
- <td class='base' colspan='3' bgcolor='$color{'color20'}'></td>
+ <th>$Lang::tr{'ids provider'}</td>
+ <th>$Lang::tr{'last updated'}</td>
+ <th align='center'>$Lang::tr{'ids autoupdates'}</td>
+ <th align='center' colspan='3'>$Lang::tr{'action'}</td>
</tr>
END
my $line = 1;
@@ -1133,13 +1132,6 @@ END
my $status = $used_providers{$id}[3];
my $unsupported;
- # Check if the item number is even or not.
- if ($line % 2) {
- $col="bgcolor='$color{'color22'}'";
- } else {
- $col="bgcolor='$color{'color20'}'";
- }
-
# Handle providers which are not longer supported.
unless ($IDS::Ruleset::Providers{$provider}{'dl_url'}) {
$col = "bgcolor='$Header::colouryellow'";
@@ -1172,8 +1164,8 @@ END
print <<END;
<tr>
- <td width='33%' class='base' $col>$provider_name $unsupported</td>
- <td width='30%' class='base' $col>$rulesetdate</td>
+ <th scope='row' width='33%' $col>$provider_name $unsupported</th>
+ <td width='30%' $col align='center'>$rulesetdate</td>
<td align='center' $col>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
@@ -1225,8 +1217,6 @@ END
# Section to add new elements or edit existing ones.
print <<END;
<br>
- <hr>
- <br>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
<div align='right'>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a718228bc..b06ba6e91 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1413,6 +1413,7 @@
'ids ruleset autoupdate in progress' => 'Der Regelsatz wird gerade aktualisiert. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...',
'ids ruleset is up to date' => 'Regelset ist aktuell - Keine Aktualisierung notwendig.',
'ids ruleset settings' => 'Regelsatzeinstellungen',
+'ids rulesets' => 'Regelsätze',
'ids show' => 'Anzeigen',
'ids the choosen provider is already in use' => 'Der gewhählte Provider wird bereits verwendet.',
'ids unable to download the ruleset' => 'Das Regelset konnte nicht heruntergeladen werden.',
@@ -1603,6 +1604,7 @@
'languagepurpose' => 'Wählen Sie eine Sprache, in der IPFire angezeigt werden soll:',
'last' => 'Letzte',
'last activity' => 'Letzte Aktivität',
+'last updated' => 'Zuletzt Aktualisiert',
'lateprompting' => 'Late prompting',
'lease expires' => 'Zuordnung verfällt',
'least preferred' => 'weniger präferiert',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 6a455ab6d..59da23c3a 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1466,6 +1466,7 @@
'ids ruleset autoupdate in progress' => 'Ruleset update in progress. Please wait until all operations have completed successfully...',
'ids ruleset is up to date' => 'No update required - The ruleset is up to date.',
'ids ruleset settings' => 'Ruleset Settings',
+'ids rulesets' => 'Rulesets',
'ids show' => 'Show',
'ids subscription code required' => 'The selected ruleset requires a subscription code',
'ids the choosen provider is already in use' => 'The choosen provider is already in use.',
@@ -1660,6 +1661,7 @@
'languagepurpose' => 'Select the language you wish IPFire to display in:',
'last' => 'Last',
'last activity' => 'Last Activity',
+'last updated' => 'Last Updated',
'lateprompting' => 'Lateprompting',
'lease expires' => 'Lease expires',
'least preferred' => 'least preferred',
--
2.39.2
next prev parent reply other threads:[~2024-09-10 14:37 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-10 14:37 Addressing #13764 Michael Tremer
2024-09-10 14:37 ` [PATCH 01/20] suricata: Move the IPS into the mangle table Michael Tremer
2024-09-10 14:37 ` [PATCH 02/20] initscripts: Fix bash function definitions in suricata Michael Tremer
2024-09-10 14:37 ` [PATCH 03/20] suricata: Use getconf to determine the number of processors Michael Tremer
2024-09-10 14:37 ` [PATCH 04/20] suricata: Remove some unused constants Michael Tremer
2024-09-10 14:37 ` [PATCH 05/20] suricata: Add whitelist to iptables Michael Tremer
2024-09-10 14:37 ` [PATCH 06/20] suricata: Replace removed CPU count function Michael Tremer
2024-09-10 14:37 ` [PATCH 07/20] suricata: Be more efficient with marks Michael Tremer
2024-09-10 14:37 ` [PATCH 08/20] suricata: Add a watcher to restart on unexpected termination Michael Tremer
2024-09-10 14:37 ` [PATCH 09/20] suricata: Start the new watcher in the background Michael Tremer
2024-09-10 14:37 ` [PATCH 10/20] suricata: Restore the interface selection Michael Tremer
2024-09-10 14:37 ` [PATCH 11/20] suricata: Remove superfluous bits from the initscript Michael Tremer
2024-09-10 14:37 ` [PATCH 12/20] suricata: Don't load /var/ipfire/ethernet/settings Michael Tremer
2024-09-10 14:37 ` [PATCH 13/20] suricata: Add option to scan WireGuard Michael Tremer
2024-09-10 14:37 ` [PATCH 14/20] suricata: Fix broken spacing in the settings section Michael Tremer
2024-09-10 14:37 ` Michael Tremer [this message]
2024-09-10 14:37 ` [PATCH 16/20] ids.cgi: Use new-style table for whitelist entries Michael Tremer
2024-09-10 14:37 ` [PATCH 17/20] ids.cgi: Sort " Michael Tremer
2024-09-10 14:37 ` [PATCH 18/20] ids.cgi: Remove box from the top section Michael Tremer
2024-09-10 14:37 ` [PATCH 19/20] ids.cgi: Fix detection for the Suricata process Michael Tremer
2024-09-10 14:37 ` [PATCH 20/20] firewall: Move the IPS after the NAT marking Michael Tremer
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=20240910143748.3469271-16-michael.tremer@ipfire.org \
--to=michael.tremer@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