From 09b4660c7d8d15cf2419202116199a725c7c109c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 10 Oct 2017 18:50:01 -0700
Subject: rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar
 selection code is consistent

---
 boot.php                    |   2 +-
 doc/member/member_guide.bb  |   2 +-
 include/nav.php             |   4 +-
 view/tpl/nav.tpl            | 170 --------------------------------------------
 view/tpl/navbar_default.tpl | 170 ++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 174 insertions(+), 174 deletions(-)
 delete mode 100755 view/tpl/nav.tpl
 create mode 100755 view/tpl/navbar_default.tpl

diff --git a/boot.php b/boot.php
index 3feac5177..367fe7709 100755
--- a/boot.php
+++ b/boot.php
@@ -2090,7 +2090,7 @@ function construct_page() {
 
 	$installing = false;
 
-	$navbar = get_config('system','navbar','nav');
+	$navbar = get_config('system','navbar','default');
 	if(App::$profile_uid) {
 		$navbar = get_pconfig(App::$profile_uid,'system','navbar',$navbar);
 	}
diff --git a/doc/member/member_guide.bb b/doc/member/member_guide.bb
index 0794f24d3..4a9262741 100644
--- a/doc/member/member_guide.bb
+++ b/doc/member/member_guide.bb
@@ -640,7 +640,7 @@ The condensed notation isn't part of Comanche itself but is recognised by $Proje
 	[navbar]tucson[/navbar]
 [/code]
 
-Use the 'tucson' navbar template and CSS rules. By default the 'nav' navbar template will be used.
+Use the 'tucson' navbar template and CSS rules. By default the 'default' navbar template will be used.
 
 
 [h4]Regions[/h4]
diff --git a/include/nav.php b/include/nav.php
index b5f713145..0d554fc84 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -6,7 +6,7 @@ require_once('include/security.php');
 require_once('include/menu.php');
 
 
-function nav($template = 'nav') {
+function nav($template = 'default') {
 
 	/**
 	 *
@@ -248,7 +248,7 @@ EOT;
 	}
 
 	if(! $tpl) {
-		$tpl = get_markup_template('nav.tpl');
+		$tpl = get_markup_template('navbar_default.tpl');
 	}
 
 	App::$page['nav'] .= replace_macros($tpl, array(
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
deleted file mode 100755
index b6faad0c2..000000000
--- a/view/tpl/nav.tpl
+++ /dev/null
@@ -1,170 +0,0 @@
-{{if $nav.login && !$userinfo}}
-<div class="d-xl-none pt-1 pb-1">
-	<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
-		{{$nav.loginmenu.1.1}}
-	</a>
-	{{if $nav.register}}
-	<a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
-		{{$nav.register.1}}
-	</a>
-	{{/if}}
-</div>
-{{/if}}
-{{if $userinfo}}
-<div class="dropdown usermenu">
-	<div class="fakelink" data-toggle="dropdown">
-		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
-		<i class="fa fa-caret-down"></i>
-	</div>
-	{{if $is_owner}}
-	<div class="dropdown-menu">
-		{{foreach $nav.usermenu as $usermenu}}
-		<a class="dropdown-item{{if $usermenu.2}} active{{/if}}"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
-		{{/foreach}}
-		{{if $nav.manage}}
-		<a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" 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"><i class="fa fa-circle{{if $localuser == $chan.channel_id}} text-success{{else}} invisible{{/if}}"></i> {{$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 $nav.settings}}
-		<div class="dropdown-divider"></div>
-		<a class="dropdown-item{{if $sel.name == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
-		{{/if}}
-		{{if $nav.admin}}
-		<div class="dropdown-divider"></div>
-		<a class="dropdown-item{{if $sel.name == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
-		{{/if}}
-		{{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>
-	{{/if}}
-	{{if ! $is_owner}}
-	<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}}
-</div>
-<div class="navbar-nav mr-auto">
-	<div><a id="nav-app-link" href="{{$url}}" class="nav-link">{{$sel.name}}</a></div>
-</div>
-{{/if}}
-<div class="navbar-toggler-right">
-	{{if $nav.help.6}}
-	<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
-		<i class="fa fa-question-circle"></i>
-	</button>
-	{{/if}}
-	<button id="expand-aside" type="button" class="d-md-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
-		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
-	</button>
-	{{if $localuser || $nav.pubs}}
-	<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white">
-		<i class="fa fa-exclamation-circle"></i>
-	</button>
-	{{/if}}
-	<button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
-		<i class="fa fa-bars"></i>
-	</button>
-</div>
-<div class="collapse navbar-collapse" id="navbar-collapse-1">
-	<div class="mr-auto d-none d-xl-flex"></div>
-
-	<div id="banner" class="navbar-text d-none d-xl-flex">{{$banner}}</div>
-
-	<ul id="nav-right" class="navbar-nav ml-auto d-none d-xl-flex">
-		<li class="nav-item collapse clearfix" id="nav-search">
-			<form class="form-inline" method="get" action="search" role="search">
-				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
-			</form>
-			<div id="nav-search-spinner" class="spinner-wrapper">
-				<div class="spinner s"></div>
-			</div>
-		</li>
-		<li class="nav-item" id="nav-search-btn">
-			<a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a>
-		</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}}
-		{{if $channel_menu && $channel_apps.0}}
-		<li class="nav-item dropdown" id="channel-menu">
-			<a class="nav-link" href="#" data-toggle="dropdown"><img src="{{$channel_thumb}}" style="height:14px; width:14px;position:relative; top:-2px;" /></a>
-			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-				{{foreach $channel_apps as $channel_app}}
-				{{$channel_app}}
-				{{/foreach}}
-			</div>
-		</li>
-		{{/if}}
-		<li class="nav-item dropdown" id="app-menu">
-			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
-			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-				{{if $channel_apps.0 && ! $channel_menu}}
-				{{foreach $channel_apps as $channel_app}}
-				{{$channel_app}}
-				{{/foreach}}
-				<div class="dropdown-divider"></div>
-				<div class="dropdown-header sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
-					{{$sysapps_toggle}}
-				</div>
-				<div id="sys_apps" style="display:none;">
-				{{/if}}
-				{{foreach $nav_apps as $nav_app}}
-				{{$nav_app}}
-				{{/foreach}}
-				{{if $channel_apps.0 && ! $channel_menu}}
-				</div>
-				{{/if}}
-				{{if $is_owner}}
-				<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>
-				<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
-				{{/if}}
-			</div>
-		</li>
-	</ul>
-</div>
-<div class="collapse d-xl-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 sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
-			{{$sysapps_toggle}}
-		</div>
-		<div id="sys-apps-collapsed" style="display:none;">
-		{{/if}}
-		{{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}}
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
new file mode 100755
index 000000000..b6faad0c2
--- /dev/null
+++ b/view/tpl/navbar_default.tpl
@@ -0,0 +1,170 @@
+{{if $nav.login && !$userinfo}}
+<div class="d-xl-none pt-1 pb-1">
+	<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
+		{{$nav.loginmenu.1.1}}
+	</a>
+	{{if $nav.register}}
+	<a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
+		{{$nav.register.1}}
+	</a>
+	{{/if}}
+</div>
+{{/if}}
+{{if $userinfo}}
+<div class="dropdown usermenu">
+	<div class="fakelink" data-toggle="dropdown">
+		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
+		<i class="fa fa-caret-down"></i>
+	</div>
+	{{if $is_owner}}
+	<div class="dropdown-menu">
+		{{foreach $nav.usermenu as $usermenu}}
+		<a class="dropdown-item{{if $usermenu.2}} active{{/if}}"  href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
+		{{/foreach}}
+		{{if $nav.manage}}
+		<a class="dropdown-item{{if $sel.name == Manage}} active{{/if}}" 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"><i class="fa fa-circle{{if $localuser == $chan.channel_id}} text-success{{else}} invisible{{/if}}"></i> {{$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 $nav.settings}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item{{if $sel.name == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
+		{{/if}}
+		{{if $nav.admin}}
+		<div class="dropdown-divider"></div>
+		<a class="dropdown-item{{if $sel.name == Admin}} active{{/if}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem" id="{{$nav.admin.4}}">{{$nav.admin.1}}</a>
+		{{/if}}
+		{{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>
+	{{/if}}
+	{{if ! $is_owner}}
+	<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}}
+</div>
+<div class="navbar-nav mr-auto">
+	<div><a id="nav-app-link" href="{{$url}}" class="nav-link">{{$sel.name}}</a></div>
+</div>
+{{/if}}
+<div class="navbar-toggler-right">
+	{{if $nav.help.6}}
+	<button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;">
+		<i class="fa fa-question-circle"></i>
+	</button>
+	{{/if}}
+	<button id="expand-aside" type="button" class="d-md-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
+		<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
+	</button>
+	{{if $localuser || $nav.pubs}}
+	<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white">
+		<i class="fa fa-exclamation-circle"></i>
+	</button>
+	{{/if}}
+	<button id="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
+		<i class="fa fa-bars"></i>
+	</button>
+</div>
+<div class="collapse navbar-collapse" id="navbar-collapse-1">
+	<div class="mr-auto d-none d-xl-flex"></div>
+
+	<div id="banner" class="navbar-text d-none d-xl-flex">{{$banner}}</div>
+
+	<ul id="nav-right" class="navbar-nav ml-auto d-none d-xl-flex">
+		<li class="nav-item collapse clearfix" id="nav-search">
+			<form class="form-inline" method="get" action="search" role="search">
+				<input class="form-control form-control-sm mt-1 mr-2" id="nav-search-text" type="text" value="" placeholder="&#xf002; {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();" onblur="closeMenu('nav-search'); openMenu('nav-search-btn');"/>
+			</form>
+			<div id="nav-search-spinner" class="spinner-wrapper">
+				<div class="spinner s"></div>
+			</div>
+		</li>
+		<li class="nav-item" id="nav-search-btn">
+			<a class="nav-link" href="#nav-search" title="{{$nav.search.3}}" onclick="openMenu('nav-search'); closeMenu('nav-search-btn'); $('#nav-search-text').focus(); return false;"><i class="fa fa-fw fa-search"></i></a>
+		</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}}
+		{{if $channel_menu && $channel_apps.0}}
+		<li class="nav-item dropdown" id="channel-menu">
+			<a class="nav-link" href="#" data-toggle="dropdown"><img src="{{$channel_thumb}}" style="height:14px; width:14px;position:relative; top:-2px;" /></a>
+			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+				{{foreach $channel_apps as $channel_app}}
+				{{$channel_app}}
+				{{/foreach}}
+			</div>
+		</li>
+		{{/if}}
+		<li class="nav-item dropdown" id="app-menu">
+			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
+			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+				{{if $channel_apps.0 && ! $channel_menu}}
+				{{foreach $channel_apps as $channel_app}}
+				{{$channel_app}}
+				{{/foreach}}
+				<div class="dropdown-divider"></div>
+				<div class="dropdown-header sys-apps-toggle" onclick="$('#dropdown-menu').click(function(e) { e.stopPropagation(); }); openClose('sys_apps');">
+					{{$sysapps_toggle}}
+				</div>
+				<div id="sys_apps" style="display:none;">
+				{{/if}}
+				{{foreach $nav_apps as $nav_app}}
+				{{$nav_app}}
+				{{/foreach}}
+				{{if $channel_apps.0 && ! $channel_menu}}
+				</div>
+				{{/if}}
+				{{if $is_owner}}
+				<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>
+				<a class="dropdown-item" href="/apporder"><i class="generic-icons-nav fa fa-fw fa-sort"></i>{{$orderapps}}</a>
+				{{/if}}
+			</div>
+		</li>
+	</ul>
+</div>
+<div class="collapse d-xl-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 sys-apps-toggle" onclick="openClose('sys-apps-collapsed');">
+			{{$sysapps_toggle}}
+		</div>
+		<div id="sys-apps-collapsed" style="display:none;">
+		{{/if}}
+		{{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}}
-- 
cgit v1.2.3