Skip to content

Commit 8559ca7

Browse files
daniloisrdaniloisr
authored
Merge pull request #117 from marcosjr182/admin_users_redesign
Admin Users redesign
2 parents a67ab24 + 75847cf commit 8559ca7

File tree

10 files changed

+149
-84
lines changed

10 files changed

+149
-84
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
### Changed
99
- Redesign project reports and edit password pages.
10+
- Redesign Admin Users pages.
1011

1112
### Fixed
1213
- Fix a locale select bug to make the options visible on a dark navbar.
@@ -18,4 +19,4 @@ The format is based on [Keep a Changelog](http://keepachangelog.com)
1819
and this project adheres to [Semantic Versioning](http://semver.org).
1920

2021
[Unreleased]: https://github.com/Codeminer42/cm42-central/compare/master...HEAD
21-
22+

‎app/assets/stylesheets/_form.scss‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,12 @@
3030
width: auto;
3131
}
3232

33-
.btn-form {
33+
.btn-square {
3434
border-radius: 0;
35+
}
36+
37+
.btn-form {
38+
@extend .btn-square;
3539
font-size: 14px;
3640
padding: 7px 20px;
3741
}

‎app/assets/stylesheets/_users.scss‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,7 @@
3737
}
3838
}
3939
}
40+
41+
.admin-users-table {
42+
tr:first-child td { border: 0; }
43+
}

‎app/views/admin/users/_form.html.erb‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,32 @@
1-
<div class="form-wrapper add-member">
21
<%= form_for [:admin, @user] do |f| %>
32
<%= render 'form_errors', object: @user if @user.errors.any? %>
43

5-
<div class="field-wrapper">
6-
<%= f.label :email, class: 'col-sm-2 control-label' %>
7-
<div class="col-sm-10"><%= f.text_field :email %></div>
4+
<div class="form-group">
5+
<%= f.label :email, class: 'control-label' %>
6+
<%= f.text_field :email, class: 'form-control auth-form-control' %>
87
</div>
98

10-
<div class="field-wrapper">
11-
<%= f.label :name, class: 'col-sm-2 control-label' %>
12-
<div class="col-sm-10"><%= f.text_field :name %></div>
9+
<div class="form-group">
10+
<%= f.label :name, class: 'control-label' %>
11+
<%= f.text_field :name, class: 'form-control auth-form-control' %>
1312
</div>
1413

15-
<div class="field-wrapper">
16-
<%= f.label :initials, class: 'col-sm-2 control-label' %>
17-
<div class="col-sm-10"><%= f.text_field :initials %></div>
14+
<div class="form-group">
15+
<%= f.label :initials, class: 'control-label' %>
16+
<%= f.text_field :initials, class: 'form-control auth-form-control' %>
1817
</div>
1918

20-
<div class="field-wrapper">
21-
<%= f.label :username, class: 'col-sm-2 control-label' %>
22-
<div class="col-sm-10"><%= f.text_field :username %></div>
19+
<div class="form-group">
20+
<%= f.label :username, class: 'control-label' %>
21+
<%= f.text_field :username, class: 'form-control auth-form-control' %>
2322
</div>
2423

25-
<div class="field-wrapper">
26-
<%= f.label :role, class: 'col-sm-2 control-label' %>
27-
<div class="col-sm-10"><%= f.select :role, User.role.options %></div>
24+
<div class="form-group">
25+
<%= f.label :role, class: 'control-label' %>
26+
<%= f.select :role, User.role.options, {}, { class: 'form-control auth-form-control' } %>
2827
</div>
2928

30-
<div class="actions">
31-
<%= f.submit nil, class: 'btn btn-primary pull-right' %>
29+
<div class="actions pull-right">
30+
<%= f.submit nil, class: 'btn btn-primary btn-form' %>
3231
</div>
3332
<% end %>
34-
</div>

‎app/views/admin/users/edit.html.erb‎

Lines changed: 43 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,55 @@
11
<% content_for :title_bar do %>
2+
<ul class="nav navbar-nav">
3+
<li>
4+
<%= link_to current_team.name, projects_path %>
5+
</li>
6+
</ul>
7+
28
<%= link_to t('back'), admin_users_path, class: "btn btn-primary btn-sm navbar-btn" %>
39
<% end %>
410

511
<div class="row">
6-
<div class="col-sm-12 col-md-6">
7-
<h2><%= t('admin.users.edit user') %></h2>
812

9-
<%= render 'form' %>
13+
<div class="col-xs-12 col-sm-8 col-sm-offset-2">
14+
<div class="page-header">
15+
<h4 class="page-header-title">
16+
<i class="mi md-20">edit</i> <%= t('admin.users.edit user') %>
17+
</h4>
18+
</div>
1019
</div>
1120

12-
<div class="col-sm-12 col-md-6">
13-
<h2><%= Project.model_name.human(count: 2) %></h2>
21+
<div class="col-xs-12 col-sm-5 col-sm-offset-2">
22+
<div class="panel card">
23+
<div class="panel-body">
24+
<%= render 'form' %>
25+
</div>
26+
</div>
27+
</div>
1428

15-
<% if @user.projects.count > 0 %>
16-
<table class="table table-hover">
17-
<% @user.projects.each do |project| %>
18-
<tr>
19-
<td class="lead"><%= link_to project.name, project %></td>
20-
<td>
21-
<%= link_to 'Remove', project_user_path(project, @user),
22-
method: :delete,
23-
class: 'btn btn-danger btn-sm',
24-
data: { confirm: 'Are you sure?' } %>
25-
</td>
26-
</tr>
29+
<div class="col-xs-12 c col-sm-3">
30+
<div class="panel card">
31+
<div class="panel-heading">
32+
<%= Project.model_name.human(count: 2) %>
33+
</div>
34+
<div class="panel-body">
35+
<% if @user.projects.count > 0 %>
36+
<table class="table table-condensed table-striped table-hover admin-users-table">
37+
<% @user.projects.each do |project| %>
38+
<tr>
39+
<td><%= link_to project.name, project %></td>
40+
<td>
41+
<%= link_to 'Remove', project_user_path(project, @user),
42+
method: :delete,
43+
class: 'btn btn-danger btn-sm btn-square pull-right',
44+
data: { confirm: t('admin.users.edit.remove from project confirmation') } %>
45+
</td>
46+
</tr>
47+
<% end %>
48+
</table>
49+
<% else %>
50+
--
2751
<% end %>
28-
</table>
29-
<% else %>
30-
--
31-
<% end %>
52+
</div>
53+
</div>
3254
</div>
3355
</div>

‎app/views/admin/users/index.html.erb‎

Lines changed: 52 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,56 @@
1+
<% content_for :title_bar do %>
2+
<%= link_to t('back'), edit_team_path(current_team), class: "btn btn-primary btn-sm navbar-btn" %>
3+
<% end %>
4+
15
<div class="row">
2-
<div class="col-sm-12">
3-
<h2><%= t('all users') %></h2>
6+
<div class="col-xs-12 col-sm-10 col-sm-offset-1">
7+
<div class="page-header">
8+
<h4 class="page-header-title">
9+
<i class="mi md-20">group</i> <%= t('all users') %>
10+
</h4>
11+
</div>
12+
</div>
413

5-
<table class="table table-hover">
6-
<% @users.order(:name).each do |user| %>
7-
<tr>
8-
<td><%= user.name %></td>
9-
<td><%= user.username %></td>
10-
<td><%= user.initials %></td>
11-
<td><%= user.role %></td>
12-
<td><%= link_to user.email, "mailto:#{user.email}" %></td>
13-
<td>
14-
<div class="users_options btn-group pull-right">
15-
<% if policy(user).update? %>
16-
<%= link_to t('edit'), edit_admin_user_path(user),
17-
class: 'btn btn-default btn-sm' %>
18-
<% if current_team.is_admin?(user) %>
19-
<%= link_to t('users.admin_off'), enrollment_admin_user_path(user, is_admin: false),
20-
data: {confirm: t('.are you sure you want to remove administration rights from this user')},
21-
method: :patch,
22-
class: 'btn btn-warning btn-sm' %>
23-
<% else %>
24-
<%= link_to t('users.admin_on'), enrollment_admin_user_path(user, is_admin: true),
25-
data: {confirm: t('.are you sure you want to give administration rights to this user')},
26-
method: :patch,
27-
class: 'btn btn-primary btn-sm' %>
28-
<% end %>
29-
<%= link_to t('delete'), admin_user_path(user),
30-
data: {confirm: t('.are you sure you want to delete this user')},
31-
method: :delete,
32-
class: 'btn btn-danger btn-sm' %>
33-
<% end %>
34-
</div>
35-
</td>
36-
</tr>
37-
<% end %>
38-
</table>
14+
<div class="col-xs-12 col-sm-10 col-sm-offset-1">
15+
<div class="panel card">
16+
<div class="panel-body">
17+
<table class="table table-condensed table-striped table-hover admin-users-table">
18+
<tbody>
19+
<% @users.order(:name).each do |user| %>
20+
<tr>
21+
<td><%= user.name %></td>
22+
<td><%= user.username %></td>
23+
<td><%= user.initials %></td>
24+
<td><%= user.role %></td>
25+
<td><%= mail_to user.email %></td>
26+
<td>
27+
<div class="users_options btn-group pull-right">
28+
<% if policy(user).update? %>
29+
<%= link_to t('edit'), edit_admin_user_path(user),
30+
class: 'btn btn-default btn-sm btn-square' %>
31+
<% if current_team.is_admin?(user) %>
32+
<%= link_to t('users.admin_off'), enrollment_admin_user_path(user, is_admin: false),
33+
data: {confirm: t('.are you sure you want to remove administration rights from this user')},
34+
method: :patch,
35+
class: 'btn btn-warning btn-sm btn-square' %>
36+
<% else %>
37+
<%= link_to t('users.admin_on'), enrollment_admin_user_path(user, is_admin: true),
38+
data: {confirm: t('.are you sure you want to give administration rights to this user')},
39+
method: :patch,
40+
class: 'btn btn-primary btn-sm btn-square' %>
41+
<% end %>
42+
<%= link_to t('delete'), admin_user_path(user),
43+
data: {confirm: t('.are you sure you want to delete this user')},
44+
method: :delete,
45+
class: 'btn btn-danger btn-sm btn-square' %>
46+
<% end %>
47+
</div>
48+
</td>
49+
</tr>
50+
<% end %>
51+
</tbody>
52+
</table>
53+
</div>
54+
</div>
3955
</div>
4056
</div>

‎app/views/teams/edit.html.erb‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</div>
1212
</div>
1313

14-
<div class="col-xs-12 col-sm-<%= current_user.teams.count > 1 ? "5" : "8" %> col-sm-offset-2">
14+
<div class="col-xs-12 col-sm-5 col-sm-offset-2">
1515
<div class="panel panel-default card">
1616
<div class="panel-body">
1717
<%= render 'form' %>
@@ -55,9 +55,21 @@
5555
</div>
5656
</div>
5757

58+
<div class="col-xs-12 col-sm-3">
59+
<div class="panel panel-default card">
60+
<div class="panel-body">
61+
<% if session[:current_team_slug] && current_team.try(:logo) %>
62+
<div class="text-center">
63+
<img class="user-image" src="<%= current_team.logo.path %>">
64+
</div>
65+
<hr />
66+
<% end %>
5867

59-
<% if current_user.teams.count > 1 %>
60-
<div class="col-xs-12 col-sm-3">
68+
<%= link_to t('teams.members'), admin_users_path, class: 'btn btn-default col-xs-12 btn-square' %>
69+
</div>
70+
</div>
71+
72+
<% if current_user.teams.count > 1 %>
6173
<div class="panel panel-default card">
6274
<div class="panel-heading">
6375
<%= t('teams.switch') %>
@@ -70,6 +82,6 @@
7082
</div>
7183
</div>
7284
</div>
73-
</div>
74-
<% end %>
85+
<% end %>
86+
</div>
7587
</div>

‎config/locales/en.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,14 +295,16 @@ en:
295295
<p>If you don't have a registered account, you can sign up first.</p>
296296
<p>The first user to sign in to this new team will become the administrator.</p>
297297
no_teams_found: "Oops! You're not enrolled to a team yet."
298-
298+
members: "Manage Team Members"
299299
admin:
300300
users:
301301
edit user: "Edit User"
302302
index:
303303
are you sure you want to delete this user: "Are you sure you want to delete this user? This action cannot be undone."
304304
are you sure you want to remove administration rights from this user: "Are you sure you want to remove administration rights from this user?"
305305
are you sure you want to give administration rights to this user: "Are you sure you want to give administration rights to this user?"
306+
edit:
307+
remove from project confirmation: "Are you sure you want to remove the user from this project?"
306308

307309
registrations:
308310
edit:

‎config/locales/es.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ es:
286286
new_instruction: |
287287
<p>Si usted no tiene una cuenta registrada, puede inscribirse en primer lugar.</p>
288288
<p>El primer usuario que acceda a este nuevo equipo será el administrador.</p>
289+
members: "Gestionar los Miembros del Equipo"
289290

290291
admin:
291292
users:
@@ -294,6 +295,8 @@ es:
294295
are you sure you want to delete this user: "¿Estas seguro de querer borrar este miembro? Esta acción no se puede deshacer."
295296
are you sure you want to remove administration rights from this user: "¿Está seguro de que desea eliminar los derechos de administración de este usuario?"
296297
are you sure you want to give administration rights to this user: "¿Está seguro de que desea dar derechos de administrador a este usuario?"
298+
edit:
299+
remove from project confirmation: "¿Estas seguro de querer borrar este usuario del proyecto?"
297300

298301
registrations:
299302
edit:

‎config/locales/pt-BR.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ pt-BR:
294294
team was successfully created: 'Equipe foi criado com sucesso'
295295
team was successfully updated: 'Equipe foi atualizado com sucesso'
296296
no_teams_found: "Oops! Você ainda não está inscrito em uma equipe."
297+
members: "Gerenciar Membros da Equipe"
297298

298299
admin:
299300
users:
@@ -302,6 +303,8 @@ pt-BR:
302303
are you sure you want to delete this user: "Tem certeza de que deseja excluir este usuário? Esta ação não pode ser desfeita."
303304
are you sure you want to remove administration rights from this user: "Tem certeza de que deseja remover direitos de administração deste usuário?"
304305
are you sure you want to give administration rights to this user: "Tem certeza de que quer dar direitos de administração para este usuário?"
306+
edit:
307+
remove from project confirmation: "Tem certeza de que deseja excluir o usuário deste projeto?"
305308

306309
registrations:
307310
edit:

0 commit comments

Comments
 (0)