diff --git a/Oqtane.Client/Head.razor b/Oqtane.Client/Head.razor
index 69d78f31..edc2da06 100644
--- a/Oqtane.Client/Head.razor
+++ b/Oqtane.Client/Head.razor
@@ -2,7 +2,7 @@
@using Oqtane.Shared
@inject SiteState SiteState
-@title
+@((MarkupString)title)
@((MarkupString)content)
@code {
@@ -21,14 +21,14 @@
case "PageTitle":
if (title != SiteState.Properties.PageTitle)
{
- title = SiteState.Properties.PageTitle;
+ title = "\n" + SiteState.Properties.PageTitle + "";
StateHasChanged();
}
break;
case "HeadContent":
if (content != SiteState.Properties.HeadContent)
{
- content = SiteState.Properties.HeadContent;
+ content = SiteState.Properties.HeadContent + "\n";
StateHasChanged();
}
break;
diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 1c179314..15b9bc83 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -29,8 +29,16 @@
SiteState.Properties.PageTitle = PageState.Site.Name + " - " + PageState.Page.Name;
}
- // set page meta
- SiteState.Properties.HeadContent = PageState.Page.Meta ?? "";
+ // set page head content
+ var content = "";
+ var favicon = "favicon.ico";
+ if (PageState.Site.FaviconFileId != null)
+ {
+ favicon = Utilities.FileUrl(PageState.Alias, PageState.Site.FaviconFileId.Value);
+ }
+ content += $"\n";
+ content += PageState.Page.Meta ?? "";
+ SiteState.Properties.HeadContent = content;
DynamicComponent = builder =>
{
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index 8bfdcbf8..9583c040 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -7,9 +7,7 @@
-
-
@if (!string.IsNullOrEmpty(Model.PWAScript))
{
@@ -20,6 +18,7 @@
@Html.Raw(Model.HeadResources)
+
@if (string.IsNullOrEmpty(Model.Message))
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index d37bca0d..82689923 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -65,7 +65,6 @@ namespace Oqtane.Pages
public string RemoteIPAddress = "";
public string HeadResources = "";
public string BodyResources = "";
- public string FavIcon = "favicon.ico";
public string PWAScript = "";
public string ReconnectScript = "";
public string Message = "";
@@ -123,10 +122,6 @@ namespace Oqtane.Pages
{
RenderMode = site.RenderMode;
}
- if (site.FaviconFileId != null)
- {
- FavIcon = Utilities.FileUrl(alias, site.FaviconFileId.Value);
- }
if (Runtime == "Server")
{
ReconnectScript = CreateReconnectScript();