diff --git a/app/views/admin/invitations/index.html.erb b/app/views/admin/invitations/index.html.erb index 306841676..d36bd1a6e 100644 --- a/app/views/admin/invitations/index.html.erb +++ b/app/views/admin/invitations/index.html.erb @@ -6,15 +6,15 @@ <%= render "admin/users/index/tabs" %>
- <%= form_with url: admin_invitations_path, method: :get, local: true, class:"grow-1" do |f| %> - <% render "admin/users/index/search_field", f: f, placeholder: "Search invited members...", aria_label: "Search invited members by name, username, or email" %> + <%= form_with url: admin_invitations_path, method: :get, local: true, class: "grow-1" do |f| %> + <% render "admin/users/index/search_field", f: f, placeholder: "Search invited members...", aria_label: "Search invited members by name, username, or email", context: "invitations" %> <% end %>
- <%= paginate @invitations, theme: "admin", scope: @invitations, label: "Paginate invitations" %> + <%= paginate @invitations, theme: "admin", scope: @invitations, label: "Paginate invitations", context: "top" %> <%= link_to "Invite member", new_admin_invitation_path, class: "c-cta c-cta--branded self-end" %>
- + @@ -47,7 +47,7 @@
- <%= paginate @invitations, theme: "admin", scope: @invitations, label: "Paginate invitations" %> + <%= paginate @invitations, theme: "admin", scope: @invitations, label: "Paginate invitations", context: "bottom" %>
<% else %> diff --git a/app/views/admin/users/_member_index.html.erb b/app/views/admin/users/_member_index.html.erb index 8937e36d9..bb6a2f814 100644 --- a/app/views/admin/users/_member_index.html.erb +++ b/app/views/admin/users/_member_index.html.erb @@ -98,7 +98,7 @@ -
- <%= paginate @users, theme: "admin", scope: @users, label: "Paginate users" %> +
+ <%= paginate @users, theme: "admin", scope: @users, label: "Paginate users", context: "bottom" %>
diff --git a/app/views/admin/users/index/_controls.html.erb b/app/views/admin/users/index/_controls.html.erb index 4347d30fa..81c9d6f58 100644 --- a/app/views/admin/users/index/_controls.html.erb +++ b/app/views/admin/users/index/_controls.html.erb @@ -15,14 +15,14 @@ ">
- <%= paginate @users, theme: "admin", scope: @users, label: "Paginate users" %> + <%= paginate @users, theme: "admin", scope: @users, label: "Paginate users", context: "small" %>
<%= render "admin/users/index/controls/export", f: f %> @@ -34,16 +34,16 @@ <% end %> diff --git a/app/views/admin/users/index/_filter_role_field.html.erb b/app/views/admin/users/index/_filter_role_field.html.erb index b17876916..1fe6a7b0f 100644 --- a/app/views/admin/users/index/_filter_role_field.html.erb +++ b/app/views/admin/users/index/_filter_role_field.html.erb @@ -1,2 +1,2 @@ -<%= f.select :role, options_for_select(Role::ROLES, params[:role]), { include_blank: "All roles" }, aria: { label: "User role" }, class: "crayons-select" %> +<%= f.select :role, options_for_select(Role::ROLES, params[:role]), { include_blank: "All roles" }, aria: { label: "User role" }, class: "crayons-select", id: "filter-#{context}" %> <%= f.submit "Filter", class: "c-btn c-btn--secondary mt-0" %> diff --git a/app/views/admin/users/index/_member_data.html.erb b/app/views/admin/users/index/_member_data.html.erb index cf79d368c..2b6175b77 100644 --- a/app/views/admin/users/index/_member_data.html.erb +++ b/app/views/admin/users/index/_member_data.html.erb @@ -1,8 +1,8 @@ - + <%= user.name %>
-

<%= link_to user.name, admin_user_path(user) %>

+

<%= link_to user.name, admin_user_path(user), class: "c-link" %>

@<%= user.username %>