Show a pending address in the cockpit, the diff and the publish confirm

2 files changed, 23 insertions, 1 deletions

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>