diff options
| author | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-08-04 21:05:45 +0000 |
|---|---|---|
| committer | ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-08-04 21:05:45 +0000 |
| commit | fa82440351a6f05e0d16b8cb45524898d9f5f713 (patch) | |
| tree | 987025b876f3a6b7e436fab12e796ae824898ad2 /admin | |
| parent | 7d23531aad07826223531ad58a12a2cbaea38e89 (diff) | |
| download | elgg-fa82440351a6f05e0d16b8cb45524898d9f5f713.tar.gz elgg-fa82440351a6f05e0d16b8cb45524898d9f5f713.tar.bz2 | |
Further changes to the admin panel
git-svn-id: https://code.elgg.org/elgg/trunk@1694 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/index.php | 4 | ||||
| -rw-r--r-- | admin/plugins/index.php | 2 | ||||
| -rw-r--r-- | admin/site/index.php | 2 | ||||
| -rw-r--r-- | admin/statistics/index.php | 2 | ||||
| -rw-r--r-- | admin/user/index.php | 26 |
5 files changed, 17 insertions, 19 deletions
diff --git a/admin/index.php b/admin/index.php index 4a84b152e..6252e8cab 100644 --- a/admin/index.php +++ b/admin/index.php @@ -16,8 +16,6 @@ // Make sure only valid admin users can see this
admin_gatekeeper();
-
- // Display main admin menu
- page_draw(elgg_echo("admin"),elgg_view_layout("one_column", elgg_view("admin/main")));
+ forward('pg/admin/statistics/')
?>
\ No newline at end of file diff --git a/admin/plugins/index.php b/admin/plugins/index.php index 14d830840..226dbdbd5 100644 --- a/admin/plugins/index.php +++ b/admin/plugins/index.php @@ -19,6 +19,6 @@ admin_gatekeeper(); // Display main admin menu - page_draw(elgg_echo("admin:plugins"),elgg_view_layout("one_column", elgg_view("admin/plugins", array('installed_plugins' => get_installed_plugins())))); + page_draw(elgg_echo("admin:plugins"),elgg_view_layout("two_column_left_sidebar", '', elgg_view_title(elgg_echo('admin:plugins')) . elgg_view("admin/plugins", array('installed_plugins' => get_installed_plugins())))); ?>
\ No newline at end of file diff --git a/admin/site/index.php b/admin/site/index.php index c3ffbc272..6df4eb3f5 100644 --- a/admin/site/index.php +++ b/admin/site/index.php @@ -18,6 +18,6 @@ admin_gatekeeper();
// Display main admin menu
- page_draw(elgg_echo("admin:site"),elgg_view_layout("one_column",elgg_view("admin/site")));
+ page_draw(elgg_echo("admin:site"),elgg_view_layout("two_column_left_sidebar",'', elgg_view_title(elgg_echo('admin:site')) . elgg_view("admin/site")));
?>
\ No newline at end of file diff --git a/admin/statistics/index.php b/admin/statistics/index.php index ee3cb15a8..49a1c5c76 100644 --- a/admin/statistics/index.php +++ b/admin/statistics/index.php @@ -20,6 +20,6 @@ // Display main admin menu - page_draw(elgg_echo("admin:statistics"),elgg_view_layout("one_column",elgg_view("admin/statistics"))); + page_draw(elgg_echo("admin:statistics"),elgg_view_layout("two_column_left_sidebar",'',elgg_view_title(elgg_echo('admin:statistics')) . elgg_view("admin/statistics"))); ?> diff --git a/admin/user/index.php b/admin/user/index.php index cd2b68d52..c18ed6c16 100644 --- a/admin/user/index.php +++ b/admin/user/index.php @@ -23,20 +23,20 @@ $offset = get_input('offset', 0); $context = get_context(); +
+ $title = elgg_view_title(elgg_echo('admin:user'));
+
set_context('search'); - - if ($search){ - $entities = search_for_user($search, $limit, $offset, "",false); - $count = search_for_user($search, $limit, $offset, "",true); - - $result = elgg_view_entity_list($entities, $count, $offset, $limit, false); - } else { - $result = list_entities_from_metadata("", $tag, "user", "",0, $limit, false);
- }
- - +
+ $result = list_entities('user');
+
+ set_context('admin'); // Display main admin menu
- page_draw(elgg_echo("admin:user"),elgg_view_layout("one_column", elgg_view("admin/user") . $result));
- set_context($context);
+ page_draw(elgg_echo("admin:user"),
+ elgg_view_layout("two_column_left_sidebar",
+ '',
+ $title . elgg_view("admin/user") . $result)
+ );
+
?>
\ No newline at end of file |