aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 18:39:14 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 18:39:14 +0000
commit6a690361091081b9ec578487e8ef79664434cf8e (patch)
tree513de19b9a26ab59f166a688d9c47367f5f27bfc /engine
parent653517bf635ad6ecb65738b46b11b3056ccca983 (diff)
downloadelgg-6a690361091081b9ec578487e8ef79664434cf8e.tar.gz
elgg-6a690361091081b9ec578487e8ef79664434cf8e.tar.bz2
Refs #2991: Readded the appearance menu under configure. Moved plugin settings under configure/settings.
git-svn-id: http://code.elgg.org/elgg/trunk@8665 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/admin.php15
-rw-r--r--engine/lib/widgets.php2
2 files changed, 9 insertions, 8 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');