diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/config_index.php | 29 | ||||
| -rw-r--r-- | templates/user_edit.php | 19 |
2 files changed, 28 insertions, 20 deletions
diff --git a/templates/config_index.php b/templates/config_index.php index 899a4b0c..6c610d2b 100644 --- a/templates/config_index.php +++ b/templates/config_index.php @@ -18,6 +18,22 @@ </div> </form> </section> + <?php endif ?> + + <div class="page-header"> + <h2><?= t('User settings') ?></h2> + </div> + <section class="settings"> + <ul> + <li> + <strong><?= t('My default project:') ?> </strong> + <?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? Helper\escape($projects[$user['default_project_id']]) : t('None') ?>, + <a href="?controller=user&action=edit&user_id=<?= $user['id'] ?>"><?= t('edit') ?></a> + </li> + </ul> + </section> + + <?php if ($user['is_admin']): ?> <div class="page-header"> <h2><?= t('More information') ?></h2> </div> @@ -54,19 +70,6 @@ </section> <?php endif ?> - <div class="page-header"> - <h2><?= t('User settings') ?></h2> - </div> - <section class="settings"> - <ul> - <li> - <strong><?= t('My default project:') ?> </strong> - <?= (isset($user['default_project_id']) && isset($projects[$user['default_project_id']])) ? Helper\escape($projects[$user['default_project_id']]) : t('None') ?>, - <a href="?controller=user&action=edit&user_id=<?= $user['id'] ?>"><?= t('edit') ?></a> - </li> - </ul> - </section> - <div class="page-header" id="last-logins"> <h2><?= t('Last logins') ?></h2> </div> diff --git a/templates/user_edit.php b/templates/user_edit.php index 0c82793d..07ae5738 100644 --- a/templates/user_edit.php +++ b/templates/user_edit.php @@ -9,18 +9,23 @@ <form method="post" action="?controller=user&action=update" autocomplete="off"> <?= 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')) ?><br/> + <?= Helper\form_text('username', $values, $errors, array('required', $values['is_ldap_user'] == 1 ? 'readonly' : '')) ?><br/> - <?= Helper\form_label(t('Current password for the user "%s"', Helper\get_username()), 'current_password') ?> - <?= Helper\form_password('current_password', $values, $errors) ?><br/> + <?php if ($values['is_ldap_user'] == 0): ?> - <?= Helper\form_label(t('Password'), 'password') ?> - <?= Helper\form_password('password', $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('Confirmation'), 'confirmation') ?> - <?= Helper\form_password('confirmation', $values, $errors) ?><br/> + <?= Helper\form_label(t('Password'), 'password') ?> + <?= Helper\form_password('password', $values, $errors) ?><br/> + + <?= Helper\form_label(t('Confirmation'), 'confirmation') ?> + <?= Helper\form_password('confirmation', $values, $errors) ?><br/> + + <?php endif ?> <?= Helper\form_label(t('Default Project'), 'default_project_id') ?> <?= Helper\form_select('default_project_id', $projects, $values, $errors) ?><br/> |