diff --git a/app/views/admin/users/_member_index.html.erb b/app/views/admin/users/_member_index.html.erb new file mode 100644 index 000000000..95122f495 --- /dev/null +++ b/app/views/admin/users/_member_index.html.erb @@ -0,0 +1,30 @@ +
+
+

Members

+ <%= render "admin/users/index/tabs" %> +
+ + <%= render "admin/users/index/controls" %> + + <%= paginate @users, theme: "internal" %> + + + + + + + + + + + + <% @users.each do |user| %> + + + + <% end %> + +
MemberStatusLast activity & Joined onOrganizations
<%= link_to user.name, admin_user_path(user) %>
+ + <%= paginate @users, theme: "internal" %> +
diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index 3318062d8..5b47e7c99 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -1,41 +1,5 @@ <% if FeatureFlag.enabled?(:member_index_view) %> -
-
-

Members

- <%= render "admin/users/index/tabs" %> -
- - <%= render "admin/users/index/controls" %> - - <%= paginate @users, theme: "internal" %> - - - - - - - - - - - - - - <% @users.each do |user| %> - - - - - - - - - <% end %> - -
UsernameIDNameTwitterGitHubEmail
<%= link_to user.username, admin_user_path(user) %><%= user.id %><%= user.name %><%= user_twitter_link(user) %><%= user_github_link(user) %><%= user.email %>
- - <%= paginate @users, theme: "internal" %> -
+ <%= render "admin/users/member_index" %> <% else %>

People

diff --git a/app/views/admin/users/index/_controls.html.erb b/app/views/admin/users/index/_controls.html.erb index 5daaab0f5..8ec5c9dbe 100644 --- a/app/views/admin/users/index/_controls.html.erb +++ b/app/views/admin/users/index/_controls.html.erb @@ -1,16 +1,30 @@ -<% if params[:controller] == "admin/users" %> - <%= form_with url: admin_users_path, method: :get, local: true, class: "flex flex-col m:flex-row gap-3 m:items-center p-3" do |f| %> -
- <%= f.label :search, class: "crayons-field__label whitespace-nowrap" %> - <%= f.text_field :search, value: params[:search], class: "crayons-textfield mt-0", placeholder: "Name, username, email, or Twitter/GitHub usernames", aria: { label: "Filter by name, username, email, or Twitter/GitHub usernames" } %> -
-
- <%= f.label :role, "Filter by Role", class: "crayons-field__label whitespace-nowrap" %> - <%= f.select :role, options_for_select(Role::ROLES, params[:role]), { include_blank: true }, class: "crayons-select mt-0" %> -
- <%= f.submit "Filter", class: "c-btn c-btn--secondary" %> +<% if FeatureFlag.enabled?(:member_index_view) %> + <% if params[:controller] == "admin/users" %> + <%= form_with url: admin_users_path, method: :get, local: true, class: "flex flex-col m:flex-row gap-3 m:items-center p-3" do |f| %> +
+ <%= f.text_field :search, value: params[:search], class: "crayons-textfield mt-0", placeholder: "Search member...", aria: { label: "Search member by name, username, email, or Twitter/GitHub usernames" } %> +
+
+ <%= f.select :role, options_for_select(Role::ROLES, params[:role]), { include_blank: true, prompt: "Filter by role..." }, class: "crayons-select mt-0" %> +
+ <%= f.submit "Filter", class: "c-btn c-btn--secondary" %> + <% end %> + <% end %> +<% else %> + <% if params[:controller] == "admin/users" %> + <%= form_with url: admin_users_path, method: :get, local: true, class: "flex flex-col m:flex-row gap-3 m:items-center p-3" do |f| %> +
+ <%= f.label :search, class: "crayons-field__label whitespace-nowrap" %> + <%= f.text_field :search, value: params[:search], class: "crayons-textfield mt-0", placeholder: "Name, username, email, or Twitter/GitHub usernames", aria: { label: "Filter by name, username, email, or Twitter/GitHub usernames" } %> +
+
+ <%= f.label :role, "Filter by Role", class: "crayons-field__label whitespace-nowrap" %> + <%= f.select :role, options_for_select(Role::ROLES, params[:role]), { include_blank: true }, class: "crayons-select mt-0" %> +
+ <%= f.submit "Filter", class: "c-btn c-btn--secondary" %> + <% end %> + <% end %> + <% if params[:controller] == "admin/invitations" %> + <%= link_to "New", new_admin_invitation_path, class: "c-cta self-end" %> <% end %> <% end %> -<% if params[:controller] == "admin/invitations" %> - <%= link_to "New", new_admin_invitation_path, class: "c-cta self-end" %> -<% end %>