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" %>
-
+
- <%= 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/search_field", f: f, placeholder: "Search member...", aria_label: "Search member by name, username, email, or Twitter/GitHub usernames" %>
+ <%= render "admin/users/index/search_field", f: f, context: "small", placeholder: "Search member...", aria_label: "Search member by name, username, email, or Twitter/GitHub usernames" %>
- <%= render "admin/users/index/filter_role_field", f: f %>
+ <%= render "admin/users/index/filter_role_field", f: f, context: "small" %>
<%= render "admin/users/index/controls/export", f: f %>
@@ -34,16 +34,16 @@
<%= form_with url: admin_users_path, method: :get, local: true, class: "flex flex-col m:flex-row gap-3 m:items-center py-3" do |f| %>
- <%= render "admin/users/index/search_field", f: f, placeholder: "Search member...", aria_label: "Search member by name, username, email, or Twitter/GitHub usernames" %>
+ <%= render "admin/users/index/search_field", f: f, context: "medium", placeholder: "Search member...", aria_label: "Search member by name, username, email, or Twitter/GitHub usernames" %>
- <%= render "admin/users/index/filter_role_field", f: f %>
+ <%= render "admin/users/index/filter_role_field", f: f, context: "medium" %>
<%= render "admin/users/index/controls/export", f: f %>
<% end %>
- <%= paginate @users, theme: "admin", scope: @users, label: "Paginate users" %>
+ <%= paginate @users, theme: "admin", scope: @users, label: "Paginate users", context: "medium" %>
<% 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 @@
-
+
-
<%= link_to user.name, admin_user_path(user) %>
+
<%= link_to user.name, admin_user_path(user), class: "c-link" %>
@<%= user.username %>
diff --git a/app/views/admin/users/index/_search_field.html.erb b/app/views/admin/users/index/_search_field.html.erb
index e466c4eff..17e270bc6 100644
--- a/app/views/admin/users/index/_search_field.html.erb
+++ b/app/views/admin/users/index/_search_field.html.erb
@@ -1,5 +1,5 @@
- <%= f.text_field :search, value: params[:search], class: "crayons-textfield mt-0", placeholder: placeholder, aria: { label: aria_label } %>
+ <%= f.text_field :search, id: "search-#{context}", value: params[:search], class: "crayons-textfield mt-0", placeholder: placeholder, aria: { label: aria_label } %>
diff --git a/app/views/kaminari/admin/_next_page.html.erb b/app/views/kaminari/admin/_next_page.html.erb
index 6b70d7b5b..66edaa984 100644
--- a/app/views/kaminari/admin/_next_page.html.erb
+++ b/app/views/kaminari/admin/_next_page.html.erb
@@ -1,4 +1,4 @@
<%= link_to_unless current_page.last?, crayons_icon_tag("chevron-right", aria_hidden: true, class: ("admin-pagination--inactive mx-1" if current_page.last?).to_s), url, rel: "next", remote: remote, class: "admin-pagination--link c-link c-link--icon-alone c-link--block",
- aria: { label: t("views.pagination.aria_next"), describedby: "pagination-description" } %>
+ aria: { label: t("views.pagination.aria_next"), describedby: "pagination-description-#{context}" } %>
diff --git a/app/views/kaminari/admin/_paginator.html.erb b/app/views/kaminari/admin/_paginator.html.erb
index 5fabf19bb..5eb66655a 100644
--- a/app/views/kaminari/admin/_paginator.html.erb
+++ b/app/views/kaminari/admin/_paginator.html.erb
@@ -1,6 +1,6 @@
<%= paginator.render do %>