aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--admin/user/index.php8
-rw-r--r--languages/en.php5
-rw-r--r--views/default/admin/site.php2
-rw-r--r--views/default/admin/statistics_opt/online.php4
-rw-r--r--views/default/admin/user.php2
-rw-r--r--views/default/admin/user_opt/search.php20
6 files changed, 37 insertions, 4 deletions
diff --git a/admin/user/index.php b/admin/user/index.php
index c1201f652..d7426afdb 100644
--- a/admin/user/index.php
+++ b/admin/user/index.php
@@ -16,6 +16,14 @@
// Make sure only valid admin users can see this
admin_gatekeeper();
+
+
+ // Display user browser
+
+ // if search, perform search
+
+
+ // extend user view with ban etc
// Display main admin menu
page_draw(elgg_echo("admin:user"),elgg_view("admin/user"));
diff --git a/languages/en.php b/languages/en.php
index 39d144c63..2fead89ed 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -240,7 +240,10 @@
'admin:statistics:label:numentities' => "Entities on site",
'admin:statistics:label:numusers' => "Number of users",
'admin:statistics:label:numonline' => "Number of users online",
- 'admin:statistics:label:onlineusers' => "%d Most recent users online",
+ 'admin:statistics:label:onlineusers' => "%d Most recent users online",
+
+ 'admin:user:label:search' => "Find users:",
+ 'admin:user:label:seachbutton' => "Search",
/**
diff --git a/views/default/admin/site.php b/views/default/admin/site.php
index 34a89481d..8792431c2 100644
--- a/views/default/admin/site.php
+++ b/views/default/admin/site.php
@@ -16,5 +16,5 @@
// Description of what's going on
echo "<p>" . nl2br(elgg_echo("admin:site:description")) . "</p>";
- echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic"));
+ echo elgg_view("settings/system",array("action" => $CONFIG->wwwroot."action/admin/site/update_basic")); // Always want to do this first.
?> \ No newline at end of file
diff --git a/views/default/admin/statistics_opt/online.php b/views/default/admin/statistics_opt/online.php
index 2a9532470..1c86c21d1 100644
--- a/views/default/admin/statistics_opt/online.php
+++ b/views/default/admin/statistics_opt/online.php
@@ -16,4 +16,6 @@
<div>
<h2><?php echo sprintf(elgg_echo('admin:statistics:label:onlineusers'), 10); ?></h2>
-</div> \ No newline at end of file
+</div>
+
+TODO: Writeme \ No newline at end of file
diff --git a/views/default/admin/user.php b/views/default/admin/user.php
index 0f5a5daf6..ee708d30e 100644
--- a/views/default/admin/user.php
+++ b/views/default/admin/user.php
@@ -14,5 +14,5 @@
// Description of what's going on
echo "<p>" . nl2br(elgg_echo("admin:user:description")) . "</p>";
-
+ echo elgg_view("admin/user_opt/search");
?> \ No newline at end of file
diff --git a/views/default/admin/user_opt/search.php b/views/default/admin/user_opt/search.php
new file mode 100644
index 000000000..071d982c4
--- /dev/null
+++ b/views/default/admin/user_opt/search.php
@@ -0,0 +1,20 @@
+<?php
+ /**
+ * Elgg user search box.
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Marcus Povey
+ * @copyright Curverider Ltd 2008
+ * @link http://elgg.org/
+ */
+?>
+<div id="search-box">
+ <form>
+ <b><?php echo elgg_echo('admin:user:label:search'); ?></b>
+ <input type="text" name="search" />
+ <input type="submit" name="<?php echo elgg_echo('admin:user:label:seachbutton'); ?>"
+ value="<?php echo elgg_echo('admin:user:label:seachbutton'); ?>" />
+ </form>
+</div>