diff --git a/app/views/manage/users/_form.html.haml b/app/views/manage/users/_form.html.haml
index ca1af575d..6f16a467c 100644
--- a/app/views/manage/users/_form.html.haml
+++ b/app/views/manage/users/_form.html.haml
@@ -6,6 +6,8 @@
= f.error_notification
.form-inputs
+ = f.input :first_name, required: true
+ = f.input :last_name, required: true
= f.input :email, input_html: { "data-validate" => "presence" }, required: true
= f.input :role, collection: User.roles.to_a.collect{|c| [c[0].titleize, c[0]]}, include_blank: false
= f.input :is_active, collection: [[t(:active, scope: "pages.manage.users.edit.form"), true], [t(:inactive, scope: "pages.manage.users.edit.form"), false]], as: :radio_buttons
diff --git a/app/views/manage/users/edit.html.haml b/app/views/manage/users/edit.html.haml
index f2f911fa0..2fdb8fa74 100644
--- a/app/views/manage/users/edit.html.haml
+++ b/app/views/manage/users/edit.html.haml
@@ -1,4 +1,4 @@
-= render "layouts/manage/page_title", title: t(:title, scope: "pages.manage.users.edit", user_email: @user.email), subtitle: @user.email do
+= render "layouts/manage/page_title", title: t(:title, scope: "pages.manage.users.edit", user_name: @user.full_name), subtitle: @user.full_name do
.btn-group
= link_to t(:cancel, scope: "pages.manage.users.edit"), manage_user_path(@user), class: 'btn btn-sm btn-outline-secondary'
= link_to t(:delete, scope: "pages.manage.users.edit"), manage_user_path(@user), method: :delete, data: { confirm: "Are you sure? #{@user.email} will be permanently deleted. This action is irreversible." }, class: 'btn btn-sm btn-outline-secondary'
diff --git a/app/views/manage/users/show.html.haml b/app/views/manage/users/show.html.haml
index 7b3387e32..9e56f0e39 100644
--- a/app/views/manage/users/show.html.haml
+++ b/app/views/manage/users/show.html.haml
@@ -1,4 +1,4 @@
-= render "layouts/manage/page_title", title: t(:title, scope: "pages.manage.users.show", user_email: @user.email) do
+= render "layouts/manage/page_title", title: t(:title, scope: "pages.manage.users.show", user_name: @user.full_name) do
.btn-group
= link_to t(:edit, scope: "pages.manage.users.show"), edit_manage_user_path(@user), class: 'btn btn-sm btn-outline-secondary'
= link_to t(:delete, scope: "pages.manage.users.show"), manage_user_path(@user), method: :delete, data: { confirm: "Are you sure? #{@user.email} along with their questionnaire will be permanently deleted. This action is irreversible." }, class: 'btn btn-sm btn-outline-secondary'
@@ -8,6 +8,12 @@
.card.mb-3
.card-header= t(:user_information, scope: "pages.manage.users.show")
.card-body
+ .row
+ %dt.col-md-5= t(:first_name, scope: "pages.manage.users.show")
+ %dd.col-md-7= @user.first_name
+ .row
+ %dt.col-md-5= t(:last_name, scope: "pages.manage.users.show")
+ %dd.col-md-7= @user.last_name
.row
%dt.col-md-5= t(:email_address, scope: "pages.manage.users.show")
%dd.col-md-7= @user.email
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 158e3dce3..a36132e5c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -156,11 +156,13 @@ en:
previous_signed_in_ip: Previous signed-in IP
sign_in_count: Sign-in count
show:
- title: "%{user_email}"
+ title: "%{user_name}"
edit: Edit
reset_password: Reset Password
delete: Delete
user_information: User Information
+ first_name: First name
+ last_name: Last name
email_address: Email address
role: Role
login_access: Login access
@@ -179,7 +181,7 @@ en:
change_history: Change History
edit:
title: Edit User
- subtitle: "%{user_email}"
+ subtitle: "%{user_name}"
cancel: Cancel
delete: Delete
form: