Merge branch 'opensearch' of https://github.com/fabrixxm/friendika into fabrixxm...

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index bfbc10f5a71a70ae71da0f20cacd5818dd8b891c..b8b65f84d00b1f24e62e120545cd173bb6aff55d 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -16,6 +16,7 @@ function nav(&$a) {
         */
 
        $a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
+       $a->page['nav'] .= lang_selector();
 
        /**
         *
@@ -25,7 +26,9 @@ function nav(&$a) {
         *
         */
 
-       $a->page['nav'] .= '<div id="site-location">' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '</div>';
+       $myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
+               
+       $a->page['nav'] .= '<div id="site-location">' . $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '</div>';
 
 
        /**
@@ -80,7 +83,7 @@ function nav(&$a) {
         *
         */
 
-       if(x($_SESSION,'uid')) {
+       if(local_user()) {
 
                $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";
@@ -98,6 +101,9 @@ function nav(&$a) {
                $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";
                
+               if(is_array($a->identities) && count($a->identities) > 1) {
+                       $a->page['nav'] .= '<a id="nav-manage-link" class="nav-commlink" href="manage">' . t('Manage') . '</a>' . "\r\n"; 
+               }
 
                $a->page['nav'] .= '<a id="nav-settings-link" class="nav-link" href="settings">' . t('Settings') . "</a>\r\n";
 
@@ -119,7 +125,7 @@ function nav(&$a) {
        $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>';
+               $banner .= '<a href="http://project.friendika.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://project.friendika.com">Friendika</a></span>';
 
 
        $a->page['nav'] .= '<span id="banner">' . $banner . '</span>';