X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fnav.php;h=8428b6b0fdb654fc5f37986cb926bb3cd7ef2d33;hb=9d322d7473fe0cc9c13d5c107fb516836fb4dd79;hp=6512d35609f25e031674a1a673434b748211cb23;hpb=e6a8a7c8a92e3160874f5c032d5e67a4cb23adfe;p=friendica.git

diff --git a/include/nav.php b/include/nav.php
index 6512d35609..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,7 +21,7 @@ function nav(&$a) {
 
 	$nav_info = nav_info($a);
 
-	/**
+	/*
 	 * Build the page
 	 */
 
@@ -29,12 +31,13 @@ function nav(&$a) {
 		'$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']);
@@ -45,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.
@@ -61,7 +64,7 @@ function nav_info(&$a) {
 	// nav links: array of array('href', 'text', 'extra css classes', 'title')
 	$nav = Array();
 
-	/**
+	/*
 	 * Display login or logout
 	 */
 
@@ -82,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'],
 		);
 
@@ -92,7 +95,7 @@ function nav_info(&$a) {
 	}
 
 
-	/**
+	/*
 	 * "Home" should also take you home from an authenticated remote profile connection
 	 */
 
@@ -107,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'));
@@ -143,7 +146,7 @@ function nav_info(&$a) {
 
 	$nav['about'] = Array('friendica', t('Information'), "", t('Information about this friendica instance'));
 
-	/**
+	/*
 	 *
 	 * The following nav links are only show to logged in users
 	 *
@@ -187,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()){
@@ -198,7 +201,7 @@ function nav_info(&$a) {
 	 $nav['navigation'] = array('navigation/', t('Navigation'), "", t('Site map'));
 
 
-	/**
+	/*
 	 *
 	 * Provide a banner/logo/whatever
 	 *
@@ -221,26 +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,
-		'events'        => null,
-		'register'      => null,
+		'messages'	=> null,
+		'directory'	=> null,
+		'settings'	=> null,
+		'contacts'	=> null,
+		'manage'	=> null,
+		'events'	=> null,
+		'register'	=> null,
 	);
 	$a->nav_sel[$item] = 'selected';
 }