From 81b15eb4290ad3f7050ed3ca54aac63cdaec34a9 Mon Sep 17 00:00:00 2001
From: Till <t.brehm@ispconfig.org>
Date: Fri, 29 Mar 2024 12:01:41 +0100
Subject: [PATCH] Fixed: Menu item title link shall use target of the first
 item

---
 interface/web/nav.php                         |  1 +
 .../themes/default/templates/sidenav.tpl.htm  | 30 +++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/interface/web/nav.php b/interface/web/nav.php
index 1091276b86..69b3c7c2d6 100644
--- a/interface/web/nav.php
+++ b/interface/web/nav.php
@@ -124,6 +124,7 @@ if(isset($_GET['nav']) && $_GET['nav'] == 'side') {
 				}
 				$nav['title'] = $app->lng($nav['title']);
 				$nav['startpage'] = $nav['items'][0]['link'];
+				$nav['startpage_target'] = $nav['items'][0]['target'];
 				$nav['items'] = $tmp_items;
 				$nav_translated[] = $nav;
 			}
diff --git a/interface/web/themes/default/templates/sidenav.tpl.htm b/interface/web/themes/default/templates/sidenav.tpl.htm
index b4dcb38ce0..4d8acbf3fa 100644
--- a/interface/web/themes/default/templates/sidenav.tpl.htm
+++ b/interface/web/themes/default/templates/sidenav.tpl.htm
@@ -1,18 +1,38 @@
 <tmpl_loop name="nav_left">
-	<tmpl_if name="title"><header><tmpl_if name="is_link" op="!=" value="no"><tmpl_if name="startpage"><a href="#" class="subnav-header" data-load-content="<tmpl_var name='startpage'>"></tmpl_if></tmpl_if><tmpl_var name="title"><tmpl_if name="is_link" op="!=" value="no"><tmpl_if name="startpage"></a></tmpl_if></tmpl_if></header></tmpl_if>
+	<tmpl_if name="title">
+		<header>
+			<tmpl_if name="is_link" op="!=" value="no">
+				<tmpl_if name="startpage">
+					<tmpl_if name="startpage_target" op="==" value="_blank">
+						<a href="{tmpl_var name='startpage'}" target="_blank">
+					<tmpl_elseif name="startpage_target" op="==" value="_top">
+						<a href="{tmpl_var name='startpage'}" target="_top">
+					<tmpl_else>
+						<a href="#" class="subnav-header" data-load-content="{tmpl_var name='startpage'}">
+					</tmpl_if>
+				</tmpl_if>
+			</tmpl_if>
+			<tmpl_var name="title">
+			<tmpl_if name="is_link" op="!=" value="no">
+				<tmpl_if name="startpage">
+					</a>
+				</tmpl_if>
+			</tmpl_if>
+		</header>
+	</tmpl_if>
 	<ul id="sub-navigation">
 	  <tmpl_loop name="items">
 	  <li<tmpl_if name="html_id"> id='<tmpl_var name="html_id">' </tmpl_if>>
 		<tmpl_if name="link">
 			<tmpl_if name="target" op="==" value="_blank">
-				<a href="<tmpl_var name='link'>" target="_blank">
+				<a href="{tmpl_var name='link'}" target="_blank">
 			<tmpl_elseif name="target" op="==" value="_top">
-				<a href="<tmpl_var name='link'>" target="_top">
+				<a href="{tmpl_var name='link'}" target="_top">
 			<tmpl_else>
-				<a href="#" data-load-content="<tmpl_var name='link'>">
+				<a href="#" data-load-content="{tmpl_var name='link'}">
 			</tmpl_if>
 		</tmpl_if>
-		  <div{tmpl_if name="css"} style="{tmpl_var name='css'}"{/tmpl_if}>
+		  <div{tmpl_if name='css'} style="{tmpl_var name='css'}"{/tmpl_if}>
 			<tmpl_if name="title"><strong><tmpl_var name="title"></strong></tmpl_if>
 			<tmpl_if name="image"><div align="center"><tmpl_var name="image"></div></tmpl_if>
 		  </div>
-- 
GitLab