flatten conversation hierarchy to one level on import but preserve all thread info

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index 48b935aae3dea1ca5cc17130fde3d397fe7ac39f..dd2655e84a1f55f75325d28d68af781e865a9109 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,10 +1,16 @@
 <?php
 
-$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
+       if(! x($a->page,'nav'))
+               $a->page['nav'] = '';
 
-if(x($_SESSION['uid'])) {
+       $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";
 
@@ -14,6 +20,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')) {
@@ -24,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";
@@ -45,7 +56,7 @@ if(x($_SESSION['uid'])) {
 
        $banner = get_config('system','banner');
 
-       if($banner === false)
-               $banner = 'mistpark';
+       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>';