aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-02 01:03:14 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-01-02 01:03:14 +0000
commitb2661f317eebc4ebeef19540a87cc39f149a0eb8 (patch)
treee52f52cf554bc5bea41a17cfe7ea8d59710baeab
parentecfeaf08fffd1e9f347543d8d88799a4efb50827 (diff)
downloadelgg-b2661f317eebc4ebeef19540a87cc39f149a0eb8.tar.gz
elgg-b2661f317eebc4ebeef19540a87cc39f149a0eb8.tar.bz2
revert structure of admin views and fixed uniqueness of admin page menu items
git-svn-id: http://code.elgg.org/elgg/trunk@7810 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/admin.php21
-rw-r--r--views/default/admin/plugins/advanced.php (renamed from views/default/admin/plugins/plugins_advanced.php)0
-rw-r--r--views/default/admin/plugins/simple.php (renamed from views/default/admin/plugins/plugins_simple.php)0
-rw-r--r--views/default/admin/site/advanced.php (renamed from views/default/admin/site/site_advanced.php)0
-rw-r--r--views/default/admin/site/basic.php (renamed from views/default/admin/site/site_basic.php)0
5 files changed, 13 insertions, 8 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 0938b0565..be3f8eacc 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -82,8 +82,13 @@ function elgg_add_admin_menu_item($section_id, $section_title, $parent_id = NULL
$href = NULL;
}
+ $name = $section_id;
+ if ($parent_id) {
+ $name = "$name:$parent_id";
+ }
+
return elgg_register_menu_item('page', array(
- 'name' => $section_id,
+ 'name' => $name,
'url' => $href,
'title' => $section_title,
'context' => 'admin',
@@ -122,8 +127,8 @@ function admin_init() {
// site
elgg_add_admin_menu_item('site', elgg_echo('admin:site'));
- elgg_add_admin_menu_item('site_basic', elgg_echo('admin:site:basic'), 'site');
- elgg_add_admin_menu_item('site_advanced', elgg_echo('admin:site:advanced'), 'site');
+ elgg_add_admin_menu_item('basic', elgg_echo('admin:site:basic'), 'site');
+ elgg_add_admin_menu_item('advanced', elgg_echo('admin:site:advanced'), 'site');
// appearance
elgg_add_admin_menu_item('appearance', elgg_echo('admin:appearance'));
@@ -132,14 +137,14 @@ function admin_init() {
// users
elgg_add_admin_menu_item('users', elgg_echo('admin:users'));
- elgg_add_admin_menu_item('users_online', elgg_echo('admin:users:online'), 'users');
- elgg_add_admin_menu_item('users_newest', elgg_echo('admin:users:newest'), 'users');
- elgg_add_admin_menu_item('users_add', elgg_echo('admin:users:add'), 'users');
+ elgg_add_admin_menu_item('online', elgg_echo('admin:users:online'), 'users');
+ elgg_add_admin_menu_item('newest', elgg_echo('admin:users:newest'), 'users');
+ elgg_add_admin_menu_item('add', elgg_echo('admin:users:add'), 'users');
// plugins
elgg_add_admin_menu_item('plugins', elgg_echo('admin:plugins'));
- elgg_add_admin_menu_item('plugins_simple', elgg_echo('admin:plugins:simple'), 'plugins');
- elgg_add_admin_menu_item('plugins_advanced', elgg_echo('admin:plugins:advanced'), 'plugins');
+ elgg_add_admin_menu_item('simple', elgg_echo('admin:plugins:simple'), 'plugins');
+ elgg_add_admin_menu_item('advanced', elgg_echo('admin:plugins:advanced'), 'plugins');
// plugins
elgg_add_admin_menu_item('utilities', elgg_echo('admin:utilities'));
diff --git a/views/default/admin/plugins/plugins_advanced.php b/views/default/admin/plugins/advanced.php
index ead930090..ead930090 100644
--- a/views/default/admin/plugins/plugins_advanced.php
+++ b/views/default/admin/plugins/advanced.php
diff --git a/views/default/admin/plugins/plugins_simple.php b/views/default/admin/plugins/simple.php
index e53ecb0c1..e53ecb0c1 100644
--- a/views/default/admin/plugins/plugins_simple.php
+++ b/views/default/admin/plugins/simple.php
diff --git a/views/default/admin/site/site_advanced.php b/views/default/admin/site/advanced.php
index 048ffa883..048ffa883 100644
--- a/views/default/admin/site/site_advanced.php
+++ b/views/default/admin/site/advanced.php
diff --git a/views/default/admin/site/site_basic.php b/views/default/admin/site/basic.php
index 9b8f4652d..9b8f4652d 100644
--- a/views/default/admin/site/site_basic.php
+++ b/views/default/admin/site/basic.php