From 195a2bd58d5eb844ea6c0c977fda4ecbe0a01b59 Mon Sep 17 00:00:00 2001 From: Andrew White Date: Thu, 23 May 2024 18:50:49 +0100 Subject: [PATCH 1/2] Update CSS for Rails 7.1 button_to changes The button_to helper now generates buttons and not inputs. --- app/assets/stylesheets/petitions/admin/views/_shared.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/petitions/admin/views/_shared.scss b/app/assets/stylesheets/petitions/admin/views/_shared.scss index 226797ddf..b646c52e1 100644 --- a/app/assets/stylesheets/petitions/admin/views/_shared.scss +++ b/app/assets/stylesheets/petitions/admin/views/_shared.scss @@ -93,7 +93,7 @@ .button_to { display: inline-block; - input[type=submit] { + button, input[type=submit] { margin: 0; font-size: 12px; padding: 2px 8px; From 5bb1b21967224153e513fd2c417bc5988943e9ad Mon Sep 17 00:00:00 2001 From: Andrew White Date: Thu, 23 May 2024 18:51:19 +0100 Subject: [PATCH 2/2] Add subscribe/unsubscribe buttons for creators --- app/views/admin/signatures/_signature.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/admin/signatures/_signature.html.erb b/app/views/admin/signatures/_signature.html.erb index 869b3bb42..42a4fb1e7 100644 --- a/app/views/admin/signatures/_signature.html.erb +++ b/app/views/admin/signatures/_signature.html.erb @@ -54,7 +54,11 @@ <% if signature.pending? %> <%= button_to 'Validate', validate_admin_signature_path(signature, search_params), method: :post, class: 'button validate-action', data: { confirm: 'Validate signature?' } %> <% else %> -   + <% if signature.subscribed? %> + <%= button_to 'Unsubscribe', [:unsubscribe, :admin, @petition, signature, search_params].compact, method: :post, class: 'button unsubscribe-action', data: { confirm: 'Unsubscribe signature?' } %> + <% else %> + <%= button_to 'Subscribe', [:subscribe, :admin, @petition, signature, search_params].compact, method: :post, class: 'button subscribe-action', data: { confirm: 'Subscribe signature?' } %> + <% end %> <% end %> <% else %> <% if signature.validated? %>