remove javascript to set selectect nav item. enanche img template prefetch ignoring

11 files changed, 15 insertions, 11 deletions

diff --git a/mod/community.php b/mod/community.php
index f8bd88d86..cb255029f 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -25,7 +25,7 @@ function community_content(&$a, $update = 0) {
 
 	$o .= '<h3>' . t('Community') . '</h3>';
 	if(! $update) {
-		$o .= set_nav_selected('nav-community-link');
+		nav_set_selected('community');
 		$o .= '<div id="live-community"></div>' . "\r\n";
 		$o .= "<script> var profile_uid = -1; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
 	}
diff --git a/mod/contacts.php b/mod/contacts.php
index f8b9a743f..eb1de25ad 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -124,7 +124,7 @@ function contacts_content(&$a) {
 
 	$sort_type = 0;
 	$o = '';
-	$o .= set_nav_selected('nav-contacts-link');
+	nav_set_selected('contacts');
 
 	$_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
 
diff --git a/mod/directory.php b/mod/directory.php
index 03b6ab4d1..93abcd5de 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -22,7 +22,7 @@ function directory_content(&$a) {
 	}
 
 	$o = '';
-	$o .= set_nav_selected('nav-directory-link');
+	nav_set_selected('directory');
 	if(x($_SESSION,'theme'))
 		unset($_SESSION['theme']);
 
diff --git a/mod/help.php b/mod/help.php
index 495b4ccc2..59e062f6d 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -17,6 +17,7 @@ function load_doc_file($s) {
 
 
 function help_content(&$a) {
+	nav_set_selected('help');
 
 	global $lang;
 
@@ -41,4 +42,4 @@ function help_content(&$a) {
 	
 	return Markdown($text);
 
-}
\ No newline at end of file
+}
diff --git a/mod/message.php b/mod/message.php
index ff3db06e2..9e8999592 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -110,7 +110,7 @@ function message_post(&$a) {
 function message_content(&$a) {
 
 	$o = '';
-	$o .= set_nav_selected('nav-messages-link');
+	nav_set_selected('messages');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
diff --git a/mod/network.php b/mod/network.php
index 7cac7b858..cf4c994f0 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -98,7 +98,7 @@ function network_content(&$a, $update = 0) {
 			}
 		}
 
-		$o .= set_nav_selected('nav-network-link');
+		nav_set_selected('network');
 
 		$_SESSION['return_url'] = $a->cmd;
 
diff --git a/mod/notifications.php b/mod/notifications.php
index 920d0d82d..0c35d4cd1 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -64,7 +64,7 @@ function notifications_content(&$a) {
 	}
 
 	$o = '';
-	$o .= set_nav_selected("nav-notifications-link");
+	nav_set_selected("notifications");
 
 	if(($a->argc > 1) && ($a->argv[1] == 'all'))
 		$sql_extra = '';
diff --git a/mod/profile.php b/mod/profile.php
index b309ea647..5a66892da 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -69,8 +69,9 @@ function profile_content(&$a, $update = 0) {
 		$a->profile['profile_uid'] = $update;
 	}
 	else {
-		if($a->profile['profile_uid'] == local_user())		
-			$o .= set_nav_selected('nav-home-link');
+		if($a->profile['profile_uid'] == local_user()) {
+			nav_set_selected('home');
+		}
 	}
 
 	$contact = null;
diff --git a/mod/profiles.php b/mod/profiles.php
index 9b0a2970b..5cc9fa38c 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -220,7 +220,7 @@ function profiles_post(&$a) {
 function profiles_content(&$a) {
 
 	$o = '';
-	$o .= set_nav_selected('nav-profiles-link');
+	nav_set_selected('profiles');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
diff --git a/mod/search.php b/mod/search.php
index 88ff9bbb7..f7ce75905 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -13,6 +13,8 @@ function search_content(&$a) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
+	
+	nav_set_selected('search');
 
 	require_once("include/bbcode.php");
 	require_once('include/security.php');
diff --git a/mod/settings.php b/mod/settings.php
index 0223b1b9c..44ebdd77b 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -299,7 +299,7 @@ if(! function_exists('settings_content')) {
 function settings_content(&$a) {
 
 	$o = '';
-	$o .=  set_nav_selected('nav-settings-link');
+	nav_set_selected('settings');
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL );