X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fnav.php;h=0fa671a27d5118a384aebbaf69945dd265f8772b;hb=c73e93b19b192600053b7e680f1179cf27c615f4;hp=3d27be13be819bf8e1c4dd66a1da260501200f50;hpb=5a1bb9866dbb09b00861688f4a78baf0391ea58f;p=friendica.git
diff --git a/include/nav.php b/include/nav.php
index 3d27be13be..0fa671a27d 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -26,8 +26,7 @@ function nav(&$a) {
$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'],
@@ -48,7 +47,7 @@ function nav_info(&$a) {
/**
*
- * 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.
*
@@ -83,7 +82,7 @@ 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'],
);
@@ -108,7 +107,7 @@ function nav_info(&$a) {
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,10 +117,18 @@ 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;
}
@@ -130,6 +137,8 @@ function nav_info(&$a) {
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'));
@@ -197,7 +206,7 @@ function nav_info(&$a) {
$banner = get_config('system','banner');
- if($banner === false)
+ if($banner === false)
$banner .= '
Friendica';
call_hooks('nav_info', $nav);
@@ -214,7 +223,7 @@ function nav_info(&$a) {
/*
* Set a menu item in navbar as selected
- *
+ *
*/
function nav_set_selected($item){
$a = get_app();
@@ -230,6 +239,7 @@ function nav_set_selected($item){
'settings' => null,
'contacts' => null,
'manage' => null,
+ 'events' => null,
'register' => null,
);
$a->nav_sel[$item] = 'selected';