Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

added HeadContent property to Site and replaced Meta property on Page with HeadContent property.

Browse Source
This commit is contained in:
sbwalker
2023-05-16 16:23:07 -04:00
parent 89ada83012
commit 8d2f644177
10 changed files with 346 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Oqtane.Client/UI/ThemeBuilder.razor
View File

@ -38,15 +38,14 @@
favicon = Utilities.FileUrl(PageState.Alias, PageState.Site.FaviconFileId.Value);
}
headcontent += $"<link id=\"app-favicon\" rel=\"shortcut icon\" type=\"image/x-icon\" href=\"{favicon}\" />\n";
// PWA manifest
if (PageState.Site.PwaIsEnabled && PageState.Site.PwaAppIconFileId != null && PageState.Site.PwaSplashIconFileId != null)
// head content
if (!string.IsNullOrEmpty(PageState.Site.HeadContent))
{
headcontent += "<link id=\"app-manifest\" rel=\"manifest\" />\n";
headcontent += PageState.Site.HeadContent + "\n";
}
// meta
if (!string.IsNullOrEmpty(PageState.Page.Meta))
if (!string.IsNullOrEmpty(PageState.Page.HeadContent))
{
headcontent += PageState.Page.Meta + "\n";
headcontent += PageState.Page.HeadContent + "\n";
}
// stylesheets
foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet))
@ -54,6 +53,11 @@
var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
headcontent += CreateLink(url, resource.Integrity, resource.CrossOrigin) + "\n";
}
// PWA manifest
if (PageState.Site.PwaIsEnabled && PageState.Site.PwaAppIconFileId != null && PageState.Site.PwaSplashIconFileId != null)
{
headcontent += "<link id=\"app-manifest\" rel=\"manifest\" />\n";
}
SiteState.Properties.HeadContent = headcontent;
// set page body content