From 4a15cf28a98994275f5efa08720cb6dfeeef6040 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 8 Jun 2012 11:37:04 +0200
Subject: [PATCH] fixed broken lines in user table

Conflicts:

	settings/css/settings.css
---
 settings/css/settings.css    | 3 ++-
 settings/templates/users.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 36d9b8d26f9..d4083857977 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -34,9 +34,10 @@ li.selected { background-color:#ddd; }
 #content>table:not(.nostyle) { margin-top:3em; }
 table:not(.nostyle) { width:100%; }
 #rightcontent { padding-left: 1em; }
-td.quota { position:relative }
+td.quota { position:relative; }
 div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
 select.quota { position:absolute; left:0; top:0; width:10em; }
+select.quota-user { position:relative; left:0; top:0; width:10em; }
 input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }
 div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
 select.quota.active { background: #fff; }
diff --git a/settings/templates/users.php b/settings/templates/users.php
index a23a5bafe61..1951f17a0b7 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -64,7 +64,7 @@ foreach($_["groups"] as $group) {
 				</select>
 			</td>
 			<td class="quota">
-				<select class='quota'>
+				<select class='quota-user'>
 					<?php foreach($_['quota_preset'] as $preset):?>
 						<option <?php if($user['quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
 					<?php endforeach;?>