X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Fnav.php;h=dd2655e84a1f55f75325d28d68af781e865a9109;hb=e9a1abd133aa3db62d17ef8bdc91e8a75f4004d3;hp=a47d55d9a2dee4b6d69dbe196370e33faad07047;hpb=e15265be3c687d5830a44de38fc2e5311dc00d86;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index a47d55d9a2..dd2655e84a 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,36 +1,62 @@
 <?php
 
-if(x($_SESSION['uid'])) {
-		$a->page['nav'] .= "<a id=\"nav-logout-link\" class=\"nav-link\" href=\"logout\">" . t('Logout') . "</a>\r\n";
-}
+	if(! x($a->page,'nav'))
+		$a->page['nav'] = '';
+
+	$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
+
+	if(local_user()) {
+		$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'] .= "<span id=\"nav-link-wrapper\" >\r\n";
 
-	if(($a->module != 'home') && (! (x($_SESSION['uid']))))
-		$a->page['nav'] .= "<a id=\"nav-home-link\" class=\"nav-commlink\" href=\"\">Home</a>\r\n";
-	
-	$a->page['nav'] .= "<a id=\"nav-directory-link\" class=\"nav-link\" href=\"directory\">Site Directory</a>\r\n";
+	if(($a->module != 'home') && (! (local_user()))) 
+		$a->page['nav'] .= '<a id="nav-home-link" class="nav-commlink" href="">' . t('Home') . "</a>\r\n";
+	if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
+		$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >' 
+			. t('Register') . "</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";
 
 	if(x($_SESSION,'uid')) {
 
-		$a->page['nav'] .= "<a id=\"nav-network-link\" class=\"nav-commlink\" href=\"network\">Network</a><span id=\"net-update\" class=\"nav-ajax-left\"></span>\r\n";
+		$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";
 
-		$a->page['nav'] .= "<a id=\"nav-home-link\" class=\"nav-commlink\" href=\"profile/{$a->user['nickname']}\">Home</a><span id=\"home-update\" class=\"nav-ajax-left\"></span>\r\n";
+		$a->page['nav'] .= '<a id="nav-home-link" class="nav-commlink" href="profile/' . $a->user['nickname'] . '">' 
+			. t('Home') . '</a><span id="home-update" class="nav-ajax-left"></span>' . "\r\n";
 
-		$a->page['nav'] .= "<a id=\"nav-notify-link\" class=\"nav-commlink\" href=\"notifications\">Notifications</a><span id=\"notify-update\" class=\"nav-ajax-left\"></span>\r\n";
+		// only show friend requests for normal pages. Other page types have automatic friendship.
 
-		$a->page['nav'] .= "<a id=\"nav-messages-link\" class=\"nav-commlink\" href=\"Messages\">Messages</a><span id=\"mail-update\" class=\"nav-ajax-left\"></span>\r\n";
-		
+		if($_SESSION['page_flags'] == PAGE_NORMAL) {
+			$a->page['nav'] .= '<a id="nav-notify-link" class="nav-commlink" href="notifications">' . t('Notifications') 
+				. '</a><span id="notify-update" class="nav-ajax-left"></span>' . "\r\n";
+		}
 
+		$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";
+		
 
-		$a->page['nav'] .= "<a id=\"nav-settings-link\" class=\"nav-link\" href=\"settings\">Settings</a>\r\n";
+		$a->page['nav'] .= '<a id="nav-settings-link" class="nav-link" href="settings">' . t('Settings') . "</a>\r\n";
 
-		$a->page['nav'] .= "<a id=\"nav-profiles-link\" class=\"nav-link\" href=\"profiles\">Profiles</a>\r\n";
+		$a->page['nav'] .= '<a id="nav-profiles-link" class="nav-link" href="profiles">' . t('Profiles') . "</a>\r\n";
 
-		$a->page['nav'] .= "<a id=\"nav-contacts-link\" class=\"nav-link\" href=\"contacts\">Contacts</a>\r\n";
+		$a->page['nav'] .= '<a id="nav-contacts-link" class="nav-link" href="contacts">' . t('Contacts') . "</a>\r\n";
 
 
 		
 	}
 
 	$a->page['nav'] .= "</span>\r\n<span id=\"nav-end\"></span>\r\n";
+
+	$banner = get_config('system','banner');
+
+	if($banner === false) 
+		$banner .= '<img id="logo-img" src="images/ff-32.jpg" alt="logo" /><span id="logo-text">Friendika</span>';
+
+	$a->page['nav'] .= '<span id="banner">' . $banner . '</span>';