initial commit for the bootstrap version 4 branch - upgrade lib and make nav.tpl kind of working again

4 files changed, 207 insertions, 202 deletions

diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index c23840c16..946ab7cdb 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -54,7 +54,8 @@
 </div><!-- /.modal -->
 </form>
 <script>
-	$('[data-toggle="popover"]').popover(); // Init the popover, if present
+	// compatibility issue with bootstrap v4
+	//$('[data-toggle="popover"]').popover(); // Init the popover, if present
 
 	if(typeof acl=="undefined"){
 		acl = new ACL(
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 5ff205c53..a5a4acd11 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -25,6 +25,6 @@
 	{{/if}}
 </div>
 {{else}}
-<li><a href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a></li>
+<a class="dropdown-item" href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
 {{/if}}
 
diff --git a/view/tpl/hdr.tpl b/view/tpl/hdr.tpl
index 577269b6f..261d3056f 100644
--- a/view/tpl/hdr.tpl
+++ b/view/tpl/hdr.tpl
@@ -1,5 +1,5 @@
 <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div>
 
-<ul id="nav-notifications-template" rel="template">
-	<li class="{5}"><a href="{0}" title="{2} {3}"><img class="dropdown-menu-img-sm" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span><div class="clear"></div></a></li>
-</ul>
+<div id="nav-notifications-template" rel="template">
+	<a class="dropdown-item" href="{0}" title="{2} {3}"><img class="dropdown-menu-img-sm" data-src="{1}"><span class="contactname">{2}</span><span class="dropdown-sub-text">{3}<br>{4}</span><div class="clear"></div></a>
+</div>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 0581989ec..06984fb02 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,215 +1,219 @@
-<div class="container-fluid">
-	<div class="navbar-header dropdown">
-		<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-2">
-			<span class="icon-bar"></span>
-			<span class="icon-bar"></span>
-			<span class="icon-bar"></span>
-		</button>
-		{{if $nav.login && !$userinfo}}
-		<button type="button" class="navbar-toggle navbar-toggle-extra-left" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
-			{{$nav.loginmenu.1.1}}
-		</button>
-		{{if $nav.register}}
-		<a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" class="navbar-toggle navbar-toggle-extra-left">
-			{{$nav.register.1}}
-		</a>
+{{if $nav.login && !$userinfo}}
+<div class="navbar-toggler-left">
+	<button type="button" class="navbar-toggler" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
+		{{$nav.loginmenu.1.1}}
+	</button>
+	{{if $nav.register}}
+	<a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" class="navbar-toggler">
+		{{$nav.register.1}}
+	</a>
+	{{/if}}
+</div>
+{{/if}}
+<div class="navbar-toggler-right">
+	{{if $nav.help.6}}
+	<button id="context-help-btn" class="navbar-toggler" type="button" onclick="contextualHelp(); return false;">
+		<i class="fa fa-question-circle"></i>
+	</button>
+	{{/if}}
+	<button id="expand-aside" type="button" class="navbar-toggler" data-toggle="offcanvas" data-target="#region_1">
+		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
+	</button>
+	<button id="expand-tabs" type="button" class="navbar-toggler" data-toggle="collapse" data-target="#tabs-collapse-1">
+		<i class="fa fa-arrow-circle-down" id="expand-tabs-icon"></i>
+	</button>
+	{{if $localuser}}
+	<button id="notifications-btn" type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar-collapse-1" style="color: grey;">
+		<i class="fa fa-exclamation-circle"></i>
+	</button>
+	{{/if}}
+	<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+		<i class="fa fa-bars"></i>
+	</button>
+</div>
+{{if $userinfo}}
+<div class="dropdown usermenu">
+	<div class="fakelink" data-toggle="dropdown">
+		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
+	</div>
+	{{if $localuser}}
+	<div class="dropdown-menu" role="menu" aria-labelledby="avatar">
+		{{foreach $nav.usermenu as $usermenu}}
+		<a class="dropdown-item"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
+		{{/foreach}}
+		{{if $nav.manage}}
+		<a class="dropdown-item" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a>
+		{{/if}}	
+		{{if $nav.channels}}
+		{{foreach $nav.channels as $chan}}
+		<a class="dropdown-item" href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a>
+		{{/foreach}}
 		{{/if}}
+		{{if $nav.profiles}}
+		<a class="dropdown-item" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a>
 		{{/if}}
-		{{if $localuser}}
-		<button id="notifications-btn" type="button" class="navbar-toggle navbar-toggle-extra" data-toggle="collapse" data-target="#navbar-collapse-1" style="color: grey;">
-			<i class="fa fa-exclamation-circle"></i>
-		</button>
+		{{if $nav.settings}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
 		{{/if}}
-		<button id="expand-tabs" type="button" class="navbar-toggle navbar-toggle-extra" data-toggle="collapse" data-target="#tabs-collapse-1">
-			<i class="fa fa-arrow-circle-down" id="expand-tabs-icon"></i>
-		</button>
-		<button id="expand-aside" type="button" class="navbar-toggle navbar-toggle-extra" data-toggle="offcanvas" data-target="#region_1">
-			<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
-		</button>
-		{{if $nav.help.6}}
-		<button id="context-help-btn" class="navbar-toggle navbar-toggle-extra" type="button" onclick="contextualHelp(); return false;">
-			<i class="fa fa-question-circle"></i>
-		</button>
+		{{if $nav.admin}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
 		{{/if}}
-		{{if $userinfo}}
-		<div class="usermenu-head dropdown-toggle fakelink" data-toggle="dropdown">
-			<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
-			<span class="caret" id="usermenu-caret"></span>
-		</div>
-		{{if $localuser}}
-		<ul class="dropdown-menu" role="menu" aria-labelledby="avatar">
-			{{foreach $nav.usermenu as $usermenu}}
-			<li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a></li>
-			{{/foreach}}
-			{{if $nav.manage}}
-			<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem" id="{{$nav.manage.4}}">{{$nav.manage.1}}</a></li>
-			{{/if}}	
-			{{if $nav.channels}}
-			{{foreach $nav.channels as $chan}}
-			<li role="presentation" class="nav-channel-select"><a href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a></li>
-			{{/foreach}}
-			{{/if}}
-			<li role="presentation" class="divider"></li>
-			{{if $nav.profiles}}
-			<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a></li>
-			{{/if}}
-			{{if $nav.settings}}
-			<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a></li>
-			{{/if}}
-			{{if $nav.admin}}
-			<li role="presentation" class="divider"></li>
-			<li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a></li>
-			{{/if}}
-			{{if $nav.logout}}
-			<li role="presentation" class="divider"></li>
-			<li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a></li>
-			{{/if}}
-		</ul>
-		{{else}}
-		{{if $nav.rusermenu}}
-		<ul class="dropdown-menu" role="menu" aria-labelledby="avatar">
-			<li role="presentation"><a href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a></li>
-			<li role="presentation"><a href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a></li>
-		</ul>
+		{{if $nav.logout}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem" id="{{$nav.logout.4}}">{{$nav.logout.1}}</a>
 		{{/if}}
+	</div>
+	{{else}}
+	{{if $nav.rusermenu}}
+	<div class="dropdown-menu" role="menu" aria-labelledby="avatar">
+		<a class="dropdown-item" href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a>
+		<a class="dropdown-item" href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a>
+	</div>
+	{{/if}}
+	{{/if}}
+</div>
+{{/if}}
+<div class="collapse navbar-collapse " id="navbar-collapse-1">
+	<ul class="navbar-nav mr-auto">
+		{{if $nav.network}}
+		<li class="nav-item dropdown {{$sel.network}} net-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu">
+				<i class="fa fa-fw fa-th"></i>
+				<span class="net-update"></span>
+			</a>
+			<div id="nav-network-menu" class="dropdown-menu" rel="network">
+				<a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a>
+				<a class="dropdown-item" id="nav-network-mark-all"href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
 		{{/if}}
+		{{if $nav.home}}
+		<li class="nav-item dropdown {{$sel.home}} home-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu">
+				<i class="fa fa-fw fa-home"></i>
+				<span class="home-update"></span>
+			</a>
+			<div id="nav-home-menu" class="dropdown-menu" rel="home">
+				<a class="dropdown-item" id="nav-home-see-all" href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a>
+				<a class="dropdown-item" id="nav-home-mark-all" href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.messages}}
+		<li class="nav-item dropdown {{$sel.messages}} mail-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu">
+				<i class="fa fa-fw fa-envelope"></i>
+				<span class="mail-update"></span>
+			</a>
+			<div id="nav-messages-menu" class="dropdown-menu" rel="messages">
+				<a class="dropdown-item" id="nav-messages-see-all" href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a>
+				<a class="dropdown-item" id="nav-messages-mark-all" href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.all_events}}
+		<li class="nav-item dropdown {{$sel.all_events}} all_events-button" style="display: none;">
+			<a class="nav-link" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu">
+				<i class="fa fa-fw fa-calendar"></i>
+				<span class="all_events-update"></span>
+			</a>
+			<div id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
+				<a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a>
+				<a class="dropdown-item" id="nav-all_events-mark-all" href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.intros}}
+		<li class="nav-item dropdown {{$sel.intros}} intro-button" style="display: none;">
+			<a class="nav-link" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu">
+				<i class="fa fa-fw fa-users"></i>
+				<span class="intro-update"></span>
+			</a>
+			<div id="nav-intros-menu" class="dropdown-menu" rel="intros">
+				<a class="dropdown-item" id="nav-intros-see-all" href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
+		{{/if}}
+		{{if $nav.notifications}}
+		<li class="nav-item dropdown {{$sel.notifications}} notify-button" style="display: none;">
+			<a class="nav-link" href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu">
+				<i class="fa fa-fw fa-exclamation"></i>
+				<span class="notify-update"></span>
+			</a>
+			<div id="nav-notify-menu" class="dropdown-menu" rel="notify">
+				<a class="dropdown-item" id="nav-notify-see-all" href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a>
+				<a class="dropdown-item" id="nav-notify-mark-all" href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a>
+				{{$emptynotifications}}
+			</div>
+		</li>
 		{{/if}}
-	</div>
-	<div class="collapse navbar-collapse" id="navbar-collapse-1">
-		<ul class="nav navbar-nav navbar-left">
-			{{if $nav.network}}
-			<li class="{{$sel.network}} net-button" style="display: none;">
-				<a href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu">
-					<i class="fa fa-fw fa-th"></i>
-					<span class="net-update badge"></span>
-				</a>
-				<ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network">
-					<li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li>
-					<li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-			</li>
-			{{/if}}
-			{{if $nav.home}}
-			<li class="{{$sel.home}} home-button" style="display: none;">
-				<a class="{{$nav.home.2}}" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu">
-					<i class="fa fa-fw fa-home"></i>
-					<span class="home-update badge"></span>
-				</a>
-				<ul id="nav-home-menu" class="dropdown-menu" rel="home">
-					<li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li>
-					<li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-			</li>
-			{{/if}}
-			{{if $nav.messages}}
-			<li class="{{$sel.messages}} mail-button" style="display: none;">
-				<a class="{{$nav.messages.2}}" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu">
-					<i class="fa fa-fw fa-envelope"></i>
-					<span class="mail-update badge"></span>
-				</a>
-				<ul id="nav-messages-menu" class="dropdown-menu" rel="messages">
-					<li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li>
-					<li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-			</li>
-			{{/if}}
-			{{if $nav.all_events}}
-			<li class="{{$sel.all_events}} all_events-button" style="display: none;">
-				<a class="{{$nav.all_events.2}}" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu">
-					<i class="fa fa-fw fa-calendar"></i>
-					<span class="all_events-update badge"></span>
-				</a>
-				<ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events">
-					<li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li>
-					<li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-			</li>
-			{{/if}}
-			{{if $nav.intros}}
-			<li class="{{$sel.intros}} intro-button" style="display: none;">
-				<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu">
-					<i class="fa fa-fw fa-users"></i>
-					<span class="intro-update badge"></span>
-				</a>
-				<ul id="nav-intros-menu" class="dropdown-menu" rel="intros">
-					<li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-			</li>
-			{{/if}}
-			{{if $nav.notifications}}
-			<li class="{{$sel.notifications}} notify-button" style="display: none;">
-				<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu">
-					<i class="fa fa-fw fa-exclamation"></i>
-					<span class="notify-update badge"></span>
-				</a>
-				<ul id="nav-notify-menu" class="dropdown-menu" rel="notify">
-					<li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
-					<li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li>
-					<li class="empty">{{$emptynotifications}}</li>
-				</ul>
-			</li>
-			{{/if}}
 			{{if $nav.login && !$userinfo}}
-			<li class="">
-				<a href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a>
+			<li class="nav-item">
+				<a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a>
 			</li>
 			{{/if}}
 			{{if $nav.register}}
-			<li class="{{$nav.register.2}} hidden-xs"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a></li>
-			{{/if}}
-			{{if $nav.alogout}}
-			<li class="{{$nav}}-alogout.2 hidden-xs"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a></li>
-			{{/if}}
-		</ul>
-		<ul class="nav navbar-nav navbar-right hidden-xs">
-			<li class="">
-				<form method="get" action="search" role="search">
-					<div id="nav-search-spinner"></div><input class="fa-search" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/>
-				</form>
-			</li>
-			{{if $nav.help.6}}
-			<li class="{{$sel.help}}">
-				<a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-question-circle"></i></a>
+			<li class="nav-item {{$nav.register.2}} hidden-xs-down">
+				<a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a>
 			</li>
 			{{/if}}
-			<li class="">
-				<a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a>
-				<ul class="dropdown-menu">
-					{{foreach $navapps as $navapp}}
-					{{$navapp}}
-					{{/foreach}}
-					{{if $localuser}}
-					<li class="divider"></li>
-					<li><a href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a></li>
-					{{/if}}
-				</ul>
+			{{if $nav.alogout}}
+			<li class="nav-item {{$nav}}-alogout.2 hidden-xs-down">
+				<a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a>
 			</li>
-		</ul>
-	</div>
-	<div class="collapse navbar-collapse" id="navbar-collapse-2">
-		<ul class="nav navbar-nav navbar-left hidden-sm hidden-md hidden-lg">
-			{{foreach $navapps as $navapp}}
-			{{$navapp}}
-			{{/foreach}}
-			{{if $localuser}}
-			<li class="divider"></li>
-			<li><a href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a></li>
 			{{/if}}
-		</ul>
-	</div>
+	</ul>
 
-	{{if $nav.help.6}}
-	<div id="contextual-help-content" class="contextual-help-content">
-		{{$nav.help.5}}
-		<div class="pull-right">
-			<a class="btn btn-primary btn-xs" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-fw fa-question"></i>&nbsp;{{$fulldocs}}</a>
-			<a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-times"></i></a>
-		</div>
+	<!--div class="navbar-text hidden-lg-down">Hubzilla</div-->
+
+	<ul class="navbar-nav hidden-sm-down ml-auto">
+		<li class="nav-item">
+			<form class="form-inline" method="get" action="search" role="search">
+				<div id="nav-search-spinner"></div><input class="fa-search" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/>
+			</form>
+		</li>
+		{{if $nav.help.6}}
+		<li class="nav-item dropdown {{$sel.help}}">
+			<a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a>
+		</li>
+		{{/if}}
+		<li class="nav-item dropdown">
+			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
+			<div class="dropdown-menu dropdown-menu-right">
+				{{foreach $navapps as $navapp}}
+				{{$navapp}}
+				{{/foreach}}
+				{{if $localuser}}
+				<div class="dropdown-divider"></div>
+				<a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+				{{/if}}
+			</div>
+		</li>
+	</ul>
+</div>
+<div class="collapse hidden-md-up" id="navbar-collapse-2">
+	<div class="navbar-nav">
+		{{foreach $navapps as $navapp}}
+		{{$navapp|replace:'dropdown-item':'nav-link'}}
+		{{/foreach}}
+		{{if $localuser}}
+		<a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>{{$addapps}}</a>
+		{{/if}}
+	</div>
+</div>
+{{if $nav.help.6}}
+<div id="contextual-help-content" class="contextual-help-content">
+	{{$nav.help.5}}
+	<div class="pull-right">
+		<a class="btn btn-primary btn-xs" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}"><i class="fa fa-fw fa-question"></i>&nbsp;{{$fulldocs}}</a>
+		<a class="contextual-help-tool" href="#" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-times"></i></a>
 	</div>
-	{{/if}}
 </div>
+{{/if}}