From fa82440351a6f05e0d16b8cb45524898d9f5f713 Mon Sep 17 00:00:00 2001 From: ben Date: Mon, 4 Aug 2008 21:05:45 +0000 Subject: Further changes to the admin panel git-svn-id: https://code.elgg.org/elgg/trunk@1694 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/admin.php | 17 ++++++++++++++++- engine/lib/entities.php | 5 +++-- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'engine') diff --git a/engine/lib/admin.php b/engine/lib/admin.php index abf3dad01..3d72eb1c4 100644 --- a/engine/lib/admin.php +++ b/engine/lib/admin.php @@ -52,6 +52,20 @@ // Register some actions register_action('admin/site/update_basic', false, "", true); // Register basic site admin action + } + + function admin_pagesetup() { + + if (get_context() == 'admin') { + + global $CONFIG; + add_submenu_item(elgg_echo('admin:statistics'), $CONFIG->wwwroot . 'pg/admin/statistics/'); + add_submenu_item(elgg_echo('admin:site'), $CONFIG->wwwroot . 'pg/admin/site/'); + add_submenu_item(elgg_echo('admin:user'), $CONFIG->wwwroot . 'pg/admin/user/'); + add_submenu_item(elgg_echo('admin:plugins'), $CONFIG->wwwroot . 'pg/admin/plugins/'); + + } + } /** @@ -117,8 +131,9 @@ return delete_entity($guid); } - /// Register init function + /// Register init functions register_elgg_event_handler('init','system','admin_init'); + register_elgg_event_handler('pagesetup','system','admin_pagesetup'); // Register a plugin hook for permissions register_plugin_hook('permissions_check','all','admin_permissions'); diff --git a/engine/lib/entities.php b/engine/lib/entities.php index ff89a3142..2e0b7d21e 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -1344,15 +1344,16 @@ * @param int $owner_guid The GUID of the owning user * @param int $limit The number of entities to display per page (default: 10) * @param true|false $fullview Whether or not to display the full view (default: true) + * @param true|false $viewtypetoggle Whether or not to allow gallery view * @return string A viewable list of entities */ - function list_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true) { + function list_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = false) { $offset = (int) get_input('offset'); $count = get_entities($type, $subtype, $owner_guid, "", $limit, $offset, true); $entities = get_entities($type, $subtype, $owner_guid, "", $limit, $offset); - return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview); + return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle); } -- cgit v1.2.3