X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnav.php;h=dd2655e84a1f55f75325d28d68af781e865a9109;hb=9d7130e40382c316f5430ace4b9ca16a998a7432;hp=2e59ad2ac465be0eb8d108265d2cb8f8f82bf2ac;hpb=8f83c4ab6408dd3fa789304ce918205e688be4a8;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index 2e59ad2ac4..dd2655e84a 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,8 +1,16 @@
 <?php
 
-if(x($_SESSION['uid'])) {
+	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";
 
@@ -12,7 +20,8 @@ if(x($_SESSION['uid'])) {
 		$a->page['nav'] .= '<a id="nav-register-link" class="nav-commlink" href="register" >' 
 			. t('Register') . "</a>\r\n";
 
-	$a->page['nav'] .= '<a id="nav-directory-link" class="nav-link" href="directory">' . t('Site Directory') . "</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')) {
 
@@ -22,8 +31,12 @@ if(x($_SESSION['uid'])) {
 		$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">' . t('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.
+
+		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";
@@ -40,3 +53,10 @@ if(x($_SESSION['uid'])) {
 	}
 
 	$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>';