removed images that were not being used, added icons and started the iconification!

2 files changed, 32 insertions, 29 deletions

diff --git a/templates/userform.inc b/templates/show_edit_user.inc.php
index fbde9f5a..675c6224 100644
--- a/templates/userform.inc
+++ b/templates/show_edit_user.inc.php
@@ -21,23 +21,23 @@
 */
 
 if ($type === 'new_user') { 
-	$userfield = "<input type=\"text\" name=\"new_username\" size=\"30\" value=\"$username\" />";
-	$title = _("Adding a New User");
+	$userfield = "<input type=\"text\" name=\"new_username\" size=\"30\" value=\"" . scrub_out($username) . "\" />";
+	$title = _('Adding a New User');
 }
 else {
-	$userfield = $username;
-	$title = _("Editing existing User");
+	$userfield = scrub_out($username);
+	$title = _('Editing existing User');
 }
 ?>
 
 <br />
-<div class="header2"><?php echo $title; ?></div>
+<?php show_box_top($title); ?>
 <?php $GLOBALS['error']->print_error('general'); ?>
 <form name="update_user" method="post" action="<?php echo conf('web_path') . "/admin/users.php"; ?>">
-<table class="text-box" cellspacing="0" cellpadding="0" border="0">
+<table cellspacing="0" cellpadding="0" border="0">
 <tr>
 	<td>
-		<?php echo  _("Username"); ; ?>:
+		<?php echo  _('Username'); ?>:
 	</td>
 	<td>
 		<?php echo $userfield; ?>
@@ -45,22 +45,22 @@ else {
 	</td>
 </tr>
 <tr>
-	<td><?php echo  _("Full Name"); ; ?>:</td>
+	<td><?php echo  _('Full Name'); ?>:</td>
 	<td>
-		<input type="text" name="new_fullname" size="30" value="<?php echo $fullname; ?>" />
+		<input type="text" name="new_fullname" size="30" value="<?php echo scrub_out($fullname); ?>" />
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo  _("E-mail"); ?>:
+		<?php echo  _('E-mail'); ?>:
 	</td>
 	<td>
-		<input type="text" name="new_email" size="30" value="<?php echo $email; ?>" />
+		<input type="text" name="new_email" size="30" value="<?php echo scrub_out($email); ?>" />
 	</td>
 </tr>
 <tr>
 	<td>
-		<?php echo  _("Password"); ?> :
+		<?php echo  _('Password'); ?> :
 	</td>
 	<td>
 		<input type="password" name="new_password_1" size="30" value="" />
@@ -69,7 +69,7 @@ else {
 </tr>
 <tr>
 	<td>
-		<?php echo  _("Confirm Password"); ?>:
+		<?php echo  _('Confirm Password'); ?>:
 	</td>
 	<td>
 		<input type="password" name="new_password_2" size="30" value="" />
@@ -77,7 +77,7 @@ else {
 </tr>
 <tr>
 	<td>
-		<?php echo  _("User Access Level"); ; ?>:
+		<?php echo  _('User Access Level'); ?>:
 	</td>
 	<td>
 		<select name="user_access">
@@ -91,12 +91,13 @@ else {
 <?php
 if ($type == 'new_user') {
 	echo "<input type=\"hidden\" name=\"action\" value=\"add_user\" />";
-	echo "<input type=\"submit\" value=\"" . _("Add User") . "\" />";
+	echo "<input type=\"submit\" value=\"" . _('Add User') . "\" />";
 }
 else {
 	echo "<input type=\"hidden\" name=\"action\" value=\"update_user\" />\n";
-	echo "<input type=\"submit\" value=\"" . _("Update User") . "\" />\n";
-	echo "<input type=\"hidden\" name=\"new_username\" value=\"$username\" />";
+	echo "<input type=\"submit\" value=\"" . _('Update User') . "\" />\n";
+	echo "<input type=\"hidden\" name=\"new_username\" value=\"$id\" />";
 }
 ?>
 </form>
+<?php show_box_bottom(); ?>
diff --git a/templates/show_users.inc b/templates/show_users.inc
index a6e6442b..dd0d7b0a 100644
--- a/templates/show_users.inc
+++ b/templates/show_users.inc
@@ -54,7 +54,8 @@ $admin_menu = "admin/";
 		<b><?php echo _("Registration Date"); ?></b>
 		</a>
 	</td>
-
+	<td colspan="5">&nbsp;</td>
+	<!--
         <td align="center">
 		<b><?php echo _("Edit"); ?></b>
 	</td>
@@ -70,6 +71,7 @@ $admin_menu = "admin/";
 	<td align="center">
 		<b><?php echo _("Delete"); ?></b>
 	</td>
+	-->
         <td align="center">
 		<b><?php echo _("On-line"); ?></b>
 	</td>
@@ -83,46 +85,46 @@ while ($results = mysql_fetch_object($db_result)) {
         if (!$user->create_date) { $create_date = "Unknown"; }
 ?>
 
-<tr class="<?php echo flip_class(); ?>">
-	<td>
-		<a href="<?php echo $web_path; ?>/admin/users.php?action=edit&amp;user=<?php echo $user->username; ?>">
+<tr class="<?php echo flip_class(); ?>" align="center">
+	<td align="left">
+		<a href="<?php echo $web_path; ?>/admin/users.php?action=edit&amp;user=<?php echo $user->id; ?>">
 			<?php echo $user->fullname; ?> (<?php echo $user->username; ?>)
 		</a>
 	</td>
-        <td align="center">
+        <td>
 		<?php echo $last_seen; ?>
 	</td>
-        <td align="center">
+        <td>
 		<?php echo $create_date; ?>
 	</td>
 
         <td>
 		<a href="<?php echo $web_path; ?>/admin/users.php?action=edit&amp;user=<?php echo $user->username; ?>">
-			<?php echo _("Edit"); ?>
+			<?php echo get_user_icon('edit'); ?>
 		</a>
 	</td>
         <td>
 		<a href="<?php echo $web_path; ?>/admin/preferences.php?action=user&amp;user_id=<?php echo $user->username; ?>">
-			<?php echo _("Prefs"); ?>
+			<?php echo get_user_icon('preferences'); ?>
 		</a>
 	</td>
 	<td>
 		<a href="<?php echo $web_path; ?>/stats.php?user_id=<?php echo $user->username; ?>">
-			<?php echo _("Stats"); ?>
+			<?php echo get_user_icon('statistics'); ?>
 		</a>
 	</td>
 	<?php
 	//FIXME: Fix this for the extra permission levels
 	if ($user->disabled == '1') { 
-		echo "<td><a href=\"".$web_path."/admin/users.php?action=update&amp;user=$user->username&amp;level=enabled\">" . _("Enable") . "</a></td>";
+		echo "<td><a href=\"".$web_path."/admin/users.php?action=update&amp;user=$user->username&amp;level=enabled\">" . get_user_icon('enable') . "</a></td>";
 	}
 	else {
-		echo "<td><a href=\"".$web_path."/admin/users.php?action=update&amp;user=$user->username&amp;level=disabled\">" . _("Disable") ."</a></td>";
+		echo "<td><a href=\"".$web_path."/admin/users.php?action=update&amp;user=$user->username&amp;level=disabled\">" . get_user_icon('disable') ."</a></td>";
 	}
 	?>
 	<td>
 		<a href="<?php echo $web_path; ?>/admin/users.php?action=delete&amp;user=<?php echo $user->username; ?>">
-		<?php echo _("delete"); ?>
+		<?php echo get_user_icon('delete'); ?>
 		</a>
 	</td>
        <?php