X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=94a71d227a474e1e4eb91d7cd1079298b2648996;hb=2fc89deaeae0341aa12b6b811927e793011055d1;hp=2e59ad2ac465be0eb8d108265d2cb8f8f82bf2ac;hpb=8f83c4ab6408dd3fa789304ce918205e688be4a8;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index 2e59ad2ac4..94a71d227a 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,18 +1,70 @@
 <?php
 
-if(x($_SESSION['uid'])) {
+	/**
+	 *
+	 * Build page header and site navigation bars
+	 *
+	 */
+
+	if(!(x($a->page,'nav')))
+		$a->page['nav'] = '';
+
+	/**
+	 * Placeholder div for popup panel
+	 */
+
+	$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
+
+	/**
+	 *
+	 * Our network is distributed, and as you visit friends some of the 
+	 * sites look exactly the same - it isn't always easy to know where you are.
+	 * Display the current site location as a navigation aid.
+	 *
+	 */
+
+	$a->page['nav'] .= '<div id="site-location">' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '</div>';
+
+
+	/**
+	 * Display login or logout
+	 */
+
+	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';
+		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";
 
+	/**
+	 * "Home" should also take you home from an authenticated remote profile connection
+	 */
+
+	$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
+
 	if(($a->module != 'home') && (! (local_user()))) 
-		$a->page['nav'] .= '<a id="nav-home-link" class="nav-commlink" href="">' . t('Home') . "</a>\r\n";
+		$a->page['nav'] .= '<a id="nav-home-link" class="nav-commlink" href="' . $homelink . '">' . 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-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";
+
+
+	/**
+	 *
+	 * The following nav links are only show to logged in users
+	 *
+	 */
 
 	if(x($_SESSION,'uid')) {
 
@@ -22,8 +74,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";
@@ -35,8 +91,23 @@ if(x($_SESSION['uid'])) {
 
 		$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";
+
+	/**
+	 *
+	 * Provide a banner/logo/whatever
+	 *
+	 */
+
+	$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>';
+
+
+	$a->page['nav'] .= '<span id="banner">' . $banner . '</span>';
+
+	call_hooks('page_header', $a->page['nav']);