From 70a506c4a3ead65809eb88f4dfcbd7137b53e2f4 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 30 Oct 2025 16:28:51 +0100 Subject: [PATCH] My menu is on every screen when the user is logged in --- app/views/account/settings/show.html.erb | 1 - app/views/cards/index.html.erb | 2 -- app/views/cards/show.html.erb | 1 - app/views/collections/columns/closeds/show.html.erb | 2 -- app/views/collections/columns/not_nows/show.html.erb | 2 -- app/views/collections/columns/show.html.erb | 2 -- app/views/collections/columns/streams/show.html.erb | 2 -- app/views/collections/edit.html.erb | 1 - app/views/collections/new.html.erb | 4 ---- app/views/collections/show.html.erb | 2 -- app/views/events/index.html.erb | 1 - app/views/layouts/application.html.erb | 1 + app/views/notifications/index.html.erb | 2 -- app/views/notifications/settings/show.html.erb | 1 - app/views/users/edit.html.erb | 4 ---- app/views/users/show.html.erb | 4 ---- app/views/webhooks/edit.html.erb | 1 - app/views/webhooks/index.html.erb | 1 - app/views/webhooks/new.html.erb | 1 - app/views/webhooks/show.html.erb | 1 - 20 files changed, 1 insertion(+), 35 deletions(-) diff --git a/app/views/account/settings/show.html.erb b/app/views/account/settings/show.html.erb index e0b8cc14a..eed15ec7e 100644 --- a/app/views/account/settings/show.html.erb +++ b/app/views/account/settings/show.html.erb @@ -1,7 +1,6 @@ <% @page_title = "Account Settings for #{Account.sole.name}" %> <% content_for :header do %> - <%= render "filters/menu" %>

<%= @page_title %>

<% end %> diff --git a/app/views/cards/index.html.erb b/app/views/cards/index.html.erb index b04212bf8..8fcca4d7c 100644 --- a/app/views/cards/index.html.erb +++ b/app/views/cards/index.html.erb @@ -4,8 +4,6 @@ <%= render "cards/broadcasts", records: @page.records %> <% content_for :header do %> - <%= render "filters/menu" %> -

<%= @user_filtering.selected_collections_label %>

diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index 92fba9e3f..c29519498 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -7,7 +7,6 @@ <% end %> <% content_for :header do %> - <%= render "filters/menu" %> <%= link_back_to_collection(@card.collection) %> <% end %> diff --git a/app/views/collections/columns/closeds/show.html.erb b/app/views/collections/columns/closeds/show.html.erb index 7ed422c02..853e02087 100644 --- a/app/views/collections/columns/closeds/show.html.erb +++ b/app/views/collections/columns/closeds/show.html.erb @@ -1,8 +1,6 @@ <% @page_title = "Column: Closed" %> <% content_for :header do %> - <%= render "filters/menu" %> -
<%= link_to @collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> diff --git a/app/views/collections/columns/not_nows/show.html.erb b/app/views/collections/columns/not_nows/show.html.erb index 91f899db5..4b0bed5e7 100644 --- a/app/views/collections/columns/not_nows/show.html.erb +++ b/app/views/collections/columns/not_nows/show.html.erb @@ -1,8 +1,6 @@ <% @page_title = "Column: Now now" %> <% content_for :header do %> - <%= render "filters/menu" %> -
<%= link_to @collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> diff --git a/app/views/collections/columns/show.html.erb b/app/views/collections/columns/show.html.erb index 19123c79f..989965939 100644 --- a/app/views/collections/columns/show.html.erb +++ b/app/views/collections/columns/show.html.erb @@ -1,8 +1,6 @@ <% @page_title = "Column: #{ @column.name }" %> <% content_for :header do %> - <%= render "filters/menu" %> -
<%= link_to @column.collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> diff --git a/app/views/collections/columns/streams/show.html.erb b/app/views/collections/columns/streams/show.html.erb index 9fd201599..0be3bdde1 100644 --- a/app/views/collections/columns/streams/show.html.erb +++ b/app/views/collections/columns/streams/show.html.erb @@ -1,8 +1,6 @@ <% @page_title = "Column: Maybe?" %> <% content_for :header do %> - <%= render "filters/menu" %> -
<%= link_to @collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb index 536f7ef68..e44b4e425 100644 --- a/app/views/collections/edit.html.erb +++ b/app/views/collections/edit.html.erb @@ -1,7 +1,6 @@ <% @page_title = "Board Settings" %> <% content_for :header do %> - <%= render "filters/menu" %>
<%= link_to @collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> diff --git a/app/views/collections/new.html.erb b/app/views/collections/new.html.erb index 90803983b..05ffb3b8c 100644 --- a/app/views/collections/new.html.erb +++ b/app/views/collections/new.html.erb @@ -1,9 +1,5 @@ <% @page_title = "Create a new board" %> -<% content_for :header do %> - <%= render "filters/menu" %> -<% end %> -
<%= form_with model: @collection, class: "flex flex-column gap", data: { controller: "form" } do |form| %>

<%= @page_title %>

diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb index aa6f54768..86169c2c8 100644 --- a/app/views/collections/show.html.erb +++ b/app/views/collections/show.html.erb @@ -4,8 +4,6 @@ <%= turbo_stream_from @collection %> <% content_for :header do %> - <%= render "filters/menu" %> -
<%= link_to_webhooks(@collection) if Current.user.admin? %>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb index 417a08416..bf942572d 100644 --- a/app/views/events/index.html.erb +++ b/app/views/events/index.html.erb @@ -4,7 +4,6 @@ <%= render "cards/broadcasts", records: @day_timeline.events %> <% content_for :header do %> - <%= render "filters/menu" %> <%= render "events/index/add_card_button", user_filtering: @user_filtering %>

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 87eef1d5c..a07685f75 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -5,6 +5,7 @@ diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb index fab500df1..38ac87f52 100644 --- a/app/views/notifications/index.html.erb +++ b/app/views/notifications/index.html.erb @@ -2,8 +2,6 @@ <% @hide_footer_frames = true %> <% content_for :header do %> - <%= render "filters/menu" %> -

<%= @page_title %>

diff --git a/app/views/notifications/settings/show.html.erb b/app/views/notifications/settings/show.html.erb index e9b28b6ec..44a7b1827 100644 --- a/app/views/notifications/settings/show.html.erb +++ b/app/views/notifications/settings/show.html.erb @@ -1,7 +1,6 @@ <% @page_title = "Notifications settings" %> <% content_for :header do %> - <%= render "filters/menu" %>

<%= @page_title %>

<% end %> diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index f834d5896..caf6abd82 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -1,9 +1,5 @@ <% @page_title = "Edit your profile" %> -<% content_for :header do %> - <%= render "filters/menu" %> -<% end %> -
<%= form_with model: @user, method: :patch, class: "flex flex-column gap", data: { controller: "form upload-preview" } do |form| %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index a70082a1c..de53c2ee9 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,9 +1,5 @@ <% @page_title = @user.name %> -<% content_for :header do %> - <%= render "filters/menu" %> -<% end %> -
<% if Current.user == @user %> diff --git a/app/views/webhooks/edit.html.erb b/app/views/webhooks/edit.html.erb index ea6fb8fec..551bf3eec 100644 --- a/app/views/webhooks/edit.html.erb +++ b/app/views/webhooks/edit.html.erb @@ -1,7 +1,6 @@ <% @page_title = @webhook.name %> <% content_for :header do %> - <%= render "filters/menu" %>
<%= link_to @webhook, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> diff --git a/app/views/webhooks/index.html.erb b/app/views/webhooks/index.html.erb index 0892598c8..8c0387510 100644 --- a/app/views/webhooks/index.html.erb +++ b/app/views/webhooks/index.html.erb @@ -1,7 +1,6 @@ <% @page_title = "Webhooks" %> <% content_for :header do %> - <%= render "filters/menu" %>
<%= link_to @collection, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> diff --git a/app/views/webhooks/new.html.erb b/app/views/webhooks/new.html.erb index a1b954c03..aafe035e6 100644 --- a/app/views/webhooks/new.html.erb +++ b/app/views/webhooks/new.html.erb @@ -1,7 +1,6 @@ <% @page_title = "Set up a Webhook" %> <% content_for :header do %> - <%= render "filters/menu" %>
<%= link_to collection_webhooks_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %> diff --git a/app/views/webhooks/show.html.erb b/app/views/webhooks/show.html.erb index 76cd91eff..3dba4d003 100644 --- a/app/views/webhooks/show.html.erb +++ b/app/views/webhooks/show.html.erb @@ -1,7 +1,6 @@ <% @page_title = @webhook.name %> <% content_for :header do %> - <%= render "filters/menu" %>
<%= link_to collection_webhooks_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>