From 4569cae57f127afd093794310ccd290d2d9fdf36 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Wed, 20 Apr 2016 10:58:46 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/themes/default/templates/sidenav.tpl.htm |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/interface/web/themes/default/templates/sidenav.tpl.htm b/interface/web/themes/default/templates/sidenav.tpl.htm
index 6064966..b4dcb38 100644
--- a/interface/web/themes/default/templates/sidenav.tpl.htm
+++ b/interface/web/themes/default/templates/sidenav.tpl.htm
@@ -1,17 +1,20 @@
 <tmpl_loop name="nav_left">
-	<tmpl_if name="title"><header><tmpl_if name="startpage"><a href="#" class="subnav-header" data-load-content="<tmpl_var name='startpage'>"></tmpl_if><tmpl_var name="title"><tmpl_if name="startpage"></a></tmpl_if></header></tmpl_if>
+	<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>
 	<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">
+			<tmpl_elseif name="target" op="==" value="_top">
+				<a href="<tmpl_var name='link'>" target="_top">
 			<tmpl_else>
 				<a href="#" data-load-content="<tmpl_var name='link'>">
 			</tmpl_if>
 		</tmpl_if>
-		  <div>
-			<strong><tmpl_var name="title"></strong>
+		  <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>
 		<tmpl_if name="link">
 		</a>

--
Gitblit v1.9.1