From 67aed4ad94b1086e2cc9a06558488508476701ec Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 15 Oct 2025 16:57:03 -0500 Subject: [PATCH 1/4] Update icon to better indicate unpinned state --- app/assets/images/unpinned.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/images/unpinned.svg b/app/assets/images/unpinned.svg index 37313eb27..993bbf75d 100644 --- a/app/assets/images/unpinned.svg +++ b/app/assets/images/unpinned.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file From e3346fde081e234ee2c46e871daf340290c975ad Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 15 Oct 2025 17:01:39 -0500 Subject: [PATCH 2/4] Update copy --- app/views/account/settings/_entropy_configuration.html.erb | 5 +++-- app/views/collections/edit/_auto_close.html.erb | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/account/settings/_entropy_configuration.html.erb b/app/views/account/settings/_entropy_configuration.html.erb index 326ffa193..910e10c5f 100644 --- a/app/views/account/settings/_entropy_configuration.html.erb +++ b/app/views/account/settings/_entropy_configuration.html.erb @@ -1,5 +1,6 @@
-

Sink or Swim

-

Choose default settings for this account. You can override them in individual collections.

+

Auto close

+

This is the default setting for this account, you can override it in each collections.

+

Cards automatically close as “Not now” if there is no activity for…

<%= render "entropy/auto_close", model: account.default_entropy_configuration, url: account_entropy_configuration_path %>
diff --git a/app/views/collections/edit/_auto_close.html.erb b/app/views/collections/edit/_auto_close.html.erb index fc52995a6..7f4e8295e 100644 --- a/app/views/collections/edit/_auto_close.html.erb +++ b/app/views/collections/edit/_auto_close.html.erb @@ -1,7 +1,7 @@ <%= turbo_frame_tag @collection, :entropy_configuration do %> -
-

Sink or Swim

-

Cards automatically move to "Not now" after…

+
+

Auto close

+

Cards automatically close as “Not now” if there is no activity for…

<%= render "entropy/auto_close", model: collection, url: collection_entropy_configuration_path(collection) %>
<% end %> From f9355ea47521f8e72c24223ec9c51093835b7a52 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 15 Oct 2025 17:07:44 -0500 Subject: [PATCH 3/4] Use "Fizzy" if they only have one account --- app/views/filters/menu/_button.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/filters/menu/_button.html.erb b/app/views/filters/menu/_button.html.erb index 66b748641..c1bec55fa 100644 --- a/app/views/filters/menu/_button.html.erb +++ b/app/views/filters/menu/_button.html.erb @@ -3,5 +3,5 @@ action: "click->dialog#open:stop keydown.j@document->hotkey#click keydown.meta+j@document->hotkey#click keydown.ctrl+j@document->hotkey#click", controller: "hotkey" } do %> <%= inline_svg "fizzy-logo" %> - <%= Account.sole.name %> + <%= Current.user.identity.memberships.many? ? Account.sole.name : "Fizzy" %> <% end %> From c640505ad8af962b41209436dc21d7ccbb6d92f6 Mon Sep 17 00:00:00 2001 From: Jason Zimdars Date: Wed, 15 Oct 2025 17:10:26 -0500 Subject: [PATCH 4/4] We don't need this anymore since it takes you to a filtered view --- app/views/filters/menu/_collections.html.erb | 1 - app/views/filters/menu/collections/_all_option.html.erb | 8 -------- 2 files changed, 9 deletions(-) delete mode 100644 app/views/filters/menu/collections/_all_option.html.erb diff --git a/app/views/filters/menu/_collections.html.erb b/app/views/filters/menu/_collections.html.erb index f6dfad1ec..590fb9173 100644 --- a/app/views/filters/menu/_collections.html.erb +++ b/app/views/filters/menu/_collections.html.erb @@ -1,7 +1,6 @@ <% # Using method: :get inside Turbo frame triggers some special Turbo handling where the script_name is lost %> <% if user_filtering.collections.any? %> <%= collapsible_nav_section "Collections" do %> - <%= render "filters/menu/collections/all_option", user_filtering: user_filtering %> <%= render partial: "filters/menu/collections/collection", collection: user_filtering.collections, as: :collection %> <% end %> <% end %> diff --git a/app/views/filters/menu/collections/_all_option.html.erb b/app/views/filters/menu/collections/_all_option.html.erb deleted file mode 100644 index e5a682b9b..000000000 --- a/app/views/filters/menu/collections/_all_option.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<% if Current.user.collections.many? %> -
  • - <%= icon_tag "collection", class: "popup__icon" %> - <%= link_to cards_path, class: "popup__btn btn" do %> - All collections - <% end %> -
    • -<% end %>