4 files changed, 34 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>