summaryrefslogtreecommitdiff
path: root/app/views/groups
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-22 22:23:29 -0700
committerGeorge Tsiolis <tsiolis.g@gmail.com>2019-08-05 11:21:41 +0300
commited29ce3622a82641ecb1e40cf596e1967dd1c19a (patch)
treed439e63851d2cc184f2e7770a2a6febf5dd78b7a /app/views/groups
parentcaac3104c4e77a40ad8ec3d1275f7b47c0fc8f68 (diff)
downloadgitlab-ce-ed29ce3622a82641ecb1e40cf596e1967dd1c19a.tar.gz
Add tabs to switch between current/invited members
Diffstat (limited to 'app/views/groups')
-rw-r--r--app/views/groups/group_members/index.html.haml87
1 files changed, 46 insertions, 41 deletions
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
index ddbf89a5fb7..cc4e8b0c31b 100644
--- a/app/views/groups/group_members/index.html.haml
+++ b/app/views/groups/group_members/index.html.haml
@@ -1,5 +1,6 @@
- page_title "Members"
- can_manage_members = can?(current_user, :admin_group_member, @group)
+- show_invited_members = can_manage_members && @invited_members.exists?
.project-members-page.prepend-top-default
%h4
@@ -16,45 +17,49 @@
= render_if_exists 'groups/group_members/ldap_sync'
- .clearfix
- %h5.member.existing-title
- Existing members
- .card
- .card-header.flex-project-members-panel
- %span.flex-project-title
- Members with access to
- %strong= @group.name
- %span.badge.badge-pill= @members.total_count
- = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
- .form-group
- .position-relative.append-right-8
- = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
- %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
- = icon("search")
- - if can_manage_members
- = render 'shared/members/filter_2fa_dropdown'
- = render 'shared/members/sort_dropdown'
- %ul.content-list.members-list
- = render partial: 'shared/members/member', collection: @members, as: :member
- = paginate @members, theme: 'gitlab'
+ %ul.nav-links.mobile-separator.nav.nav-tabs.clearfix
+ %li.nav-item
+ = link_to "Existing members", "#existing_members", class: "nav-link active", 'data-toggle' => 'tab'
+ - if show_invited_members
+ %li.nav-item
+ = link_to "Invited members", "#invited_members", class: "nav-link", 'data-toggle' => 'tab'
+
+ .tab-content
+ #existing_members.tab-pane.active
+ .card
+ .card-header.flex-project-members-panel
+ %span.flex-project-title
+ Members with access to
+ %strong= @group.name
+ %span.badge.badge-pill= @members.total_count
+ = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
+ .form-group
+ .position-relative.append-right-8
+ = search_field_tag :search, params[:search], { placeholder: 'Find existing members by name', class: 'form-control', spellcheck: false }
+ %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
+ = icon("search")
+ - if can_manage_members
+ = render 'shared/members/filter_2fa_dropdown'
+ = render 'shared/members/sort_dropdown'
+ %ul.content-list.members-list
+ = render partial: 'shared/members/member', collection: @members, as: :member
+ = paginate @members, theme: 'gitlab'
- - if can_manage_members && @invited_members.exists?
- .clearfix
- %h5.member.existing-title
- Invited members
- .card
- .card-header.flex-project-members-panel
- %span.flex-project-title
- Pending members to
- %strong= @group.name
- %span.badge.badge-pill= @invited_members.total_count
- = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
- .form-group
- .position-relative.append-right-8
- = search_field_tag :search_invited, params[:search_invited], { placeholder: 'Find invited members by e-mail', class: 'form-control', spellcheck: false }
- %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
- = icon("search")
- = render 'shared/members/sort_dropdown'
- %ul.content-list.invited-members-list
- = render partial: 'shared/members/member', collection: @invited_members, as: :member
- = paginate @invited_members, param_name: 'invited_members_page', theme: 'gitlab'
+ - if show_invited_members
+ #invited_members.tab-pane
+ .card
+ .card-header.flex-project-members-panel
+ %span.flex-project-title
+ Pending members to
+ %strong= @group.name
+ %span.badge.badge-pill= @invited_members.total_count
+ = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
+ .form-group
+ .position-relative.append-right-8
+ = search_field_tag :search_invited, params[:search_invited], { placeholder: 'Find invited members by e-mail', class: 'form-control', spellcheck: false }
+ %button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
+ = icon("search")
+ = render 'shared/members/sort_dropdown'
+ %ul.content-list.invited-members-list
+ = render partial: 'shared/members/member', collection: @invited_members, as: :member
+ = paginate @invited_members, param_name: 'invited_members_page', theme: 'gitlab'