diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-02 18:05:06 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-14 13:18:14 +0200 |
| commit | 515205d3c1c6655302ed0ae44cc5954dead7ae79 (patch) | |
| tree | 5ac24884eb0e6faf56e1e460260303fbdb14b9cf /app/views/projects/project_members | |
| parent | 6d103a2f4764441b1650ba6d790732056c9a8516 (diff) | |
| download | gitlab-ce-515205d3c1c6655302ed0ae44cc5954dead7ae79.tar.gz | |
UI and copywriting improvements13948-access-request-to-projects-and-groups
+ Move 'Edit Project/Group' out of membership-related partial
+ Show the access request buttons only to logged-in users
+ Put the request access buttons out of in a more visible button
+ Improve the copy in the #remove_member_message helper
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/views/projects/project_members')
| -rw-r--r-- | app/views/projects/project_members/_group_members.html.haml | 10 | ||||
| -rw-r--r-- | app/views/projects/project_members/index.html.haml | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/app/views/projects/project_members/_group_members.html.haml b/app/views/projects/project_members/_group_members.html.haml index 78c12d52a78..cb6136c215a 100644 --- a/app/views/projects/project_members/_group_members.html.haml +++ b/app/views/projects/project_members/_group_members.html.haml @@ -6,8 +6,9 @@ (#{members.count}) - if can?(current_user, :admin_group_member, @group) .controls - = link_to group_group_members_path(@group), class: 'btn' do - Manage group members + = link_to 'Manage group members', + group_group_members_path(@group), + class: 'btn' %ul.content-list = render partial: 'shared/members/member', collection: members.limit(20), @@ -15,7 +16,4 @@ locals: { show_controls: false } - if members.size > 20 %li - and - = members.size - 20 - more. For full list visit - = link_to 'group members page', group_group_members_path(@group) + and #{members.count - 20} more. For full list visit #{link_to 'group members page', group_group_members_path(@group)} diff --git a/app/views/projects/project_members/index.html.haml b/app/views/projects/project_members/index.html.haml index 61a82724d69..357ccccaf1d 100644 --- a/app/views/projects/project_members/index.html.haml +++ b/app/views/projects/project_members/index.html.haml @@ -13,9 +13,9 @@ Users with access to this project are listed below. = render "new_project_member" - = render "shared/members/requests", entity: @project, members: @project_members + = render 'shared/members/requests', membership_source: @project, members: @project_members.request - = render "team", members: @project_members.non_request + = render 'team', members: @project_members.non_request - if @group = render "group_members", members: @group_members |