From 0463df62f0d7146b557ba881ac60b0a6916fefa6 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Sat, 23 Apr 2016 13:21:25 +0200
Subject: only display help button in collapsed panel if context help is
 enabled

---
 view/tpl/nav.tpl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index ff71c224d..2a6af3f6a 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -11,9 +11,11 @@
 			<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1">
 				<i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
 			</button>
+			{{if $nav.help.6}}
 			<a class="navbar-toggle" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}_collapsed"{{if $nav.help.6}} onclick="return false;"{{/if}}>
-				{{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}}
+				<i class="icon-question-sign"></i>
 			</a>
+			{{/if}}
 			{{if $userinfo}}
 				<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span>
 				{{if $localuser}}
@@ -191,7 +193,7 @@
 			{{/if}}
 
 			{{if $nav.help}}
-				<li class="{{$sel.help}} hidden-xs">
+				<li class="{{$sel.help}}{{if $nav.help.6}} hidden-xs{{/if}}">
 					<a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="return false;"{{/if}}>{{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}}</a>
 				</li>
 			{{/if}}
-- 
cgit v1.2.3