site nav menu now uses new menu code (and finished the implementation of custom menu items while I was at it - not backward compatible with the previous half finished version)

git-svn-id: http://code.elgg.org/elgg/trunk@7668 36083f99-b078-4883-b0ff-0f9b5a30f544

7 files changed, 13 insertions, 8 deletions

diff --git a/mod/blog/start.php b/mod/blog/start.php
index 374fe22d2..fb9e7d6ef 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -22,7 +22,8 @@ function blog_init() {
 	
 	elgg_register_library('elgg:blog', elgg_get_plugin_path() . 'blog/lib/blog.php');
 
-	add_menu(elgg_echo('blog:blogs'), "pg/blog/all/", array());
+	$item = new ElggMenuItem('blog', elgg_echo('blog:blogs'), 'pg/blog/all');
+	elgg_register_menu_item('site', $item);
 
 	// run the setup upon activations or to upgrade old installations.
 	run_function_once('blog_runonce', '1269370108');
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 8e33991c9..30272bb69 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -11,7 +11,8 @@ function bookmarks_init() {
 	global $CONFIG;
 
 	//add a tools menu option
-	add_menu(elgg_echo('bookmarks'), 'pg/bookmarks');
+	$item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks'), 'pg/bookmarks');
+	elgg_register_menu_item('site', $item);
 
 	// Register a page handler, so we can have nice URLs
 	register_page_handler('bookmarks', 'bookmarks_page_handler');
diff --git a/mod/file/start.php b/mod/file/start.php
index c939877f5..227a5c33c 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -28,7 +28,8 @@
 		global $CONFIG;
 
 		// Set up menu (tools dropdown)
-		add_menu(elgg_echo('files'), "pg/file/");
+		$item = new ElggMenuItem('file', elgg_echo('file'), 'pg/file');
+		elgg_register_menu_item('site', $item);
 
 		// Extend CSS
 		elgg_extend_view('css/screen', 'file/css');
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 36a1964ba..aaaaa3f45 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -14,7 +14,8 @@
 		global $CONFIG;
 
 		// Set up the menu
-		add_menu(elgg_echo('groups'), "pg/groups/world/");
+		$item = new ElggMenuItem('groups', elgg_echo('groups'), 'pg/groups/world');
+		elgg_register_menu_item('site', $item);
 
 		// Register a page handler, so we can have nice URLs
 		register_page_handler('groups','groups_page_handler');
diff --git a/mod/pages/start.php b/mod/pages/start.php
index 1e0c5bdc2..e90c6db54 100644
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -12,7 +12,8 @@
 function pages_init() {
 	global $CONFIG;
 
-	add_menu(elgg_echo('pages'), "mod/pages/world.php");
+	$item = new ElggMenuItem('pages', elgg_echo('pages'), 'mod/pages/world.php');
+	elgg_register_menu_item('site', $item);
 
 	// Register a page handler, so we can have nice URLs
 	register_page_handler('pages','pages_page_handler');
diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php
index cc0c4abac..6d1581873 100644
--- a/mod/riverdashboard/start.php
+++ b/mod/riverdashboard/start.php
@@ -11,7 +11,6 @@ function riverdashboard_init() {
 	global $CONFIG;
 	// Register and optionally replace the dashboard
 	register_page_handler('dashboard', 'riverdashboard_page_handler');
-	add_menu(elgg_echo('activity'), "pg/activity/");
 
 	// Page handler
 	register_page_handler('activity', 'riverdashboard_page_handler');
diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 3eb172360..abb0cb019 100644
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -20,8 +20,9 @@
 		function thewire_init() {
 				
 			// Set up menu for logged in users
-				add_menu(elgg_echo('thewire:title'), "pg/thewire");
-				
+				$item = new ElggMenuItem('thewire', elgg_echo('thewire:title'), 'pg/thewire');
+				elgg_register_menu_item('site', $item);
+
 			// Extend system CSS with our own styles, which are defined in the thewire/css view
 				elgg_extend_view('css/screen', 'thewire/css');