X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=b8b65f84d00b1f24e62e120545cd173bb6aff55d;hb=b8479cc2f98bdd3b144cfda127c799ba4740fc83;hp=96acf826df6e4c8521e54f695f951aeca5081609;hpb=91db3b3f41f7822e80df360a0a551afb3af38797;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index 96acf826df..b8b65f84d0 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,5 +1,7 @@
 <?php
 
+function nav(&$a) {
+
 	/**
 	 *
 	 * Build page header and site navigation bars
@@ -14,6 +16,7 @@
 	 */
 
 	$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
+	$a->page['nav'] .= lang_selector();
 
 	/**
 	 *
@@ -23,7 +26,9 @@
 	 *
 	 */
 
-	$a->page['nav'] .= '<div id="site-location">' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '</div>';
+	$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
+		
+	$a->page['nav'] .= '<div id="site-location">' . $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '</div>';
 
 
 	/**
@@ -34,7 +39,10 @@
 		$a->page['nav'] .= '<a id="nav-logout-link" class="nav-link" href="logout">' . t('Logout') . "</a>\r\n";
 	}
 	else {
-		$a->page['nav'] .= '<a id="nav-login-link" class="nav-login-link" href="login">' . t('Login') . "</a>\r\n";
+		$a->page['nav'] .= '<a id="nav-login-link" class="nav-login-link';
+		if ($a->module == 'login') { $a->page['nav'] .= ' nav-selected';  }
+
+		$a->page['nav'] .= '" href="login">' . t('Login') . "</a>\r\n";
 	}
 
 	$a->page['nav'] .= "<span id=\"nav-link-wrapper\" >\r\n";
@@ -53,9 +61,21 @@
 		$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >' 
 			. t('Register') . "</a>\r\n";
 
+	if(strlen($a->apps)) {
+		$a->page['nav'] .= '<a id="nav-apps-link" class="nav-link" href="apps">' . t('Apps') . "</a>\r\n";
+	}
+
 	$a->page['nav'] .= '<a id="nav-search-link" class="nav-link" href="search">' . t('Search') . "</a>\r\n";
-	$a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Directory') . "</a>\r\n";
 
+	$gdirpath = 'directory';
+
+	if(strlen(get_config('system','singleuser'))) {
+		$gdir = dirname(get_config('system','directory_submit_url'));
+		if(strlen($gdir))
+			$gdirpath = $gdir;
+	}
+
+	$a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="' . $gdirpath . '">' . t('Directory') . "</a>\r\n";
 
 	/**
 	 *
@@ -63,7 +83,7 @@
 	 *
 	 */
 
-	if(x($_SESSION,'uid')) {
+	if(local_user()) {
 
 		$a->page['nav'] .= '<a id="nav-network-link" class="nav-commlink" href="network">' . t('Network') 
 			. '</a><span id="net-update" class="nav-ajax-left"></span>' . "\r\n";
@@ -81,6 +101,9 @@
 		$a->page['nav'] .= '<a id="nav-messages-link" class="nav-commlink" href="message">' . t('Messages') 
 			. '</a><span id="mail-update" class="nav-ajax-left"></span>' . "\r\n";
 		
+		if(is_array($a->identities) && count($a->identities) > 1) {
+			$a->page['nav'] .= '<a id="nav-manage-link" class="nav-commlink" href="manage">' . t('Manage') . '</a>' . "\r\n"; 
+		}
 
 		$a->page['nav'] .= '<a id="nav-settings-link" class="nav-link" href="settings">' . t('Settings') . "</a>\r\n";
 
@@ -102,9 +125,11 @@
 	$banner = get_config('system','banner');
 
 	if($banner === false) 
-		$banner .= '<a href="http://friendika.com"><img id="logo-img" src="images/ff-32.jpg" alt="logo" /></a><span id="logo-text"><a href="http://friendika.com">Friendika</a></span>';
+		$banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';
 
 
 	$a->page['nav'] .= '<span id="banner">' . $banner . '</span>';
 
 	call_hooks('page_header', $a->page['nav']);
+
+}