Skip to content

Commit fe8137b

Browse files
author
Till Brehm
committed
Merge branch '6663-menu-item-title-link-shall-use-target-of-the-first-item' into 'develop'
Resolve "Menu item title link shall use target of the first item" Closes #6663 See merge request ispconfig/ispconfig3!1870
2 parents 047dddb + 81b15eb commit fe8137b

File tree

2 files changed

+26
-5
lines changed

2 files changed

+26
-5
lines changed

interface/web/nav.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@
124124
}
125125
$nav['title'] = $app->lng($nav['title']);
126126
$nav['startpage'] = $nav['items'][0]['link'];
127+
$nav['startpage_target'] = $nav['items'][0]['target'];
127128
$nav['items'] = $tmp_items;
128129
$nav_translated[] = $nav;
129130
}

interface/web/themes/default/templates/sidenav.tpl.htm

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,38 @@
11
<tmpl_loop name="nav_left">
2-
<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>
2+
<tmpl_if name="title">
3+
<header>
4+
<tmpl_if name="is_link" op="!=" value="no">
5+
<tmpl_if name="startpage">
6+
<tmpl_if name="startpage_target" op="==" value="_blank">
7+
<a href="{tmpl_var name='startpage'}" target="_blank">
8+
<tmpl_elseif name="startpage_target" op="==" value="_top">
9+
<a href="{tmpl_var name='startpage'}" target="_top">
10+
<tmpl_else>
11+
<a href="#" class="subnav-header" data-load-content="{tmpl_var name='startpage'}">
12+
</tmpl_if>
13+
</tmpl_if>
14+
</tmpl_if>
15+
<tmpl_var name="title">
16+
<tmpl_if name="is_link" op="!=" value="no">
17+
<tmpl_if name="startpage">
18+
</a>
19+
</tmpl_if>
20+
</tmpl_if>
21+
</header>
22+
</tmpl_if>
323
<ul id="sub-navigation">
424
<tmpl_loop name="items">
525
<li<tmpl_if name="html_id"> id='<tmpl_var name="html_id">' </tmpl_if>>
626
<tmpl_if name="link">
727
<tmpl_if name="target" op="==" value="_blank">
8-
<a href="<tmpl_var name='link'>" target="_blank">
28+
<a href="{tmpl_var name='link'}" target="_blank">
929
<tmpl_elseif name="target" op="==" value="_top">
10-
<a href="<tmpl_var name='link'>" target="_top">
30+
<a href="{tmpl_var name='link'}" target="_top">
1131
<tmpl_else>
12-
<a href="#" data-load-content="<tmpl_var name='link'>">
32+
<a href="#" data-load-content="{tmpl_var name='link'}">
1333
</tmpl_if>
1434
</tmpl_if>
15-
<div{tmpl_if name="css"} style="{tmpl_var name='css'}"{/tmpl_if}>
35+
<div{tmpl_if name='css'} style="{tmpl_var name='css'}"{/tmpl_if}>
1636
<tmpl_if name="title"><strong><tmpl_var name="title"></strong></tmpl_if>
1737
<tmpl_if name="image"><div align="center"><tmpl_var name="image"></div></tmpl_if>
1838
</div>

0 commit comments

Comments
 (0)