X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=895c321e6ad39ac893d3dadd3585c1d34377a97f;hb=37c7f68a23d5c93a28671958283a6dcab01bb6e7;hp=703d8da40e49d0bdedf837ab84ee231d29dfcc98;hpb=85f709320b588f3231875d097217bd9abd223c9f;p=friendica.git
diff --git a/include/nav.php b/include/nav.php
index 703d8da40e..895c321e6a 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -16,7 +16,6 @@ function nav(&$a) {
*/
$a->page['nav'] .= '
' ;
- $a->page['nav'] .= lang_selector();
/**
*
@@ -28,24 +27,23 @@ function nav(&$a) {
$myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
- $a->page['nav'] .= '' . $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ) . '
';
+ $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
@@ -54,24 +52,21 @@ function nav(&$a) {
$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 = get_config('system','help_url');
- if(! $help_url)
- $help_url = 'http://github.com/friendika/friendika/wiki';
+ $help_url = $a->get_baseurl() . '/help';
- $a->page['nav'] .= '' . t('Help') . "\r\n";
+ if(! get_config('system','hide_help'))
+ $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
- if(strlen($a->apps)) {
- $a->page['nav'] .= '' . t('Apps') . "\r\n";
- }
+ if($a->apps)
+ $nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
- $a->page['nav'] .= '' . t('Search') . "\r\n";
+ $nav['search'] = array('search', t('Search'), "", t('Search site content'));
$gdirpath = 'directory';
@@ -80,8 +75,10 @@ function nav(&$a) {
if(strlen($gdir))
$gdirpath = $gdir;
}
+ elseif(! get_config('system','no_community_page'))
+ $nav['community'] = array('community', t('Community'), "", t('Conversations on this site'));
- $a->page['nav'] .= '' . t('Directory') . "\r\n";
+ $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
/**
*
@@ -91,36 +88,35 @@ function nav(&$a) {
if(local_user()) {
- $a->page['nav'] .= '' . t('Network')
- . '' . "\r\n";
+ $nav['network'] = array('network', t('Network'), "", t('Conversations from your friends'));
+
+ $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) {
- $a->page['nav'] .= '' . t('Manage') . '' . "\r\n";
+ $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'));
+ }
+
/**
*
@@ -134,7 +130,14 @@ function nav(&$a) {
$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']);