Further changes to the admin panel

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

3 files changed, 20 insertions, 10 deletions

diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php
index f5957d6df..95249c784 100644
--- a/views/default/account/forms/useradd.php
+++ b/views/default/account/forms/useradd.php
@@ -19,11 +19,16 @@
 	<div id="add-box">
 	<h2><?php echo elgg_echo('adduser'); ?></h2>
 		<form action="<?php echo $vars['url']; ?>action/useradd" method="POST">
-			<p><label><?php echo elgg_echo('name'); ?>: <input name="name" type="text" class="general-textarea" /></label><br />
-			<label><?php echo elgg_echo('email'); ?>: <input name="email" type="text" class="general-textarea" /></label><br />
-			<label><?php echo elgg_echo('username'); ?>: <input name="username" type="text" class="general-textarea" /></label><br />
-			<label><?php echo elgg_echo('password'); ?>: <input name="password" type="password" class="general-textarea" /></label><br />
-			<label><?php echo elgg_echo('passwordagain'); ?>: <input name="password2" type="password" class="general-textarea" /></label><br />
+			<p><label><?php echo elgg_echo('name'); ?>:

+			<?php echo elgg_view('input/text', array('internalname' => 'name')); ?></label><br />
+			<label><?php echo elgg_echo('email'); ?>: 

+			<?php echo elgg_view('input/email', array('internalname' => 'email')); ?></label><br />
+			<label><?php echo elgg_echo('username'); ?>:

+			<?php echo elgg_view('input/text', array('internalname' => 'username')); ?></label><br />
+			<label><?php echo elgg_echo('password'); ?>: 

+			<?php echo elgg_view('input/password', array('internalname' => 'password')); ?></label><br />
+			<label><?php echo elgg_echo('passwordagain'); ?>:

+			<?php echo elgg_view('input/password', array('internalname' => 'password2')); ?></label><br />
 			<?php
 				if ($admin_option) {
 ?>		
diff --git a/views/default/admin/user_opt/adduser.php b/views/default/admin/user_opt/adduser.php
index 29827d798..b60bb9d52 100644
--- a/views/default/admin/user_opt/adduser.php
+++ b/views/default/admin/user_opt/adduser.php
@@ -12,9 +12,9 @@
 	 */
 ?>
 
-<div>
-	<?php echo elgg_echo('admin:user:adduser:label'); ?>
+<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">
+<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 32477e9cf..2c9e84f2e 100644
--- a/views/default/admin/user_opt/search.php
+++ b/views/default/admin/user_opt/search.php
@@ -11,9 +11,14 @@
 	 */
 ?>
 <div id="search-box">
-	<form>
+	<form action="<?php echo $vars['url']; ?>search/" method="get">
 	<b><?php echo elgg_echo('admin:user:label:search'); ?></b>
-	<input type="text" name="s"  />
+	<?php

+

+		echo elgg_view('input/text',array('internalname' => 'tag'));

+	

+	?>

+	<input type="hidden" name="object" value="user" />
 	<input type="submit" name="<?php echo elgg_echo('admin:user:label:seachbutton'); ?>" 
 		value="<?php echo elgg_echo('admin:user:label:seachbutton'); ?>" />
 	</form>