5 files changed, 35 insertions, 50 deletions
diff --git a/views/default/admin/users/add.php b/views/default/admin/users/add.php
index cc2da61db..6d22b9c29 100644
--- a/views/default/admin/users/add.php
+++ b/views/default/admin/users/add.php
@@ -3,5 +3,7 @@
  * Display an add user form.
  */
 
-echo elgg_view_title(elgg_echo('admin:users'));
-echo elgg_view('account/forms/useradd', array('show_admin'=>true));
-\ No newline at end of file
+$title = elgg_echo('adduser');
+$body = elgg_view_form('useradd', array(), array('show_admin' => true));
+
+echo elgg_view_module('inline', $title, $body);
+\ No newline at end of file
diff --git a/views/default/admin/users/admins.php b/views/default/admin/users/admins.php
new file mode 100644
index 000000000..9b175d437
--- /dev/null
+++ b/views/default/admin/users/admins.php
@@ -0,0 +1,12 @@
+<?php
+$admins = elgg_list_entities(array(), 'elgg_get_admins');
+	
+?>
+<div class="elgg-module elgg-module-inline">
+	<div class="elgg-head">
+		<h3><?php echo elgg_echo('admin:statistics:label:admins'); ?></h3>
+	</div>
+	<div class="elgg-body">
+		<?php echo $admins; ?>
+	</div>
+</div>
diff --git a/views/default/admin/users/find.php b/views/default/admin/users/find.php
deleted file mode 100644
index a2fcc1a56..000000000
--- a/views/default/admin/users/find.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Elgg user search box.
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
-echo elgg_view_title(elgg_echo('admin:users'));
-
-if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) {
-?>
-	<div class="admin_settings user_search">
-		<form action="<?php echo $vars['url']; ?>pg/search/" method="get">
-			<h3><?php echo elgg_echo('admin:user:label:search'); ?></h3>
-			<?php echo elgg_view('input/text',array('internalname' => 'q')); ?>
-			<input type="hidden" name="entity_type" value="user" />
-			<input type="hidden" name="search_type" value="entities" />
-			<input type="submit" name="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>"
-				value="<?php echo elgg_echo('admin:user:label:searchbutton'); ?>" />
-		</form>
-	</div>
-<?php
-}
-?>
-\ No newline at end of file
diff --git a/views/default/admin/users/newest.php b/views/default/admin/users/newest.php
index 79de121e5..91a6fa338 100644
--- a/views/default/admin/users/newest.php
+++ b/views/default/admin/users/newest.php
@@ -1,17 +1,18 @@
 <?php
 // newest users
-if (is_plugin_enabled('profile')) {
-	$users = elgg_list_entities(array(
-		'type' => 'user', 'subtype'=>null,
-		'full_view' => FALSE
-	));
+$users = elgg_list_entities(array(
+	'type' => 'user',
+	'subtype'=> null,
+	'full_view' => FALSE
+));
 
-	echo elgg_view_title(elgg_echo('admin:users'));
-	?>
+?>
 
-	<div class="admin_settings members_list users_online">
+<div class="elgg-module elgg-module-inline">
+	<div class="elgg-head">
 		<h3><?php echo elgg_echo('admin:users:newest'); ?></h3>
+	</div>
+	<div class="elgg-body">
 		<?php echo $users; ?>
 	</div>
-<?php
-}
-\ No newline at end of file
+</div>
diff --git a/views/default/admin/users/online.php b/views/default/admin/users/online.php
index b172b994f..dbda06066 100644
--- a/views/default/admin/users/online.php
+++ b/views/default/admin/users/online.php
@@ -1,16 +1,13 @@
 <?php
-// users online
-if ((is_plugin_enabled('search')) && (is_plugin_enabled('profile'))) {
-	get_context('search');
-	$users_online = get_online_users();
-	get_context('admin');
-	
-	echo elgg_view_title(elgg_echo('admin:users'));
-	?>
 
-	<div class="admin_settings members_list users_online">
+$users_online = get_online_users();
+	
+?>
+<div class="elgg-module elgg-module-inline">
+	<div class="elgg-head">
 		<h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
+	</div>
+	<div class="elgg-body">
 		<?php echo $users_online; ?>
 	</div>
-<?php
-}
-\ No newline at end of file
+</div>