X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=e6460c046b7a857d83f5c3eb1edf5a43b4d2b37b;hb=152efdaec5c04dbef27218cce027b9e633df7bca;hp=0261ab7d6673383f6133532037ea5292796fd088;hpb=c42922f25f34f7d34fa50bc743680169542ac4a5;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index 0261ab7d66..e6460c046b 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -2,7 +2,7 @@
 
 function nav(&$a) {
 
-	/**
+	/*
 	 *
 	 * Build page header and site navigation bars
 	 *
@@ -11,23 +11,17 @@ function nav(&$a) {
 	if(!(x($a->page,'nav')))
 		$a->page['nav'] = '';
 
-	$base = z_root();
-	/**
+	$a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), array());
+
+	/*
 	 * Placeholder div for popup panel
 	 */
 
-	$a->page['htmlhead'] .= <<< EOT
-
-<script>$(document).ready(function() {
-		$("#search-text").search_autocomplete('$base/acl');
-});
-</script>
-EOT;
 	$a->page['nav'] .= '<div id="panel" style="display: none;"></div>' ;
 
 	$nav_info = nav_info($a);
 
-	/**
+	/*
 	 * Build the page
 	 */
 
@@ -37,12 +31,13 @@ EOT;
 		'$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']);
@@ -53,7 +48,7 @@ function nav_info(&$a) {
 
 	$ssl_state = ((local_user()) ? true : false);
 
-	/**
+	/*
 	 *
 	 * 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.
@@ -69,7 +64,7 @@ function nav_info(&$a) {
 	// nav links: array of array('href', 'text', 'extra css classes', 'title')
 	$nav = Array();
 
-	/**
+	/*
 	 * Display login or logout
 	 */
 
@@ -90,7 +85,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'],
 		);
 
@@ -100,7 +95,7 @@ function nav_info(&$a) {
 	}
 
 
-	/**
+	/*
 	 * "Home" should also take you home from an authenticated remote profile connection
 	 */
 
@@ -115,7 +110,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'));
@@ -123,15 +118,17 @@ function nav_info(&$a) {
 	if(count($a->apps)>0)
 		$nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
 
-	$nav['search'] = array('search', t('Search'), "", t('Search site content'));
+	if (local_user() OR !get_config('system','local_search')) {
+		$nav['search'] = array('search', t('Search'), "", t('Search site content'));
 
-	$nav['searchoption'] = array(
-					t("Full Text"),
-					t("Tags"),
-					t("Contacts"));
+		$nav['searchoption'] = array(
+						t("Full Text"),
+						t("Tags"),
+						t("Contacts"));
 
-	if (get_config('system','poco_local_search'))
-		$nav['searchoption'][] = t("Forums");
+		if (get_config('system','poco_local_search'))
+			$nav['searchoption'][] = t("Forums");
+	}
 
 	$gdirpath = 'directory';
 
@@ -145,13 +142,14 @@ 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'));
+	if(local_user())
+		$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
 	 *
@@ -172,7 +170,7 @@ function nav_info(&$a) {
 			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['notifications']['mark'] = array('', t('Mark as seen'), '',t('Mark all system notifications seen'));
 			}
 		}
 
@@ -195,7 +193,7 @@ function nav_info(&$a) {
 		$nav['contacts'] = array('contacts', t('Contacts'),"", t('Manage/edit friends and contacts'));
 	}
 
-	/**
+	/*
 	 * Admin page
 	 */
 	 if (is_site_admin()){
@@ -206,7 +204,7 @@ function nav_info(&$a) {
 	 $nav['navigation'] = array('navigation/', t('Navigation'), "", t('Site map'));
 
 
-	/**
+	/*
 	 *
 	 * Provide a banner/logo/whatever
 	 *
@@ -229,26 +227,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,
-		'events'        => null,
-		'register'      => null,
+		'messages'	=> null,
+		'directory'	=> null,
+		'settings'	=> null,
+		'contacts'	=> null,
+		'manage'	=> null,
+		'events'	=> null,
+		'register'	=> null,
 	);
 	$a->nav_sel[$item] = 'selected';
 }