From 239b0a430d063e0249ff351109da3adf18fb5312 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 11 Apr 2025 12:48:24 -0500 Subject: [PATCH 01/15] Don't show the engagement toggle on closed cards --- app/views/cards/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index c4a621a00..cae272b79 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -23,7 +23,7 @@ <%= link_to_home %> <%= link_to_back fallback_path: cards_path(collection_id: @card.collection) %> - <% if @card.published? %> + <% if @card.published? && !@card.closed? %>
<%= form_with url: card_engagement_path(@card), method: :delete, data: { controller: "form" } do |form| %> From 0c5b875dedee0b3e0381af29ae79ff72b91cae53 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 11 Apr 2025 12:55:11 -0500 Subject: [PATCH 02/15] Update `card-color` in a couple more places --- app/views/cards/_closure_toggle.html.erb | 2 +- app/views/cards/show.html.erb | 2 +- app/views/cards/stagings/create.turbo_stream.erb | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/cards/_closure_toggle.html.erb b/app/views/cards/_closure_toggle.html.erb index 6ad45c388..0904c02f8 100644 --- a/app/views/cards/_closure_toggle.html.erb +++ b/app/views/cards/_closure_toggle.html.erb @@ -1,4 +1,4 @@ -
+
<% if card.closed? %> Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>. <%= button_to card_closure_path(card), method: :delete, class: "btn btn--plain borderless fill-transparent" do %> diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index cae272b79..3193e01c2 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -24,7 +24,7 @@ <%= link_to_back fallback_path: cards_path(collection_id: @card.collection) %> <% if @card.published? && !@card.closed? %> -
+
<%= form_with url: card_engagement_path(@card), method: :delete, data: { controller: "form" } do |form| %> <%= form.label :engagement, value: "considering", class: "btn", aria: { label: "Move to Doing"} do %> diff --git a/app/views/cards/stagings/create.turbo_stream.erb b/app/views/cards/stagings/create.turbo_stream.erb index ca33c37bb..ac3942d6a 100644 --- a/app/views/cards/stagings/create.turbo_stream.erb +++ b/app/views/cards/stagings/create.turbo_stream.erb @@ -2,5 +2,7 @@ <%= render partial: "cards/stagings/stages", locals: { card: @card } %> <% end %> +<%= turbo_stream.set_css_variable dom_id(@card, :card_closure_toggle), name: "--card-color", value: @card.color %> <%= turbo_stream.set_css_variable dom_id(@card, :card_container), name: "--card-color", value: @card.color %> +<%= turbo_stream.set_css_variable dom_id(@card, :card_engagement_toggle), name: "--card-color", value: @card.color %> <%= turbo_stream.set_css_variable dom_id(@card, :ticket), name: "--card-color", value: @card.color %> From 0f103afb123516e1510d5c9b34e083cc7e1bb32f Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 11 Apr 2025 12:56:53 -0500 Subject: [PATCH 03/15] Nicer spacing when the large button isn't present --- app/views/cards/_closure_toggle.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/cards/_closure_toggle.html.erb b/app/views/cards/_closure_toggle.html.erb index 0904c02f8..246464dc3 100644 --- a/app/views/cards/_closure_toggle.html.erb +++ b/app/views/cards/_closure_toggle.html.erb @@ -1,8 +1,8 @@
<% if card.closed? %> - Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>. + Completed by <%= card.closed_by.name %> on <%= local_datetime_tag(card.closed_at, style: :shortdate) %>. <%= button_to card_closure_path(card), method: :delete, class: "btn btn--plain borderless fill-transparent" do %> - Un-do + Un-do <% end %> <% else %>
From 2934eb03f903fab2a2ee9e17e5f9b4cc7a7a4e92 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Fri, 11 Apr 2025 13:04:19 -0500 Subject: [PATCH 04/15] Some actions shouldn't be available to closed cards --- app/views/cards/_image.html.erb | 2 +- app/views/cards/display/common/_assignees.html.erb | 2 +- app/views/cards/display/perma/_tags.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/cards/_image.html.erb b/app/views/cards/_image.html.erb index b7b037be1..c1617792e 100644 --- a/app/views/cards/_image.html.erb +++ b/app/views/cards/_image.html.erb @@ -3,7 +3,7 @@ <%= icon_tag "picture-remove" %> Clear background image <% end %> -<% else %> +<% elsif !card.closed? %> <%= form_with model: card, url: collection_card_path(card.collection, card), data: { controller: "form" } do |form| %>