Fix Target attribute on menus breaks HTML validation ，Fixes: OrchardC…

…MS#16340
hyzx86 · Jun 18, 2024 · a2f0b26 · a2f0b26
1 parent 3d3f172
commit a2f0b26
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 10 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Models/HtmlMenuItemPart.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Models/HtmlMenuItemPart.cs
@@ -12,7 +12,7 @@ public class HtmlMenuItemPart : ContentPart
         /// <summary>
         /// The target of the link to create.
         /// </summary>
-        public string Target { get; set; }
+        public string Target { get; set; } = "_self";
 
         /// <summary>
         /// The raw html to display for this link.

diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Models/LinkMenuItemPart.cs b/src/OrchardCore.Modules/OrchardCore.Menu/Models/LinkMenuItemPart.cs
@@ -12,6 +12,6 @@ public class LinkMenuItemPart : ContentPart
         /// <summary>
         /// The target of the link to create.
         /// </summary>
-        public string Target { get; set; }
+        public string Target { get; set; } = "_self";
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/HtmlMenuItemPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/HtmlMenuItemPartEditViewModel.cs
@@ -9,7 +9,7 @@ public class HtmlMenuItemPartEditViewModel
 
         public string Url { get; set; }
 
-        public string Target { get; set; }
+        public string Target { get; set; } = "_self";
 
         public string Html { get; set; }
 

diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/LinkMenuItemPartEditViewModel.cs b/src/OrchardCore.Modules/OrchardCore.Menu/ViewModels/LinkMenuItemPartEditViewModel.cs
@@ -9,7 +9,7 @@ public class LinkMenuItemPartEditViewModel
 
         public string Url { get; set; }
 
-        public string Target { get; set; }
+        public string Target { get; set; } = "_self";
 
         [BindNever]
         public LinkMenuItemPart MenuItemPart { get; set; }

diff --git a/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItemLink-LinkMenuItem.cshtml b/src/OrchardCore.Modules/OrchardCore.Menu/Views/MenuItemLink-LinkMenuItem.cshtml
@@ -16,7 +16,11 @@
         url = Url.Content(linkMenuItemPart.Url);
     }
 
-    tag.Attributes["target"] = linkMenuItemPart.Target;
+    if (!string.IsNullOrEmpty(linkMenuItemPart.Target))
+    {
+        tag.Attributes["target"] = linkMenuItemPart.Target;
+    }
+
     tag.Attributes["href"] = url;
     tag.InnerHtml.Append(contentItem.DisplayText);
 }

diff --git a/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-HtmlMenuItem.liquid b/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-HtmlMenuItem.liquid
@@ -1,2 +1,2 @@
 {% assign link = Model.ContentItem.Content.HtmlMenuItemPart %}
-<a class="nav-link" href="{{ link.Url | href }}" target="{{ link.Target }}">{{ link.Html | raw }}</a>
+<a class="nav-link" href="{{ link.Url | href }}"{% if link.Target %} target="{{link.Target}}" {% endif %}>{{ link.Html | raw }}</a>
diff --git a/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-LinkMenuItem.liquid b/src/OrchardCore.Themes/TheAgencyTheme/Views/MenuItemLink-LinkMenuItem.liquid
@@ -1,5 +1,5 @@
 {% assign link = Model.ContentItem.Content.LinkMenuItemPart %}
-<a class="nav-link" href="{{ link.Url | href }}" target="{{ link.Target }}"
+<a class="nav-link" href="{{ link.Url | href }}"{% if link.Target %} target="{{link.Target}}" {% endif %}
     {% if link.Url contains "#" %}
         data-bs-target="{{ link.Url | split: '/' | last }}"
     {% endif %}>

diff --git a/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-HtmlMenuItem.liquid b/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-HtmlMenuItem.liquid
@@ -3,5 +3,5 @@
 {% if Model.HasItems %}
     <a href="{{ link.Url | href }}" class="nav-link px-lg-3 py-3 py-lg-4 dropdown-toggle" data-bs-toggle="dropdown">{{ link.Html | raw }}<b class="caret"></b></a>
 {% else %}
-    <a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}" target="{{ link.Target }}">{{ link.Html | raw }}</a>
+    <a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}"{% if link.Target %} target="{{link.Target}}"{% endif %}>{{ link.Html | raw }}</a>
 {% endif %}
diff --git a/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-LinkMenuItem.liquid b/src/OrchardCore.Themes/TheBlogTheme/Views/MenuItemLink-LinkMenuItem.liquid
@@ -3,5 +3,5 @@
 {% if Model.HasItems %}
     <a href="{{ link.Url | href }}" class="nav-link px-lg-3 py-3 py-lg-4 dropdown-toggle" data-bs-toggle="dropdown">{{ Model.ContentItem.DisplayText }}<b class="caret"></b></a>
 {% else %}
-    <a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }} target="{{ link.Target }}">{{ Model.ContentItem.DisplayText }}</a>
+    <a class="nav-link px-lg-3 py-3 py-lg-4" href="{{ link.Url | href }}{% if link.Target %} target="{{link.Target}}"{% endif %}>{{ Model.ContentItem.DisplayText }}</a>
 {% endif %}
diff --git a/src/OrchardCore/OrchardCore.Navigation.Core/MenuItem.cs b/src/OrchardCore/OrchardCore.Navigation.Core/MenuItem.cs
@@ -39,7 +39,7 @@ public MenuItem()
         /// <summary>
         /// The html target of the menu item.
         /// </summary>
-        public string Target { get; set; }
+        public string Target { get; set; } = "_self";
 
         /// <summary>
         /// The optional url the menu item should link to.