X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=0fa671a27d5118a384aebbaf69945dd265f8772b;hb=c73e93b19b192600053b7e680f1179cf27c615f4;hp=e28081839965731b7aa2135e71fb8c3f805c9e27;hpb=9243c9fc141237453f05d215058d4b975d010437;p=friendica.git diff --git a/include/nav.php b/include/nav.php old mode 100755 new mode 100644 index e280818399..0fa671a27d --- a/include/nav.php +++ b/include/nav.php @@ -8,8 +8,6 @@ function nav(&$a) { * */ - $ssl_state = ((local_user()) ? true : false); - if(!(x($a->page,'nav'))) $a->page['nav'] = ''; @@ -19,16 +17,44 @@ function nav(&$a) { $a->page['nav'] .= '
' ; + $nav_info = nav_info($a); + + /** + * Build the page + */ + + $tpl = get_markup_template('nav.tpl'); + + $a->page['nav'] .= replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), + '$sitelocation' => $nav_info['sitelocation'], + '$nav' => $nav_info['nav'], + '$banner' => $nav_info['banner'], + '$emptynotifications' => t('Nothing new here'), + '$userinfo' => $nav_info['userinfo'], + '$sel' => $a->nav_sel, + '$apps' => $a->apps, + '$clear_notifs' => t('Clear notifications') + )); + + call_hooks('page_header', $a->page['nav']); +} + + +function nav_info(&$a) { + + $ssl_state = ((local_user()) ? true : false); + /** * - * Our network is distributed, and as you visit friends some of the + * Our network is distributed, and as you visit friends some of the * sites look exactly the same - it isn't always easy to know where you are. * Display the current site location as a navigation aid. * */ $myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : ''); - + $sitelocation = $myident . substr($a->get_baseurl($ssl_state),strpos($a->get_baseurl($ssl_state),'//') + 2 ); @@ -44,21 +70,22 @@ function nav(&$a) { if(local_user()) { $nav['logout'] = Array('logout',t('Logout'), "", t('End this session')); - + // user menu $nav['usermenu'][] = Array('profile/' . $a->user['nickname'], t('Status'), "", t('Your posts and conversations')); $nav['usermenu'][] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); $nav['usermenu'][] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); + $nav['usermenu'][] = Array('videos/' . $a->user['nickname'], t('Videos'), "", t('Your videos')); $nav['usermenu'][] = Array('events/', t('Events'), "", t('Your events')); - $nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); - + $nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal notes')); + // user info $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl($ssl_state)."/images/default-profile-mm.jpg"), + 'icon' => (count($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg"), 'name' => $a->user['username'], ); - + } else { $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'selected':''), t('Sign in')); @@ -69,16 +96,18 @@ function nav(&$a) { * "Home" should also take you home from an authenticated remote profile connection */ - $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : ''); + $homelink = get_my_url(); + if(! $homelink) + $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : ''); - if(($a->module != 'home') && (! (local_user()))) + if(($a->module != 'home') && (! (local_user()))) $nav['home'] = array($homelink, t('Home'), "", t('Home Page')); if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user())) $nav['register'] = array('register',t('Register'), "", t('Create an account')); - $help_url = $a->get_baseurl($ssl_state) . '/help'; + $help_url = 'help'; if(! get_config('system','hide_help')) $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation')); @@ -88,17 +117,31 @@ function nav(&$a) { $nav['search'] = array('search', t('Search'), "", t('Search site content')); + $nav['searchoption'] = array( + t("Full Text"), + t("Tags"), + t("Contacts")); + + if (get_config('system','poco_local_search')) + $nav['searchoption'][] = t("Forums"); + $gdirpath = 'directory'; if(strlen(get_config('system','singleuser'))) { - $gdir = dirname(get_config('system','directory_submit_url')); + $gdir = get_config('system','directory'); if(strlen($gdir)) $gdirpath = $gdir; } - elseif(! get_config('system','no_community_page')) + elseif(get_config('system','community_page_style') == CP_USERS_ON_SERVER) $nav['community'] = array('community', t('Community'), "", t('Conversations on this site')); + elseif(get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY) + $nav['community'] = array('community', t('Community'), "", t('Conversations on the network')); - $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory')); + $nav['events'] = Array('events', t('Events'), "", t('Events and Calendar')); + + $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory')); + + $nav['about'] = Array('friendica', t('Information'), "", t('Information about this friendica instance')); /** * @@ -109,31 +152,38 @@ function nav(&$a) { if(local_user()) { $nav['network'] = array('network', t('Network'), "", t('Conversations from your friends')); + $nav['net_reset'] = array('network/0?f=&order=comment&nets=all', t('Network Reset'), "", t('Load Network page with no filters')); $nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); + if(in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_PRVGROUP))) { + /* only show friend requests for normal pages. Other page types have automatic friendship. */ + if(in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_PRVGROUP))) + $nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests')); - /* only show friend requests for normal pages. Other page types have automatic friendship. */ - - if($_SESSION['page_flags'] == PAGE_NORMAL) { - $nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests')); - $nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications')); - $nav['notifications']['all']=array('notifications/system', t('See all notifications'), "", ""); - $nav['notifications']['mark'] = array('', t('Mark all system notifications seen'), '',''); - + if(in_array($_SESSION['page_flags'], array(PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE))) { + $nav['notifications'] = array('notifications', t('Notifications'), "", 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']['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')); - + if(is_array($a->identities) && count($a->identities) > 1) { $nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages')); } + $nav['delegations'] = Array('delegate', t('Delegations'), "", t('Delegate Page Management')); + $nav['settings'] = array('settings', t('Settings'),"", t('Account settings')); - $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles')); + + if(feature_enabled(local_user(),'multi_profiles')) + $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/Edit Profiles')); + $nav['contacts'] = array('contacts', t('Contacts'),"", t('Manage/edit friends and contacts')); } @@ -145,6 +195,9 @@ function nav(&$a) { } + $nav['navigation'] = array('navigation/', t('Navigation'), "", t('Site map')); + + /** * * Provide a banner/logo/whatever @@ -153,29 +206,24 @@ function nav(&$a) { $banner = get_config('system','banner'); - if($banner === false) + if($banner === false) $banner .= '