try to auto-fill the profile address if we actually do know it.

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index 7f6aea17f447904e0e8c4df296c46f3f629f1474..74b4defc38f453b38224df164c682da4633a9342 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,8 +1,17 @@
 <?php
 
-if(x($_SESSION['uid'])) {
+       if(!(x($a->page,'nav')))
+               $a->page['nav'] = '';
+
+       $a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
+
+       $a->page['nav'] .= '<div id="site-location">' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '</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,6 +21,7 @@ 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-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 +32,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,7 +49,6 @@ if(x($_SESSION['uid'])) {
 
                $a->page['nav'] .= '<a id="nav-contacts-link" class="nav-link" href="contacts">' . t('Contacts') . "</a>\r\n";
 
-
                
        }
 
@@ -43,7 +56,10 @@ if(x($_SESSION['uid'])) {
 
        $banner = get_config('system','banner');
 
-       if($banner === false)
-               $banner = 'mistpark';
+       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']);