Refactoring of user management (ui)

1 files changed, 22 insertions, 71 deletions

diff --git a/app/Templates/user_edit.php b/app/Templates/user_edit.php
index 8fba922f..14063d49 100644
--- a/app/Templates/user_edit.php
+++ b/app/Templates/user_edit.php
@@ -1,79 +1,30 @@
-<section id="main">
-    <div class="page-header">
-        <h2><?= t('Edit user') ?></h2>
-        <ul>
-            <li><a href="?controller=user"><?= t('All users') ?></a></li>
-        </ul>
-    </div>
-    <section>
-    <form method="post" action="?controller=user&amp;action=update" autocomplete="off">
-
-        <?= Helper\form_csrf() ?>
-
-        <div class="form-column">
-
-            <?= Helper\form_hidden('id', $values) ?>
-            <?= Helper\form_hidden('is_ldap_user', $values) ?>
-
-            <?= Helper\form_label(t('Username'), 'username') ?>
-            <?= Helper\form_text('username', $values, $errors, array('required', $values['is_ldap_user'] == 1 ? 'readonly' : '')) ?><br/>
-
-            <?= Helper\form_label(t('Name'), 'name') ?>
-            <?= Helper\form_text('name', $values, $errors) ?><br/>
+<div class="page-header">
+    <h2><?= t('Edit user') ?></h2>
+</div>
+<form method="post" action="?controller=user&amp;action=edit&amp;user_id=<?= $user['id'] ?>" autocomplete="off">
 
-            <?= Helper\form_label(t('Email'), 'email') ?>
-            <?= Helper\form_email('email', $values, $errors) ?><br/>
+    <?= Helper\form_csrf() ?>
 
-            <?= Helper\form_label(t('Default Project'), 'default_project_id') ?>
-            <?= Helper\form_select('default_project_id', $projects, $values, $errors) ?><br/>
+    <?= Helper\form_hidden('id', $values) ?>
+    <?= Helper\form_hidden('is_ldap_user', $values) ?>
 
-        </div>
+    <?= Helper\form_label(t('Username'), 'username') ?>
+    <?= Helper\form_text('username', $values, $errors, array('required', $values['is_ldap_user'] == 1 ? 'readonly' : '')) ?><br/>
 
-        <div class="form-column">
+    <?= Helper\form_label(t('Name'), 'name') ?>
+    <?= Helper\form_text('name', $values, $errors) ?><br/>
 
-            <?php if ($values['is_ldap_user'] == 0): ?>
+    <?= Helper\form_label(t('Email'), 'email') ?>
+    <?= Helper\form_email('email', $values, $errors) ?><br/>
 
-                <?= Helper\form_label(t('Current password for the user "%s"', Helper\get_username()), 'current_password') ?>
-                <?= Helper\form_password('current_password', $values, $errors) ?><br/>
+    <?= Helper\form_label(t('Default project'), 'default_project_id') ?>
+    <?= Helper\form_select('default_project_id', $projects, $values, $errors) ?><br/>
 
-                <?= Helper\form_label(t('Password'), 'password') ?>
-                <?= Helper\form_password('password', $values, $errors) ?><br/>
+    <?php if (Helper\is_admin()): ?>
+        <?= Helper\form_checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?><br/>
+    <?php endif ?>
 
-                <?= Helper\form_label(t('Confirmation'), 'confirmation') ?>
-                <?= Helper\form_password('confirmation', $values, $errors) ?><br/>
-
-            <?php endif ?>
-
-            <?php if (Helper\is_admin()): ?>
-                <?= Helper\form_checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?><br/>
-            <?php endif ?>
-
-            <ul>
-            <?php if (GOOGLE_AUTH && Helper\is_current_user($values['id'])): ?>
-                <li>
-                <?php if (empty($values['google_id'])): ?>
-                    <a href="?controller=user&amp;action=google<?= Helper\param_csrf() ?>"><?= t('Link my Google Account') ?></a>
-                <?php else: ?>
-                    <a href="?controller=user&amp;action=unlinkGoogle<?= Helper\param_csrf() ?>"><?= t('Unlink my Google Account') ?></a>
-                <?php endif ?>
-                </li>
-            <?php endif ?>
-
-            <?php if (GITHUB_AUTH && Helper\is_current_user($values['id'])): ?>
-                <li>
-                <?php if (empty($values['github_id'])): ?>
-                    <a href="?controller=user&amp;action=gitHub<?= Helper\param_csrf() ?>"><?= t('Link my GitHub Account') ?></a>
-                <?php else: ?>
-                    <a href="?controller=user&amp;action=unlinkGitHub<?= Helper\param_csrf() ?>"><?= t('Unlink my GitHub Account') ?></a>
-                <?php endif ?>
-                </li>
-            <?php endif ?>
-            </ul>
-        </div>
-
-        <div class="form-actions">
-            <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> <?= t('or') ?> <a href="?controller=user"><?= t('cancel') ?></a>
-        </div>
-    </form>
-    </section>
-</section>
\ No newline at end of file
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> <?= t('or') ?> <a href="?controller=user&amp;action=show&amp;user_id=<?= $user['id'] ?>"><?= t('cancel') ?></a>
+    </div>
+</form>
\ No newline at end of file