From a6f1fcb404d09aa04db5598217011e51459417a7 Mon Sep 17 00:00:00 2001 From: Arnaud Levy <contact@arnaudlevy.com> Date: Wed, 4 May 2022 17:22:14 +0200 Subject: [PATCH] users --- app/views/admin/users/index.html.erb | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index 1e1ee9d58..bda69d5ff 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -7,9 +7,9 @@ <table class="table"> <thead> <tr> - <th><%= User.human_attribute_name('email') %></th> - <th><%= User.human_attribute_name('first_name') %></th> <th><%= User.human_attribute_name('last_name') %></th> + <th><%= User.human_attribute_name('first_name') %></th> + <th><%= User.human_attribute_name('email') %></th> <th><%= User.human_attribute_name('role') %></th> <th><%= User.human_attribute_name('language') %></th> <th></th> @@ -18,11 +18,19 @@ <tbody> <% @users.each do |user| %> <tr> - <td><%= link_to user.email, [:admin, user] %></td> - <td><%= user.first_name %></td> <td><%= user.last_name %></td> - <td><%= t("activerecord.attributes.user.roles.#{user.role}") %></td> - <td><%= user.language %></td> + <td><%= user.first_name %></td> + <td><%= link_to user.email, [:admin, user] %></td> + <td> + <span class="badge bg-secondary"> + <%= t("activerecord.attributes.user.roles.#{user.role}") %> + </span> + </td> + <td> + <span class="badge bg-secondary"> + <%= user.language %> + </span> + </td> <td class="text-end"> <div class="btn-group" role="group"> <%= edit_link user %> -- GitLab