7 files changed, 58 insertions, 3 deletions

diff --git a/app/helpers/node_actions_helper.rb b/app/helpers/node_actions_helper.rb
index c4de46cc..19385543 100644
--- a/app/helpers/node_actions_helper.rb
+++ b/app/helpers/node_actions_helper.rb
@@ -221,8 +221,8 @@ module NodeActionsHelper
   end
 
   def subject_ref action
-    action.node ? link_to(h(action.subject_name), node_path(action.node))
-                : h(action.subject_name)
+    name = action.subject_name.presence || t("admin.common.no_title")
+    action.node ? link_to(h(name), node_path(action.node)) : h(name)
   end
 
   def asset_ref action
diff --git a/app/models/page.rb b/app/models/page.rb
index 4635f1b4..bba7e6bc 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -272,6 +272,7 @@ class Page < ApplicationRecord
       end
 
     text_diffs.merge(
+      address:       address_diff_against(other),
       tags:          { added: tag_list.to_a - other.tag_list.to_a, removed: other.tag_list.to_a - tag_list.to_a },
       template_name: { from: other.template_name, to: template_name, changed: template_name != other.template_name },
       assets:        { added: assets.to_a - other.assets.to_a, removed: other.assets.to_a - assets.to_a }
@@ -417,4 +418,12 @@ class Page < ApplicationRecord
 
       self.body = doc.to_html
     end
+
+    def address_diff_against other
+      changed = slug != other.slug || parent_node_id != other.parent_node_id
+
+      { :from    => other.prospective_unique_name,
+        :to      => prospective_unique_name,
+        :changed => changed }
+    end
 end
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 3b2d28d9..a826be37 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -50,8 +50,13 @@
           <% if @node.draft && !@node.autosave && !@node.in_trash? && !@node.trash_node? %>
             <div class="info_item">
               <% if may_change_live %>
+                <% confirm = t(".confirm_publish") %>
+                <% if @node.prospective_unique_name != @node.unique_name %>
+                  <% confirm += " " + t(".confirm_publish_moves",
+                                        :path => @node.prospective_unique_name) %>
+                <% end %>
                 <%= button_to t(".publish"), publish_node_path(@node), method: :put,
-                      form: { data: { confirm: t(".confirm_publish") }, class: 'button_to state_changing' } %>
+                      form: { data: { confirm: confirm }, class: 'button_to state_changing' } %>
               <% else %>
                 <span class="disabled_action"><%= t(".publish") %></span>
               <% end %>
@@ -223,6 +228,13 @@
         locale_param  = ->(locale) { locale unless locale == I18n.default_locale }
       %>
 
+      <% if @node.prospective_unique_name != @node.unique_name %>
+        <p class="pending_address">
+          <%= icon("arrow-move-right", library: "tabler", "aria-hidden": true) %>
+          <%= t(".pending_address", :path => @node.prospective_unique_name) %>
+        </p>
+      <% end %>
+
       <div class="link_matrix link_matrix_<%= link_locales.size %>">
         <div class="link_matrix_head">
           <span></span>
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index 5c881f24..0fd9ccb9 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -115,6 +115,16 @@
     <%= raw @diff[:body] %>
   <% end %>
 
+  <h3><%= t(".address") %></h3>
+  <% if @diff[:address][:changed] %>
+    <p>
+      <del><%= @diff[:address][:from] || t(".none_marker") %></del>
+      <ins><%= @diff[:address][:to] || t(".none_marker") %></ins>
+    </p>
+  <% else %>
+    <p class="diff_unchanged"><%= t(".no_change") %></p>
+  <% end %>
+
   <h3><%= Page.human_attribute_name(:tag_list) %></h3>
   <% if @diff[:tags][:added].empty? && @diff[:tags][:removed].empty? %>
     <p class="diff_unchanged"><%= t(".no_change") %></p>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 6068d4c4..032d7647 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -477,6 +477,7 @@ de:
       layer_autosave: "Autosave"
       publish: "Veröffentlichen"
       confirm_publish: "Diesen Entwurf veröffentlichen?"
+      confirm_publish_moves: "Dabei wird die Seite nach %{path} verschoben."
       destroy_draft: "Entwurf löschen"
       discard_autosave: "Autosave verwerfen"
       confirm_trash: "Diese Seite und alles darunter in den Papierkorb verschieben? Alle veröffentlichten Inhalte darin gehen offline."
@@ -512,6 +513,7 @@ de:
       will_publish_at: "Wird veröffentlicht am"
       links: "Links"
       public: "Öffentlich"
+      pending_address: "Beim Veröffentlichen wird diese Seite nach %{path} verschoben"
       admin_preview: "Admin-Vorschau"
       public_preview: "Öffentliche Vorschau"
       revoke: "Zurückziehen"
@@ -747,6 +749,7 @@ de:
       no_change: "Keine Änderung."
       unchanged_here_html: "Keine Änderung in der Übersetzung %{lang} zwischen diesen Revisionen — geändert wurde %{others}."
       unchanged_anywhere: "Zwischen diesen Revisionen wurde keine Übersetzung geändert."
+      address: "Adresse"
     index:
       title: "Revisionen für Node: %{path}"
       back_to_node: "Zurück zum Node"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 524d07d0..e75000bc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -424,6 +424,7 @@ en:
       layer_autosave: "Autosave"
       publish: "Publish"
       confirm_publish: "Publish this draft?"
+      confirm_publish_moves: "This will also move the page to %{path}."
       destroy_draft: "Destroy Draft"
       discard_autosave: "Discard Autosave"
       confirm_trash: "Move this page and everything beneath it to the Trash? All published content in it will go offline."
@@ -459,6 +460,7 @@ en:
       will_publish_at: "Will publish at"
       links: "Links"
       public: "Public"
+      pending_address: "Beim Veröffentlichen wird diese Seite nach %{path} verschoben"
       admin_preview: "Admin Preview"
       public_preview: "Public Preview"
       revoke: "Revoke"
@@ -710,6 +712,7 @@ en:
       no_change: "No change."
       unchanged_here_html: "No change in the %{lang} translation between these revisions — %{others} changed."
       unchanged_anywhere: "No translation changed between these revisions."
+      address: "Address"
     index:
       title: "Revisions for Node: %{path}"
       back_to_node: "Back to node"
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 889a5729..9d287dc7 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -1424,6 +1424,20 @@ form.button_to button[type="submit"] {
   }
 }
 
+.pending_address {
+  display: flex;
+  align-items: center;
+  gap: 0.4rem;
+  margin: 0 0 0.75rem;
+  font-weight: bold;
+}
+
+.pending_address svg {
+  width: 1.25rem;
+  height: 1.25rem;
+  flex-shrink: 0;
+}
+
 /* Layout only -- the at-rest visibility (wavy underline) for these
    links comes from the scoped rule in Base elements above. */
 .add_events,
@@ -2348,6 +2362,10 @@ input#menu_item_title {
   overflow-y: auto;
 }
 
+.restore_picker .search_results:empty {
+  display: none;
+}
+
 /* ============================================================
    User section
    ============================================================ */