aboutsummaryrefslogtreecommitdiff
path: root/views/default/admin/user_opt
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-03 17:53:05 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-03 17:53:05 +0000
commit4766f36a4d74924f21ff329c4318ce4e069ffa04 (patch)
tree969b84632f2a8b0db79788a8a6db8e41d63e5cb4 /views/default/admin/user_opt
parent57a217fd6b708844407486046a1faa23b46cac08 (diff)
downloadelgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.gz
elgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.bz2
Pulled in the interface changes.
git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/admin/user_opt')
-rw-r--r--views/default/admin/user_opt/adduser.php18
-rw-r--r--views/default/admin/user_opt/search.php29
2 files changed, 15 insertions, 32 deletions
diff --git a/views/default/admin/user_opt/adduser.php b/views/default/admin/user_opt/adduser.php
index 759678bc1..e69de29bb 100644
--- a/views/default/admin/user_opt/adduser.php
+++ b/views/default/admin/user_opt/adduser.php
@@ -1,18 +0,0 @@
-<?php
-/**
- * Add a user.
- * Form to add a new user.
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-?>
-
-<div class="admin_adduser_link">
- <a href="#" onclick="$('#add_user_showhide').toggle()"><?php echo elgg_echo('admin:user:adduser:label'); ?></a>
-</div>
-<div id="add_user_showhide" style="display:none" >
-<?php echo elgg_view('account/forms/useradd', array('show_admin'=>true)); ?>
-</div> \ No newline at end of file
diff --git a/views/default/admin/user_opt/search.php b/views/default/admin/user_opt/search.php
index 2e337755b..f853dcf3c 100644
--- a/views/default/admin/user_opt/search.php
+++ b/views/default/admin/user_opt/search.php
@@ -7,18 +7,19 @@
* @author Curverider Ltd
* @link http://elgg.org/
*/
+
+if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) {
?>
-<div id="search-box">
- <form action="<?php echo $vars['url']; ?>pg/search/" method="get">
- <b><?php echo elgg_echo('admin:user:label:search'); ?></b>
- <?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>
+ <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