From ab3dab56b00fd8a1b85d68a63ef2536cbf4ea10c Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 14 Feb 2008 20:15:36 +0000
Subject: [PATCH] Manage Users styling updates

git-svn-id: http://svn.automattic.com/wordpress/trunk@6852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/template.php | 22 ++++++++++++----------
 wp-admin/users.php             | 13 ++++---------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 3c1d7032c3..e39a29fc15 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -519,23 +519,25 @@ function user_row( $user_object, $style = '', $role = '' ) {
 	if ( strlen( $short_url ) > 35 )
 		$short_url =  substr( $short_url, 0, 32 ).'...';
 	$numposts = get_usernumposts( $user_object->ID );
+	if ( current_user_can( 'edit_user', $user_object->ID ) ) {
+		$edit = add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" );
+		$edit = "<a href=\"$edit\">$user_object->user_login</a>";
+	} else {
+		$edit = $user_object->user_login;
+	}
 	$r = "<tr id='user-$user_object->ID'$style>
 		<td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /></td>
-		<td><label for='user_{$user_object->ID}'>{$user_object->ID}</label></td>
-		<td><label for='user_{$user_object->ID}'><strong>$user_object->user_login</strong></label></td>
-		<td><label for='user_{$user_object->ID}'>$user_object->first_name $user_object->last_name</label></td>
+		<td><strong>$edit</strong></td>
+		<td>$user_object->first_name $user_object->last_name</td>
 		<td><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td>
 		<td><a href='$url' title='website: $url'>$short_url</a></td>";
-	$r .= "\n\t\t<td align='center'>";
+	$r .= "\n\t\t<td>";
 	if ( $numposts > 0 ) {
 		$r .= "<a href='edit.php?author=$user_object->ID' title='" . __( 'View posts by this author' ) . "' class='edit'>";
-		$r .= sprintf(__ngettext( 'View %s post', 'View %s posts', $numposts ), $numposts);
+		$r .= $numposts;
 		$r .= '</a>';
-	}
-	$r .= "</td>\n\t\t<td>";
-	if ( current_user_can( 'edit_user', $user_object->ID ) ) {
-		$edit_link = add_query_arg( 'wp_http_referer', urlencode( clean_url( stripslashes( $_SERVER['REQUEST_URI'] ) ) ), "user-edit.php?user_id=$user_object->ID" );
-		$r .= "<a href='$edit_link' class='edit'>".__( 'Edit' )."</a>";
+	} else {
+		$r .= 0;
 	}
 	$r .= "</td>\n\t</tr>";
 	return $r;
diff --git a/wp-admin/users.php b/wp-admin/users.php
index aada46a5a5..4e17ec47b6 100644
--- a/wp-admin/users.php
+++ b/wp-admin/users.php
@@ -292,13 +292,11 @@ foreach($roleclasses as $role => $roleclass) {
 </tr>
 <tr class="thead">
 	<th><input type="checkbox" onclick="checkAllUsers('<?php echo $role; ?>')"/> </th>
-	<th><?php _e('ID') ?></th>
 	<th><?php _e('Username') ?></th>
 	<th><?php _e('Name') ?></th>
 	<th><?php _e('E-mail') ?></th>
 	<th><?php _e('Website') ?></th>
-	<th><?php _e('Posts created') ?></th>
-	<th colspan="2" style="text-align: center"><?php _e('Actions') ?></th>
+	<th><?php _e('Posts') ?></th>
 </tr>
 </tbody>
 <tbody id="role-<?php echo $role; ?>" class="list:user user-list"><?php
@@ -356,8 +354,6 @@ foreach ( (array) $roleclass as $user_object ) {
 <?php endif; ?>
 <div id="ajax-response"></div>
 
-<div class="narrow">
-
 <?php
 	if ( get_option('users_can_register') )
 		echo '<p>' . sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), get_option('siteurl').'/wp-register.php') . '</p>';
@@ -366,10 +362,10 @@ foreach ( (array) $roleclass as $user_object ) {
 ?>
 <form action="#add-new-user" method="post" name="adduser" id="adduser" class="add:user-list:">
 <?php wp_nonce_field('add-user') ?>
-<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+<table class="niceblue">
 	<tr class="form-field form-required">
-		<th scope="row" width="33%"><?php _e('Username (required)') ?><input name="action" type="hidden" id="action" value="adduser" /></th>
-		<td width="66%"><input name="user_login" type="text" id="user_login" value="<?php echo $new_user_login; ?>" /></td>
+		<th scope="row"><?php _e('Username (required)') ?><input name="action" type="hidden" id="action" value="adduser" /></th>
+		<td ><input name="user_login" type="text" id="user_login" value="<?php echo $new_user_login; ?>" /></td>
 	</tr>
 	<tr class="form-field">
 		<th scope="row"><?php _e('First Name') ?> </th>
@@ -420,7 +416,6 @@ foreach ( (array) $roleclass as $user_object ) {
 </tbody>
 </table>
 
-</div>
 </div>
 
 <?php