Commit a28bc409fcedfbd668ab9be725b451d5c02ba5cb
1 parent
c5add8fe
Exists in
master
and in
4 other branches
Improve project team page usability
Showing
3 changed files
with
5 additions
and
5 deletions
Show diff stats
app/views/projects/team_members/_group_members.html.haml
| 1 | .ui-box | 1 | .ui-box |
| 2 | .title | 2 | .title |
| 3 | - %strong #{@group.name} Group | ||
| 4 | - members (#{@group.users_groups.count}) | 3 | + %strong #{@group.name} |
| 4 | + group members (#{@group.users_groups.count}) | ||
| 5 | .pull-right | 5 | .pull-right |
| 6 | = link_to members_group_path(@group), class: 'btn btn-small' do | 6 | = link_to members_group_path(@group), class: 'btn btn-small' do |
| 7 | %i.icon-edit | 7 | %i.icon-edit |
app/views/projects/team_members/_team.html.haml
| @@ -2,8 +2,8 @@ | @@ -2,8 +2,8 @@ | ||
| 2 | - can_admin_project = (can? current_user, :admin_project, @project) | 2 | - can_admin_project = (can? current_user, :admin_project, @project) |
| 3 | .ui-box | 3 | .ui-box |
| 4 | .title | 4 | .title |
| 5 | - %strong #{@project.name} Project | ||
| 6 | - members (#{members.count}) | 5 | + %strong #{@project.name} |
| 6 | + project members (#{members.count}) | ||
| 7 | %ul.well-list | 7 | %ul.well-list |
| 8 | - members.each do |team_member| | 8 | - members.each do |team_member| |
| 9 | = render 'team_member', member: team_member, current_user_can_admin_project: can_admin_project | 9 | = render 'team_member', member: team_member, current_user_can_admin_project: can_admin_project |
app/views/projects/team_members/index.html.haml
| @@ -11,6 +11,6 @@ | @@ -11,6 +11,6 @@ | ||
| 11 | %p.light | 11 | %p.light |
| 12 | Read more about project permissions | 12 | Read more about project permissions |
| 13 | %strong= link_to "here", help_permissions_path, class: "vlink" | 13 | %strong= link_to "here", help_permissions_path, class: "vlink" |
| 14 | += render "team", members: @users_projects | ||
| 14 | - if @group | 15 | - if @group |
| 15 | = render "group_members" | 16 | = render "group_members" |
| 16 | -= render "team", members: @users_projects |