Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

5 files changed, 225 insertions, 256 deletions

diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 434653e1e..2ecb5a701 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -1,6 +1,7 @@
+{{if !$navapps}}
 <div class="app-container">
 	<div class="app-detail{{if $deleted}} app-deleted{{/if}}">
-		<a href="{{$app.url}}" {{if $ap.target}}target="{{$ap.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}}
+		<a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}}
 			<div class="app-name" style="text-align:center;">{{$app.name}}</div>
 		</a>
 	</div>
@@ -10,17 +11,21 @@
 		<a href="{{$app.page}}" class="btn btn-default" title="{{$purchase}}" ><i class="fa fa-external"></i></a>
 	</div>
 	{{/if}}
-	{{if $install || $update || $delete }}
+
 	<div class="app-tools">
 		<form action="{{$hosturl}}appman" method="post">
 		<input type="hidden" name="papp" value="{{$app.papp}}" />
+		{{if $install || $update || $delete }}
 		{{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default btn-xs" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}}
 		{{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default btn-xs" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}}
 		{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-default btn-xs" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}}
+		{{/if}}
 		<button type="submit" name="feature" value="feature" class="btn btn-default btn-xs" ><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button>
 		</form>
 	</div>
 	{{/if}}
-	{{/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>
+{{/if}}
 
diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl
index 32ab7fd4c..7a0521436 100644
--- a/view/tpl/app_create.tpl
+++ b/view/tpl/app_create.tpl
@@ -1,36 +1,40 @@
-<h2>{{$banner}}</h2>
-
-
-<form action="appman" method="post">
-{{if $guid}}
-<input type="hidden" name="guid" value="{{$guid}}" />
-{{/if}}
-{{if $author}}
-<input type="hidden" name="author" value="{{$author}}" />
-{{/if}}
-{{if $addr}}
-<input type="hidden" name="addr" value="{{$addr}}" />
-{{/if}}
-
-<input type="hidden" name="requires" value="{{$requires}}" />
-<input type="hidden" name="system" value="{{$system}}" />
-<input type="hidden" name="plugin" value="{{$plugin}}" />
-
-
-{{include file="field_input.tpl" field=$name}}
-{{include file="field_input.tpl" field=$categories}}
-{{include file="field_input.tpl" field=$url}}
-{{include file="field_textarea.tpl" field=$desc}}
-{{include file="field_input.tpl" field=$photo}}
-{{include file="field_input.tpl" field=$version}}
-{{include file="field_input.tpl" field=$price}}
-{{include file="field_input.tpl" field=$page}}
-
-{{if $embed}}
-{{include file="field_textarea.tpl" field=$embed}}
-{{/if}}
-
-<input type="submit" name="submit" value="{{$submit}}" />
-
-</form>
-
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$banner}}</h2>
+	</div>
+
+	<div class="section-content-wrapper">
+		<form action="appman" method="post">
+		{{if $guid}}
+		<input type="hidden" name="guid" value="{{$guid}}" />
+		{{/if}}
+		{{if $author}}
+		<input type="hidden" name="author" value="{{$author}}" />
+		{{/if}}
+		{{if $addr}}
+		<input type="hidden" name="addr" value="{{$addr}}" />
+		{{/if}}
+
+		<input type="hidden" name="requires" value="{{$requires}}" />
+		<input type="hidden" name="system" value="{{$system}}" />
+		<input type="hidden" name="plugin" value="{{$plugin}}" />
+
+
+		{{include file="field_input.tpl" field=$name}}
+		{{include file="field_input.tpl" field=$categories}}
+		{{include file="field_input.tpl" field=$url}}
+		{{include file="field_textarea.tpl" field=$desc}}
+		{{include file="field_input.tpl" field=$photo}}
+		{{include file="field_input.tpl" field=$version}}
+		{{include file="field_input.tpl" field=$price}}
+		{{include file="field_input.tpl" field=$page}}
+
+		{{if $embed}}
+		{{include file="field_textarea.tpl" field=$embed}}
+		{{/if}}
+
+		<input type="submit" name="submit" value="{{$submit}}" />
+
+		</form>
+	</div>
+</div>
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
index c654993b7..074965985 100755
--- a/view/tpl/myapps.tpl
+++ b/view/tpl/myapps.tpl
@@ -1,8 +1,11 @@
-<div class="generic-content-wrapper-styled">
-<h3>{{$title}}{{$cat}}</h3>
-
-{{foreach $apps as $ap}}
-{{$ap}}
-{{/foreach}}
-<div class="clear"></div>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<h2>{{$title}}{{$cat}}</h2>
+	</div>
+	<div class="section-content-wrapper">
+		{{foreach $apps as $ap}}
+		{{$ap}}
+		{{/foreach}}
+		<div class="clear"></div>
+	</div>
 </div>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index c504e5515..236cde230 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,225 +1,190 @@
-	<div class="container-fluid">
-		<div class="navbar-header">
-			<div>
-				<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-					<span class="icon-bar"></span>
-				</button>
-				<button id="expand-tabs" type="button" class="navbar-toggle" 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" 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" type="button" onclick="contextualHelp(); return false;">
-					<i class="fa fa-question-circle"></i>
-				</button>
-				{{/if}}
-			</div>
-			{{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}}
-						<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.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}}
-						{{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}}
-				{{/if}}
-			{{/if}}
+<div class="container-fluid">
+	<div class="navbar-header">
+		<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 $localuser}}
+		<button id="notifications-btn" type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1" style="color: grey;">
+			<i class="fa fa-exclamation-circle"></i>
+		</button>
+		{{/if}}
+		<button id="expand-tabs" type="button" class="navbar-toggle" 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" 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" type="button" onclick="contextualHelp(); return false;">
+			<i class="fa fa-question-circle"></i>
+		</button>
+		{{/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>
-		<div class="collapse navbar-collapse" id="navbar-collapse-1">
-			<ul class="nav navbar-nav navbar-left">
-
+		{{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}}
+		{{/if}}
+		{{/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}} hidden-xs">
-					<a href="{{$nav.network.0}}" title="{{$nav.network.3}}" id="{{$nav.network.4}}"><i class="fa fa-th"></i></a>
-					<span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span>
-					<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>
-				<li class="{{$sel.network}} visible-xs">
-					<a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="fa fa-th"></i></a>
-					<span class="net-update badge" rel="#nav-network-menu"></span>
-				</li>
+			<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}} hidden-xs">
-					<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" id="{{$nav.home.4}}"><i class="fa fa-home"></i></a>
-					<span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span>
-					<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>
-				<li class="{{$sel.home}} visible-xs">
-					<a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="fa fa-home"></i></a>
-					<span class="home-update badge" rel="#nav-home-menu"></span>
-				</li>
+			<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}} hidden-xs">
-					<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}"><i class="fa fa-envelope"></i></a>
-					<span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span>
-					<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>
-				<li class="{{$sel.messages}} visible-xs">
-					<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope"></i></a>
-					<span class="mail-update badge" rel="#nav-messages-menu"></span>
-				</li>
+			<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}} hidden-xs">
-					<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" id='{{$nav.all_events.4}}'><i class="fa fa-calendar"></i></a>
-					<span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span>
-					<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>
-				<li class="{{$sel.all_events}} visible-xs">
-					<a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="fa fa-calendar"></i></a>
-					<span class="all_events-update badge" rel="#nav-all_events-menu"></span>
-				</li>
+			<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}} hidden-xs">
-					<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}"><i class="fa fa-user"></i></a>
-					<span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span>
-					<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>
-				<li class="{{$sel.intros}} visible-xs">
-					<a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="fa fa-user"></i></a>
-					<span class="intro-update badge" rel="#nav-intros-menu"></span>
-				</li>
+			<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}} hidden-xs">
-					<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}"><i class="fa fa-exclamation"></i></a>
-					<span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span>
-					<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>
-				<li class="{{$sel.notifications}} visible-xs">
-					<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation"></i></a>
-					<span class="notify-update badge" rel="#nav-notify-menu"></span>
-				</li>
+			<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>
+			<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>
 			{{/if}}
-
 			{{if $nav.register}}
-				<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a></li>
+			<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"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a></li>
+			<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">
-				<li class="hidden-xs">
-					<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>
-				<li class="visible-xs">
-					<a href="/search" title="{{$nav.search.3}}"><i class="fa fa-search"></i></a>
-				</li>
-
-			{{if $powered_by}}
-				<div id="powered-by">{{$powered_by}}</div>
-			{{/if}}
-{{if ! $navapps}}
-			{{if $nav.directory}}
-				<li class="{{$sel.directory}}">
-					<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="fa fa-sitemap"></i></a>
-				</li>
-			{{/if}}
-
-			{{if $nav.apps}}
-				<li class="{{$sel.apps}}">
-					<a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" id="{{$nav.apps.4}}"><i class="fa fa-cogs"></i></a>
-				</li>
-			{{/if}}
-
-			{{if $nav.help}}
-				<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="contextualHelp(); return false;"{{/if}}>{{if $nav.help.6}}<i class="fa fa-question-circle"></i>{{else}}<i class="fa fa-question"></i>{{/if}}</a>
-				</li>
+		</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>
 			{{/if}}
-{{/if}}
-
-			{{if $navapps}}
-				{{if $nav.help.6}}
-				<li class="{{$sel.help}} hidden-xs">
-					<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>
-				{{/if}}
-				<li class="dropdown-toggle" data-toggle="dropdown">
-					<a href="#"><i class="fa fa-bars"></i></a>
-				</li>
-				{{$navapps}}
-			{{/if}}
-
-			</ul>
-
-		</div>
-		<div class="collapse navbar-collapse" id="navbar-collapse-2">
+			<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>Add Apps</a></li>
+					{{/if}}
+				</ul>
+			</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">
 			{{$navapps}}
-		</div>
+		</ul>
 	</div>
 
 	{{if $nav.help.6}}
@@ -231,3 +196,4 @@
 		</div>
 	</div>
 	{{/if}}
+</div>
diff --git a/view/tpl/navapps.tpl b/view/tpl/navapps.tpl
deleted file mode 100644
index de4a6223c..000000000
--- a/view/tpl/navapps.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<ul class="dropdown-menu" style="max-height: 80vh">
-	{{foreach $apps as $app}}
-	<li><a href="{{$app.url}}">{{if $icon}}<i class="app-icon fa fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}}&nbsp;{{$app.name}}</a></li>
-	{{/foreach}}
-	{{if $localuser}}
-	<li class="divider"></li>
-	<li><a href="/apps/edit"><i class="app-icon fa fa-plus-circle"></i>&nbsp;Add Apps</a></li>
-	{{/if}}
-</ul>