Merge pull request #1325 from basecamp/jz/10-15-25

JZ 10/15/25

app/assets/images/unpinned.svg

@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m.6 22.4c.6.6 1.5.6 2.1 0l5.3-5.3 3 3c.5.4 1.1.7 1.8.7h.3c.7-.1 1.4-.5 1.8-1.2.9-1.7 1.3-3.6 1-5.5l5.9-3.7c1.2-.7 1.5-2.2.8-3.4-.1-.2-.2-.3-.3-.4l-5.8-5.8c-.4-.5-1-.7-1.7-.7s-1.3.2-1.8.7c-.1 0-.2.2-.3.4l-3.7 5.9c-1.9-.3-3.8 0-5.5 1-1.2.7-1.6 2.2-.9 3.4.1.2.2.4.4.5l3 3-5.4 5.4c-.6.6-.6 1.5 0 2zm3.8-11.8c-.1 0-.1-.1-.1-.1v-.4c0-.1.1-.2.2-.3 1.4-.8 3.1-1.1 4.7-.7l.7.2 4.5-7h.1c.1-.2.2-.2.3-.2h.3l5.7 5.8c.2.2.1.5 0 .6l-7 4.5.2.7c.4 1.6.1 3.3-.7 4.7 0 .1-.3.2-.4.2 0 .1-.3 0-.4-.1z"/></svg>
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m23.5 19.5-6.2-6.2 4.8-3.1c.7-.4.9-1.3.5-2 0 0-.2-.3-.2-.3l-5.8-5.8c-.6-.6-1.5-.6-2.1 0s-.2.3-.2.3l-3.1 4.9-6.8-7c-.4-.3-1-.3-1.4 0-.4.4-.4 1 0 1.4l7 7s0 0 0 0l5.8 5.8s0 0 0 0l6.4 6.4c.4.4 1 .4 1.4 0s.4-1 0-1.4z"/><path d="m4.8 9.6c-.7.4-.9 1.3-.5 2 0 0 .2.3.2.3l3 3s-.1 0-.2.1l-5.9 5.9c-.6.6-.6 1.5 0 2.1s1.5.6 2.1 0l5.9-5.9s0 0 0-.1l3.1 3.1c.3.3.7.4 1.2.4s.9-.3 1.1-.7c.6-1 .9-2 1-3.1l-7.9-8.1c-1 0-2.1.4-3 1z"/></svg>

app/views/account/settings/_entropy_configuration.html.erb

@@ -1,5 +1,6 @@
 <div class="settings__panel settings__panel--entropy panel shadow center">
-  <h2 class="divider txt-large">Sink or Swim</h2>
-  <p class="margin-none-block-start">Choose default settings for this account. You can override them in individual collections.</p>
+  <h2 class="divider txt-large">Auto close</h2>
+  <p class="margin-none-block-start">This is the default setting for this account, you can override it in each collections.</p>
+  <p class="margin-none-block-start">Cards automatically close as “Not now” if there is no activity for…</p>
   <%= render "entropy/auto_close", model: account.default_entropy_configuration, url: account_entropy_configuration_path %>
 </div>

app/views/collections/edit/_auto_close.html.erb

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag @collection, :entropy_configuration do %>
-  <div>
-    <h2 class="divider txt-large">Sink or Swim</h2>
-    <p class="margin-none-block-start">Cards automatically move to "Not now" after…</p>
+  <div class="margin-block-end">
+    <h2 class="divider txt-large">Auto close</h2>
+    <p class="margin-none-block-start">Cards automatically close as “Not now” if there is no activity for…</p>
     <%= render "entropy/auto_close", model: collection, url: collection_entropy_configuration_path(collection) %>
   </div>
 <% end %>

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" %>
-  <strong class="txt-medium overflow-ellipsis margin-none"><%= Account.sole.name %></strong>
+  <strong class="txt-medium overflow-ellipsis margin-none"><%= Current.user.identity.memberships.many? ? Account.sole.name : "Fizzy" %></strong>
 <% end %>

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 %>

app/views/filters/menu/collections/_all_option.html.erb

@@ -1,8 +0,0 @@
-<% if Current.user.collections.many? %>
-  <li class="popup__item" data-filter-target="item" data-navigable-list-target="item" id="filter-collection-all">
-    <%= icon_tag "collection", class: "popup__icon" %>
-    <%= link_to cards_path, class: "popup__btn btn" do %>
-      <span class="overflow-ellipsis">All collections</span>
-    <% end %>
-  </li>
-<% end %>