resolving conflict when picking 8b81a0b

1 files changed, 30 insertions, 0 deletions

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