X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnav.php;h=895c321e6ad39ac893d3dadd3585c1d34377a97f;hb=4ba29089d27912fc0e742fb1e1d1c12b6719c5c5;hp=94a71d227a474e1e4eb91d7cd1079298b2648996;hpb=21bc6982acc78ca44fc6babf9654c619e8dee0e5;p=friendica.git
diff --git a/include/nav.php b/include/nav.php
index 94a71d227a..895c321e6a 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,5 +1,7 @@
page['nav'] .= '
' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '
';
+ $myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
+
+ $sitelocation = $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 );
+
+ // nav links: array of array('href', 'text', 'extra css classes', 'title')
+ $nav = Array();
/**
* Display login or logout
*/
if(local_user()) {
- $a->page['nav'] .= '' . t('Logout') . "\r\n";
+ $nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
}
else {
- $a->page['nav'] .= '' . t('Login') . "\r\n";
+ $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'nav-selected':''), t('Sign in'));
}
- $a->page['nav'] .= "\r\n";
/**
* "Home" should also take you home from an authenticated remote profile connection
@@ -49,16 +52,33 @@
$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
if(($a->module != 'home') && (! (local_user())))
- $a->page['nav'] .= '' . t('Home') . "\r\n";
+ $nav['home'] = array($homelink, t('Home'), "", t('Home Page'));
if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
- $a->page['nav'] .= ''
- . t('Register') . "\r\n";
+ $nav['register'] = array('register',t('Register'), "", t('Create an account'));
+
+ $help_url = $a->get_baseurl() . '/help';
+
+ if(! get_config('system','hide_help'))
+ $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
- $a->page['nav'] .= '' . t('Search') . "\r\n";
- $a->page['nav'] .= '' . t('Directory') . "\r\n";
+ if($a->apps)
+ $nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
+ $nav['search'] = array('search', t('Search'), "", t('Search site content'));
+
+ $gdirpath = 'directory';
+
+ if(strlen(get_config('system','singleuser'))) {
+ $gdir = dirname(get_config('system','directory_submit_url'));
+ if(strlen($gdir))
+ $gdirpath = $gdir;
+ }
+ elseif(! get_config('system','no_community_page'))
+ $nav['community'] = array('community', t('Community'), "", t('Conversations on this site'));
+
+ $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
/**
*
@@ -66,35 +86,37 @@
*
*/
- if(x($_SESSION,'uid')) {
+ if(local_user()) {
+
+ $nav['network'] = array('network', t('Network'), "", t('Conversations from your friends'));
- $a->page['nav'] .= '' . t('Network')
- . '' . "\r\n";
+ $nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations'));
- $a->page['nav'] .= ''
- . t('Home') . '' . "\r\n";
/* only show friend requests for normal pages. Other page types have automatic friendship. */
if($_SESSION['page_flags'] == PAGE_NORMAL) {
- $a->page['nav'] .= '' . t('Notifications')
- . '' . "\r\n";
+ $nav['notifications'] = array('notifications', t('Notifications'), "", t('Friend requests'));
}
- $a->page['nav'] .= '' . t('Messages')
- . '' . "\r\n";
+ $nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
+ if(is_array($a->identities) && count($a->identities) > 1) {
+ $nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
+ }
- $a->page['nav'] .= '' . t('Settings') . "\r\n";
-
- $a->page['nav'] .= '' . t('Profiles') . "\r\n";
-
- $a->page['nav'] .= '' . t('Contacts') . "\r\n";
-
-
+ $nav['settings'] = array('settings', t('Settings'),"", t('Account settings'));
+ $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles'));
+ $nav['contacts'] = array('contacts', t('Contacts'),"", t('Manage/edit friends and contacts'));
}
- $a->page['nav'] .= "\r\n\r\n";
+ /**
+ * Admin page
+ */
+ if (is_site_admin()){
+ $nav['admin'] = array('admin/', t('Admin'), "", t('Site setup and configuration'));
+ }
+
/**
*
@@ -105,9 +127,18 @@
$banner = get_config('system','banner');
if($banner === false)
- $banner .= 'Friendika';
+ $banner .= 'Friendika';
- $a->page['nav'] .= '' . $banner . '';
+ $tpl = get_markup_template('nav.tpl');
+
+ $a->page['nav'] .= replace_macros($tpl, array(
+ '$langselector' => lang_selector(),
+ '$sitelocation' => $sitelocation,
+ '$nav' => $nav,
+ '$banner' => $banner,
+ ));
call_hooks('page_header', $a->page['nav']);
+
+}