From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tim FitzGeorge <ipfr@tfitzgeorge.me.uk>
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>
In-Reply-To: <20200515213952.15127-1-ipfr@tfitzgeorge.me.uk>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8953316405361015891=="
List-Id: <development.lists.ipfire.org>

--===============8953316405361015891==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Extracts help key from menu hash when building menus and adds help
link to the menu.

Signed-off-by: Tim FitzGeorge <ipfr(a)tfitzgeorge.me.uk>
---
 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 =3D shift;
+	my $uri =3D shift;
+	my $help;
 =09
 	print "<ul>";
 	foreach my $item (sort keys %$submenus) {
@@ -54,16 +56,26 @@ sub showsubmenu() {
 		}
 		print '<a href=3D"'.$link.'">'.$submenus->{$item}->{'caption'}.'</a>';
=20
+		if (exists $submenus->{$item}->{'help'} and $link eq $uri) {
+			$help =3D $submenus->{$item}->{'help'};
+		}
+
 		&showsubmenu($subsubmenus) if ($subsubmenus);
 		print '</li>';
 	}
-	print "</ul>"
+	print "</ul>";
+
+	return $help;
 }
=20
 ############################################################################=
###
 #
 # print menu html elements
 sub showmenu() {
+  $uri =3D shift;
+  my $help =3D '';
+  my $subhelp;
+
 	print '<div id=3D"cssmenu" class=3D"bigbox fixed">';
=20
 	if ($settings{'SPEED'} ne 'off') {
@@ -82,10 +94,11 @@ EOF
 		next if (!is_menu_visible($link) or $link eq '');
 		print '<li class=3D"has-sub "><a href=3D"#"><span>'.$menu->{$k1}->{'captio=
n'}.'</span></a>';
 		my $submenus =3D $menu->{$k1}->{'subMenu'};
-		&showsubmenu($submenus) if ($submenus);
+		$help .=3D &showsubmenu($submenus, $uri) if ($submenus);
 		print "</li>";
 	}
=20
+	print '<li><a href=3D"https://wiki.ipfire.org/'.$help.'" target=3D"ipfire" =
class=3D"help">?</a></li>' if ($help);
 	print "</ul></div>";
 }
=20
@@ -168,7 +181,7 @@ print <<END
 END
 ;
=20
-&showmenu() if ($suppressMenu !=3D 1);
+&showmenu( $URI[0] ) if ($suppressMenu !=3D 1);
=20
 print <<END
 	<div class=3D"bigbox fixed">
--=20
2.26.1


--===============8953316405361015891==--