From 7c9864f49be103bc1081d001c78de87cf01af1ac Mon Sep 17 00:00:00 2001 From: Chris Lowis Date: Wed, 27 Sep 2023 15:26:58 +0100 Subject: [PATCH 1/2] Use secondary quiet button for "Upload a batch of users" We identified this change during a design review. --- app/views/users/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index af82ebb2b..46b32efd5 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -25,7 +25,7 @@ <%= render "govuk_publishing_components/components/button", { text: "Upload a batch of users", href: new_batch_invitation_path, - secondary: true, + secondary_quiet: true, margin_bottom: 4, } %> <% end %> From 1c820d9e40df918e443763d8d9c65e2d52697c30 Mon Sep 17 00:00:00 2001 From: Chris Lowis Date: Thu, 28 Sep 2023 16:50:14 +0100 Subject: [PATCH 2/2] Remove 2SV abbr tag from /users table Using isn't consistent with the design system so we're removing it. --- app/helpers/users_helper.rb | 4 ---- app/views/users/index.html.erb | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index fd5f5c2f0..f4d8e631c 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,8 +1,4 @@ module UsersHelper - def two_step_abbr_tag - tag.abbr("2SV", title: "Two step verification") - end - def two_step_status(user) user.two_step_status.humanize.capitalize end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 46b32efd5..aafeda413 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -48,7 +48,7 @@ { text: "Email" }, { text: "Role" }, { text: "Status" }, - { text: "#{two_step_abbr_tag} Status".html_safe }, + { text: "2SV Status" }, ], rows: @users.map do |user| [