diff options
Diffstat (limited to 'include/nav.php')
| -rw-r--r-- | include/nav.php | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/include/nav.php b/include/nav.php index 5490d6cd4..626caf981 100644 --- a/include/nav.php +++ b/include/nav.php @@ -1,4 +1,4 @@ -<?php +<?php /** @file */ function nav(&$a) { @@ -71,7 +71,7 @@ EOT; $nav['logout'] = Array('logout',t('Logout'), "", t('End this session')); // user menu - $nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Status'), "", t('Your posts and conversations')); + $nav['usermenu'][] = Array('channel/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations')); $nav['usermenu'][] = Array('profile/' . $channel['channel_address'], t('View Profile'), "", t('Your profile page')); if(feature_enabled(local_user(),'multi_profiles')) $nav['usermenu'][] = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit Profiles')); @@ -107,8 +107,10 @@ EOT; */ $homelink = get_my_url(); - if(! $homelink) - $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : ''); + if(! $homelink) { + $observer = $a->get_observer(); + $homelink = (($observer) ? $observer['xchan_url'] : ''); + } if(($a->module != 'home') && (! (local_user()))) $nav['home'] = array($homelink, t('Home'), "", t('Home Page')); @@ -128,7 +130,7 @@ EOT; $nav['search'] = array('search', t('Search'), "", t('Search site content')); - $nav['directory'] = array('directory', t('Channel Directory'), "", t('Channel Locator')); + $nav['directory'] = array('directory', t('Directory'), "", t('Channel Locator')); /** @@ -139,24 +141,24 @@ EOT; if(local_user()) { - $nav['network'] = array('network', t('Network'), "", t('Conversations from your friends')); - $nav['network']['all']=array('notifications/network', t('See all network notifications'), "", ""); - $nav['network']['mark'] = array('', t('Mark all network notifications seen'), '',''); + $nav['network'] = array('network', t('Matrix'), "", t('Conversations from your grid')); + $nav['network']['all']=array('notifications/network', t('See all matrix notifications'), "", ""); + $nav['network']['mark'] = array('', t('Mark all matrix notifications seen'), '',''); $nav['home'] = array('channel/' . $channel['channel_address'], t('Home'), "", t('Your posts and conversations')); $nav['home']['all']=array('notifications/channel', t('See all channel notifications'), "", ""); $nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '',''); - $nav['intros'] = array('connections/pending', t('Introductions'), "", t('New Connections')); + $nav['intros'] = array('connections/pending', t('Intros'), "", t('New Connections')); $nav['intros']['all']=array('intro', t('See all channel introductions'), "", ""); - $nav['notifications'] = array('notifications/system', t('Notifications'), "", t('Notifications')); + $nav['notifications'] = array('notifications/system', t('Notices'), "", t('Notifications')); $nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", ""); $nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '',''); - $nav['messages'] = array('message', t('Messages'), "", t('Private mail')); + $nav['messages'] = array('message', t('Mail'), "", t('Private mail')); $nav['messages']['all']=array('message', t('See all private messages'), "", ""); $nav['messages']['mark'] = array('', t('Mark all private messages seen'), '',''); $nav['messages']['inbox'] = array('message', t('Inbox'), "", t('Inbox')); @@ -192,7 +194,6 @@ EOT; $banner = get_config('system','banner'); if($banner === false) -// $banner .= '<a href="http://friendica.com"><img id="logo-img" src="images/fred-32.png" alt="logo" /></a>'; $banner = 'red'; $tpl = get_markup_template('nav.tpl'); |