From patchwork Fri May 15 21:39:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim FitzGeorge X-Patchwork-Id: 3101 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 49P1zZ0wjrz3xVh for ; Fri, 15 May 2020 21:40:25 +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 49P1zX1BR8z1Kg; Fri, 15 May 2020 21:40:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49P1zW47tpz2yBT; Fri, 15 May 2020 21:40:23 +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 49P1zT5sXdz2y9P for ; Fri, 15 May 2020 21:40:21 +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 49P1zS0fphz1Ym for ; Fri, 15 May 2020 21:40:19 +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 1jZi3r-0005Nq-6o; Fri, 15 May 2020 22:40:13 +0100 From: Tim FitzGeorge To: development@lists.ipfire.org Subject: [PATCH 0/3] Help for GUI Date: Fri, 15 May 2020 22:39:49 +0100 Message-Id: <20200515213952.15127-1-ipfr@tfitzgeorge.me.uk> X-Mailer: git-send-email 2.26.1 MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1589578820; 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; bh=6W1cBmn7Z95PmRqnvnyAnCLaIdHJOC4x6r0D5vuOvfY=; b=lEZ9adOpZe4IKRPBvRu3UZmbbl+cbU2EldU968RwH6qEWYvCA7tIzm/E2BDXji3oGoTMx2 QUCmcQ1iOMkvezjdrT+rjtQy7m6CNt4s0d4phb/NuCf0/lgh9RrUSRCX8MVLNRqQlHoT5e EeFcBr7V433A1fyegAUlIwpWE+0y754LG6M2yRbAlLoq0y7Qq7HTy8h/ry5VgMQEwE+O2a yzOeaS91zxshFx5/ezurYf5SD5RJAhLxRs3yG46DIUR0puK2xTYqMtRxOFFUNPogy5YWeT elf77EL4Vs2RE6wU7/d2Ily3zzletRep6vtzx9+6Pj17wuxEpA2iei/k7qJC6A== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1589578820; a=rsa-sha256; cv=none; b=ReKgoOuNgXa9HXRg+CW8jNGSkm7P30YImTVNZVa2r7owoEVW/YxLeq/89DP95QfYHxISlo bX+h+wwbQII9O6m/sDGn+jRwXn1GSCpFibRtzidg2Pwotof7iioW43RORjR4EEnrAVDHZt Gir1E7RCmiyNVbmdQaZfkMmbxiRdwhBmy42PmSj9HmaAiQt7QbWIYsCSw6QyxCGwNye9Y8 QpS9DvrgfGRmTtMZOb+ctCkZKhGmZWM1sOW0d/PUt+yZUosFwtvyiESmN64KnqcCPr8JMo PqcTn2M33I7Nai3gzQ9GPZE3o+okVGbKSr8mmvInDwBqX3xxsUeNJ6flsIMW2g== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=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: 49P1zS0fphz1Ym X-Spamd-Result: default: False [1.27 / 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.28)[96.65%]; 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.045]; 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" Add per-page help link to GUI. The link is extracted from the menu file and added to the menu. Currently only implemented for 'ipfire' and 'ipfire-rounded' themes. Tim FitzGeorge (3): Help for GUI - ipfire theme code Help for GUI - Help links Help for GUI - help link style 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 + html/html/themes/ipfire/include/css/style.css | 8 +++++ html/html/themes/ipfire/include/functions.pl | 19 +++++++++-- 15 files changed, 107 insertions(+), 18 deletions(-) --- 2.26.1