Add link target to Alloy templates

templates/Alloy.Mvc/Helpers/HtmlHelpers.cs

@@ -106,7 +106,8 @@ public MenuItem(PageData page)
     /// Returns a ConditionalLink object which when disposed will write a closing <![CDATA[ </a> ]]> tag
     /// to the response if the shouldWriteLink argument is true.
     /// </summary>
-    public static ConditionalLink BeginConditionalLink(this IHtmlHelper helper, bool shouldWriteLink, string url, string title = null, string cssClass = null)
+    public static ConditionalLink BeginConditionalLink(this IHtmlHelper helper, bool shouldWriteLink, string url,
+        string title = null, string cssClass = null, string linkTarget = null)
     {
         if (shouldWriteLink)
         {
@@ -123,6 +124,11 @@ public static ConditionalLink BeginConditionalLink(this IHtmlHelper helper, bool
                 linkTag.Attributes.Add("class", cssClass);
             }
 
+            if (!string.IsNullOrWhiteSpace(linkTarget))
+            {
+                linkTag.Attributes.Add("target", linkTarget);
+            }
+
             helper.ViewContext.Writer.Write(linkTag.RenderStartTag());
         }
         return new ConditionalLink(helper.ViewContext, shouldWriteLink);
@@ -137,7 +143,8 @@ public static ConditionalLink BeginConditionalLink(this IHtmlHelper helper, bool
     /// Overload which only executes the delegate for retrieving the URL if the link should be written.
     /// This may be used to prevent null reference exceptions by adding null checkes to the shouldWriteLink condition.
     /// </remarks>
-    public static ConditionalLink BeginConditionalLink(this IHtmlHelper helper, bool shouldWriteLink, Func<string> urlGetter, string title = null, string cssClass = null)
+    public static ConditionalLink BeginConditionalLink(this IHtmlHelper helper, bool shouldWriteLink,
+        Func<string> urlGetter, string title = null, string cssClass = null, string linkTarget = null)
     {
         var url = string.Empty;
 
@@ -146,7 +153,7 @@ public static ConditionalLink BeginConditionalLink(this IHtmlHelper helper, bool
             url = urlGetter();
         }
 
-        return helper.BeginConditionalLink(shouldWriteLink, url, title, cssClass);
+        return helper.BeginConditionalLink(shouldWriteLink, url, title, cssClass, linkTarget);
     }
 
     public class ConditionalLink : IDisposable

templates/Alloy.Mvc/Helpers/UrlHelpers.cs

@@ -1,4 +1,5 @@
 using EPiServer.ServiceLocation;
+using EPiServer.Shell.Navigation;
 using EPiServer.Web.Routing;
 using Microsoft.AspNetCore.Mvc;
 
@@ -55,4 +56,20 @@ public static string PageLinkUrl(this IUrlHelper urlHelper, PageData page)
         }
         return string.Empty;
     }
+
+    /// <summary>
+    /// Returns the URL anchor target for a page with shortcut settings
+    /// </summary>
+    public static string PageLinkTarget(this IUrlHelper urlHelper, PageData page)
+    {
+        return page.LinkType switch
+        {
+            PageShortcutType.Normal => "",
+            PageShortcutType.Inactive => "",
+            PageShortcutType.FetchData => page.TargetFrameName,
+            PageShortcutType.Shortcut => page.TargetFrameName,
+            PageShortcutType.External => page.TargetFrameName,
+            _ => throw new ArgumentOutOfRangeException($"Unknown link type: {page.LinkType}'")
+        };
+    }
 }

templates/Alloy.Mvc/Views/Shared/PagePartials/Page.cshtml

@@ -3,7 +3,7 @@
 @model SitePageData
 
 <div>
-    @using (Html.BeginConditionalLink(Model.HasTemplate(), Url.PageLinkUrl(Model), Model.PageName))
+    @using (Html.BeginConditionalLink(Model.HasTemplate(), Url.PageLinkUrl(Model), Model.PageName, null, Url.PageLinkTarget(Model)))
     {
         <div class="img-wrapper mb-3">
             @Html.DisplayFor(m => m.PageImage)

templates/Alloy.Mvc/Views/Shared/PagePartials/PageWide.cshtml

@@ -8,7 +8,7 @@
             <img class="pb-3 pb-lg-0" src="@Url.ContentUrl(Model.PageImage)" />
         </div>
         <div class="col-sm-12 col-lg-6">
-            @using (Html.BeginConditionalLink(Model.HasTemplate(), Url.PageLinkUrl(Model), Model.PageName))
+            @using (Html.BeginConditionalLink(Model.HasTemplate(), Url.PageLinkUrl(Model), Model.PageName, null, Url.PageLinkTarget(Model)))
             {
                 <h2>@Model.PageName</h2>
                 <p>@Model.TeaserText</p>