X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnav.php;h=2ead5c07e9465db1167faf36b6ad2aa0557593a2;hb=b3a5fccc9d4af4dc66ae8f0404817690a333c433;hp=96acf826df6e4c8521e54f695f951aeca5081609;hpb=44ff96e0cf64fab4a4b9d8d71beeec485ffea4f3;p=friendica.git
diff --git a/include/nav.php b/include/nav.php
index 96acf826df..2ead5c07e9 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')
+ $nav = Array();
/**
* Display login or logout
*/
if(local_user()) {
- $a->page['nav'] .= '' . t('Logout') . "\r\n";
+ $nav['logout'] = Array('logout',t('Logout'), "");
}
else {
- $a->page['nav'] .= '' . t('Login') . "\r\n";
+ $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'nav-selected':''));
}
- $a->page['nav'] .= "\r\n";
/**
* "Home" should also take you home from an authenticated remote profile connection
@@ -46,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'), "");
if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
- $a->page['nav'] .= ''
- . t('Register') . "\r\n";
+ $nav['register'] = array('register',t('Register'), "");
+
+ $help_url = $a->get_baseurl() . '/help';
+
+ if(! get_config('system','hide-help'))
+ $nav['help'] = array($help_url, t('Help'), "");
+
+
+ if(strlen($a->apps)) {
+ $nav['apps'] = array('apps', t('Apps'), "");
+ }
+
+ $nav['search'] = array('search', t('Search'), "");
- $a->page['nav'] .= '' . t('Search') . "\r\n";
- $a->page['nav'] .= '' . t('Directory') . "\r\n";
+ $gdirpath = 'directory';
+ if(strlen(get_config('system','singleuser'))) {
+ $gdir = dirname(get_config('system','directory_submit_url'));
+ if(strlen($gdir))
+ $gdirpath = $gdir;
+ }
+
+ $nav['directory'] = array($gdirpath, t('Directory'), "");
/**
*
@@ -63,35 +86,32 @@
*
*/
- if(x($_SESSION,'uid')) {
+ if(local_user()) {
- $a->page['nav'] .= '' . t('Network')
- . '' . "\r\n";
+ $nav['network'] = array('network', t('Network'), "");
+
+ $nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "");
- $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'), "");
}
- $a->page['nav'] .= '' . t('Messages')
- . '' . "\r\n";
+ $nav['messages'] = array('message', t('Messages'), "");
+ if(is_array($a->identities) && count($a->identities) > 1) {
+ $nav['manage'] = array('manage', t('Manage'), "");
+ }
- $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'),"");
+ $nav['profiles'] = array('profiles', t('Profiles'),"");
+ $nav['contacts'] = array('contacts', t('Contacts'),"");
}
- $a->page['nav'] .= "\r\n\r\n";
/**
*
@@ -102,9 +122,18 @@
$banner = get_config('system','banner');
if($banner === false)
- $banner .= 'Friendika';
+ $banner .= 'Friendika';
- $a->page['nav'] .= '' . $banner . '';
+ $tpl = load_view_file('view/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']);
+
+}