Merged 18_new_admin branch to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5977 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 45 insertions, 0 deletions

diff --git a/views/default/admin/users/add.php b/views/default/admin/users/add.php
new file mode 100644
index 000000000..4275b27e1
--- /dev/null
+++ b/views/default/admin/users/add.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Display an add user form.
+ */
+
+echo elgg_view('account/forms/useradd', array('show_admin'=>true));
\ No newline at end of file
diff --git a/views/default/admin/users/find.php b/views/default/admin/users/find.php
new file mode 100644
index 000000000..9684cb88c
--- /dev/null
+++ b/views/default/admin/users/find.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Elgg user search box.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+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/online.php b/views/default/admin/users/online.php
new file mode 100644
index 000000000..22b183da8
--- /dev/null
+++ b/views/default/admin/users/online.php
@@ -0,0 +1,14 @@
+<?php
+// users online
+if ((is_plugin_enabled('search')) && (is_plugin_enabled('profile'))) {
+	get_context('search');
+	$users_online = get_online_users();
+	get_context('admin');
+	?>
+
+	<div class="admin_settings members_list users_online">
+		<h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
+		<?php echo $users_online; ?>
+	</div>
+<?php
+}
\ No newline at end of file