From bbdc5ac8a8ddac6d0c7fc5328628e15e5d286a89 Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Mon, 29 Sep 2025 14:31:05 -0500
Subject: [PATCH] Move rename dialog inside the menu div

---
 app/views/collections/show/_column.html.erb      | 10 ----------
 app/views/collections/show/menu/_column.html.erb | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/views/collections/show/_column.html.erb b/app/views/collections/show/_column.html.erb
index 147593c6d..cc7ac0697 100644
--- a/app/views/collections/show/_column.html.erb
+++ b/app/views/collections/show/_column.html.erb
@@ -11,15 +11,5 @@
     <%= render "collections/show/menu/column", column: column %>
   <% end %>
 
-  <div data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
-    <button id="<%= dom_id(column, :manage_menu) %>" class="popup__btn btn" data-action="click->dialog#open:stop" data-clicker-target="clickable" hidden aria-hidden>Rename column</button>
-    <dialog class="popup panel flex-column gap fill-white shadow txt-small margin-block-double" data-dialog-target="dialog">
-      <%= form_with model: [column.collection, column], data: { action: "turbo:submit-end->dialog#close" } do |form| %>
-        <%= form.text_field :name, class: "input", placeholder: "Column name", value: column.name, required: true %>
-        <%= form.submit "Rename column", class: "btn btn--link" %>
-      <% end %>
-    </dialog>
-  </div>
-
   <%= column_frame_tag dom_id(column, :cards), src: collection_column_path(column.collection, column) %>
 </section>
diff --git a/app/views/collections/show/menu/_column.html.erb b/app/views/collections/show/menu/_column.html.erb
index f719420d4..05f79208f 100644
--- a/app/views/collections/show/menu/_column.html.erb
+++ b/app/views/collections/show/menu/_column.html.erb
@@ -23,4 +23,14 @@
       </li>
     </ul>
   </dialog>
+
+  <div data-controller="dialog" data-action="keydown.esc->dialog#close click@document->dialog#closeOnClickOutside">
+    <button id="<%= dom_id(column, :manage_menu) %>" class="popup__btn btn" data-action="click->dialog#open:stop" data-clicker-target="clickable" hidden aria-hidden>Rename column</button>
+    <dialog class="popup panel flex-column gap fill-white shadow txt-small margin-block-double" data-dialog-target="dialog">
+      <%= form_with model: [column.collection, column], data: { action: "turbo:submit-end->dialog#close" } do |form| %>
+        <%= form.text_field :name, class: "input", placeholder: "Column name", value: column.name, required: true %>
+        <%= form.submit "Rename column", class: "btn btn--link" %>
+      <% end %>
+    </dialog>
+  </div>
 </div>