migrate more notifications

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index f9e72bda7d9aff304711b08683dcefe3ad51c718..4c75a495b3925d1ee0fe0153e5e983535d93a675 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -81,7 +81,7 @@ function nav(&$a) {
        if(! get_config('system','hide_help'))
                $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
 
-       if($a->apps)
+       if(count($a->apps)>0)
                $nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
 
        $nav['search'] = array('search', t('Search'), "", t('Search site content'));
@@ -114,7 +114,9 @@ function nav(&$a) {
                /* only show friend requests for normal pages. Other page types have automatic friendship. */
 
                if($_SESSION['page_flags'] == PAGE_NORMAL) {
-                       $nav['notifications'] = array('notifications',  t('Notifications'), "", t('Friend requests'));
+                       $nav['introductions'] = array('notifications/intros',   t('Introductions'), "", t('Friend Requests'));
+                       $nav['notifications'] = array('notifications',  t('Notifications'), "", t('Notifications'));
+
                }
 
                $nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
@@ -145,7 +147,7 @@ function nav(&$a) {
        $banner = get_config('system','banner');
 
        if($banner === false) 
-               $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>';
+               $banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/friendika-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
 
 
        $tpl = get_markup_template('nav.tpl');
@@ -158,6 +160,7 @@ function nav(&$a) {
                '$emptynotifications' => t('Nothing new here'),
                '$userinfo' => $userinfo,
                '$sel' =>       $a->nav_sel,
+               '$apps' => $a->apps,
        ));
 
        call_hooks('page_header', $a->page['nav']);
@@ -174,11 +177,14 @@ function nav_set_selected($item){
                'network'               => null,
                'home'                  => null,
                'profiles'              => null,
+               'introductions' => null,
                'notifications' => null,
                'messages'              => null,
-               'directyory'    => null,
+               'directory'         => null,
                'settings'              => null,
                'contacts'              => null,
+               'manage'        => null,
+               'register'      => null,
        );
        $a->nav_sel[$item] = 'selected';
 }