9 files changed, 29 insertions, 15 deletions

diff --git a/views/default/admin/site/advanced.php b/views/default/admin/settings/advanced.php
index 12e4303e7..12e4303e7 100644
--- a/views/default/admin/site/advanced.php
+++ b/views/default/admin/settings/advanced.php
diff --git a/views/default/admin/site/basic.php b/views/default/admin/settings/basic.php
index 3b8f4f183..3b8f4f183 100644
--- a/views/default/admin/site/basic.php
+++ b/views/default/admin/settings/basic.php
diff --git a/views/default/admin/appearance/default_widgets.php b/views/default/admin/settings/default_widgets.php
index 7462dfa7c..ce9f6a5c2 100644
--- a/views/default/admin/appearance/default_widgets.php
+++ b/views/default/admin/settings/default_widgets.php
@@ -18,7 +18,7 @@ if (!$widget_context && $list) {
 $current_info = null;
 $tabs = array();
 foreach ($list as $info) {
-	$url = "admin/appearance/default_widgets?widget_context={$info['widget_context']}";
+	$url = "admin/settings/default_widgets?widget_context={$info['widget_context']}";
 	$selected = false;
 	if ($widget_context == $info['widget_context']) {
 		$selected = true;
@@ -38,10 +38,10 @@ $tabs_vars = array(
 
 echo elgg_view('navigation/tabs', $tabs_vars);
 
-echo elgg_view('output/longtext', array('value' => elgg_echo('admin:appearance:default_widgets:instructions')));
+echo elgg_view('output/longtext', array('value' => elgg_echo('admin:default_widgets:instructions')));
 
 if (!$current_info) {
-	$content = elgg_echo('admin:appearance:default_widgets:unknown_type');
+	$content = elgg_echo('admin:default_widgets:unknown_type');
 } else {
 	// default widgets are owned and saved to the site.
 	elgg_set_page_owner_guid(elgg_get_config('site_guid'));
@@ -62,4 +62,4 @@ if (!$current_info) {
 }
 elgg_pop_context();
 
-echo $content;
\ No newline at end of file
+echo $content;
diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/settings/menu_items.php
index 4e35e032f..4e35e032f 100644
--- a/views/default/admin/appearance/menu_items.php
+++ b/views/default/admin/settings/menu_items.php
diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/settings/profile_fields.php
index 7077687cc..e9dc609e3 100644
--- a/views/default/admin/appearance/profile_fields.php
+++ b/views/default/admin/settings/profile_fields.php
@@ -4,7 +4,7 @@
  */
 
 $add = elgg_view_form('profile/fields/add', array(), array());
-$list = elgg_view('admin/appearance/profile_fields/list');
+$list = elgg_view('admin/settings/profile_fields/list');
 $reset = elgg_view_form('profile/fields/reset', array(), array());
 
 $body = <<<__HTML
diff --git a/views/default/admin/appearance/profile_fields/list.php b/views/default/admin/settings/profile_fields/list.php
index 493129583..493129583 100644
--- a/views/default/admin/appearance/profile_fields/list.php
+++ b/views/default/admin/settings/profile_fields/list.php
diff --git a/views/default/admin/sidebar.php b/views/default/admin/sidebar.php
index b2c520705..a6c16c758 100644
--- a/views/default/admin/sidebar.php
+++ b/views/default/admin/sidebar.php
@@ -1,8 +1,17 @@
 <?php
 /**
- * Admin sidebar -- just outputs the page menu
+ * Admin sidebar -- just outputs the page menus
  */
+$sections = array('administer', 'configure', 'develop');
+$content = '';
 
-$content = elgg_view_menu('page', array('sort_by' => 'priority'));
+foreach ($sections as $section) {
+	$section_content = elgg_view_menu("admin-$section", array('sort_by' => 'priority', 'class' => 'mbl mts'));
+	
+	if ($section_content) {
+		$content .= '<h2>' . elgg_echo("admin:$section") . '</h2>';
+		$content .= $section_content;
+	}
+}
 
-echo elgg_view_module('main', '', $content);
\ No newline at end of file
+echo elgg_view_module('main', '', $content, array('class' => 'elgg-admin-sidebar-menu'));
\ No newline at end of file
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 1a8747f3a..3a3c8eb16 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -266,7 +266,8 @@ table.mceLayout {
 /* ***************************************
 	SIDEBAR MENU
 *************************************** */
-.elgg-menu-page a {
+.elgg-admin-sidebar-menu a {
+	border: 1px solid red;
 	display: block;
 	padding: 5px;
 	color: #333333;
@@ -279,31 +280,32 @@ table.mceLayout {
 	-moz-border-radius: 5px;
 	border-radius: 5px;
 }
-.elgg-menu-page a:hover {
+
+.elgg-admin-sidebar-menu a:hover {
 	text-decoration: none;
 	background: black;
 	color: white;
 	border: 1px solid black;
 }
-.elgg-menu-page li.elgg-state-selected > a {
+.elgg-admin-sidebar-menu li.elgg-state-selected > a {
 	background-color: #BBB;
 }
 
-.elgg-menu-page .elgg-menu-closed:before {
+.elgg-admin-sidebar-menu .elgg-menu-closed:before {
 	content: "\25B8";
 	padding-right: 4px;
 }
 
-.elgg-menu-page .elgg-menu-opened:before {
+.elgg-admin-sidebar-menu .elgg-menu-opened:before {
 	content: "\25BE";
 	padding-right: 4px;
 }
 
-.elgg-menu-page .elgg-child-menu {
+.elgg-admin-sidebar-menu .elgg-child-menu {
 	display: none;
 	padding-left: 30px;
 }
-.elgg-menu-page li.elgg-state-selected > ul {
+.elgg-admin-sidebar-menu li.elgg-state-selected > ul {
 	display: block;
 }
 
diff --git a/views/default/js/admin.php b/views/default/js/admin.php
index 15c74d4de..d37dc7a81 100644
--- a/views/default/js/admin.php
+++ b/views/default/js/admin.php
@@ -16,6 +16,9 @@ elgg.admin.init = function () {
 		$(this).stop().slideUp('medium');
 	});
 
+	// semi-custom menus
+	$('.elgg-admin-sidebar-menu .elgg-menu-parent').live('click', elgg.ui.toggleMenu);
+
 	// plugin screenshot modal
 	$('.elgg-plugin-screenshot a').click(elgg.admin.displayPluginScreenshot);