From c6072728df02314180139b38b3b115a7dcc58d5a Mon Sep 17 00:00:00 2001
From: harukin <harukin0731@gmail.com>
Date: Wed, 2 Jan 2019 21:11:44 +0900
Subject: [PATCH] fix user-icon move bug

---
 view/theme/plusfuture/tpl/navbar_default.tpl | 77 ++++++++++----------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/view/theme/plusfuture/tpl/navbar_default.tpl b/view/theme/plusfuture/tpl/navbar_default.tpl
index d78335f..d37ee77 100755
--- a/view/theme/plusfuture/tpl/navbar_default.tpl
+++ b/view/theme/plusfuture/tpl/navbar_default.tpl
@@ -149,43 +149,7 @@
 		</li>
 	</ul>
 </div>
-<div class="collapse d-lg-none" id="navbar-collapse-2">
-	<div class="navbar-nav mr-auto">
-		{{if $channel_apps.0}}
-		{{foreach $channel_apps as $channel_app}}
-		{{$channel_app|replace:'dropdown-item':'nav-link'}}
-		{{/foreach}}
-		<div class="dropdown-header text-white-50 sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
-			{{$sysapps_toggle}}
-		</div>
-		<div id="sys-apps-collapsed" style="display:none;">
-		{{/if}}
-		{{foreach $navbar_apps as $navbar_app}}
-		{{$navbar_app}}
-		{{/foreach}}
-		{{foreach $nav_apps as $nav_app}}
-		{{$nav_app|replace:'dropdown-item':'nav-link'}}
-		{{/foreach}}
-		{{if $channel_apps.0}}
-		</div>
-		{{/if}}
-		{{if $is_owner}}
-		<div class="dropdown-divider"></div>
-		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
-		<a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
-		{{/if}}
-	</div>
-</div>
-{{if $nav.help.6}}
-<div id="contextual-help-content" class="contextual-help-content">
-	{{$nav.help.5}}
-	<div class="float-right">
-		<a class="btn btn-primary btn-sm" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i>&nbsp;{{$fulldocs}}</a>
-		<a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a>
-	</div>
-</div>
-{{/if}}
-{{if $userinfo}}
+{if $userinfo}}
 <div class="dropdown">
 	<div class="fakelink usermenu" data-toggle="dropdown">
 		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
@@ -231,4 +195,41 @@
 	</div>
 	{{/if}}
 </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
+<div class="collapse d-lg-none" id="navbar-collapse-2">
+	<div class="navbar-nav mr-auto">
+		{{if $channel_apps.0}}
+		{{foreach $channel_apps as $channel_app}}
+		{{$channel_app|replace:'dropdown-item':'nav-link'}}
+		{{/foreach}}
+		<div class="dropdown-header text-white-50 sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
+			{{$sysapps_toggle}}
+		</div>
+		<div id="sys-apps-collapsed" style="display:none;">
+		{{/if}}
+		{{foreach $navbar_apps as $navbar_app}}
+		{{$navbar_app}}
+		{{/foreach}}
+		{{foreach $nav_apps as $nav_app}}
+		{{$nav_app|replace:'dropdown-item':'nav-link'}}
+		{{/foreach}}
+		{{if $channel_apps.0}}
+		</div>
+		{{/if}}
+		{{if $is_owner}}
+		<div class="dropdown-divider"></div>
+		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+		<a class="nav-link" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
+		{{/if}}
+	</div>
+</div>
+{{if $nav.help.6}}
+<div id="contextual-help-content" class="contextual-help-content">
+	{{$nav.help.5}}
+	<div class="float-right">
+		<a class="btn btn-primary btn-sm" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-question"></i>&nbsp;{{$fulldocs}}</a>
+		<a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-times"></i></a>
+	</div>
+</div>
+{{/if}}
+{
\ No newline at end of file