kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2885 from sbwalker/dev

Browse Source 
handle type for favicon and improve helptext
This commit is contained in:
Shaun Walker 2023-06-12 12:31:09 -04:00 committed by GitHub
commit 875bcd8ce2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Resources/Modules/Admin/Site/Index.resx
View File

@ -175,7 +175,7 @@
<value>Specify a logo for the site</value> <value>Specify a logo for the site</value>
</data> </data>
<data name="FavoriteIcon.HelpText" xml:space="preserve"> <data name="FavoriteIcon.HelpText" xml:space="preserve">
<value>Specify a Favicon</value> <value>Specify a Favicon. The format for the image must be 16×16, 32×32, 48×48, or 64×64 pixels in size, and 8-bit, 24-bit, or 32-bit in color depth. The format of the image must be ICO, PNG, or GIF.</value>
</data> </data>
<data name="DefaultTheme.HelpText" xml:space="preserve"> <data name="DefaultTheme.HelpText" xml:space="preserve">
<value>Select the sites default theme</value> <value>Select the sites default theme</value>

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

@ -33,11 +33,13 @@
var headcontent = ""; var headcontent = "";
// favicon // favicon
var favicon = "favicon.ico"; var favicon = "favicon.ico";
var favicontype = "x-icon";
if (PageState.Site.FaviconFileId != null) if (PageState.Site.FaviconFileId != null)
{ {
favicon = Utilities.FileUrl(PageState.Alias, PageState.Site.FaviconFileId.Value); favicon = Utilities.FileUrl(PageState.Alias, PageState.Site.FaviconFileId.Value);
favicontype = favicon.Substring(favicon.LastIndexOf(".") + 1);
} }
headcontent += $"<link id=\"app-favicon\" rel=\"shortcut icon\" type=\"image/x-icon\" href=\"{favicon}\" />\n"; headcontent += $"<link id=\"app-favicon\" rel=\"shortcut icon\" type=\"image/{favicontype}\" href=\"{favicon}\" />\n";
// stylesheets // stylesheets
foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet)) foreach (Resource resource in PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Stylesheet))
{ {