whitespace cleanup

view/tpl/nav.tpl

@@ -1,4 +1,4 @@
-	<div class="container-fluid">
+<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>
@@ -21,7 +21,6 @@
 			<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}}">
@@ -32,16 +31,21 @@
 			{{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.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.profiles}}
-						{{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}}
+			<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>
@@ -61,10 +65,8 @@
 		{{/if}}
 		{{/if}}
 	</div>
-
 	<div class="collapse navbar-collapse" id="navbar-collapse-1">
 		<ul class="nav navbar-nav navbar-left">
-			{{if $localuser}}
 			{{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">
@@ -78,7 +80,6 @@
 				</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">
@@ -92,7 +93,6 @@
 				</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">
@@ -106,7 +106,6 @@
 				</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">
@@ -120,7 +119,6 @@
 				</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">
@@ -133,7 +131,6 @@
 				</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">
@@ -147,8 +144,6 @@
 				</ul>
 			</li>
 			{{/if}}
-			{{/if}}
-
 			{{if $nav.login && !$userinfo}}
 			<li class="hidden-xs">
 				<a href="#" class="dropdown-toggle" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}" data-toggle="dropdown">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
@@ -160,23 +155,19 @@
 				</div>
 			</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">
 			<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>
-
 			{{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>
@@ -188,10 +179,7 @@
 				{{$navapps}}
 				</ul>
 			</li>
-
 		</ul>
-
-		</div>
 	</div>
 	<div class="collapse navbar-collapse" id="navbar-collapse-2">
 		<ul class="nav navbar-nav navbar-left hidden-sm hidden-md hidden-lg">
@@ -207,3 +195,4 @@
 		</div>
 	</div>
 	{{/if}}
+</div>