Move group members index from `/members` to `/group_members`.

2 files changed, 58 insertions, 0 deletions

diff --git a/app/views/groups/group_members/_new_group_member.html.haml b/app/views/groups/group_members/_new_group_member.html.haml
new file mode 100644
index 00000000000..c4c29bb2e8d
--- /dev/null
+++ b/app/views/groups/group_members/_new_group_member.html.haml
@@ -0,0 +1,15 @@
+= form_for @group_member, url: group_group_members_path(@group), html: { class: 'form-horizontal users-group-form' } do |f|
+  .form-group
+    = f.label :user_ids, "People", class: 'control-label'
+    .col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large')
+
+  .form-group
+    = f.label :access_level, "Group Access", class: 'control-label'
+    .col-sm-10
+      = select_tag :access_level, options_for_select(GroupMember.access_level_roles, @group_member.access_level), class: "project-access-select select2"
+      .help-block
+        Read more about role permissions
+        %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
+
+  .form-actions
+    = f.submit 'Add users to group', class: "btn btn-create"
diff --git a/app/views/groups/group_members/index.html.haml b/app/views/groups/group_members/index.html.haml
new file mode 100644
index 00000000000..0d501fe7bd3
--- /dev/null
+++ b/app/views/groups/group_members/index.html.haml
@@ -0,0 +1,43 @@
+- show_roles = should_user_see_group_roles?(current_user, @group)
+
+%h3.page-title
+  Group members
+- if show_roles
+  %p.light
+    Members of group have access to all group projects.
+    Read more about permissions
+    %strong= link_to "here", help_page_path("permissions", "permissions"), class: "vlink"
+
+%hr
+
+.clearfix.js-toggle-container
+  = form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form'  do
+    .form-group
+      = search_field_tag :search, params[:search], { placeholder: 'Find existing member by name', class: 'form-control search-text-input input-mn-300' }
+    = button_tag 'Search', class: 'btn'
+
+  - if current_user && current_user.can?(:manage_group, @group)
+    .pull-right
+      = button_tag class: 'btn btn-new js-toggle-button', type: 'button' do
+        Add members
+        %i.fa.fa-chevron-down
+
+    .js-toggle-content.hide.new-group-member-holder
+      = render "new_group_member"
+
+.panel.panel-default.prepend-top-20
+  .panel-heading
+    %strong #{@group.name}
+    group members
+    %small
+      (#{@members.total_count})
+  %ul.well-list
+    - @members.each do |member|
+      = render 'groups/group_members/group_member', member: member, show_roles: show_roles, show_controls: true
+
+= paginate @members, theme: 'gitlab'
+
+:coffeescript
+  $('form.member-search-form').on 'submit', (event) ->
+    event.preventDefault()
+    Turbolinks.visit @.action + '?' + $(@).serialize()