user mgmt: move 'Show storage location' and 'Show last log in' to settings area

settings/css/settings.css

@@ -100,11 +100,6 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point
 tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; }
 tr:hover>td.remove>a { float:right; }
 
-div.quota {
-	margin: 10px;
-	display: block;
-}
-div.quota-select-wrapper { position: relative; }
 div.recoveryPassword { left:50em; display:block; position:absolute; top:-1px; }
 input#recoveryPassword {width:15em;}
 #controls select.quota {
@@ -113,11 +108,6 @@ input#recoveryPassword {width:15em;}
 	height: 37px;
 }
 select.quota-user { position:relative; left:0; top:0; width:10em; }
-div.quota>span {
-	white-space: nowrap;
-	color: #888;
-	text-shadow: 0 1px 0 #fff;
-}
 select.quota.active { background: #fff; }
 
 input.userFilter {width: 200px;}

settings/templates/users/main.php

@@ -22,7 +22,23 @@ $userlistParams['subadmingroups'] = array_flip($items);
 <div id="app-navigation">
 	<?php print_unescaped($this->inc('users/part.grouplist')); ?>
 	<div id="app-settings">
+		<div id="app-settings-header">
+			<button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"></button>
+		</div>
+		<div id="app-settings-content">
 			<?php print_unescaped($this->inc('users/part.setquota')); ?>
+
+			<div id="userlistoptions">
+				<p><label>
+						<input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation">
+						<?php p($l->t('Show storage location')) ?>
+				</label></p>
+				<p><label>
+					<input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin">
+					<?php p($l->t('Show last log in')) ?>
+				</label></p>
+			</div>
+		</div>
 	</div>
 </div>
 

settings/templates/users/part.createuser.php

@@ -28,17 +28,6 @@
 		   alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
 	</div>
 	<?php endif; ?>
-	
-	<form id="userlistoptions">
-		<?php p($l->t('Display')) ?> : 
-		<label><input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation">
-			<?php p($l->t('Location')) ?>
-		</label>
-		<label><input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin">
-			<?php p($l->t('Last login')) ?>
-		</label>
-	</form>
-	
 	<form autocomplete="off" id="usersearchform">
 		<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
 	</form>

settings/templates/users/part.setquota.php

-<div id="app-settings-header">
-	<button class="settings-button" tabindex="0" data-apps-slide-toggle="#app-settings-content"></button>
-</div>
-<div id="app-settings-content">
 <div class="quota">
 	<!-- Default storage -->
 	<span><?php p($l->t('Default Quota'));?></span>
@@ -36,4 +32,3 @@
 		</select>
 	<?php endif; ?>
 </div>
-</div>