From 69ca95a5b8a287b23a988456a3bfbf05995aae3a Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Thu, 4 Dec 2025 10:37:25 -0500
Subject: [PATCH 01/13] First batch of change

Changed id to class so that every button that can do one feature behaves the same and changed the organisation of the jquery
---
 app/views/bookmarks/_bookmark_blurb.html.erb  |  4 ++--
 .../_bookmark_owner_navigation.html.erb       |  2 +-
 .../bookmarks/bookmark_form_dynamic.js.erb    | 20 +++++++++----------
 app/views/bookmarks/index.html.erb            |  4 ++--
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/views/bookmarks/_bookmark_blurb.html.erb b/app/views/bookmarks/_bookmark_blurb.html.erb
index 8a35ee3da27..4479de229ff 100644
--- a/app/views/bookmarks/_bookmark_blurb.html.erb
+++ b/app/views/bookmarks/_bookmark_blurb.html.erb
@@ -25,9 +25,9 @@
         <% if logged_in? && !is_author_of?(bookmark) %>
           <li>
             <% if (current_user_bookmark ||= bookmark_if_exists(bookmarkable)) %>
-              <%= link_to ts("Saved"), edit_bookmark_path(current_user_bookmark), id: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
+              <%= link_to ts("Saved"), edit_bookmark_path(current_user_bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
             <% else %>
-              <%= link_to ts("Save"), get_new_bookmark_path(bookmarkable), id: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
+              <%= link_to ts("Save"), get_new_bookmark_path(bookmarkable), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
             <% end %>
           </li>
         <% end %>
diff --git a/app/views/bookmarks/_bookmark_owner_navigation.html.erb b/app/views/bookmarks/_bookmark_owner_navigation.html.erb
index b3bf21ef810..9026a12a171 100644
--- a/app/views/bookmarks/_bookmark_owner_navigation.html.erb
+++ b/app/views/bookmarks/_bookmark_owner_navigation.html.erb
@@ -1,7 +1,7 @@
 <% # expects "bookmark" %>
 <% bookmark_form_id = (bookmark.bookmarkable.blank? ? "#{bookmark.id}" : "#{bookmark.bookmarkable.id}") %>
 <ul class="actions" role="menu">
-  <li><%= link_to ts("Edit"), edit_bookmark_path(bookmark), id: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %></li>
+  <li><%= link_to ts("Edit"), edit_bookmark_path(bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %></li>
   <li><%= link_to ts("Delete"), confirm_delete_bookmark_path(bookmark), data: {confirm: ts('Are you sure you want to delete this bookmark?')} %></li>
   <li id="add_collection_link"><%= collection_link(bookmark) %></li>
   <% if bookmark.bookmarkable.is_a?(Work) && !bookmark.bookmarkable.unrevealed? %>
diff --git a/app/views/bookmarks/bookmark_form_dynamic.js.erb b/app/views/bookmarks/bookmark_form_dynamic.js.erb
index c9695504603..780b07e4f84 100644
--- a/app/views/bookmarks/bookmark_form_dynamic.js.erb
+++ b/app/views/bookmarks/bookmark_form_dynamic.js.erb
@@ -2,21 +2,19 @@
 <% bookmark_form_id = (@bookmarkable.blank? ? "#{@bookmark.id}" : "#{@bookmarkable.id}") %>
 
 var bookmark_div = $j('#bookmark_form_placement_for_<%= bookmark_form_id %>');
-var bookmark_close = $j('#bookmark_form_close_for_<%= bookmark_form_id %>');
-var bookmark_open = $j('#bookmark_form_trigger_for_<%= bookmark_form_id %>');
 
 bookmark_div.html("<%= escape_javascript(render "bookmarks/bookmark_form", :bookmarkable => @bookmarkable, :bookmark => @bookmark, :button_name => @button_name, :action => @action, :in_page => true, :dynamic => true) %>");
-bookmark_open.hide();
+$j('.bookmark_form_trigger_for_<%= bookmark_form_id %>').hide();
 
-$j('#bookmark_form_close_for_<%= bookmark_form_id %>').click(function(){ 
-  bookmark_div.hide();
-  bookmark_open.show();
+$j('#bookmark_form_close_for_<%= bookmark_form_id %>').click(function(){
+  $j('#bookmark_form_placement_for_<%= bookmark_form_id %>').hide();
+  $j('.bookmark_form_trigger_for_<%= bookmark_form_id %>').show();
+  $j('.bookmark_form_trigger_for_<%= bookmark_form_id %>').attr('href', '#');
 });
 
 // if canceled we don't want to generate the form a second time, just reopen it
-bookmark_open.attr('href', '#');
-$j("#bookmark_form_trigger_for_<%= bookmark_form_id %>").click(function(event){
-  bookmark_div.show();
-  bookmark_open.hide();
+$j(".bookmark_form_trigger_for_<%= bookmark_form_id %>").click(function(event){
+  $j('#bookmark_form_placement_for_<%= bookmark_form_id %>').show();
+  $j('.bookmark_form_trigger_for_<%= bookmark_form_id %>').hide();
   event.preventDefault();
-});
+});
\ No newline at end of file
diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb
index baeb8322025..040a14ddf0b 100755
--- a/app/views/bookmarks/index.html.erb
+++ b/app/views/bookmarks/index.html.erb
@@ -21,9 +21,9 @@
       <% if logged_in? && !is_author_of?(@bookmark) %>
         <li>
           <% if (current_user_bookmark ||= bookmark_if_exists(@bookmarkable)) %>
-            <%= link_to ts("Edit Bookmark"), edit_bookmark_path(current_user_bookmark), :id => "bookmark_form_trigger_for_#{bookmark_form_id}", :remote => true %>
+            <%= link_to ts("Edit Bookmark"), edit_bookmark_path(current_user_bookmark), :class => "bookmark_form_trigger_for_#{bookmark_form_id}", :remote => true %>
           <% else %>
-            <%= link_to ts("Bookmark"), get_new_bookmark_path(@bookmarkable), :id => "bookmark_form_trigger_for_#{bookmark_form_id}", :remote => true %>
+            <%= link_to ts("Bookmark"), get_new_bookmark_path(@bookmarkable), :class => "bookmark_form_trigger_for_#{bookmark_form_id}", :remote => true %>
           <% end %>
         </li>
       <% end %>

From 3f055aff2df61738cfd2b9568016041f198b2cfe Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Mon, 8 Dec 2025 17:22:36 -0500
Subject: [PATCH 02/13] Added test and translation

---
 .../bookmarks/_bookmark_owner_navigation.html.erb   |  6 +++---
 app/views/bookmarks/index.html.erb                  | 10 +++++-----
 config/locales/views/en.yml                         | 12 ++++++++++++
 features/bookmarks/bookmark_create.feature          | 13 +++++++++++++
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/app/views/bookmarks/_bookmark_owner_navigation.html.erb b/app/views/bookmarks/_bookmark_owner_navigation.html.erb
index 9026a12a171..d3cb7d948a4 100644
--- a/app/views/bookmarks/_bookmark_owner_navigation.html.erb
+++ b/app/views/bookmarks/_bookmark_owner_navigation.html.erb
@@ -1,12 +1,12 @@
 <% # expects "bookmark" %>
 <% bookmark_form_id = (bookmark.bookmarkable.blank? ? "#{bookmark.id}" : "#{bookmark.bookmarkable.id}") %>
 <ul class="actions" role="menu">
-  <li><%= link_to ts("Edit"), edit_bookmark_path(bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %></li>
-  <li><%= link_to ts("Delete"), confirm_delete_bookmark_path(bookmark), data: {confirm: ts('Are you sure you want to delete this bookmark?')} %></li>
+  <li><%= link_to t(".edit"), edit_bookmark_path(bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %></li>
+  <li><%= link_to t(".delete"), confirm_delete_bookmark_path(bookmark), data: {confirm: t(".delete_confirmation")} %></li>
   <li id="add_collection_link"><%= collection_link(bookmark) %></li>
   <% if bookmark.bookmarkable.is_a?(Work) && !bookmark.bookmarkable.unrevealed? %>
     <li class="share hidden">
-      <%= link_to_modal ts("Share"), for: share_bookmark_path(bookmark), title: ts("Share Bookmark") %>
+      <%= link_to_modal t(".share"), for: share_bookmark_path(bookmark), title: t(".share_bookmark") %>
     </li>
   <% end %>
 </ul>
diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb
index 040a14ddf0b..60728d7a4c4 100755
--- a/app/views/bookmarks/index.html.erb
+++ b/app/views/bookmarks/index.html.erb
@@ -14,23 +14,23 @@
 <% if current_user.is_a?(User) || @tag || @facets.present? %>
   <ul class="navigation actions" role="navigation">
     <% if logged_in? && (@user == current_user || (@owner.blank? && @bookmarkable.blank?) || @collection) %>
-      <li><%= link_to ts("Bookmark External Work"), new_external_work_path %></li>
+      <li><%= link_to t(".navigation.new_external_work"), new_external_work_path %></li>
     <% elsif params[:work_id] || params[:series_id] || params[:external_work_id] %>
       <% bookmark_form_id = (@bookmarkable.blank? ? "#{@bookmark.id}" : "#{@bookmarkable.id}") %>
       <% # let the user reading this bookmark save a copy for themselves %>
       <% if logged_in? && !is_author_of?(@bookmark) %>
         <li>
           <% if (current_user_bookmark ||= bookmark_if_exists(@bookmarkable)) %>
-            <%= link_to ts("Edit Bookmark"), edit_bookmark_path(current_user_bookmark), :class => "bookmark_form_trigger_for_#{bookmark_form_id}", :remote => true %>
+            <%= link_to t(".navigation.edit"), edit_bookmark_path(current_user_bookmark), :class => "bookmark_form_trigger_for_#{bookmark_form_id}", :remote => true %>
           <% else %>
-            <%= link_to ts("Bookmark"), get_new_bookmark_path(@bookmarkable), :class => "bookmark_form_trigger_for_#{bookmark_form_id}", :remote => true %>
+            <%= link_to t(".navigation.new"), get_new_bookmark_path(@bookmarkable), :class => "bookmark_form_trigger_for_#{bookmark_form_id}", :remote => true %>
           <% end %>
         </li>
       <% end %>
     <% end %>
     <% if @tag %>
-      <li><%= span_if_current ts('Works'), tag_works_path(@tag) %></li>
-      <li><%= span_if_current ts('Bookmarks'), tag_bookmarks_path(@tag) %></li>
+      <li><%= span_if_current t(".navigation.works"), tag_works_path(@tag) %></li>
+      <li><%= span_if_current t(".navigation.bookmarks"), tag_bookmarks_path(@tag) %></li>
     <% end %>
     <% if @facets.present? %>
       <% # Filters button for narrow screens jumps to filters when JavaScript is disabled and opens filters when JavaScript is enabled %>
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 12b3e8d85da..61808d8355a 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -536,9 +536,21 @@ en:
           hide_works: hide their works or bookmarks from you
           intro: 'Blocking a user will not:'
   bookmarks:
+    bookmark_owner_navigation:
+      delete: Delete
+      delete_confirmation: Are you sure you want to delete this bookmark?
+      edit: Edit
+      share: Share
+      share_bookmark: Share Bookmark
     bookmark_user_module:
       bookmarked_by_html: Bookmarked by %{pseud_link}
     index:
+      navigation:
+        bookmarks: Bookmarks
+        edit: Edit Bookmark
+        new: Boorkmark
+        new_external_work: Bookmark External Work   
+        works: Works
       advanced_search: try our advanced search
       choose_fandom: choose a fandom
       recent_bookmarks_html: These are some of the latest bookmarks created on the Archive. To find more bookmarks, %{choose_fandom_link} or %{advanced_search_link}.
diff --git a/features/bookmarks/bookmark_create.feature b/features/bookmarks/bookmark_create.feature
index a5c3e97fcac..dbe10b1c9c6 100644
--- a/features/bookmarks/bookmark_create.feature
+++ b/features/bookmarks/bookmark_create.feature
@@ -387,6 +387,19 @@ Scenario: Editing a bookmark's tags should expire the bookmark cache
     And the cache of the bookmark on "Really Good Thing" should not expire if I have not edited the bookmark
     And the cache of the bookmark on "Really Good Thing" should expire after I edit the bookmark tags
 
+@javascript @load-default-skin
+Scenario: The Save a bookmark form can be reopened after closing it with "X" on some pages (AO3-7215)
+  Given I am logged in as "bookmarker"
+    And the work "Really Good Thing"
+    And I have a bookmark for "Really Good Thing"
+  When I view the work "Really Good Thing"
+    And I follow "1"
+    And I press "Edit"
+  Then I should see "save a bookmark!"
+  When I press "×"
+    And I press "Edit"
+  Then I should see "save a bookmark!"
+
 Scenario: User can't bookmark same work twice
   Given the work "Haven"
     And I am logged in as "Mara"

From df354d9a5904a97e258f640a108fad4833e14c84 Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Tue, 9 Dec 2025 20:05:17 -0500
Subject: [PATCH 03/13] Added tests

---
 features/bookmarks/bookmark_create.feature    | 12 +++---
 .../bookmarks/bookmark_javascript.feature     | 42 +++++++++++++++++++
 features/step_definitions/bookmark_steps.rb   |  5 +++
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 features/bookmarks/bookmark_javascript.feature

diff --git a/features/bookmarks/bookmark_create.feature b/features/bookmarks/bookmark_create.feature
index dbe10b1c9c6..46d3d10f918 100644
--- a/features/bookmarks/bookmark_create.feature
+++ b/features/bookmarks/bookmark_create.feature
@@ -387,12 +387,14 @@ Scenario: Editing a bookmark's tags should expire the bookmark cache
     And the cache of the bookmark on "Really Good Thing" should not expire if I have not edited the bookmark
     And the cache of the bookmark on "Really Good Thing" should expire after I edit the bookmark tags
 
-@javascript @load-default-skin
 Scenario: The Save a bookmark form can be reopened after closing it with "X" on some pages (AO3-7215)
-  Given I am logged in as "bookmarker"
-    And the work "Really Good Thing"
-    And I have a bookmark for "Really Good Thing"
-  When I view the work "Really Good Thing"
+  Given a canonical fandom "The Hobbit"
+    And the work "A Hobbit's Meandering" by "bookmarker" with fandom "The Hobbit"
+    And all indexing jobs have been run
+    And the dashboard counts have expired
+    And I am logged in as "bookmarker"
+    And I bookmark the work "A Hobbit's Meandering"
+  When I view the work "A Hobbit's Meandering"
     And I follow "1"
     And I press "Edit"
   Then I should see "save a bookmark!"
diff --git a/features/bookmarks/bookmark_javascript.feature b/features/bookmarks/bookmark_javascript.feature
new file mode 100644
index 00000000000..5000416125c
--- /dev/null
+++ b/features/bookmarks/bookmark_javascript.feature
@@ -0,0 +1,42 @@
+@bookmarks
+Feature: Edit bookmarks with javascript enabled
+  In order to have a good user experience
+  As a humble user
+  I want to be able to edit bookmarks with javascript enabled
+  
+  Background:
+    Given a canonical fandom "The Bookmarks"
+      And the work "Bookmark: The Beginnings" by "bookmarker" with fandom "The Bookmarks"
+      And the work "Bookmark: The Sequel" by "bookmarker" with fandom "The Bookmarks"
+      And all indexing jobs have been run
+      And the dashboard counts have expired
+      And I am logged in as "bookmarker"
+
+  @javascript
+  Scenario: Opening multiple edit forms lets you close all of them (AO3-7214)
+    Given I am logged in as "recengine"
+      And I bookmark the work "Bookmark: The Beginnings"
+      And I bookmark the work "Bookmark: The Sequel"
+      And all indexing jobs have been run
+    When I follow "Bookmarks"
+      And I follow "Edit"
+      And I follow "Edit"
+    Then I should not see "Edit"
+    When I exit the bookmark edit form
+      And I exit the bookmark edit form
+    Then I should not see "save a bookmark!"
+  
+  @javascript
+  Scenario: The edit form can be reopened after closing it with "X" on some pages (AO3-7215)
+    Given I am logged in as "recengine"
+      And I bookmark the work "Bookmark: The Beginnings"
+    When I view the work "Bookmark: The Beginnings"
+      And I follow "1"
+      And I follow "Edit"
+    Then I should see "save a bookmark!"
+      And I should not see "Edit Bookmark"
+    When I exit the bookmark edit form
+    Then I should see "Edit Bookmark"
+    When I follow "Edit"
+    Then I should see "save a bookmark!"
+
diff --git a/features/step_definitions/bookmark_steps.rb b/features/step_definitions/bookmark_steps.rb
index 9c7903cd977..3d9ba346a2b 100644
--- a/features/step_definitions/bookmark_steps.rb
+++ b/features/step_definitions/bookmark_steps.rb
@@ -384,6 +384,11 @@ def submit_bookmark_form(pseud, note, tags, collection)
   visit work_path(work)
 end
 
+# Capybara will not find links without href with the click_link method (see issue #379 on the capybara repository)
+When "I exit the bookmark edit form" do
+  find("a", :text => "×").click
+end
+
 When /^I add my bookmark to the collection "([^\"]*)"$/ do |collection_name|
   step %{I follow "Add To Collection"}
   fill_in("collection_names", with: collection_name)

From 9146e6d9eaa08e184afba48205b9aa72195380ed Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Tue, 9 Dec 2025 23:19:10 -0500
Subject: [PATCH 04/13] Adressed style issues

---
 app/views/bookmarks/_bookmark_blurb.html.erb            | 6 +++---
 app/views/bookmarks/_bookmark_owner_navigation.html.erb | 2 +-
 app/views/bookmarks/index.html.erb                      | 4 ++--
 config/locales/views/en.yml                             | 4 ++++
 features/bookmarks/bookmark_javascript.feature          | 1 -
 features/step_definitions/bookmark_steps.rb             | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/views/bookmarks/_bookmark_blurb.html.erb b/app/views/bookmarks/_bookmark_blurb.html.erb
index 4479de229ff..85c5a2fd92a 100644
--- a/app/views/bookmarks/_bookmark_blurb.html.erb
+++ b/app/views/bookmarks/_bookmark_blurb.html.erb
@@ -4,7 +4,7 @@
 <li id="bookmark_<%= bookmark.id %>" class="<%= css_classes_for_bookmark_blurb(bookmark) %>" role="article">
 
   <% if bookmarkable.blank? %>
-    <p class="message"><%= ts("This has been deleted, sorry!") %></p>
+    <p class="message"><%= t("deleted") %></p>
     <% # Bookmarks of deleted items need a div because they can still be edited. %>
     <div class="new dynamic" id="bookmark_form_placement_for_<%= bookmark_form_id %>"></div>
   <% else %>
@@ -25,9 +25,9 @@
         <% if logged_in? && !is_author_of?(bookmark) %>
           <li>
             <% if (current_user_bookmark ||= bookmark_if_exists(bookmarkable)) %>
-              <%= link_to ts("Saved"), edit_bookmark_path(current_user_bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
+              <%= link_to t("saved"), edit_bookmark_path(current_user_bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
             <% else %>
-              <%= link_to ts("Save"), get_new_bookmark_path(bookmarkable), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
+              <%= link_to t("save"), get_new_bookmark_path(bookmarkable), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
             <% end %>
           </li>
         <% end %>
diff --git a/app/views/bookmarks/_bookmark_owner_navigation.html.erb b/app/views/bookmarks/_bookmark_owner_navigation.html.erb
index d3cb7d948a4..58d8d5a6bcb 100644
--- a/app/views/bookmarks/_bookmark_owner_navigation.html.erb
+++ b/app/views/bookmarks/_bookmark_owner_navigation.html.erb
@@ -2,7 +2,7 @@
 <% bookmark_form_id = (bookmark.bookmarkable.blank? ? "#{bookmark.id}" : "#{bookmark.bookmarkable.id}") %>
 <ul class="actions" role="menu">
   <li><%= link_to t(".edit"), edit_bookmark_path(bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %></li>
-  <li><%= link_to t(".delete"), confirm_delete_bookmark_path(bookmark), data: {confirm: t(".delete_confirmation")} %></li>
+  <li><%= link_to t(".delete"), confirm_delete_bookmark_path(bookmark), data: { confirm: t(".delete_confirmation") } %></li>
   <li id="add_collection_link"><%= collection_link(bookmark) %></li>
   <% if bookmark.bookmarkable.is_a?(Work) && !bookmark.bookmarkable.unrevealed? %>
     <li class="share hidden">
diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb
index 60728d7a4c4..c14578ddcdd 100755
--- a/app/views/bookmarks/index.html.erb
+++ b/app/views/bookmarks/index.html.erb
@@ -21,9 +21,9 @@
       <% if logged_in? && !is_author_of?(@bookmark) %>
         <li>
           <% if (current_user_bookmark ||= bookmark_if_exists(@bookmarkable)) %>
-            <%= link_to t(".navigation.edit"), edit_bookmark_path(current_user_bookmark), :class => "bookmark_form_trigger_for_#{bookmark_form_id}", :remote => true %>
+            <%= link_to t(".navigation.edit"), edit_bookmark_path(current_user_bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
           <% else %>
-            <%= link_to t(".navigation.new"), get_new_bookmark_path(@bookmarkable), :class => "bookmark_form_trigger_for_#{bookmark_form_id}", :remote => true %>
+            <%= link_to t(".navigation.new"), get_new_bookmark_path(@bookmarkable), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
           <% end %>
         </li>
       <% end %>
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 61808d8355a..e2e3b577e50 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -536,6 +536,10 @@ en:
           hide_works: hide their works or bookmarks from you
           intro: 'Blocking a user will not:'
   bookmarks:
+    bookmark_blurb:
+      deleted: This has been deleted, sorry!
+      save: Save
+      saved: Saved
     bookmark_owner_navigation:
       delete: Delete
       delete_confirmation: Are you sure you want to delete this bookmark?
diff --git a/features/bookmarks/bookmark_javascript.feature b/features/bookmarks/bookmark_javascript.feature
index 5000416125c..bcbbd291b7d 100644
--- a/features/bookmarks/bookmark_javascript.feature
+++ b/features/bookmarks/bookmark_javascript.feature
@@ -39,4 +39,3 @@ Feature: Edit bookmarks with javascript enabled
     Then I should see "Edit Bookmark"
     When I follow "Edit"
     Then I should see "save a bookmark!"
-
diff --git a/features/step_definitions/bookmark_steps.rb b/features/step_definitions/bookmark_steps.rb
index 3d9ba346a2b..b641d39cd02 100644
--- a/features/step_definitions/bookmark_steps.rb
+++ b/features/step_definitions/bookmark_steps.rb
@@ -386,7 +386,7 @@ def submit_bookmark_form(pseud, note, tags, collection)
 
 # Capybara will not find links without href with the click_link method (see issue #379 on the capybara repository)
 When "I exit the bookmark edit form" do
-  find("a", :text => "×").click
+  find("a", text: "×").click
 end
 
 When /^I add my bookmark to the collection "([^\"]*)"$/ do |collection_name|

From 36786903ffd4160e419740de920f86f15f18743f Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Tue, 9 Dec 2025 23:28:45 -0500
Subject: [PATCH 05/13] Fixed translation

---
 app/views/bookmarks/_bookmark_blurb.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/bookmarks/_bookmark_blurb.html.erb b/app/views/bookmarks/_bookmark_blurb.html.erb
index 85c5a2fd92a..382b6939f4d 100644
--- a/app/views/bookmarks/_bookmark_blurb.html.erb
+++ b/app/views/bookmarks/_bookmark_blurb.html.erb
@@ -4,7 +4,7 @@
 <li id="bookmark_<%= bookmark.id %>" class="<%= css_classes_for_bookmark_blurb(bookmark) %>" role="article">
 
   <% if bookmarkable.blank? %>
-    <p class="message"><%= t("deleted") %></p>
+    <p class="message"><%= t(".deleted") %></p>
     <% # Bookmarks of deleted items need a div because they can still be edited. %>
     <div class="new dynamic" id="bookmark_form_placement_for_<%= bookmark_form_id %>"></div>
   <% else %>
@@ -25,9 +25,9 @@
         <% if logged_in? && !is_author_of?(bookmark) %>
           <li>
             <% if (current_user_bookmark ||= bookmark_if_exists(bookmarkable)) %>
-              <%= link_to t("saved"), edit_bookmark_path(current_user_bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
+              <%= link_to t(".saved"), edit_bookmark_path(current_user_bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
             <% else %>
-              <%= link_to t("save"), get_new_bookmark_path(bookmarkable), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
+              <%= link_to t(".save"), get_new_bookmark_path(bookmarkable), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
             <% end %>
           </li>
         <% end %>

From 3affd9515d264606131ba9fe31c712cd79c4253e Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Tue, 9 Dec 2025 23:33:48 -0500
Subject: [PATCH 06/13] Remove leftover test

Since the new tests have been moved to their new feature file to test javascript feature these are not needed
---
 features/bookmarks/bookmark_create.feature | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/features/bookmarks/bookmark_create.feature b/features/bookmarks/bookmark_create.feature
index 46d3d10f918..a5c3e97fcac 100644
--- a/features/bookmarks/bookmark_create.feature
+++ b/features/bookmarks/bookmark_create.feature
@@ -387,21 +387,6 @@ Scenario: Editing a bookmark's tags should expire the bookmark cache
     And the cache of the bookmark on "Really Good Thing" should not expire if I have not edited the bookmark
     And the cache of the bookmark on "Really Good Thing" should expire after I edit the bookmark tags
 
-Scenario: The Save a bookmark form can be reopened after closing it with "X" on some pages (AO3-7215)
-  Given a canonical fandom "The Hobbit"
-    And the work "A Hobbit's Meandering" by "bookmarker" with fandom "The Hobbit"
-    And all indexing jobs have been run
-    And the dashboard counts have expired
-    And I am logged in as "bookmarker"
-    And I bookmark the work "A Hobbit's Meandering"
-  When I view the work "A Hobbit's Meandering"
-    And I follow "1"
-    And I press "Edit"
-  Then I should see "save a bookmark!"
-  When I press "×"
-    And I press "Edit"
-  Then I should see "save a bookmark!"
-
 Scenario: User can't bookmark same work twice
   Given the work "Haven"
     And I am logged in as "Mara"

From dc7d11bd1ca0afdddd8b962ccc67ee54e9f24310 Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Tue, 9 Dec 2025 23:37:04 -0500
Subject: [PATCH 07/13] These spaces thought we wouldn't see them

---
 config/locales/views/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index e2e3b577e50..af9af66fa0b 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -553,7 +553,7 @@ en:
         bookmarks: Bookmarks
         edit: Edit Bookmark
         new: Boorkmark
-        new_external_work: Bookmark External Work   
+        new_external_work: Bookmark External Work
         works: Works
       advanced_search: try our advanced search
       choose_fandom: choose a fandom

From d2dfbd3870d6d10e8c9eb800c23868a9f5940b4a Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Wed, 10 Dec 2025 13:15:28 -0500
Subject: [PATCH 08/13] Normalizing

---
 config/locales/views/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index af9af66fa0b..731ca4fc42c 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -549,14 +549,14 @@ en:
     bookmark_user_module:
       bookmarked_by_html: Bookmarked by %{pseud_link}
     index:
+      advanced_search: try our advanced search
+      choose_fandom: choose a fandom
       navigation:
         bookmarks: Bookmarks
         edit: Edit Bookmark
         new: Boorkmark
         new_external_work: Bookmark External Work
         works: Works
-      advanced_search: try our advanced search
-      choose_fandom: choose a fandom
       recent_bookmarks_html: These are some of the latest bookmarks created on the Archive. To find more bookmarks, %{choose_fandom_link} or %{advanced_search_link}.
   challenge:
     gift_exchange:

From 9c90fe57472b7be789cdc653bcb0090293007b07 Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Thu, 1 Jan 2026 14:00:22 -0500
Subject: [PATCH 09/13] Changed an id to class

---
 app/views/bookmarks/_bookmarkable_blurb.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/bookmarks/_bookmarkable_blurb.html.erb b/app/views/bookmarks/_bookmarkable_blurb.html.erb
index 672f57e0878..d6bac2fea33 100644
--- a/app/views/bookmarks/_bookmarkable_blurb.html.erb
+++ b/app/views/bookmarks/_bookmarkable_blurb.html.erb
@@ -18,12 +18,12 @@
       <% if current_user_bookmark ||= bookmark_if_exists(unwrapped) %>
         <%= link_to ts("Saved"),
                     edit_bookmark_path(current_user_bookmark),
-                    id: "bookmark_form_trigger_for_#{bookmarkable.id}",
+                    class: "bookmark_form_trigger_for_#{bookmarkable.id}",
                     remote: true %>
       <% else %>
         <%= link_to ts("Save"),
                     new_polymorphic_path([bookmarkable, Bookmark]),
-                    id: "bookmark_form_trigger_for_#{bookmarkable.id}",
+                    class: "bookmark_form_trigger_for_#{bookmarkable.id}",
                     remote: true %>
       <% end %>
     </li>

From b4bbe6e8de1125437e8c5ef2ebb5268bb0a909cd Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Thu, 1 Jan 2026 14:08:35 -0500
Subject: [PATCH 10/13] fixed linter issue

---
 app/views/bookmarks/_bookmarkable_blurb.html.erb | 10 ++--------
 config/locales/views/en.yml                      |  3 +++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/views/bookmarks/_bookmarkable_blurb.html.erb b/app/views/bookmarks/_bookmarkable_blurb.html.erb
index d6bac2fea33..1caecfb4a6a 100644
--- a/app/views/bookmarks/_bookmarkable_blurb.html.erb
+++ b/app/views/bookmarks/_bookmarkable_blurb.html.erb
@@ -16,15 +16,9 @@
   <ul class="actions" role="navigation">
     <li>
       <% if current_user_bookmark ||= bookmark_if_exists(unwrapped) %>
-        <%= link_to ts("Saved"),
-                    edit_bookmark_path(current_user_bookmark),
-                    class: "bookmark_form_trigger_for_#{bookmarkable.id}",
-                    remote: true %>
+        <%= link_to t(".saved"), edit_bookmark_path(current_user_bookmark), class: "bookmark_form_trigger_for_#{bookmarkable.id}", remote: true %>
       <% else %>
-        <%= link_to ts("Save"),
-                    new_polymorphic_path([bookmarkable, Bookmark]),
-                    class: "bookmark_form_trigger_for_#{bookmarkable.id}",
-                    remote: true %>
+        <%= link_to t(".save"), new_polymorphic_path([bookmarkable, Bookmark]), class: "bookmark_form_trigger_for_#{bookmarkable.id}", remote: true %>
       <% end %>
     </li>
   </ul>
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 731ca4fc42c..344efc2deca 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -540,6 +540,9 @@ en:
       deleted: This has been deleted, sorry!
       save: Save
       saved: Saved
+    bookmarkable_blurb:
+      save: Save
+      saved: Saved
     bookmark_owner_navigation:
       delete: Delete
       delete_confirmation: Are you sure you want to delete this bookmark?

From 7a33cf609a5532f30d28e4153e659c55cabfb867 Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Thu, 1 Jan 2026 20:10:22 -0500
Subject: [PATCH 11/13] Normalized

---
 config/locales/views/en.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index 344efc2deca..83adfed1120 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -540,9 +540,6 @@ en:
       deleted: This has been deleted, sorry!
       save: Save
       saved: Saved
-    bookmarkable_blurb:
-      save: Save
-      saved: Saved
     bookmark_owner_navigation:
       delete: Delete
       delete_confirmation: Are you sure you want to delete this bookmark?
@@ -551,6 +548,9 @@ en:
       share_bookmark: Share Bookmark
     bookmark_user_module:
       bookmarked_by_html: Bookmarked by %{pseud_link}
+    bookmarkable_blurb:
+      save: Save
+      saved: Saved
     index:
       advanced_search: try our advanced search
       choose_fandom: choose a fandom

From 48127a961179a9491cd637853c40e83e3293ce3f Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Thu, 8 Jan 2026 14:01:29 -0500
Subject: [PATCH 12/13] Added fix to allow right click

---
 Gemfile.lock                                            | 3 ++-
 app/views/bookmarks/_bookmark_blurb.html.erb            | 2 +-
 app/views/bookmarks/_bookmark_owner_navigation.html.erb | 2 +-
 app/views/bookmarks/_bookmarkable_blurb.html.erb        | 2 +-
 app/views/bookmarks/bookmark_form_dynamic.js.erb        | 4 ++--
 app/views/bookmarks/index.html.erb                      | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index e6e5924ca23..5c58a6a4b99 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -369,7 +369,8 @@ GEM
     multi_xml (0.6.0)
     mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
-    mysql2 (0.5.6)
+    mysql2 (0.5.7)
+      bigdecimal
     n_plus_one_control (0.7.2)
     net-http (0.6.0)
       uri
diff --git a/app/views/bookmarks/_bookmark_blurb.html.erb b/app/views/bookmarks/_bookmark_blurb.html.erb
index 382b6939f4d..597b827c5df 100644
--- a/app/views/bookmarks/_bookmark_blurb.html.erb
+++ b/app/views/bookmarks/_bookmark_blurb.html.erb
@@ -25,7 +25,7 @@
         <% if logged_in? && !is_author_of?(bookmark) %>
           <li>
             <% if (current_user_bookmark ||= bookmark_if_exists(bookmarkable)) %>
-              <%= link_to t(".saved"), edit_bookmark_path(current_user_bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
+              <%= link_to t(".saved"), edit_bookmark_path(current_user_bookmark), data: { path: edit_bookmark_path(current_user_bookmark) }, class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
             <% else %>
               <%= link_to t(".save"), get_new_bookmark_path(bookmarkable), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
             <% end %>
diff --git a/app/views/bookmarks/_bookmark_owner_navigation.html.erb b/app/views/bookmarks/_bookmark_owner_navigation.html.erb
index 58d8d5a6bcb..b674b37bb20 100644
--- a/app/views/bookmarks/_bookmark_owner_navigation.html.erb
+++ b/app/views/bookmarks/_bookmark_owner_navigation.html.erb
@@ -1,7 +1,7 @@
 <% # expects "bookmark" %>
 <% bookmark_form_id = (bookmark.bookmarkable.blank? ? "#{bookmark.id}" : "#{bookmark.bookmarkable.id}") %>
 <ul class="actions" role="menu">
-  <li><%= link_to t(".edit"), edit_bookmark_path(bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %></li>
+  <li><%= link_to t(".edit"), edit_bookmark_path(bookmark), data: { path: edit_bookmark_path(bookmark) }, class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %></li>
   <li><%= link_to t(".delete"), confirm_delete_bookmark_path(bookmark), data: { confirm: t(".delete_confirmation") } %></li>
   <li id="add_collection_link"><%= collection_link(bookmark) %></li>
   <% if bookmark.bookmarkable.is_a?(Work) && !bookmark.bookmarkable.unrevealed? %>
diff --git a/app/views/bookmarks/_bookmarkable_blurb.html.erb b/app/views/bookmarks/_bookmarkable_blurb.html.erb
index 1caecfb4a6a..806126adfca 100644
--- a/app/views/bookmarks/_bookmarkable_blurb.html.erb
+++ b/app/views/bookmarks/_bookmarkable_blurb.html.erb
@@ -16,7 +16,7 @@
   <ul class="actions" role="navigation">
     <li>
       <% if current_user_bookmark ||= bookmark_if_exists(unwrapped) %>
-        <%= link_to t(".saved"), edit_bookmark_path(current_user_bookmark), class: "bookmark_form_trigger_for_#{bookmarkable.id}", remote: true %>
+        <%= link_to t(".saved"), edit_bookmark_path(current_user_bookmark), data: { path: edit_bookmark_path(current_user_bookmark) }, class: "bookmark_form_trigger_for_#{bookmarkable.id}", remote: true %>
       <% else %>
         <%= link_to t(".save"), new_polymorphic_path([bookmarkable, Bookmark]), class: "bookmark_form_trigger_for_#{bookmarkable.id}", remote: true %>
       <% end %>
diff --git a/app/views/bookmarks/bookmark_form_dynamic.js.erb b/app/views/bookmarks/bookmark_form_dynamic.js.erb
index 780b07e4f84..da09bea436c 100644
--- a/app/views/bookmarks/bookmark_form_dynamic.js.erb
+++ b/app/views/bookmarks/bookmark_form_dynamic.js.erb
@@ -3,13 +3,13 @@
 
 var bookmark_div = $j('#bookmark_form_placement_for_<%= bookmark_form_id %>');
 
-bookmark_div.html("<%= escape_javascript(render "bookmarks/bookmark_form", :bookmarkable => @bookmarkable, :bookmark => @bookmark, :button_name => @button_name, :action => @action, :in_page => true, :dynamic => true) %>");
+if (!bookmark_div.children().length) { bookmark_div.html("<%= escape_javascript(render "bookmarks/bookmark_form", :bookmarkable => @bookmarkable, :bookmark => @bookmark, :button_name => @button_name, :action => @action, :in_page => true, :dynamic => true) %>"); }
 $j('.bookmark_form_trigger_for_<%= bookmark_form_id %>').hide();
 
 $j('#bookmark_form_close_for_<%= bookmark_form_id %>').click(function(){
   $j('#bookmark_form_placement_for_<%= bookmark_form_id %>').hide();
   $j('.bookmark_form_trigger_for_<%= bookmark_form_id %>').show();
-  $j('.bookmark_form_trigger_for_<%= bookmark_form_id %>').attr('href', '#');
+  $j('.bookmark_form_trigger_for_<%= bookmark_form_id %>').attr('href', j('.bookmark_form_trigger_for_<%= bookmark_form_id %>').attr("data-path"));
 });
 
 // if canceled we don't want to generate the form a second time, just reopen it
diff --git a/app/views/bookmarks/index.html.erb b/app/views/bookmarks/index.html.erb
index c14578ddcdd..7293d1419f2 100755
--- a/app/views/bookmarks/index.html.erb
+++ b/app/views/bookmarks/index.html.erb
@@ -21,7 +21,7 @@
       <% if logged_in? && !is_author_of?(@bookmark) %>
         <li>
           <% if (current_user_bookmark ||= bookmark_if_exists(@bookmarkable)) %>
-            <%= link_to t(".navigation.edit"), edit_bookmark_path(current_user_bookmark), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
+            <%= link_to t(".navigation.edit"), edit_bookmark_path(current_user_bookmark), data: { path: edit_bookmark_path(current_user_bookmark) }, class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
           <% else %>
             <%= link_to t(".navigation.new"), get_new_bookmark_path(@bookmarkable), class: "bookmark_form_trigger_for_#{bookmark_form_id}", remote: true %>
           <% end %>

From 3a9a6d360fe19b0ab45a487d72de52447ec445e8 Mon Sep 17 00:00:00 2001
From: ReverM <danael.villeneuve@gmail.com>
Date: Thu, 8 Jan 2026 14:02:57 -0500
Subject: [PATCH 13/13] Pushed gemfile.lock by accident

---
 Gemfile.lock | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a2e83bf3995..8d9f6478ad7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -372,8 +372,7 @@ GEM
     multi_xml (0.6.0)
     mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
-    mysql2 (0.5.7)
-      bigdecimal
+    mysql2 (0.5.6)
     n_plus_one_control (0.7.2)
     net-http (0.6.0)
       uri