diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/user_edit.php | 18 | ||||
| -rw-r--r-- | templates/user_index.php | 8 | ||||
| -rw-r--r-- | templates/user_login.php | 8 | ||||
| -rw-r--r-- | templates/user_new.php | 6 |
4 files changed, 38 insertions, 2 deletions
diff --git a/templates/user_edit.php b/templates/user_edit.php index 07ae5738..1805d042 100644 --- a/templates/user_edit.php +++ b/templates/user_edit.php @@ -14,6 +14,12 @@ <?= 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/> + + <?= Helper\form_label(t('Email'), 'email') ?> + <?= Helper\form_email('email', $values, $errors) ?><br/> + <?php if ($values['is_ldap_user'] == 0): ?> <?= Helper\form_label(t('Current password for the user "%s"', Helper\get_username()), 'current_password') ?> @@ -31,7 +37,17 @@ <?= Helper\form_select('default_project_id', $projects, $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) ?> + <?= Helper\form_checkbox('is_admin', t('Administrator'), 1, isset($values['is_admin']) && $values['is_admin'] == 1 ? true : false) ?><br/> + <?php endif ?> + + <?php if (GOOGLE_AUTH && Helper\is_current_user($values['id'])): ?> + <div class="form-row"> + <?php if (empty($values['google_id'])): ?> + <a href="?controller=user&action=google"><?= t('Link my Google Account') ?></a> + <?php else: ?> + <a href="?controller=user&action=unlinkGoogle"><?= t('Unlink my Google Account') ?></a> + <?php endif ?> + <div> <?php endif ?> <div class="form-actions"> diff --git a/templates/user_index.php b/templates/user_index.php index fc15ae44..f6302a6b 100644 --- a/templates/user_index.php +++ b/templates/user_index.php @@ -14,6 +14,8 @@ <table> <tr> <th><?= t('Username') ?></th> + <th><?= t('Name') ?></th> + <th><?= t('Email') ?></th> <th><?= t('Administrator') ?></th> <th><?= t('Default Project') ?></th> <th><?= t('Actions') ?></th> @@ -24,6 +26,12 @@ <span title="user_id=<?= $user['id'] ?>"><?= Helper\escape($user['username']) ?></span> </td> <td> + <?= Helper\escape($user['name']) ?> + </td> + <td> + <?= Helper\escape($user['email']) ?> + </td> + <td> <?= $user['is_admin'] ? t('Yes') : t('No') ?> </td> <td> diff --git a/templates/user_login.php b/templates/user_login.php index 6a805f14..f8981cb5 100644 --- a/templates/user_login.php +++ b/templates/user_login.php @@ -14,7 +14,13 @@ <?= Helper\form_label(t('Password'), 'password') ?> <?= Helper\form_password('password', $values, $errors, array('required')) ?> - <?= Helper\form_checkbox('remember_me', t('Remember Me'), 1) ?> + <?= Helper\form_checkbox('remember_me', t('Remember Me'), 1) ?><br/> + + <?php if (GOOGLE_AUTH): ?> + <p> + <a href="?controller=user&action=google"><?= t('Login with my Google Account') ?></a> + </p> + <?php endif ?> <div class="form-actions"> <input type="submit" value="<?= t('Sign in') ?>" class="btn btn-blue"/> diff --git a/templates/user_new.php b/templates/user_new.php index 8b15525b..ec3d3f15 100644 --- a/templates/user_new.php +++ b/templates/user_new.php @@ -11,6 +11,12 @@ <?= Helper\form_label(t('Username'), 'username') ?> <?= Helper\form_text('username', $values, $errors, array('autofocus', 'required')) ?><br/> + <?= Helper\form_label(t('Name'), 'name') ?> + <?= Helper\form_text('name', $values, $errors) ?><br/> + + <?= Helper\form_label(t('Email'), 'email') ?> + <?= Helper\form_email('email', $values, $errors) ?><br/> + <?= Helper\form_label(t('Password'), 'password') ?> <?= Helper\form_password('password', $values, $errors, array('required')) ?><br/> |