X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=8428b6b0fdb654fc5f37986cb926bb3cd7ef2d33;hb=9d322d7473fe0cc9c13d5c107fb516836fb4dd79;hp=f838830a8873b109537acec32edc15de36907c96;hpb=016b6428a091e4d9067962e2d8931e7e51254621;p=friendica.git
diff --git a/include/nav.php b/include/nav.php
index f838830a88..8428b6b0fd 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -2,7 +2,7 @@
function nav(&$a) {
- /**
+ /*
*
* Build page header and site navigation bars
*
@@ -11,7 +11,9 @@ function nav(&$a) {
if(!(x($a->page,'nav')))
$a->page['nav'] = '';
- /**
+ $a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), array());
+
+ /*
* Placeholder div for popup panel
*/
@@ -19,23 +21,23 @@ function nav(&$a) {
$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(),
- '$langselector' => lang_selector(),
+ '$baseurl' => $a->get_baseurl(),
'$sitelocation' => $nav_info['sitelocation'],
'$nav' => $nav_info['nav'],
- '$banner' => $nav_info['banner'],
+ '$banner' => $nav_info['banner'],
'$emptynotifications' => t('Nothing new here'),
'$userinfo' => $nav_info['userinfo'],
- '$sel' => $a->nav_sel,
+ '$sel' => $a->nav_sel,
'$apps' => $a->apps,
- '$clear_notifs' => t('Clear notifications')
+ '$clear_notifs' => t('Clear notifications'),
+ '$search_hint' => t('@name, !forum, #tags, content')
));
call_hooks('page_header', $a->page['nav']);
@@ -46,23 +48,23 @@ 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 );
// nav links: array of array('href', 'text', 'extra css classes', 'title')
$nav = Array();
- /**
+ /*
* Display login or logout
*/
@@ -83,17 +85,17 @@ function nav_info(&$a) {
// user info
$r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
$userinfo = array(
- 'icon' => (count($r) ? $a->get_cached_avatar_image($r[0]['micro']) : $a->get_baseurl($ssl_state)."/images/person-48.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'));
}
- /**
+ /*
* "Home" should also take you home from an authenticated remote profile connection
*/
@@ -101,14 +103,14 @@ function nav_info(&$a) {
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'));
@@ -118,21 +120,33 @@ function nav_info(&$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['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'));
- /**
+ /*
*
* The following nav links are only show to logged in users
*
@@ -145,15 +159,16 @@ function nav_info(&$a) {
$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 || $_SESSION['page_flags'] == PAGE_SOAPBOX || $_SESSION['page_flags'] == PAGE_PRVGROUP) {
- $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'));
@@ -175,7 +190,7 @@ function nav_info(&$a) {
$nav['contacts'] = array('contacts', t('Contacts'),"", t('Manage/edit friends and contacts'));
}
- /**
+ /*
* Admin page
*/
if (is_site_admin()){
@@ -186,7 +201,7 @@ function nav_info(&$a) {
$nav['navigation'] = array('navigation/', t('Navigation'), "", t('Site map'));
- /**
+ /*
*
* Provide a banner/logo/whatever
*
@@ -194,9 +209,11 @@ function nav_info(&$a) {
$banner = get_config('system','banner');
- if($banner === false)
+ if($banner === false)
$banner .= '
Friendica';
+ call_hooks('nav_info', $nav);
+
return array(
'sitelocation' => $sitelocation,
@@ -207,25 +224,26 @@ function nav_info(&$a) {
}
-/*
+/**
* Set a menu item in navbar as selected
- *
+ *
*/
function nav_set_selected($item){
$a = get_app();
- $a->nav_sel = array(
+ $a->nav_sel = array(
'community' => null,
- 'network' => null,
- 'home' => null,
- 'profiles' => null,
+ 'network' => null,
+ 'home' => null,
+ 'profiles' => null,
'introductions' => null,
'notifications' => null,
- 'messages' => null,
- 'directory' => null,
- 'settings' => null,
- 'contacts' => null,
- 'manage' => null,
- 'register' => null,
+ 'messages' => null,
+ 'directory' => null,
+ 'settings' => null,
+ 'contacts' => null,
+ 'manage' => null,
+ 'events' => null,
+ 'register' => null,
);
$a->nav_sel[$item] = 'selected';
}