| Message ID | 20221011220157.17385-4-robin.roevens@disroot.org |
|---|---|
| State | Accepted |
| Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Mn8tW3xyZz3wgL for <patchwork@web04.haj.ipfire.org>; Tue, 11 Oct 2022 22:03:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Mn8tP6t8Rz2RV; Tue, 11 Oct 2022 22:03:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Mn8tP09fVz302f; Tue, 11 Oct 2022 22:03:25 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Mn8tM04s6z2xfn for <development@lists.ipfire.org>; Tue, 11 Oct 2022 22:03:23 +0000 (UTC) Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4Mn8tL65XPzyn for <development@lists.ipfire.org>; Tue, 11 Oct 2022 22:03:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9AE434DAF4 for <development@lists.ipfire.org>; Wed, 12 Oct 2022 00:03:22 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with UTF8SMTP id 6HixwdkJf82d for <development@lists.ipfire.org>; Wed, 12 Oct 2022 00:03:21 +0200 (CEST) Received: from chojin.sicho.home (amaterasu.sicho.home [192.168.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (no client certificate requested) (Authenticated sender) by hachiman (MailScanner Milter) with SMTP id 0D29A751F7; Wed, 12 Oct 2022 00:02:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1665525747; bh=vbDvSVGhgCO6+RtYlm/w2uMpg29aUcrnpQFLZJTdVho=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OrxlLqc3bW5OIZPfST0nzZmhqn6YxI72qNJbbz8CV4ONhe0HiRgBKLjiZ+ImimmZv /M4uo4LXpEXprXRsEhnNsQo9i4aGbdHXCxjOiupRWUjNPHrB4ngM7yMH6hcRB3LkHN 4ldd9uapW7u4ow+Kku2vUZUBCecNULFJWxRRk78J4eLEGRrmw9z4HIjAk8qFP8HKFS Jn4YACOSzNu281EMFZZXcIF+Ik8crOtp0UORosBcsQmZjYYbuWYV+3rDeQhTuyKTZ9 ltPJncxKT8riA/PLy6KtW5MpRVooAnp4dkzpR2yVDM1/qEYYlU/J6+e4oNecsJLONg 73ExljrTbBWmw== From: Robin Roevens <robin.roevens@disroot.org> To: development@lists.ipfire.org Subject: [PATCH v3 3/5] services.cgi: minor cosmetics Date: Wed, 12 Oct 2022 00:01:55 +0200 Message-Id: <20221011220157.17385-4-robin.roevens@disroot.org> In-Reply-To: <20221011220157.17385-1-robin.roevens@disroot.org> References: <20221011220157.17385-1-robin.roevens@disroot.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-sicho-MailScanner-ID: 0D29A751F7.A8A80 X-sicho-MailScanner: Found to be clean X-sicho-MailScanner-From: robin.roevens@disroot.org X-sicho-MailScanner-Watermark: 1666130530.96056@f98+IXgoBH6OtFxrZ6r2ZA ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1665525802; a=rsa-sha256; cv=none; b=xvYOD+oSBvw/AwMwNokEM3YNKxIEVKJGTlOy/Ay8VqfX2zhPP+rhcnumYFmitWeXILUbJR Jax++3jUxCQ/S8TxYhu/RsS2GjOY9lviq1QEtnl7BHi9CO+MjWqrgC5rVHjxzA+pRLOlAy uvUxe+sOQH9sEdW6Npj8kPnOZVeO2G6lCjuK8S76XedTfG6fXcoHvcuJF1egkrS4JiEJ7E Ragqi0OWCqVvMLXKC7iJEXuBodL+ewjqh0OVnz9WWCwXY3r+DRb3LtO9QmBP7ZTb0ZbJTK EFzbfyY/LiB6QDIrzqAvogzRzukICxxivwwMrmZ3KdQfcv9MiCzpS32wvtGizg== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=OrxlLqc3; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1665525802; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=kv4X7Ldg++5HyH98neE3Ar4qsUNU6YeUaIoFM7DSOko=; b=EPUPZ0ZcWjRxDXyVRBthmcfDsbgpaQG/Z0jCL5mP7FfvG1iQkjZ9oOXuRuOAoXGk3U6oG7 zPZ2o2mV65/ci726ZNeSFvJc/cutznCEx9U7HsCy1+ILCgeAIry1UNDZThtcLMB2y9nmC2 XwHljwMdh/CqOuSyCOA3pI7/XUwGJKKnpEFbCr9/kajTorXvLFLTELQ0IVygBz7UQKUD4F gkiIC7f1snPNWWdXXq4Km5nORidb5/MB/qykOnQg1vE+r/yVNYihF+7J1Wru2geEG5wVrh ZGcqe/Cr6u0LzmpaUH0mI2+n7gaDVEKbI35a61eC8Kvu0tyqSril79np2ZI/eA== Authentication-Results: mail01.ipfire.org; dkim=pass header.d=disroot.org header.s=mail header.b=OrxlLqc3; spf=pass (mail01.ipfire.org: domain of robin.roevens@disroot.org designates 178.21.23.139 as permitted sender) smtp.mailfrom=robin.roevens@disroot.org; dmarc=pass (policy=quarantine) header.from=disroot.org X-Rspamd-Server: mail01.haj.ipfire.org X-Spamd-Result: default: False [-3.58 / 11.00]; BAYES_HAM(-1.47)[91.49%]; IP_REPUTATION_HAM(-1.13)[asn: 50673(-0.32), country: NL(-0.01), ip: 178.21.23.139(-0.81)]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-1.000]; DKIM_REPUTATION(-0.82)[-0.81568261952269]; SPF_REPUTATION_HAM(-0.61)[-0.61451727240354]; DMARC_POLICY_ALLOW(-0.50)[disroot.org,quarantine]; R_MISSING_CHARSET(0.50)[]; MV_CASE(0.50)[]; R_DKIM_ALLOW(0.27)[disroot.org:s=mail]; R_SPF_ALLOW(-0.20)[+a:c]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; ARC_NA(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; ARC_SIGNED(0.00)[lists.ipfire.org:s=202003rsa:i=1]; ASN(0.00)[asn:50673, ipnet:178.21.23.0/24, country:NL]; DKIM_TRACE(0.00)[disroot.org:+]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_TWO(0.00)[2]; TO_DN_SOME(0.00)[] X-Rspamd-Queue-Id: 4Mn8tL65XPzyn X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
| Series |
Fix Bug#12935 + cosmetic changes/enhancements
|
|
Commit Message
Robin Roevens
Oct. 11, 2022, 10:01 p.m. UTC
* Singular 'Service' instead of plural 'Services' as column header of
services table
* Sort list of services
Signed-off-by: Robin Roevens <robin.roevens@disroot.org>
---
html/cgi-bin/services.cgi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Comments
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org> > On 11 Oct 2022, at 23:01, Robin Roevens <robin.roevens@disroot.org> wrote: > > * Singular 'Service' instead of plural 'Services' as column header of > services table > * Sort list of services > > Signed-off-by: Robin Roevens <robin.roevens@disroot.org> > --- > html/cgi-bin/services.cgi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi > index de946d755..e35b04cae 100644 > --- a/html/cgi-bin/services.cgi > +++ b/html/cgi-bin/services.cgi > @@ -105,7 +105,7 @@ if ( $querry[0] =~ "processescpu"){ > <div align='center'> > <table width='80%' cellspacing='1' class='tbl'> > <tr> > - <th align='left'><b>$Lang::tr{'services'}</b></th> > + <th align='left'><b>$Lang::tr{'service'}</b></th> > <th align='center' ><b>$Lang::tr{'status'}</b></th> > <th align='center'><b>PID</b></th> > <th align='center'><b>$Lang::tr{'memory'}</b></th> > @@ -174,7 +174,7 @@ END > # Generate list of installed addon pak services > my %paklist = &Pakfire::dblist("installed"); > > - foreach my $pak (keys %paklist) { > + foreach my $pak (sort keys %paklist) { > my %metadata = &Pakfire::getmetadata($pak, "installed"); > > my $service; > -- > 2.37.3 > > > -- > Dit bericht is gescanned op virussen en andere gevaarlijke > inhoud door MailScanner en lijkt schoon te zijn. >
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi index de946d755..e35b04cae 100644 --- a/html/cgi-bin/services.cgi +++ b/html/cgi-bin/services.cgi @@ -105,7 +105,7 @@ if ( $querry[0] =~ "processescpu"){ <div align='center'> <table width='80%' cellspacing='1' class='tbl'> <tr> - <th align='left'><b>$Lang::tr{'services'}</b></th> + <th align='left'><b>$Lang::tr{'service'}</b></th> <th align='center' ><b>$Lang::tr{'status'}</b></th> <th align='center'><b>PID</b></th> <th align='center'><b>$Lang::tr{'memory'}</b></th> @@ -174,7 +174,7 @@ END # Generate list of installed addon pak services my %paklist = &Pakfire::dblist("installed"); - foreach my $pak (keys %paklist) { + foreach my $pak (sort keys %paklist) { my %metadata = &Pakfire::getmetadata($pak, "installed"); my $service;