3 files changed, 60 insertions, 24 deletions

diff --git a/app/controllers/content_controller.rb b/app/controllers/content_controller.rb
index 8be4bfbd..debb69b9 100644
--- a/app/controllers/content_controller.rb
+++ b/app/controllers/content_controller.rb
@@ -14,6 +14,11 @@ class ContentController < ApplicationController
     expires_in 20.minutes, :public => true
 
     if @page and @page.public?
+      if (target = @page.redirect_target)
+        return redirect_to(target.internal? ? content_path(target.node.unique_name) : target.url,
+                           :status => @page.redirect_status)
+      end
+
       render(
         :template => @page.valid_template,
         :layout => true
diff --git a/app/models/page.rb b/app/models/page.rb
index 9115ccb0..b17708e7 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -124,7 +124,7 @@ class Page < ApplicationRecord
   end
 
   # One row per non-default locale, read from the actual translation
-  # row -- never through the locale-dependent accessor, so a locale
+  # row, never through the locale-dependent accessor, so a locale
   # with no real translation yet reports as absent rather than quietly
   # showing a fallback value borrowed from another locale.
   def translation_summary
@@ -311,21 +311,27 @@ class Page < ApplicationRecord
     published_at.nil? ? true : published_at < Time.now
   end
 
-  # The destination this page sends visitors to, or nil. An internal target
-  # wins over an external one. A target that is restricted or has no head is
-  # no destination at all, so the page renders itself rather than linking to
-  # nothing. The banner partial calls this too, so the precedence cannot
-  # drift between the redirect and the link.
+  # Where this page sends visitors, or nil. Internal wins over external. A
+  # node that is restricted or has no head is no destination at all, so the
+  # page renders itself rather than pointing at nothing.
+  RedirectTarget = Struct.new(:node, :url) do
+    def internal?
+      node.present?
+    end
+  end
+
   def redirect_target
     return nil if redirect.blank?
 
     if redirect_node_id.present?
-      node = Node.find_by(:id => redirect_node_id)
-      return nil unless node&.head && !node.restricted?
-      return node.unique_name
+      target = Node.find_by(:id => redirect_node_id)
+      return nil unless target&.head && !target.restricted?
+      return RedirectTarget.new(target, nil)
     end
 
-    external_url.presence
+    return RedirectTarget.new(nil, external_url) if external_url.present?
+
+    nil
   end
 
   def redirect_status
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 927cc648..f629985e 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -80,7 +80,7 @@
                     </li>
                   <% end %>
                 </ul>
-                <p class="field_hint"><%= t(".headline_hint") %></p>
+                <span class="field_hint"><%= t(".headline_hint") %></span>
                 <%= text_field_tag nil, nil, id: "related_asset_search_term", placeholder: t(".attach_search_placeholder"), autocomplete: "off" %>
                 <div id="related_asset_search_results" class="search_results"></div>
               </div>
@@ -118,7 +118,7 @@
               <div class="layout_row_label"><%= t(".parent") %></div>
               <div class="layout_row_content">
                 <%= text_field_tag :move_to_search_term, (Node.find_by(:id => @page.parent_node_id) || @node.parent)&.title %>
-                <p class="field_hint"><%= t(".parent_hint") %></p>
+                <span class="field_hint"><%= t(".parent_hint") %></span>
                 <div id="move_to_search_results" class="search_results"></div>
                 <%= d.hidden_field(
                       :parent_node_id,
@@ -129,6 +129,43 @@
             </div>
 
             <div class="layout_row">
+              <div class="layout_row_label"><%= t(".author") %></div>
+              <div class="layout_row_content">
+                <%= d.select :user_id, user_list,
+                      :selected => @page.user_id || @node.draft&.user_id || @node.head&.user_id %>
+              </div>
+            </div>
+
+            <div class="layout_row">
+              <div class="layout_row_label"><%= t(".publish_at") %></div>
+              <div class="layout_row_content"><%= d.datetime_select :published_at, :value => @page.published_at %></div>
+            </div>
+
+            <div class="layout_row">
+              <div class="layout_row_label"><%= t(".redirect") %></div>
+              <div class="layout_row_content">
+                <label>
+                  <%= d.check_box :redirect, { :checked => @page.redirect.present? },
+                        "temporary", "" %>
+                  <%= t(".redirect_enable") %>
+                </label>
+                <span class="field_hint"><%= t(".redirect_hint") %></span>
+
+                <div id="redirect_target_field" style="<%= "display: none;" unless @page.redirect.present? %>">
+                  <div class="input_group" data-clears="page_redirect_node_id">
+                    <span class="field_search_icon"><%= icon("search", library: "tabler", "aria-hidden": true) %></span>
+                    <%= text_field_tag :redirect_search_term,
+                          Node.find_by(:id => @page.redirect_node_id)&.title,
+                          :placeholder => "—", :class => "clearable_input" %>
+                    <div id="redirect_search_results" class="search_results"></div>
+                    <button type="button" class="field_clear" aria-label="clear input">×</button>
+                    <%= d.hidden_field :redirect_node_id %>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="layout_row">
               <div class="layout_row_label"><%= t(".external_url") %></div>
               <div class="layout_row_content">
                 <%= d.text_field :external_url %>
@@ -144,11 +181,6 @@
             </div>
 
             <div class="layout_row">
-              <div class="layout_row_label"><%= t(".publish_at") %></div>
-              <div class="layout_row_content"><%= d.datetime_select :published_at, :value => @page.published_at %></div>
-            </div>
-
-            <div class="layout_row">
               <div class="layout_row_label"><%= t(".template") %></div>
               <div class="layout_row_content">
               <%= d.select :template_name, custom_page_templates, {:prompt => 'Select Template'} %>
@@ -156,13 +188,6 @@
               </div>
             </div>
 
-            <div class="layout_row">
-              <div class="layout_row_label"><%= t(".author") %></div>
-              <div class="layout_row_content">
-                <%= d.select :user_id, user_list,
-                      :selected => @page.user_id || @node.draft&.user_id || @node.head&.user_id %>
-              </div>
-            </div>
           </div>
         </details>