summaryrefslogtreecommitdiff
path: root/app/views/admin/users/_user_detail.html.haml
diff options
context:
space:
mode:
authorBrandon Labuschagne <blabuschagne@gitlab.com>2019-01-07 13:54:41 +0200
committerBrandon Labuschagne <blabuschagne@gitlab.com>2019-02-05 17:56:51 +0200
commitd279cc94088fddd6f6bb2847e456bbf68ae616ea (patch)
treef3c16dbcc9f7b927a2f4ed63cbd286a70ae49a13 /app/views/admin/users/_user_detail.html.haml
parent55cb4bc9cafca0c838192b54f9daa4b2bc0b86b0 (diff)
downloadgitlab-ce-d279cc94088fddd6f6bb2847e456bbf68ae616ea.tar.gz
Add last activity to user administration
The columns 'Created on' and 'Last activity' have been added to the admin -> users view. Sorting options have also been added for last activity and the search bar has been moved to match the issues page.
Diffstat (limited to 'app/views/admin/users/_user_detail.html.haml')
-rw-r--r--app/views/admin/users/_user_detail.html.haml17
1 files changed, 17 insertions, 0 deletions
diff --git a/app/views/admin/users/_user_detail.html.haml b/app/views/admin/users/_user_detail.html.haml
new file mode 100644
index 00000000000..3319b4bad3a
--- /dev/null
+++ b/app/views/admin/users/_user_detail.html.haml
@@ -0,0 +1,17 @@
+.flex-list
+ .flex-row
+ = image_tag avatar_icon_for_user(user), class: 'avatar s32 d-none d-md-flex', alt: _('Avatar for %{name}') % { name: sanitize_name(user.name) }
+ .row-main-content
+ .row-title.str-truncated-100
+ = image_tag avatar_icon_for_user(user), class: 'avatar s16 d-xs-flex d-md-none mr-1 prepend-top-2', alt: _('Avatar for %{name}') % { name: sanitize_name(user.name) }
+ = link_to user.name, admin_user_path(user), class: 'text-plain js-user-link', data: { user_id: user.id }
+
+ = render_if_exists 'admin/users/user_detail_note', user: user
+
+ - user_badges_in_admin_section(user).each do |badge|
+ - css_badge = "badge badge-#{badge[:variant]}" if badge[:variant].present?
+ %span{ class: css_badge }
+ = badge[:text]
+
+ .row-second-line.str-truncated-100
+ = mail_to user.email, user.email, class: 'text-secondary'