aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engine/lib/admin.php15
-rw-r--r--engine/lib/widgets.php2
-rw-r--r--views/default/admin/appearance/default_widgets.php (renamed from views/default/admin/settings/default_widgets.php)0
-rw-r--r--views/default/admin/appearance/menu_items.php (renamed from views/default/admin/settings/menu_items.php)0
-rw-r--r--views/default/admin/appearance/profile_fields.php (renamed from views/default/admin/settings/profile_fields.php)0
-rw-r--r--views/default/admin/appearance/profile_fields/list.php (renamed from views/default/admin/settings/profile_fields/list.php)0
-rw-r--r--views/default/css/admin.php2
-rw-r--r--views/default/js/admin.php3
8 files changed, 10 insertions, 12 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index bab2da64e..e788e3056 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -212,10 +212,13 @@ function admin_init() {
// settings
elgg_register_admin_menu_item('configure', 'basic', 'settings', 10);
elgg_register_admin_menu_item('configure', 'advanced', 'settings', 20);
- elgg_register_admin_menu_item('configure', 'menu_items', 'settings', 30);
- elgg_register_admin_menu_item('configure', 'profile_fields', 'settings', 40);
- // default widgets is added via an event handler elgg_default_widgets_init() because it
- // requires additional setup.
+ elgg_register_admin_menu_item('configure', 'menu_items', 'appearance', 30);
+ elgg_register_admin_menu_item('configure', 'profile_fields', 'appearance', 40);
+ // default widgets is added via an event handler elgg_default_widgets_init() in widgets.php
+ // because it requires additional setup.
+
+ // plugin settings are added in elgg_admin_add_plugin_settings_menu() via the admin page handler
+ // for performance reasons.
elgg_register_menu_item('topbar', array(
'name' => 'administration',
@@ -257,8 +260,6 @@ function elgg_admin_add_plugin_settings_menu() {
return FALSE;
}
- elgg_register_admin_menu_item('configure', 'plugin_settings', null, 51);
-
foreach ($active_plugins as $plugin) {
$plugin_id = $plugin->getID();
if (elgg_view_exists("settings/$plugin_id/edit")) {
@@ -266,7 +267,7 @@ function elgg_admin_add_plugin_settings_menu() {
'name' => $plugin_id,
'href' => "admin/plugin_settings/$plugin_id",
'text' => $plugin->manifest->getName(),
- 'parent_name' => 'plugin_settings',
+ 'parent_name' => 'settings',
'context' => 'admin',
'section' => 'configure',
));
diff --git a/engine/lib/widgets.php b/engine/lib/widgets.php
index 71f0c3ce9..21fbbcad9 100644
--- a/engine/lib/widgets.php
+++ b/engine/lib/widgets.php
@@ -288,7 +288,7 @@ function elgg_default_widgets_init() {
$CONFIG->default_widget_info = $default_widgets;
if ($default_widgets) {
- elgg_register_admin_menu_item('configure', 'default_widgets', 'settings');
+ elgg_register_admin_menu_item('configure', 'default_widgets', 'appearance');
// override permissions for creating widget on logged out / just created entities
elgg_register_plugin_hook_handler('container_permissions_check', 'object', 'elgg_default_widgets_permissions_override');
diff --git a/views/default/admin/settings/default_widgets.php b/views/default/admin/appearance/default_widgets.php
index ce9f6a5c2..ce9f6a5c2 100644
--- a/views/default/admin/settings/default_widgets.php
+++ b/views/default/admin/appearance/default_widgets.php
diff --git a/views/default/admin/settings/menu_items.php b/views/default/admin/appearance/menu_items.php
index 4e35e032f..4e35e032f 100644
--- a/views/default/admin/settings/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
diff --git a/views/default/admin/settings/profile_fields.php b/views/default/admin/appearance/profile_fields.php
index e9dc609e3..e9dc609e3 100644
--- a/views/default/admin/settings/profile_fields.php
+++ b/views/default/admin/appearance/profile_fields.php
diff --git a/views/default/admin/settings/profile_fields/list.php b/views/default/admin/appearance/profile_fields/list.php
index 493129583..493129583 100644
--- a/views/default/admin/settings/profile_fields/list.php
+++ b/views/default/admin/appearance/profile_fields/list.php
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index 37d53673a..6f2a72caa 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -313,7 +313,7 @@ table.mceLayout {
padding-bottom: 5px;
}
-.elgg-admin-sidebar-menu ul {
+.elgg-admin-sidebar-menu ul.elgg-menu-page {
padding-bottom: 15px;
}
diff --git a/views/default/js/admin.php b/views/default/js/admin.php
index d37dc7a81..15c74d4de 100644
--- a/views/default/js/admin.php
+++ b/views/default/js/admin.php
@@ -16,9 +16,6 @@ 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);