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

Merge pull request #2948 from sbwalker/dev

Browse Source 
fix #2942 - reverse ordering of page name and site name for page title
This commit is contained in:
Shaun Walker 2023-06-28 12:51:11 -04:00 committed by GitHub
commit e669bb1f82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@
} }
else else
{ {
SiteState.Properties.PageTitle = PageState.Site.Name + " - " + PageState.Page.Name; SiteState.Properties.PageTitle = PageState.Page.Name + " - " + PageState.Site.Name;
} }
// set page head content // set page head content

7
Oqtane.Server/Controllers/PageController.cs
View File

@ -14,6 +14,7 @@ using Oqtane.Modules.Admin.Users;
using System.IO; using System.IO;
using Oqtane.Services; using Oqtane.Services;
using Oqtane.UI; using Oqtane.UI;
using System;
namespace Oqtane.Controllers namespace Oqtane.Controllers
{ {
@ -182,9 +183,9 @@ namespace Oqtane.Controllers
page = new Page(); page = new Page();
page.SiteId = parent.SiteId; page.SiteId = parent.SiteId;
page.ParentId = parent.PageId; page.ParentId = parent.PageId;
page.Name = user.Username; page.Name = user.DisplayName;
page.Path = parent.Path + "/" + page.Name; page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(page.Name);
page.Title = parent.Name + " - " + page.Name; page.Title = page.Name + " - " + parent.Name;
page.Order = 0; page.Order = 0;
page.IsNavigation = false; page.IsNavigation = false;
page.Url = ""; page.Url = "";