From 5fac18d01f2daf5118f9a6ca2759ffa7ebf1f8d6 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Thu, 20 Nov 2025 14:35:08 -0600 Subject: [PATCH 01/11] Restore auto-postponed events to the timeline --- app/models/user/day_timeline.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/user/day_timeline.rb b/app/models/user/day_timeline.rb index 623433126..9ac3e296c 100644 --- a/app/models/user/day_timeline.rb +++ b/app/models/user/day_timeline.rb @@ -55,6 +55,7 @@ class User::DayTimeline card_collection_changed card_board_changed card_postponed + card_auto_postponed card_triaged card_sent_back_to_triage comment_created From 86932803e4ccb9e27c29bb10db1ac92cdc25150b Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Thu, 20 Nov 2025 14:36:06 -0600 Subject: [PATCH 02/11] Clarify not now move actions copy --- app/helpers/webhooks_helper.rb | 2 +- app/models/card/eventable/system_commenter.rb | 2 +- app/models/event/description.rb | 2 +- app/views/account/settings/_entropy.html.erb | 2 +- app/views/cards/container/_closure.html.erb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/webhooks_helper.rb b/app/helpers/webhooks_helper.rb index e0e0e3387..f3bb077c8 100644 --- a/app/helpers/webhooks_helper.rb +++ b/app/helpers/webhooks_helper.rb @@ -10,7 +10,7 @@ module WebhooksHelper card_closed: "Card moved to “Done”", card_reopened: "Card reopened", card_postponed: "Card moved to “Not Now”", - card_auto_postponed: "Card auto-closed as “Not Now”", + card_auto_postponed: "Card moved to “Not Now” due to inactivity", card_sent_back_to_triage: "Card moved back to “Maybe?”" }.with_indifferent_access.freeze diff --git a/app/models/card/eventable/system_commenter.rb b/app/models/card/eventable/system_commenter.rb index ace5701bf..0c9fe3517 100644 --- a/app/models/card/eventable/system_commenter.rb +++ b/app/models/card/eventable/system_commenter.rb @@ -25,7 +25,7 @@ class Card::Eventable::SystemCommenter when "card_postponed" "#{event.creator.name} moved this to “Not Now”" when "card_auto_postponed" - "Closed as “Not Now” due to inactivity" + "Moved to “Not Now” due to inactivity" when "card_title_changed" "#{event.creator.name} changed the title from “#{event.particulars.dig('particulars', 'old_title')}” to “#{event.particulars.dig('particulars', 'new_title')}”." when "card_board_changed" diff --git a/app/models/event/description.rb b/app/models/event/description.rb index 7718a795c..672784ddb 100644 --- a/app/models/event/description.rb +++ b/app/models/event/description.rb @@ -64,7 +64,7 @@ class Event::Description when "card_postponed" %(#{creator} moved #{card_title} to "Not Now") when "card_auto_postponed" - %(#{card_title} was closed as "Not Now" due to inactivity) + %(#{card_title} moved to "Not Now" due to inactivity) when "card_resumed" "#{creator} resumed #{card_title}" when "card_title_changed" diff --git a/app/views/account/settings/_entropy.html.erb b/app/views/account/settings/_entropy.html.erb index 11ff9b326..59972e608 100644 --- a/app/views/account/settings/_entropy.html.erb +++ b/app/views/account/settings/_entropy.html.erb @@ -1,7 +1,7 @@

Auto close

-

Fizzy doesn’t let stale cards stick around forever. Cards automatically close as “Not Now” without activity for specific period of time. This is the default, global setting — you can override it on each board.

+

Fizzy doesn’t let stale cards stick around forever. Cards automatically move to “Not Now” without activity for specific period of time. This is the default, global setting — you can override it on each board.

<%= render "entropy/auto_close", model: account.entropy, url: account_entropy_path, disabled: !Current.user.admin? %> diff --git a/app/views/cards/container/_closure.html.erb b/app/views/cards/container/_closure.html.erb index 6fa2fed57..f7c69a98d 100644 --- a/app/views/cards/container/_closure.html.erb +++ b/app/views/cards/container/_closure.html.erb @@ -12,7 +12,7 @@
<% if card.entropic? && card.open? && !card.postponed? %>
- Closes as “Not Now” <%= local_datetime_tag(card.entropy.auto_clean_at, style: :indays) -%> if there’s no activity. + Moves to “Not Now” <%= local_datetime_tag(card.entropy.auto_clean_at, style: :indays) -%> if there’s no activity.
<% end %>
From 31d3aea3fadcd1fe57fe62046d3cf1adbda28255 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Thu, 20 Nov 2025 15:28:46 -0600 Subject: [PATCH 03/11] More copy edits --- app/views/account/settings/_entropy.html.erb | 2 +- app/views/boards/edit/_auto_close.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/account/settings/_entropy.html.erb b/app/views/account/settings/_entropy.html.erb index 59972e608..ec9c58302 100644 --- a/app/views/account/settings/_entropy.html.erb +++ b/app/views/account/settings/_entropy.html.erb @@ -1,7 +1,7 @@

Auto close

-

Fizzy doesn’t let stale cards stick around forever. Cards automatically move to “Not Now” without activity for specific period of time. This is the default, global setting — you can override it on each board.

+

Fizzy doesn’t let stale cards stick around forever. Cards automatically move to “Not Now” if there is no activity for specific period of time. This is the default, global setting — you can override it on each board.

<%= render "entropy/auto_close", model: account.entropy, url: account_entropy_path, disabled: !Current.user.admin? %> diff --git a/app/views/boards/edit/_auto_close.html.erb b/app/views/boards/edit/_auto_close.html.erb index 2e4dc55a2..c32c1c050 100644 --- a/app/views/boards/edit/_auto_close.html.erb +++ b/app/views/boards/edit/_auto_close.html.erb @@ -1,7 +1,7 @@ <%= turbo_frame_tag @board, :entropy do %>

Auto close

-

Fizzy doesn’t let stale cards stick around forever. Cards automatically close as “Not now” if no one updates, comments, or moves a card for…

+

Fizzy doesn’t let stale cards stick around forever. Cards automatically move to “Not now” if no one updates, comments, or moves a card for…

<%= render "entropy/auto_close", model: board, url: board_entropy_path(board), disabled: !Current.user.can_administer_board?(@board) %>
<% end %> From 6af569ddd8aea71112c2ede5659fc88647d83c73 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Thu, 20 Nov 2025 15:29:38 -0600 Subject: [PATCH 04/11] Use move icon here, too --- app/helpers/events_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index a29085d44..acc78da95 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -9,7 +9,7 @@ module EventsHelper "comment" when "card_title_changed" "rename" - when "card_board_changed", "card_triaged", "card_postponed" + when "card_board_changed", "card_triaged", "card_postponed", "card_auto_postponed" "move" else "person" From 87c2428d479e7b8b0b671e7eb6d31011b4dc141e Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Thu, 20 Nov 2025 16:02:03 -0600 Subject: [PATCH 05/11] Differentiate, even though they share some properties --- app/assets/stylesheets/card-columns.css | 12 +++++++++--- app/views/boards/show/_closed.html.erb | 2 +- app/views/boards/show/_mobile_columns.html.erb | 2 +- app/views/public/boards/show/_closed.html.erb | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/card-columns.css b/app/assets/stylesheets/card-columns.css index 5fda5823b..2170b576e 100644 --- a/app/assets/stylesheets/card-columns.css +++ b/app/assets/stylesheets/card-columns.css @@ -438,9 +438,7 @@ /* Cover bubbles and cards on small viewports */ @media (max-width: 639px) { - &:not(.cards--closed &) { - margin-inline: calc(-1 * var(--cards-gap) - var(--main-padding)); - } + margin-inline: calc(-1 * var(--cards-gap) - var(--main-padding)); } &, .cards__filter { @@ -659,6 +657,7 @@ /* On Deck (Not Now) /* ------------------------------------------------------------------------ */ + .cards--closed, .cards--on-deck { --card-color: var(--color-ink-light) !important; @@ -671,6 +670,13 @@ } } + /* Closed (Done) + /* ------------------------------------------------------------------------ */ + + .cards--closed { + + } + /* Doing /* -------------------------------------------------------------------------- */ diff --git a/app/views/boards/show/_closed.html.erb b/app/views/boards/show/_closed.html.erb index 0d4c772f4..5d2820399 100644 --- a/app/views/boards/show/_closed.html.erb +++ b/app/views/boards/show/_closed.html.erb @@ -1,4 +1,4 @@ -<%= column_tag id: "closed-cards", name: "Done", drop_url: columns_card_drops_closure_path("__id__"), class: "cards--on-deck", style: "--card-color: var(--color-card-complete);", +<%= column_tag id: "closed-cards", name: "Done", drop_url: columns_card_drops_closure_path("__id__"), class: "cards--closed", style: "--card-color: var(--color-card-complete);", data: { drag_and_strum_target: "container", collapsible_columns_target: "column", diff --git a/app/views/boards/show/_mobile_columns.html.erb b/app/views/boards/show/_mobile_columns.html.erb index 0848b2cea..964d75220 100644 --- a/app/views/boards/show/_mobile_columns.html.erb +++ b/app/views/boards/show/_mobile_columns.html.erb @@ -32,7 +32,7 @@ <% end %> <% end %> - <%= link_to board_columns_closed_path(board), class: "cards cards--on-deck is-collapsed", style: "--card-color: var(--color-card-complete);", data: { turbo_frame: "_top" } do %> + <%= link_to board_columns_closed_path(board), class: "cards cards--closed is-collapsed", style: "--card-color: var(--color-card-complete);", data: { turbo_frame: "_top" } do %>
<%= board.cards.closed.count %>

diff --git a/app/views/public/boards/show/_closed.html.erb b/app/views/public/boards/show/_closed.html.erb index 9f1e1c930..ec75aed00 100644 --- a/app/views/public/boards/show/_closed.html.erb +++ b/app/views/public/boards/show/_closed.html.erb @@ -1,4 +1,4 @@ -