user list has descriptions now

2 files changed, 24 insertions, 12 deletions

diff --git a/settings/css/settings.css b/settings/css/settings.css
index d68d05a73e6..827f215efbe 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -12,6 +12,8 @@ input#identity { width:20em; }
 
 /* USERS */
 form { display:inline; }
+table th { height:2em; padding:0 .5em; color:#999; padding-left:.8em; }
+table th, table td { border-bottom:1px solid #ddd; text-align:left; font-weight:normal; }
 td.name, td.password { padding-left:.8em; }
 td.password>img, td.remove>img, td.quota>img { visibility:hidden; }
 td.password>span { margin-right:1.2em; }
diff --git a/settings/templates/users.php b/settings/templates/users.php
index a97774cea0b..bcc4d65fe43 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -10,19 +10,29 @@ foreach($_["groups"] as $group) {
 }
 ?>
 
+<div id="controls">
+	<form id="newuser">
+		<th class="name"><input id="newusername" placeholder="<?php echo $l->t('Name')?>" /></th>
+		<th class="password"><input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" /></th>
+		<th class="groups"><select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
+		<?php foreach($_["groups"] as $group): ?>
+			<option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
+		<?php endforeach;?>
+		</select></th>
+		<th class="quota"></th>
+		<th><input type="submit" value="<?php echo $l->t('Create')?>" /></th>
+	</form>
+</div>
+
 <table data-groups="<?php echo implode(', ',$allGroups);?>">
-	<thead id="controls">
-		<tr><form id="newuser">
-			<th class="name"><input id="newusername" placeholder="<?php echo $l->t('Name')?>" /></th>
-			<th class="password"><input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" /></th>
-			<th class="groups"><select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
-			<?php foreach($_["groups"] as $group): ?>
-				<option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
-			<?php endforeach;?>
-			</select></th>
-			<th class="quota"></th>
-			<th><input type="submit" value="<?php echo $l->t('Create')?>" /></th>
-		</form></tr>
+	<thead>
+		<tr>
+			<th id='headerName'><?php echo $l->t('Name')?></th>
+			<th id="headerPassword"><?php echo $l->t( 'Password' ); ?></th>
+			<th id="headerGroups"><?php echo $l->t( 'Groups' ); ?></th>
+			<th id="headerQuota"><?php echo $l->t( 'Quota' ); ?></th>
+			<th id="headerRemove">&nbsp;</th>
+		</tr>
 	</thead>
 	<tbody>
 	<?php foreach($_["users"] as $user): ?>