From d798a26666189a586e190d9914cc19febbb4189a Mon Sep 17 00:00:00 2001 From: Mark Szymanski <mark@blueye.com> Date: Tue, 17 Jan 2017 21:46:24 -0600 Subject: Updates to clarify difference between username and name in profile page (fixes #2812) --- app/Template/user_view/profile.php | 6 +++--- app/Template/user_view/show.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/Template') diff --git a/app/Template/user_view/profile.php b/app/Template/user_view/profile.php index 117ab719..486ca428 100644 --- a/app/Template/user_view/profile.php +++ b/app/Template/user_view/profile.php @@ -3,9 +3,9 @@ <?= $this->avatar->render($user['id'], $user['username'], $user['name'], $user['email'], $user['avatar_path']) ?> <div class="panel"> <ul> - <li><?= t('Username:') ?> <strong><?= $this->text->e($user['username']) ?></strong></li> - <li><?= t('Name:') ?> <strong><?= $this->text->e($user['name']) ?: t('None') ?></strong></li> + <li><?= t('Login:') ?> <strong><?= $this->text->e($user['username']) ?></strong></li> + <li><?= t('Full Name:') ?> <strong><?= $this->text->e($user['name']) ?: t('None') ?></strong></li> <li><?= t('Email:') ?> <strong><?= $this->text->e($user['email']) ?: t('None') ?></strong></li> </ul> </div> -</section> \ No newline at end of file +</section> diff --git a/app/Template/user_view/show.php b/app/Template/user_view/show.php index 4b444b89..e57fd4cd 100644 --- a/app/Template/user_view/show.php +++ b/app/Template/user_view/show.php @@ -2,8 +2,8 @@ <h2><?= t('Summary') ?></h2> </div> <ul class="panel"> - <li><?= t('Username:') ?> <strong><?= $this->text->e($user['username']) ?></strong></li> - <li><?= t('Name:') ?> <strong><?= $this->text->e($user['name']) ?: t('None') ?></strong></li> + <li><?= t('Login:') ?> <strong><?= $this->text->e($user['username']) ?></strong></li> + <li><?= t('Full Name:') ?> <strong><?= $this->text->e($user['name']) ?: t('None') ?></strong></li> <li><?= t('Email:') ?> <strong><?= $this->text->e($user['email']) ?: t('None') ?></strong></li> <li><?= t('Status:') ?> <strong><?= $user['is_active'] ? t('Active') : t('Inactive') ?></strong></li> </ul> -- cgit v1.2.3