Refs #2991. First round at rearranging and grouping admin menu based upon tasks.

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

7 files changed, 9 insertions, 9 deletions

diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php
index 7c9ec93d3..8bc1f596a 100644
--- a/mod/developers/languages/en.php
+++ b/mod/developers/languages/en.php
@@ -7,7 +7,7 @@
 $english = array(
 	// menu
 	'admin:developers' => 'Developers',
-	'admin:developers:settings' => 'Settings',
+	'admin:developers:settings' => 'Developer Settings',
 	'admin:developers:preview' => 'Theming Preview',
 
 	// settings
diff --git a/mod/developers/start.php b/mod/developers/start.php
index ff33f3e91..3c2f6bd5f 100644
--- a/mod/developers/start.php
+++ b/mod/developers/start.php
@@ -18,9 +18,8 @@ function developers_init() {
 
 function developers_setup_menu() {
 	if (elgg_in_context('admin')) {
-		elgg_register_admin_menu_item('developers');
-		elgg_register_admin_menu_item('settings', 'developers');
-		elgg_register_admin_menu_item('preview', 'developers');
+		elgg_register_admin_menu_item('develop', 'settings', 'developers');
+		elgg_register_admin_menu_item('develop', 'preview', 'developers');
 	}
 }
 
diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php
index 74c53e2f6..d310684ba 100644
--- a/mod/diagnostics/start.php
+++ b/mod/diagnostics/start.php
@@ -16,7 +16,7 @@ function diagnostics_init() {
 	elgg_register_page_handler('diagnostics','diagnostics_page_handler');
 
 	// Add admin menu item
-	elgg_register_admin_menu_item('diagnostics', 'utilities');
+	elgg_register_admin_menu_item('develop', 'diagnostics', 'utilities');
 
 	// Register some actions
 	$file = elgg_get_plugins_path() . "diagnostics/actions/download.php";
diff --git a/mod/externalpages/start.php b/mod/externalpages/start.php
index 533d71104..9ec7c174e 100644
--- a/mod/externalpages/start.php
+++ b/mod/externalpages/start.php
@@ -11,7 +11,7 @@ function expages_init() {
 	elgg_register_page_handler('expages', 'expages_page_handler');
 
 	// add a menu item for the admin edit page
-	elgg_register_admin_menu_item('expages', 'site');
+	elgg_register_admin_menu_item('configure', 'expages', 'site');
 
 	// add footer links
 	expages_setup_footer_menu();
diff --git a/mod/logbrowser/start.php b/mod/logbrowser/start.php
index 5b4e0541e..eedc9d8ad 100644
--- a/mod/logbrowser/start.php
+++ b/mod/logbrowser/start.php
@@ -14,7 +14,7 @@ function logbrowser_init() {
 	
 	elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'logbrowser_user_hover_menu');
 	
-	elgg_register_admin_menu_item('logbrowser', 'utilities');
+	elgg_register_admin_menu_item('administer', 'logbrowser', 'utilities');
 }
 
 /**
diff --git a/mod/reportedcontent/start.php b/mod/reportedcontent/start.php
index a7e3afe19..406624e50 100644
--- a/mod/reportedcontent/start.php
+++ b/mod/reportedcontent/start.php
@@ -37,7 +37,8 @@ function reportedcontent_init() {
 	elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'reportedcontent_user_hover_menu');
 
 	// Add admin menu item
-	elgg_register_admin_menu_item('reportedcontent', 'utilities');
+	// @todo Might want to move this to a 'feedback' section. something other than utils
+	elgg_register_admin_menu_item('administer', 'reportedcontent', 'utilities');
 
 	elgg_register_widget_type(
 			'reportedcontent',
diff --git a/mod/uservalidationbyemail/start.php b/mod/uservalidationbyemail/start.php
index 175905d1d..d3d0c3488 100644
--- a/mod/uservalidationbyemail/start.php
+++ b/mod/uservalidationbyemail/start.php
@@ -39,7 +39,7 @@ function uservalidationbyemail_init() {
 	elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'uservalidationbyemail_public_pages');
 
 	// admin interface to manually validate users
-	elgg_register_admin_menu_item('unvalidated', 'users');
+	elgg_register_admin_menu_item('administer', 'unvalidated', 'users');
 
 	elgg_extend_view('js/elgg', 'uservalidationbyemail/js');