From patchwork Fri May 15 21:39:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim FitzGeorge X-Patchwork-Id: 3102 Return-Path: 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49P1zf6t4jz3xVh for ; Fri, 15 May 2020 21:40:30 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49P1zf2g7Gz2f6; Fri, 15 May 2020 21:40:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49P1zf1Bkmz2yCT; Fri, 15 May 2020 21:40:30 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49P1zc1tHdz2xbY for ; Fri, 15 May 2020 21:40:28 +0000 (UTC) Received: from mail-out-auth1.hosts.co.uk (mail-out-auth1.hosts.co.uk [195.7.255.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 49P1zb2qpzz2JZ for ; Fri, 15 May 2020 21:40:27 +0000 (UTC) Received: from [95.149.142.196] (helo=aragorn.hosts.co.uk.tfitzgeorge.me.uk) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1jZi41-0005Nq-7m; Fri, 15 May 2020 22:40:21 +0100 From: Tim FitzGeorge To: development@lists.ipfire.org Subject: [PATCH 1/3] Help for GUI - ipfire theme code Date: Fri, 15 May 2020 22:39:50 +0100 Message-Id: <20200515213952.15127-2-ipfr@tfitzgeorge.me.uk> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200515213952.15127-1-ipfr@tfitzgeorge.me.uk> References: <20200515213952.15127-1-ipfr@tfitzgeorge.me.uk> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1589578827; 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; bh=PWzIGSD26NMJUzz4xZhIfJqLvwp07y1cSUUR5S+qiH0=; b=YOwb4iz1lLNN21x/qVYSKL2Jsp1bRd86D1xB62c+aJCqFhYhv9mRPEfgWUm7A298tf0NeM Z3TO8hB/ihBiiGhFRXdTjmHor4AK+owQuHKU5jwQ3dezWm13AOJqbDYPDUDxJBzCBkQeuv eq/xY1eW+4+0vAfsaViVWIWWkzzGgu58cvqizG31IVhNFIZdlDy7L+y0UNlub6J5KejXuu SrOW0kCgJPCwI00rCUy8iG9x4vL5o11JrfHjL2dClkTr2J+AiI02F33BpQmdFR++oGttsC UFBQpzNT0dF0b9AYxHV6OSMR01NOLlqjPooc9MC4zzhcg7LYXMnreNF31FWSig== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1589578827; a=rsa-sha256; cv=none; b=mTTnmtbE89B/4687GEnRQ8Insdm6ndjCTFG5E0CIDEieqMYTprJwjYh7vLqbQxHkzFGhTX QeKjkfwxoBNsHJEpvCpdWanfVdVD+xHfWaQmHbpl5U3JccA8j9ffK6Eaym2k0Jm3nviO82 8Pwv9Q+Wkp5ZM6LrxMKGNVloAZly6Oi2NCEYgHMGz1immW/4sjfUiG9xmDQXxXMWq3xii6 5MwO1wZkvEBJimsLqlopkZp9Ja4JOfZ/e5Af679Q5gf/TAIlVWiT1MOZ6SENWptzMVe6e0 Jcz3ReGclLPF2xyC5wrPcPJk+hEke4y9Bi2SKpf7h6q1bOCqgU/2wA/9ue4LTw== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; spf=pass (mail01.ipfire.org: domain of ipfr@tfitzgeorge.me.uk designates 195.7.255.1 as permitted sender) smtp.mailfrom=ipfr@tfitzgeorge.me.uk Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of ipfr@tfitzgeorge.me.uk designates 195.7.255.1 as permitted sender) smtp.mailfrom=ipfr@tfitzgeorge.me.uk X-Rspamd-Queue-Id: 49P1zb2qpzz2JZ X-Spamd-Result: default: False [0.61 / 11.00]; RCVD_TLS_LAST(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; R_SPF_ALLOW(-0.20)[+ip4:195.7.255.0/25]; MIME_GOOD(-0.10)[text/plain]; ARC_SIGNED(0.00)[i=1]; BROKEN_CONTENT_TYPE(1.50)[]; DMARC_NA(0.00)[tfitzgeorge.me.uk]; RECEIVED_SPAMHAUS_PBL(0.00)[95.149.142.196:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.00)[-1.002]; IP_REPUTATION_SPAM(0.01)[asn: 8622(0.00), country: GB(0.01), ip: 195.7.255.1(0.00)]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:8622, ipnet:195.7.224.0/19, country:GB]; RCVD_COUNT_TWO(0.00)[2]; BAYES_HAM(-2.98)[99.91%]; RCVD_IN_DNSWL_LOW(-0.10)[195.7.255.1:from] X-Rspamd-Server: mail01.haj.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Extracts help key from menu hash when building menus and adds help link to the menu. Signed-off-by: Tim FitzGeorge --- html/html/themes/ipfire/include/functions.pl | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 9aec77497..6eb56c628 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -39,6 +39,8 @@ require "${General::swroot}/lang.pl"; # @param submenu entries sub showsubmenu() { my $submenus = shift; + my $uri = shift; + my $help; print "
    "; foreach my $item (sort keys %$submenus) { @@ -54,16 +56,26 @@ sub showsubmenu() { } print ''.$submenus->{$item}->{'caption'}.''; + if (exists $submenus->{$item}->{'help'} and $link eq $uri) { + $help = $submenus->{$item}->{'help'}; + } + &showsubmenu($subsubmenus) if ($subsubmenus); print ''; } - print "
" + print ""; + + return $help; } ############################################################################### # # print menu html elements sub showmenu() { + $uri = shift; + my $help = ''; + my $subhelp; + print '
'; if ($settings{'SPEED'} ne 'off') { @@ -82,10 +94,11 @@ EOF next if (!is_menu_visible($link) or $link eq ''); print '
  • '.$menu->{$k1}->{'caption'}.''; my $submenus = $menu->{$k1}->{'subMenu'}; - &showsubmenu($submenus) if ($submenus); + $help .= &showsubmenu($submenus, $uri) if ($submenus); print "
  • "; } + print '
  • ?
  • ' if ($help); print "
    "; } @@ -168,7 +181,7 @@ print < From patchwork Fri May 15 21:39:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim FitzGeorge X-Patchwork-Id: 3104 Return-Path: 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49P1zl0wr0z3xVh for ; Fri, 15 May 2020 21:40:35 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49P1zk4tx6z3xH; Fri, 15 May 2020 21:40:34 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49P1zk0tnqz2y9P; Fri, 15 May 2020 21:40:34 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49P1zg1KCnz2yBT for ; Fri, 15 May 2020 21:40:31 +0000 (UTC) Received: from smtp.hosts.co.uk (smtp.hosts.co.uk [85.233.160.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 49P1zd4sRCz286 for ; Fri, 15 May 2020 21:40:29 +0000 (UTC) Received: from [95.149.142.196] (helo=aragorn.hosts.co.uk.tfitzgeorge.me.uk) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1jZi46-0005Nq-9d; Fri, 15 May 2020 22:40:29 +0100 From: Tim FitzGeorge To: development@lists.ipfire.org Subject: [PATCH 2/3] Help for GUI - Help links Date: Fri, 15 May 2020 22:39:51 +0100 Message-Id: <20200515213952.15127-3-ipfr@tfitzgeorge.me.uk> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200515213952.15127-1-ipfr@tfitzgeorge.me.uk> References: <20200515213952.15127-1-ipfr@tfitzgeorge.me.uk> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1589578829; 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; bh=OQ+DDj7YNWkyElXWdP2Y/b1EkzaX8NM6zUzT/dMNNXI=; b=n8cINu+qbWYdnT43pLYW64Ne29fAD65dnwiyobH6nsXNggkf1HScadBEMunUWFvZA4p62u lLWdxcdqwhBP2zB4NehvBoIwg4RymyMzDNp+r/d4XqiyD5rFtzb1BSPnqQv2cfGSH2nZ6x evRLZBeYmJ64b5wApqhsbZu1cnSnCCWvNaC79elHKuJHbX0R2I+YVwhSWLLBym8aWh9Qvj 6nlyUvqAeXDIbvEkDqHzTS5ssvuCoNDxMFTA0Q1EgLhPJLsHmAHQBQnSpyQS5oOUk/iQnM d3ktu6en9Vhnse8jPeJa1326YapnxmyDI/1HN9g2FueLgKiX/qM/Fx7Zrib6rg== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1589578829; a=rsa-sha256; cv=none; b=Ny4Ovf4X5MkVKjEb757ak8ETL1SzVr7DR6bSCgO0NjRU1No1Huvuiq+MNHuaWqQ9myVxyw Nvzcdzh0GDYRRSOG8yu0KsYJmIdWM5MseaEwf/NExb5svOs7yt/FYQZLbMUOXtMrzuA6FP 8F+KZvPNaOEEqkm8O2gGUKNn1gXGgUvxB67X4U25Di2/bJbKccW8TPMDOQ3gVBg6VgNBs/ YdsvX3Wuq93opg+7oRAkVOGBt0rABiAYxwkCsTEBtQXx6XYHVIfyBmiTSgAQYvnZwZlZnM Evt3yRsM67rjYpEpiKS5XR4CwmDctGjYkG4hh96JHklGKGLYAcp4VJzydBg1OA== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of ipfr@tfitzgeorge.me.uk designates 85.233.160.19 as permitted sender) smtp.mailfrom=ipfr@tfitzgeorge.me.uk Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of ipfr@tfitzgeorge.me.uk designates 85.233.160.19 as permitted sender) smtp.mailfrom=ipfr@tfitzgeorge.me.uk X-Rspamd-Queue-Id: 49P1zd4sRCz286 X-Spamd-Result: default: False [0.59 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; R_SPF_ALLOW(-0.20)[+ip4:85.233.160.0/27]; RWL_MAILSPIKE_GOOD(0.00)[85.233.160.19:from]; ARC_SIGNED(0.00)[i=1]; BROKEN_CONTENT_TYPE(1.50)[]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWO(0.00)[2]; RECEIVED_SPAMHAUS_PBL(0.00)[95.149.142.196:received]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-2.97)[99.86%]; ASN(0.00)[asn:8622, ipnet:85.233.160.0/19, country:GB]; ARC_NA(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[85.233.160.19:from]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[tfitzgeorge.me.uk]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.04)[-1.042]; IP_REPUTATION_SPAM(0.01)[asn: 8622(0.00), country: GB(0.01), ip: 85.233.160.19(0.00)]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mail01.haj.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Tim FitzGeorge --- config/menu/10-system.menu | 11 +++++++++++ config/menu/20-status.menu | 13 +++++++++++++ config/menu/30-network.menu | 20 +++++++++++++++++--- config/menu/40-services.menu | 6 ++++++ config/menu/50-firewall.menu | 8 +++++++- config/menu/60-ipfire.menu | 1 + config/menu/70-log.menu | 33 ++++++++++++++++++++++----------- config/menu/EX-apcupsd.menu | 1 + config/menu/EX-guardian.menu | 1 + config/menu/EX-mpfire.menu | 1 + config/menu/EX-samba.menu | 1 + config/menu/EX-tor.menu | 1 + config/menu/EX-wlanap.menu | 1 + 13 files changed, 83 insertions(+), 15 deletions(-) -- 2.26.1 diff --git a/config/menu/10-system.menu b/config/menu/10-system.menu index b142bfbac..176621b41 100644 --- a/config/menu/10-system.menu +++ b/config/menu/10-system.menu @@ -3,63 +3,74 @@ 'uri' => '/cgi-bin/index.cgi', 'title' => "$Lang::tr{'alt home'}", 'enabled' => 1, + 'help' => 'configuration/system/startpage' }; $subsystem->{'20.dialup'} = { 'caption' => $Lang::tr{'alt dialup'}, 'uri' => '/cgi-bin/pppsetup.cgi', 'title' => "$Lang::tr{'alt dialup'}", 'enabled' => 1, + 'help' => 'configuration/system/dial' }; $subsystem->{'21.wlan'} = { 'caption' => $Lang::tr{'wlan client'}, 'uri' => '/cgi-bin/wirelessclient.cgi', 'title' => "$Lang::tr{'wlan client'}", 'enabled' => 0, + 'help' => 'configuration/system/wlanclient' }; $subsystem->{'22.dma'} = {'caption' => $Lang::tr{'email settings'}, 'uri' => '/cgi-bin/mail.cgi', 'title' => "$Lang::tr{'email settings'}", 'enabled' => 1, + 'help' => 'configuration/system/mail_service' }; $subsystem->{'30.ssh'} = { 'caption' => $Lang::tr{'ssh access'}, 'uri' => '/cgi-bin/remote.cgi', 'title' => "$Lang::tr{'ssh access'}", 'enabled' => 1, + 'help' => 'configuration/system/ssh' }; $subsystem->{'40.gui'} = { 'caption' => $Lang::tr{'gui settings'}, 'uri' => '/cgi-bin/gui.cgi', 'title' => "$Lang::tr{'gui settings'}", 'enabled' => 1, + 'help' => 'configuration/system/userinterface' }; $subsystem->{'40.backup'} = { 'caption' => $Lang::tr{'backup'}, 'uri' => '/cgi-bin/backup.cgi', 'title' => "$Lang::tr{'backup'}", 'enabled' => 1, + 'help' => 'configuration/system/backup' }; $subsystem->{'41.fireinfo'} = { 'caption' => $Lang::tr{'system information'}, 'uri' => '/cgi-bin/fireinfo.cgi', 'title' => "$Lang::tr{'system information'}", 'enabled' => 1, + 'help' => 'fireinfo' }; $subsystem->{'42.hwvuln'} = { 'caption' => $Lang::tr{'hardware vulnerabilities'}, 'uri' => '/cgi-bin/vulnerabilities.cgi', 'title' => "$Lang::tr{'hardware vulnerabilities'}", 'enabled' => 1, + 'help' => 'configuration/system/vulnerabilties' }; $subsystem->{'43.shutdown'} = { 'caption' => $Lang::tr{'shutdown'}, 'uri' => '/cgi-bin/shutdown.cgi', 'title' => "$Lang::tr{'shutdown'}", 'enabled' => 1, + 'help' => 'configuration/system/shutdown' }; $subsystem->{'99.credits'} = { 'caption' => $Lang::tr{'credits'}, 'uri' => '/cgi-bin/credits.cgi', 'title' => "$Lang::tr{'credits'}", 'enabled' => 1, + 'help' => 'configuration/system/credits' }; diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 2bcf0d5e8..38944b447 100644 --- a/config/menu/20-status.menu +++ b/config/menu/20-status.menu @@ -3,48 +3,56 @@ 'uri' => '/cgi-bin/system.cgi', 'title' => "$Lang::tr{'system'}", 'enabled' => 1, + 'help' => 'configuration/status/system' }; $substatus->{'20.memory'} = { 'caption' => $Lang::tr{'memory'}, 'uri' => '/cgi-bin/memory.cgi', 'title' => "$Lang::tr{'memory'}", 'enabled' => 1, + 'help' => 'configuration/status/memory' }; $substatus->{'30.services'} = { 'caption' => $Lang::tr{'services'}, 'uri' => '/cgi-bin/services.cgi', 'title' => "$Lang::tr{'services'}", 'enabled' => 1, + 'help' => 'configuration/status/services' }; $substatus->{'40.media'} = { 'caption' => $Lang::tr{'media'}, 'uri' => '/cgi-bin/media.cgi', 'title' => "$Lang::tr{'media'}", 'enabled' => 1, + 'help' => 'configuration/status/drives' }; $substatus->{'50.networkred'} = { 'caption' => "$Lang::tr{'network red'}", 'uri' => '/cgi-bin/netexternal.cgi', 'title' => "$Lang::tr{'network red'}", 'enabled' => 1, + 'help' => 'configuration/status/network_ext' }; $substatus->{'51.networkinternal'} = { 'caption' => "$Lang::tr{'network internal'}", 'uri' => '/cgi-bin/netinternal.cgi', 'title' => "$Lang::tr{'network internal'}", 'enabled' => 1, + 'help' => 'configuration/status/network_int' }; $substatus->{'52.networkother'} = { 'caption' => "$Lang::tr{'network other'}", 'uri' => '/cgi-bin/netother.cgi', 'title' => "$Lang::tr{'network other'}", 'enabled' => 1, + 'help' => 'configuration/status/network_other' }; $substatus->{'53.networkovpn'} = { 'caption' => "$Lang::tr{'vpn statistic rw'}", 'uri' => '/cgi-bin/netovpnrw.cgi', 'title' => "$Lang::tr{'vpn statistic rw'}", 'enabled' => 1, + 'help' => 'configuration/status/network_ovpnrw' }; $substatus->{'54.networkovpnsrv'} = { 'caption' => "$Lang::tr{'vpn statistic n2n'}", @@ -57,24 +65,28 @@ 'uri' => '/cgi-bin/hardwaregraphs.cgi', 'title' => "$Lang::tr{'hardware graphs'}", 'enabled' => 1, + 'help' => 'configuration/status/hardware_diagrams' }; $substatus->{'61.entropy'} = { 'caption' => "$Lang::tr{'entropy'}", 'uri' => '/cgi-bin/entropy.cgi', 'title' => "$Lang::tr{'entropy graphs'}", 'enabled' => 1, + 'help' => 'configuration/status/entropy' }; $substatus->{'71.connections'} = { 'caption' => $Lang::tr{'connections'}, 'uri' => '/cgi-bin/connections.cgi', 'title' => "$Lang::tr{'connections'}", 'enabled' => 1, + 'help' => 'configuration/status/connections' }; $substatus->{'72.nettraf'} = { 'caption' => $Lang::tr{'sstraffic'}, 'uri' => '/cgi-bin/traffic.cgi', 'title' => "$Lang::tr{'sstraffic'}", 'enabled' => 1, + 'help' => 'configuration/status/nettraffic' }; $substatus->{'73.qos'} = { 'caption' => $Lang::tr{'qos graphs'}, @@ -96,4 +108,5 @@ 'uri' => '/cgi-bin/mdstat.cgi', 'title' => 'Mdstat', 'enabled' => 1, + 'help' => 'configuration/status/mdstat' }; diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu index 19571a870..6b1e8edf6 100644 --- a/config/menu/30-network.menu +++ b/config/menu/30-network.menu @@ -1,83 +1,97 @@ $subnetwork->{'10.netconf'} = {'caption' => "$Lang::tr{'net config'}", 'uri' => '/cgi-bin/netconfig.cgi', 'title' => "$Lang::tr{'net config'}", - 'enabled' => 0, + 'enabled' => 0 }; $subnetwork->{'11.zoneconf'} = {'caption' => "$Lang::tr{'zoneconf title'}", 'uri' => '/cgi-bin/zoneconf.cgi', 'title' => "$Lang::tr{'zoneconf title'}", 'enabled' => 1, + 'help' => 'configuration/network/zoneconf' }; $subnetwork->{'12.dns'} = { 'caption' => $Lang::tr{'dns title'}, 'uri' => '/cgi-bin/dns.cgi', 'title' => "$Lang::tr{'dns title'}", 'enabled' => 1, + 'help' => 'configuration/network/dns' }; $subnetwork->{'20.proxy'} = {'caption' => "$Lang::tr{'web proxy'}", 'uri' => '/cgi-bin/proxy.cgi', 'title' => "$Lang::tr{'web proxy'}", 'enabled' => 1, + 'help' => 'configuration/network/proxy/wui_conf' }; $subnetwork->{'21.urlfilter'} = {'caption' => $Lang::tr{'url filter'}, 'uri' => '/cgi-bin/urlfilter.cgi', 'title' => $Lang::tr{'url filter'}, 'enabled' => 1, + 'help' => 'configuration/network/url-filter' }; $subnetwork->{'22.updxlrator'} = {'caption' => $Lang::tr{'update accelerator'}, 'uri' => '/cgi-bin/updatexlrator.cgi', 'title' => $Lang::tr{'update accelerator'}, 'enabled' => 1, + 'help' => 'configuration/network/update-booster' }; $subnetwork->{'30.dhcp'} = {'caption' => $Lang::tr{'dhcp server'}, 'uri' => '/cgi-bin/dhcp.cgi', 'title' => "$Lang::tr{'dhcp server'}", 'enabled' => 1, + 'help' => 'configuration/network/dhcp' }; $subnetwork->{'32.captive'} = {'caption' => $Lang::tr{'Captive'}, 'uri' => '/cgi-bin/captive.cgi', 'title' => $Lang::tr{'Captive'}, 'enabled' => 1, + 'help' => 'configuration/network/captive' }; $subnetwork->{'40.scheduler'} = { 'caption' => $Lang::tr{'connscheduler'}, 'uri' => '/cgi-bin/connscheduler.cgi', 'title' => "$Lang::tr{'connscheduler'}", 'enabled' => 1, + 'help' => 'configuration/network/connectionscheduler' }; $subnetwork->{'50.hosts'} = { 'caption' => $Lang::tr{'edit hosts'}, 'uri' => '/cgi-bin/hosts.cgi', 'title' => "$Lang::tr{'edit hosts'}", 'enabled' => 1, + 'help' => 'configuration/network/hosts' }; $subnetwork->{'52.dnsforward'} = { 'caption' => $Lang::tr{'dnsforward'}, 'uri' => '/cgi-bin/dnsforward.cgi', 'title' => "$Lang::tr{'dnsforward'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/network/dnsforward' }; $subnetwork->{'60.routes'} = { 'caption' => $Lang::tr{'static routes'}, 'uri' => '/cgi-bin/routing.cgi', 'title' => "$Lang::tr{'static routes'}", 'enabled' => 1, + 'help' => 'configuration/network/static' }; $subnetwork->{'70.aliases'} = { 'caption' => $Lang::tr{'aliases'}, 'uri' => '/cgi-bin/aliases.cgi', 'title' => "$Lang::tr{'aliases'}", - 'enabled' => `grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings`, + 'help' => 'configuration/network/aliases', + 'enabled' => `grep "RED_TYPE=STATIC" /var/ipfire/ethernet/settings` }; $subnetwork->{'80.macadressmenu'} = { 'caption' => $Lang::tr{'mac address menu'}, 'uri' => '/cgi-bin/mac.cgi', 'title' => "$Lang::tr{'mac address menu'}", 'enabled' => 1, + 'help' => 'configuration/network/mac-address' }; $subnetwork->{'90.wakeonlan'} = { 'caption' => $Lang::tr{'WakeOnLan'}, 'uri' => '/cgi-bin/wakeonlan.cgi', 'title' => "$Lang::tr{'WakeOnLan'}", 'enabled' => 1, + 'help' => 'configuration/network/wake-on-lan' }; diff --git a/config/menu/40-services.menu b/config/menu/40-services.menu index 83ce3bc1f..bb363cbae 100644 --- a/config/menu/40-services.menu +++ b/config/menu/40-services.menu @@ -3,30 +3,36 @@ 'uri' => '/cgi-bin/vpnmain.cgi', 'title' => "$Lang::tr{'virtual private networking'}", 'enabled' => 1, + 'help' => 'configuration/services/ipsec' }; $subservices->{'20.openvpn'} = { 'caption' => 'OpenVPN', 'uri' => '/cgi-bin/ovpnmain.cgi', 'title' => "$Lang::tr{'virtual private networking'}", 'enabled' => 1, + 'help' => 'configuration/services/openvpn' }; $subservices->{'30.dyndns'} = {'caption' => $Lang::tr{'dynamic dns'}, 'uri' => '/cgi-bin/ddns.cgi', 'title' => "$Lang::tr{'dynamic dns'}", 'enabled' => 1, + 'help' => 'configuration/services/dyndns' }; $subservices->{'40.time'} = {'caption' => $Lang::tr{'time server'}, 'uri' => '/cgi-bin/time.cgi', 'title' => "$Lang::tr{'time server'}", 'enabled' => 1, + 'help' => 'configuration/services/ntp' }; $subservices->{'50.qos'} = {'caption' => 'Quality of Service', 'uri' => '/cgi-bin/qos.cgi', 'title' => "Quality of Service", 'enabled' => 1, + 'help' => 'configuration/services/qos' }; $subservices->{'70.extrahd'} = {'caption' => "ExtraHD", 'enabled' => 1, 'uri' => '/cgi-bin/extrahd.cgi', 'title' => "ExtraHD", + 'help' => 'configuration/services/extrahd' }; diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu index 5ec1f67fc..07dfd4732 100644 --- a/config/menu/50-firewall.menu +++ b/config/menu/50-firewall.menu @@ -3,6 +3,7 @@ 'uri' => '/cgi-bin/firewall.cgi', 'title' => "$Lang::tr{'firewall rules'}", 'enabled' => 1, + 'help' => 'configuration/firewall/rules' }; $subfirewall->{'20.fwhost'} = { 'caption' => $Lang::tr{'fwhost menu'}, @@ -15,29 +16,33 @@ 'uri' => '/cgi-bin/optionsfw.cgi', 'title' => "$Lang::tr{'options fw'}", 'enabled' => 1, + 'help' => 'configuration/firewall/options' }; $subfirewall->{'40.ids'} = {'caption' => $Lang::tr{'intrusion detection'}, 'uri' => '/cgi-bin/ids.cgi', 'title' => "$Lang::tr{'intrusion detection system'}", 'enabled' => 1, + 'help' => 'configuration/firewall/ips' }; $subfirewall->{'50.p2p'} = { 'caption' => $Lang::tr{'p2p block'}, 'uri' => '/cgi-bin/p2p-block.cgi', 'title' => "P2P-Block", 'enabled' => 1, + 'help' => 'configuration/firewall/p2p-block' }; $subfirewall->{'60.geoipblock'} = { 'caption' => $Lang::tr{'geoipblock'}, 'uri' => '/cgi-bin/geoip-block.cgi', 'title' => $Lang::tr{'geoipblock'}, 'enabled' => 1, + 'help' => 'configuration/firewall/geoip-block' }; $subfirewall->{'70.wireless'} = { 'caption' => $Lang::tr{'blue access'}, 'uri' => '/cgi-bin/wireless.cgi', 'title' => "$Lang::tr{'blue access'}", - 'enabled' => 1, + 'enabled' => 1 }; $subfirewall->{'80.upnp'} = { 'caption' => 'UPnP', @@ -50,4 +55,5 @@ 'uri' => '/cgi-bin/iptables.cgi', 'title' => "$Lang::tr{'ipts'}", 'enabled' => 1, + 'help' => 'configuration/firewall/iptables' }; diff --git a/config/menu/60-ipfire.menu b/config/menu/60-ipfire.menu index 8b4c13950..87ce7f506 100644 --- a/config/menu/60-ipfire.menu +++ b/config/menu/60-ipfire.menu @@ -2,6 +2,7 @@ 'uri' => '/cgi-bin/pakfire.cgi', 'title' => "Pakfire", 'enabled' => 1, + 'help' => 'configuration/ipfire/pakfire' }; $subipfire->{'99.help'} = {'caption' => $Lang::tr{'help'}, 'uri' => '/cgi-bin/help.cgi', diff --git a/config/menu/70-log.menu b/config/menu/70-log.menu index 2fa0e426e..97931d3b8 100644 --- a/config/menu/70-log.menu +++ b/config/menu/70-log.menu @@ -1,59 +1,69 @@ $sublogs->{'10.summary'} = {'caption' => $Lang::tr{'log summary'}, 'uri' => '/cgi-bin/logs.cgi/summary.dat', 'title' => "$Lang::tr{'log summary'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/logs/summary' }; $sublogs->{'20.settings'} = {'caption' => $Lang::tr{'log settings'}, 'uri' => '/cgi-bin/logs.cgi/config.dat', 'title' => "$Lang::tr{'log settings'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/logs/logsettings' }; $sublogs->{'30.proxy'} = {'caption' => $Lang::tr{'proxy logs'}, 'uri' => '/cgi-bin/logs.cgi/proxylog.dat', 'title' => "$Lang::tr{'proxy logs'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/logs/proxy' }; $sublogs->{'31.calamaris'} = {'caption' => $Lang::tr{'calamaris proxy reports'}, 'uri' => '/cgi-bin/logs.cgi/calamaris.dat', 'title' => "$Lang::tr{'calamaris proxy reports'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/logs/proxyreports' }; $sublogs->{'40.firewall'} = {'caption' => $Lang::tr{'firewall logs'}, 'uri' => '/cgi-bin/logs.cgi/firewalllog.dat', 'title' => "$Lang::tr{'firewall logs'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/logs/firewall' }; $sublogs->{'41.firewallip'} = {'caption' => $Lang::tr{'firewall logs ip'}, 'uri' => '/cgi-bin/logs.cgi/firewalllogip.dat', 'title' => "$Lang::tr{'firewall logs ip'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/logs/firewall-ip' }; $sublogs->{'42.firewallport'} = {'caption' => $Lang::tr{'firewall logs port'}, 'uri' => '/cgi-bin/logs.cgi/firewalllogport.dat', 'title' => "$Lang::tr{'firewall logs port'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/logs/firewall-port' }; $sublogs->{'43.firewallcountry'} = {'caption' => $Lang::tr{'firewall logs country'}, 'uri' => '/cgi-bin/logs.cgi/firewalllogcountry.dat', 'title' => "$Lang::tr{'firewall logs country'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/logs/firewall-country' }; $sublogs->{'50.ids'} = {'caption' => $Lang::tr{'ids logs'}, 'uri' => '/cgi-bin/logs.cgi/ids.dat', 'title' => "$Lang::tr{'ids logs'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/logs/ids' }; $sublogs->{'55.ovpnclients'} = { 'caption' => $Lang::tr{'ovpn rw connection log'}, 'uri' => '/cgi-bin/logs.cgi/ovpnclients.dat', 'title' => "$Lang::tr{'ovpn rw connection log'}", - 'enabled' => 1, + 'enabled' => 1 }; $sublogs->{'60.urlfilter'} = { 'caption' => $Lang::tr{'urlfilter logs'}, 'uri' => '/cgi-bin/logs.cgi/urlfilter.dat', 'title' => "$Lang::tr{'urlfilter log'}", 'enabled' => 1, + 'help' => 'configuration/logs/url-filter' }; $sublogs->{'70.openvpn'} = {'caption' => $Lang::tr{'openvpn log'}, 'uri' => '/cgi-bin/logs.cgi/openvpn.dat', @@ -63,7 +73,8 @@ $sublogs->{'80.system'} = {'caption' => $Lang::tr{'system logs'}, 'uri' => '/cgi-bin/logs.cgi/log.dat', 'title' => "$Lang::tr{'system logs'}", - 'enabled' => 1 + 'enabled' => 1, + 'help' => 'configuration/logs/system' }; $sublogs->{'90.userlog'} = {'caption' => $Lang::tr{'user proxy logs'}, 'uri' => '/cgi-bin/logs.cgi/userlog.dat', diff --git a/config/menu/EX-apcupsd.menu b/config/menu/EX-apcupsd.menu index 5f01dce33..70553c8a5 100644 --- a/config/menu/EX-apcupsd.menu +++ b/config/menu/EX-apcupsd.menu @@ -2,4 +2,5 @@ 'uri' => '/cgi-bin/upsstats.cgi', 'title' => $Lang::tr{'apcupsd'}, 'enabled' => 1, + 'help' => 'addons/apcupsd' }; diff --git a/config/menu/EX-guardian.menu b/config/menu/EX-guardian.menu index 89cda9d35..159b54486 100644 --- a/config/menu/EX-guardian.menu +++ b/config/menu/EX-guardian.menu @@ -3,4 +3,5 @@ $subservices->{'65.guardian'} = { 'uri' => '/cgi-bin/guardian.cgi', 'title' => "$Lang::tr{'guardian'}", 'enabled' => '1', + 'help' => 'addons/guardian' }; diff --git a/config/menu/EX-mpfire.menu b/config/menu/EX-mpfire.menu index afba4dbde..583e7eca0 100644 --- a/config/menu/EX-mpfire.menu +++ b/config/menu/EX-mpfire.menu @@ -2,4 +2,5 @@ 'uri' => '/cgi-bin/mpfire.cgi', 'title' => $Lang::tr{'mpfire'}, 'enabled' => 1, + 'help' => 'addons/mpfire' }; diff --git a/config/menu/EX-samba.menu b/config/menu/EX-samba.menu index 6a9a1ae71..30bcb0c8b 100644 --- a/config/menu/EX-samba.menu +++ b/config/menu/EX-samba.menu @@ -2,4 +2,5 @@ 'uri' => '/cgi-bin/samba.cgi', 'title' => $Lang::tr{'samba'}, 'enabled' => 1, + 'help' => 'addons/samba' }; diff --git a/config/menu/EX-tor.menu b/config/menu/EX-tor.menu index 00ddffe8d..aec5b4354 100644 --- a/config/menu/EX-tor.menu +++ b/config/menu/EX-tor.menu @@ -3,4 +3,5 @@ $subipfire->{'50.tor'} = { 'uri' => '/cgi-bin/tor.cgi', 'title' => $Lang::tr{'tor'}, 'enabled' => 1, + 'help' => 'addons/tor' }; diff --git a/config/menu/EX-wlanap.menu b/config/menu/EX-wlanap.menu index 95b653052..cc131a209 100644 --- a/config/menu/EX-wlanap.menu +++ b/config/menu/EX-wlanap.menu @@ -2,4 +2,5 @@ 'uri' => '/cgi-bin/wlanap.cgi', 'title' => WLanAP, 'enabled' => 1, + 'help' => 'addons/wireless' }; From patchwork Fri May 15 21:39:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim FitzGeorge X-Patchwork-Id: 3103 Return-Path: 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49P1zj0JGCz3xVh for ; Fri, 15 May 2020 21:40:33 +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 "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 49P1zh4c0zz3J7; Fri, 15 May 2020 21:40:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49P1zh3k4yz2xkm; Fri, 15 May 2020 21:40:32 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 49P1zf6lBXz2xbY for ; Fri, 15 May 2020 21:40:30 +0000 (UTC) Received: from smtp.hosts.co.uk (smtp.hosts.co.uk [85.233.160.19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 49P1zf5S7Wz3J7 for ; Fri, 15 May 2020 21:40:30 +0000 (UTC) Received: from [95.149.142.196] (helo=aragorn.hosts.co.uk.tfitzgeorge.me.uk) by smtp.hosts.co.uk with esmtpa (Exim) (envelope-from ) id 1jZi4E-0005Nq-7M; Fri, 15 May 2020 22:40:30 +0100 From: Tim FitzGeorge To: development@lists.ipfire.org Subject: [PATCH 3/3] Help for GUI - help link style Date: Fri, 15 May 2020 22:39:52 +0100 Message-Id: <20200515213952.15127-4-ipfr@tfitzgeorge.me.uk> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200515213952.15127-1-ipfr@tfitzgeorge.me.uk> References: <20200515213952.15127-1-ipfr@tfitzgeorge.me.uk> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1589578830; 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; bh=Iwc2vCev1uToVfuwhy5N1HPsHfdMv6r1xjHLyMsMUxQ=; b=cBHgebsIIV0rfbh6tyk8RY39Mu0xkSnWI2kHLlSclHmqEVokXuXTpiXaWyOIM2AnFSt3GV 1gbH5UQG/vOFd2jDeXoQPbdrm26A9fm+RG6AMiwc4wnBDdjCYV3Mg3P/fozJfdYJQeC9FA tibTTJW/iJ3oKIavwHILJfWZH0HgDm3Nj9TiV0zlQudcoxgvii83/ecSeANV70b6252pDE fKsilSDfm/IrqVloXX3rZvPCbDWP51qZf20kt+oRbkfFIzOjU0vOwO5UppeE1TZ1Z0Pcne RgEpPhDQl9vEs+vWg/r68ZvU977IiHpZ3H3f8Vqkl/R6xLP2JwObGFzXgzJg+Q== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1589578830; a=rsa-sha256; cv=none; b=HVSm8GptZGX3G+KQg9dH3i4aD6GhREgbvj25tUL3CLij73GJBFxbpsnnpeOMSrQlZK/erj 70St6nEvdS/0rnvri6/VxflIIhzrrOnTOxN6/Scd4VYjKLjfjRZhhmP2XIZUcXLxFXV8Ct /9i26UmsdrtOdOAHZP+RXTlsSwWAn7KOmZqyO9uuDnHRyosPuutQP7+4Ukg2+/TnI2YxRQ jB+ftk12AmQ9hmB+lDyp4yOucTq+c0TuUhEaSsaL4k0uSJE8NTWIJk7wusd+LcuQV87EkH chorMlM9UZzYu9hqA710To0A5Hug+0W+3SptltRVjEjnRHUGEnsAD6i8KvKauw== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of ipfr@tfitzgeorge.me.uk designates 85.233.160.19 as permitted sender) smtp.mailfrom=ipfr@tfitzgeorge.me.uk Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=none; spf=pass (mail01.ipfire.org: domain of ipfr@tfitzgeorge.me.uk designates 85.233.160.19 as permitted sender) smtp.mailfrom=ipfr@tfitzgeorge.me.uk X-Rspamd-Queue-Id: 49P1zf5S7Wz3J7 X-Spamd-Result: default: False [0.60 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; R_SPF_ALLOW(-0.20)[+ip4:85.233.160.0/27]; RWL_MAILSPIKE_GOOD(0.00)[85.233.160.19:from]; ARC_SIGNED(0.00)[i=1]; BROKEN_CONTENT_TYPE(1.50)[]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWO(0.00)[2]; RECEIVED_SPAMHAUS_PBL(0.00)[95.149.142.196:received]; RCVD_TLS_LAST(0.00)[]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; BAYES_HAM(-2.94)[99.75%]; ASN(0.00)[asn:8622, ipnet:85.233.160.0/19, country:GB]; ARC_NA(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[85.233.160.19:from]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[tfitzgeorge.me.uk]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-1.05)[-1.051]; IP_REPUTATION_SPAM(0.01)[asn: 8622(0.00), country: GB(0.01), ip: 85.233.160.19(0.00)]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mail01.haj.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Tim FitzGeorge --- html/html/themes/ipfire/include/css/style.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css index 9421fc111..7c2ec8577 100644 --- a/html/html/themes/ipfire/include/css/style.css +++ b/html/html/themes/ipfire/include/css/style.css @@ -261,6 +261,14 @@ input.text { background: #dddddd; } +#cssmenu .help { + padding: 0px 6px; + border: solid; + border-width: thin; + border-radius: 10px; + line-height: 20px; +} + /* This decorates all tables with class="tbl" */ table {