diff options
Diffstat (limited to 'include/nav.php')
| -rw-r--r-- | include/nav.php | 52 |
1 files changed, 29 insertions, 23 deletions
diff --git a/include/nav.php b/include/nav.php index 5490d6cd4..008899c47 100644 --- a/include/nav.php +++ b/include/nav.php @@ -1,4 +1,4 @@ -<?php +<?php /** @file */ function nav(&$a) { @@ -22,6 +22,7 @@ function nav(&$a) { serviceUrl: '$base/acl', minChars: 2, width: 250, + id: 'nav-search-text-ac', }); a.setOptions({ autoSubmit: true, params: { type: 'x' }}); @@ -71,7 +72,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')); @@ -95,20 +96,26 @@ EOT; ); } - if($observer) + if($observer) { + $nav['locked'] = true; $nav['lock'] = array('logout','','lock', sprintf( t('%s - click to logout'), $observer['xchan_addr'])); - else + } + else { + $nav['locked'] = false; $nav['lock'] = array('rmagic','','unlock', t('Click to authenticate to your home hub')); + } /** * "Home" should also take you home from an authenticated remote profile connection */ $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 +135,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,29 +146,26 @@ 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('Your matrix')); + $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'] = array('channel/' . $channel['channel_address'], t('Channel Home'), "", t('Channel home')); $nav['home']['mark'] = array('', t('Mark all channel notifications seen'), '',''); - $nav['intros'] = array('connections/pending', t('Introductions'), "", t('New Connections')); - $nav['intros']['all']=array('intro', t('See all channel introductions'), "", ""); + $nav['intros'] = array('connections/pending', t('Intros'), "", t('New Connections')); - $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')); $nav['messages']['outbox']= array('message/sent', t('Outbox'), "", t('Outbox')); - $nav['messages']['new'] = array('message/new', t('New Message'), "", t('New Message')); + $nav['messages']['new'] = array('mail/new', t('New Message'), "", t('New Message')); $nav['all_events'] = array('events', t('Events'), "", t('Event Calendar')); @@ -192,19 +196,21 @@ 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'; + $banner = get_config('system','sitename'); + + $x = array('nav' => $nav, 'usermenu' => $userinfo ); + call_hooks('nav', $x); $tpl = get_markup_template('nav.tpl'); $a->page['nav'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), - '$langselector' => lang_selector(), + '$langselector' => ((get_config('system','select_language')) ? lang_selector() : ''), '$sitelocation' => $sitelocation, - '$nav' => $nav, + '$nav' => $x['nav'], '$banner' => $banner, '$emptynotifications' => t('Nothing new here'), - '$userinfo' => $userinfo, + '$userinfo' => $x['usermenu'], '$localuser' => local_user(), '$sel' => $a->nav_sel, '$apps' => $a->get_apps(), @@ -234,5 +240,5 @@ function nav_set_selected($item){ 'manage' => null, 'register' => null, ); - $a->nav_sel[$item] = 'selected'; + $a->nav_sel[$item] = 'active'; } |