From 9ba4a7621446433fcf5eed2569473984753141a0 Mon Sep 17 00:00:00 2001
From: raghunayyar <me@iraghu.com>
Date: Wed, 19 Feb 2014 21:23:29 +0530
Subject: [PATCH] resolving conflict when picking 8b81a0b

---
 settings/templates/users.php                 | 246 -------------------
 settings/templates/users/main.php            |  29 +++
 settings/templates/users/part.createuser.php |  30 +++
 settings/templates/users/part.grouplist.php  |  38 +++
 settings/templates/users/part.setquota.php   |  42 ++++
 settings/templates/users/part.userlist.php   | 114 +++++++++
 settings/users.php                           |   2 +-
 7 files changed, 254 insertions(+), 247 deletions(-)
 delete mode 100644 settings/templates/users.php
 create mode 100644 settings/templates/users/main.php
 create mode 100644 settings/templates/users/part.createuser.php
 create mode 100644 settings/templates/users/part.grouplist.php
 create mode 100644 settings/templates/users/part.setquota.php
 create mode 100644 settings/templates/users/part.userlist.php

diff --git a/settings/templates/users.php b/settings/templates/users.php
deleted file mode 100644
index 699af21efef..00000000000
--- a/settings/templates/users.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-$allGroups=array();
-foreach($_["groups"] as $group) {
-	$allGroups[] = $group['name'];
-}
-$_['subadmingroups'] = $allGroups;
-$items = array_flip($_['subadmingroups']);
-unset($items['admin']);
-$_['subadmingroups'] = array_flip($items);
-?>
-
-<!-- THE APP NAVIGATION LEFT CONTENT AREA -->
-<div id="app-navigation">
-	<ul>
-		<!-- Add new group -->
-		<li>
-			<form id="newgroup">
-				<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
-				<input type="submit" class="button" value="<?php p($l->t('Add Group'))?>" />
-			</form>
-		</li>
-		<!-- Everyone -->
-		<li>
-			<a href="#"><?php p($l->t('Everyone')); ?></a>
-		</li>
-
-		<!-- The Admin Group -->
-		<?php foreach($_["adminGroup"] as $adminGroup): ?>
-			<li>
-				<a href="#"><?php p($l->t('Admins')); ?></a>
-				<span class="utils">
-					<span class="usercount"><?php if(count($adminGroup['useringroup']) > 0) { p(count($adminGroup['useringroup'])); } ?></span>
-				</span>
-			</li>
-		<?php endforeach; ?>
-
-		<!--List of Groups-->
-		<?php foreach($_["groups"] as $group): ?>
-		<li data-gid="<?php p($group['name']) ?>">
-			<a href="#"><?php p($group['name']); ?></a>
-			<span class="utils">
-				<span class="usercount"><?php if(count($group['useringroup']) > 0) { p(count($group['useringroup'])); } ?></span>
-				<img class="svg action rename" src="<?php p(image_path('core', 'actions/rename.svg'))?>"
-					alt="<?php p($l->t("change group name"))?>" title="<?php p($l->t("change group name"))?>" />
-				<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
-					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
-				</a>
-			</span>
-		</li>
-	<?php endforeach; ?>
-	</ul>
-
-	<div id="app-settings" class="" style="">
-		<div id="app-settings-header">
-			<button class="settings-button" tabindex="0"></button>
-		</div>
-		<div id="app-settings-content">
-			<div class="quota">
-				<!-- Default storage -->
-				<span><?php p($l->t('Default Quota'));?></span>
-				<?php if((bool) $_['isadmin']): ?>
-				<select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
-					<option
-						<?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?>
-						value='none'>
-						<?php p($l->t('Unlimited'));?>
-					</option>
-					<?php foreach($_['quota_preset'] as $preset):?>
-						<?php if($preset !== 'default'):?>
-						<option
-							<?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?>
-							value='<?php p($preset);?>'>
-							<?php p($preset);?>
-						</option>
-						<?php endif;?>
-					<?php endforeach;?>
-					<?php if($_['defaultQuotaIsUserDefined']):?>
-						<option selected="selected" value='<?php p($_['default_quota']);?>'>
-							<?php p($_['default_quota']);?>
-						</option>
-					<?php endif;?>
-					<option data-new value='other'>
-						<?php p($l->t('Other'));?>
-						...
-					</option>
-				</select>
-			<?php endif; ?>
-			<?php if((bool) !$_['isadmin']): ?>
-				<select class='quota' disabled="disabled">
-					<option selected="selected">
-				<?php p($_['default_quota']);?>
-					</option>
-				</select>
-			<?php endif; ?>
-		</div>
-	</div>
-</div>
-<div id="user-controls">
-	<form id="newuser" autocomplete="off">
-		<input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input
-			type="password" id="newuserpassword"
-			placeholder="<?php p($l->t('Password'))?>" /> <select
-			class="groupsselect"
-			id="newusergroups" data-placeholder="groups"
-			title="<?php p($l->t('Groups'))?>" multiple="multiple">
-			<?php foreach($_["adminGroup"] as $adminGroup): ?>
-			<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
-			<?php endforeach; ?>
-			<?php foreach($_["groups"] as $group): ?>
-			<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
-			<?php endforeach;?>
-		</select>
-		<input type="submit" class="button" value="<?php p($l->t('Create'))?>" />
-	</form>
-	<?php if((bool)$_['recoveryAdminEnabled']): ?>
-	<div class="recoveryPassword">
-	<input id="recoveryPassword"
-		   type="password"
-		   placeholder="<?php p($l->t('Admin Recovery Password'))?>"
-		   title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
-		   alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
-	</div>
-	<?php endif; ?>
-	<form autocomplete="off" id="usersearchform">
-		<input type="text" class="input" placeholder="<?php p($l->t( 'Search by Username' )); ?>" />
-	</form>
-</div>
-<table class="hascontrols grid" data-groups="<?php p(json_encode($allGroups));?>">
-	<thead>
-		<tr>
-			<?php if ($_['enableAvatars']): ?>
-			<th id='headerAvatar'></th>
-			<?php endif; ?>
-			<th id='headerName'><?php p($l->t('Username'))?></th>
-			<th id="headerDisplayName"><?php p($l->t( 'Full Name' )); ?></th>
-			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
-			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
-			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<th id="headerSubAdmins"><?php p($l->t('Group Admin')); ?></th>
-			<?php endif;?>
-			<th id="headerQuota"><?php p($l->t('Quota')); ?></th>
-			<th id="headerStorageLocation"><?php p($l->t('Storage Location')); ?></th>
-			<th id="headerLastLogin"><?php p($l->t('Last Login')); ?></th>
-			<th id="headerRemove">&nbsp;</th>
-		</tr>
-	</thead>
-	<tbody>
-		<?php foreach($_["users"] as $user): ?>
-		<tr data-uid="<?php p($user["name"]) ?>"
-			data-displayName="<?php p($user["displayName"]) ?>">
-			<?php if ($_['enableAvatars']): ?>
-			<td class="avatar"><div class="avatardiv"></div></td>
-			<?php endif; ?>
-			<td class="name"><?php p($user["name"]); ?></td>
-			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
-				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
-				alt="<?php p($l->t("change full name"))?>" title="<?php p($l->t("change full name"))?>"/>
-			</td>
-			<td class="password"><span>●●●●●●●</span> <img class="svg action"
-				src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>"
-				alt="<?php p($l->t("set new password"))?>" title="<?php p($l->t("set new password"))?>"/>
-			</td>
-			<td class="groups"><select
-				class="groupsselect"
-				data-username="<?php p($user['name']) ;?>"
-				data-user-groups="<?php p(json_encode($user['groups'])) ;?>"
-				data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
-				multiple="multiple">
-					<?php foreach($_["adminGroup"] as $adminGroup): ?>
-					<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
-					<?php endforeach; ?>
-					<?php foreach($_["groups"] as $group): ?>
-					<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
-					<?php endforeach;?>
-			</select>
-			</td>
-			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<td class="subadmins"><select
-				class="subadminsselect"
-				data-username="<?php p($user['name']) ;?>"
-				data-subadmin="<?php p(json_encode($user['subadmin']));?>"
-				data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
-				multiple="multiple">
-					<?php foreach($_["subadmingroups"] as $group): ?>
-					<option value="<?php p($group);?>"><?php p($group);?></option>
-					<?php endforeach;?>
-			</select>
-			</td>
-			<?php endif;?>
-			<td class="quota">
-				<select class='quota-user' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
-					<option
-						<?php if($user['quota'] === 'default') print_unescaped('selected="selected"');?>
-							value='default'>
-						<?php p($l->t('Default'));?>
-					</option>
-					<option
-					<?php if($user['quota'] === 'none') print_unescaped('selected="selected"');?>
-							value='none'>
-						<?php p($l->t('Unlimited'));?>
-					</option>
-					<?php foreach($_['quota_preset'] as $preset):?>
-					<option
-					<?php if($user['quota']==$preset) print_unescaped('selected="selected"');?>
-						value='<?php p($preset);?>'>
-						<?php p($preset);?>
-					</option>
-					<?php endforeach;?>
-					<?php if($user['isQuotaUserDefined']):?>
-					<option selected="selected" value='<?php p($user['quota']);?>'>
-						<?php p($user['quota']);?>
-					</option>
-					<?php endif;?>
-					<option value='other' data-new>
-						<?php p($l->t('Other'));?>
-						...
-					</option>
-				</select>
-			</td>
-			<td class="storageLocation"><?php p($user["storageLocation"]); ?></td>
-			<?php
-			if($user["lastLogin"] === 0) {
-				$lastLogin = 'never';
-				$lastLoginDate = '';
-			} else {
-				$lastLogin = relative_modified_date($user["lastLogin"]);
-				$lastLoginDate = \OC_Util::formatDate($user["lastLogin"]);
-			}
-			?>
-			<td class="lastLogin" title="<?php p('<span style="white-space: nowrap;">'.$lastLoginDate.'</span>'); ?>"><?php p($lastLogin); ?></td>
-			<td class="remove">
-				<?php if($user['name']!=OC_User::getUser()):?>
-					<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
-						<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
-					</a>
-				<?php endif;?>
-			</td>
-		</tr>
-		<?php endforeach; ?>
-	</tbody>
-</table>
diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
new file mode 100644
index 00000000000..99c6848d2ec
--- /dev/null
+++ b/settings/templates/users/main.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+$allGroups=array();
+foreach($_["groups"] as $group) {
+	$allGroups[] = $group['name'];
+}
+$_['subadmingroups'] = $allGroups;
+$items = array_flip($_['subadmingroups']);
+unset($items['admin']);
+$_['subadmingroups'] = array_flip($items);
+?>
+
+<script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkToRoute('isadmin'));?>"></script>
+
+<div id="app-navigation">
+	<?php print_unescaped($this->inc('users/part.grouplist')); ?>
+	<div id="app-settings">
+		<?php print_unescaped($this->inc('users/part.setquota')); ?>
+	</div>
+</div>
+
+<div id="app-content">
+	<?php print_unescaped($this->inc('users/part.createuser')); ?>
+	<?php print_unescaped($this->inc('users/part.userlist')); ?>
+</div>
\ No newline at end of file
diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
new file mode 100644
index 00000000000..e52f0da0b36
--- /dev/null
+++ b/settings/templates/users/part.createuser.php
@@ -0,0 +1,30 @@
+<div id="user-controls">
+	<form id="newuser" autocomplete="off">
+		<input id="newusername" type="text" placeholder="<?php p($l->t('Login Name'))?>" /> <input
+			type="password" id="newuserpassword"
+			placeholder="<?php p($l->t('Password'))?>" /> <select
+			class="groupsselect"
+			id="newusergroups" data-placeholder="groups"
+			title="<?php p($l->t('Groups'))?>" multiple="multiple">
+			<?php foreach($_["adminGroup"] as $adminGroup): ?>
+			<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
+			<?php endforeach; ?>
+			<?php foreach($_["groups"] as $group): ?>
+			<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
+			<?php endforeach;?>
+		</select>
+		<input type="submit" class="button" value="<?php p($l->t('Create'))?>" />
+	</form>
+	<?php if((bool)$_['recoveryAdminEnabled']): ?>
+	<div class="recoveryPassword">
+	<input id="recoveryPassword"
+		   type="password"
+		   placeholder="<?php p($l->t('Admin Recovery Password'))?>"
+		   title="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"
+		   alt="<?php p($l->t('Enter the recovery password in order to recover the users files during password change'))?>"/>
+	</div>
+	<?php endif; ?>
+	<form autocomplete="off" id="usersearchform">
+		<input type="text" class="input" placeholder="<?php p($l->t( 'Search by Username' )); ?>" />
+	</form>
+</div>
\ No newline at end of file
diff --git a/settings/templates/users/part.grouplist.php b/settings/templates/users/part.grouplist.php
new file mode 100644
index 00000000000..cf7338b5096
--- /dev/null
+++ b/settings/templates/users/part.grouplist.php
@@ -0,0 +1,38 @@
+<ul>
+	<!-- Add new group -->
+	<li>
+		<form id="newgroup">
+			<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
+			<input type="submit" class="button" value="<?php p($l->t('Add Group'))?>" />
+		</form>
+	</li>
+	<!-- Everyone -->
+	<li>
+		<a href="#"><?php p($l->t('Everyone')); ?></a>
+	</li>
+
+	<!-- The Admin Group -->
+	<?php foreach($_["adminGroup"] as $adminGroup): ?>
+		<li>
+			<a href="#"><?php p($l->t('Admins')); ?></a>
+			<span class="utils">
+				<span class="usercount"><?php if(count($adminGroup['useringroup']) > 0) { p(count($adminGroup['useringroup'])); } ?></span>
+			</span>
+		</li>
+	<?php endforeach; ?>
+
+	<!--List of Groups-->
+	<?php foreach($_["groups"] as $group): ?>
+		<li data-gid="<?php p($group['name']) ?>">
+			<a href="#"><?php p($group['name']); ?></a>
+			<span class="utils">
+				<span class="usercount"><?php if(count($group['useringroup']) > 0) { p(count($group['useringroup'])); } ?></span>
+				<img class="svg action rename" src="<?php p(image_path('core', 'actions/rename.svg'))?>"
+					alt="<?php p($l->t("change group name"))?>" title="<?php p($l->t("change group name"))?>" />
+				<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
+					<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
+				</a>
+			</span>
+		</li>
+	<?php endforeach; ?>
+</ul>
\ No newline at end of file
diff --git a/settings/templates/users/part.setquota.php b/settings/templates/users/part.setquota.php
new file mode 100644
index 00000000000..23fdbe6ab54
--- /dev/null
+++ b/settings/templates/users/part.setquota.php
@@ -0,0 +1,42 @@
+<div id="app-settings-header">
+	<button class="settings-button" tabindex="0"></button>
+</div>
+<div id="app-settings-content">
+	<div class="quota">
+		<!-- Default storage -->
+		<span><?php p($l->t('Default Quota'));?></span>
+		<?php if((bool) $_['isadmin']): ?>
+		<select class='quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
+			<option
+				<?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?>
+				value='none'>
+				<?php p($l->t('Unlimited'));?>
+			</option>
+			<?php foreach($_['quota_preset'] as $preset):?>
+				<?php if($preset !== 'default'):?>
+				<option
+					<?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?>
+					value='<?php p($preset);?>'>
+					<?php p($preset);?>
+				</option>
+				<?php endif;?>
+			<?php endforeach;?>
+			<?php if($_['defaultQuotaIsUserDefined']):?>
+				<option selected="selected" value='<?php p($_['default_quota']);?>'>
+					<?php p($_['default_quota']);?>
+				</option>
+			<?php endif;?>
+			<option data-new value='other'>
+				<?php p($l->t('Other'));?>
+				...
+			</option>
+		</select>
+	<?php endif; ?>
+	<?php if((bool) !$_['isadmin']): ?>
+		<select class='quota' disabled="disabled">
+			<option selected="selected">
+		<?php p($_['default_quota']);?>
+			</option>
+		</select>
+	<?php endif; ?>
+</div>
\ No newline at end of file
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
new file mode 100644
index 00000000000..9df069364d4
--- /dev/null
+++ b/settings/templates/users/part.userlist.php
@@ -0,0 +1,114 @@
+<table class="hascontrols grid" data-groups="<?php p(json_encode($allGroups));?>">
+	<thead>
+		<tr>
+			<?php if ($_['enableAvatars']): ?>
+			<th id='headerAvatar'></th>
+			<?php endif; ?>
+			<th id='headerName'><?php p($l->t('Username'))?></th>
+			<th id="headerDisplayName"><?php p($l->t( 'Full Name' )); ?></th>
+			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
+			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
+			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<th id="headerSubAdmins"><?php p($l->t('Group Admin')); ?></th>
+			<?php endif;?>
+			<th id="headerQuota"><?php p($l->t('Quota')); ?></th>
+			<th id="headerStorageLocation"><?php p($l->t('Storage Location')); ?></th>
+			<th id="headerLastLogin"><?php p($l->t('Last Login')); ?></th>
+			<th id="headerRemove">&nbsp;</th>
+		</tr>
+	</thead>
+	<tbody>
+		<?php foreach($_["users"] as $user): ?>
+		<tr data-uid="<?php p($user["name"]) ?>"
+			data-displayName="<?php p($user["displayName"]) ?>">
+			<?php if ($_['enableAvatars']): ?>
+			<td class="avatar"><div class="avatardiv"></div></td>
+			<?php endif; ?>
+			<td class="name"><?php p($user["name"]); ?></td>
+			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
+				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
+				alt="<?php p($l->t("change full name"))?>" title="<?php p($l->t("change full name"))?>"/>
+			</td>
+			<td class="password"><span>●●●●●●●</span> <img class="svg action"
+				src="<?php print_unescaped(image_path('core', 'actions/rename.svg'))?>"
+				alt="<?php p($l->t("set new password"))?>" title="<?php p($l->t("set new password"))?>"/>
+			</td>
+			<td class="groups"><select
+				class="groupsselect"
+				data-username="<?php p($user['name']) ;?>"
+				data-user-groups="<?php p(json_encode($user['groups'])) ;?>"
+				data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
+				multiple="multiple">
+					<?php foreach($_["adminGroup"] as $adminGroup): ?>
+					<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
+					<?php endforeach; ?>
+					<?php foreach($_["groups"] as $group): ?>
+					<option value="<?php p($group['name']);?>"><?php p($group['name']);?></option>
+					<?php endforeach;?>
+			</select>
+			</td>
+			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
+			<td class="subadmins"><select
+				class="subadminsselect"
+				data-username="<?php p($user['name']) ;?>"
+				data-subadmin="<?php p(json_encode($user['subadmin']));?>"
+				data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
+				multiple="multiple">
+					<?php foreach($_["subadmingroups"] as $group): ?>
+					<option value="<?php p($group);?>"><?php p($group);?></option>
+					<?php endforeach;?>
+			</select>
+			</td>
+			<?php endif;?>
+			<td class="quota">
+				<select class='quota-user' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
+					<option
+						<?php if($user['quota'] === 'default') print_unescaped('selected="selected"');?>
+							value='default'>
+						<?php p($l->t('Default'));?>
+					</option>
+					<option
+					<?php if($user['quota'] === 'none') print_unescaped('selected="selected"');?>
+							value='none'>
+						<?php p($l->t('Unlimited'));?>
+					</option>
+					<?php foreach($_['quota_preset'] as $preset):?>
+					<option
+					<?php if($user['quota']==$preset) print_unescaped('selected="selected"');?>
+						value='<?php p($preset);?>'>
+						<?php p($preset);?>
+					</option>
+					<?php endforeach;?>
+					<?php if($user['isQuotaUserDefined']):?>
+					<option selected="selected" value='<?php p($user['quota']);?>'>
+						<?php p($user['quota']);?>
+					</option>
+					<?php endif;?>
+					<option value='other' data-new>
+						<?php p($l->t('Other'));?>
+						...
+					</option>
+				</select>
+			</td>
+			<td class="storageLocation"><?php p($user["storageLocation"]); ?></td>
+			<?php
+			if($user["lastLogin"] === 0) {
+				$lastLogin = 'never';
+				$lastLoginDate = '';
+			} else {
+				$lastLogin = relative_modified_date($user["lastLogin"]);
+				$lastLoginDate = \OC_Util::formatDate($user["lastLogin"]);
+			}
+			?>
+			<td class="lastLogin" title="<?php p('<span style="white-space: nowrap;">'.$lastLoginDate.'</span>'); ?>"><?php p($lastLogin); ?></td>
+			<td class="remove">
+				<?php if($user['name']!=OC_User::getUser()):?>
+					<a href="#" class="action delete" original-title="<?php p($l->t('Delete'))?>">
+						<img src="<?php print_unescaped(image_path('core', 'actions/delete.svg')) ?>" class="svg" />
+					</a>
+				<?php endif;?>
+			</td>
+		</tr>
+		<?php endforeach; ?>
+	</tbody>
+</table>
diff --git a/settings/users.php b/settings/users.php
index 6b16e3aff73..7bf240fa16e 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -115,7 +115,7 @@ if(!empty($adminGroup)) {
 	array_multisort($sortAdminGroupsKeys, SORT_DESC, $adminGroup);
 }
 
-$tmpl = new OC_Template( "settings", "users", "user" );
+$tmpl = new OC_Template( "settings", "users/main", "user" );
 $tmpl->assign( 'users', $users );
 $tmpl->assign( 'groups', $groups );
 $tmpl->assign( 'adminGroup', $adminGroup );
-- 
2.39.5