From 452c3fd355806fb2b70fd45036119607cf6b57dd Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Wed, 28 Jun 2023 12:50:58 -0400
Subject: [PATCH] fix #2942 - reverse ordering of page name and site name for
 page title

---
 Oqtane.Client/UI/ThemeBuilder.razor         | 2 +-
 Oqtane.Server/Controllers/PageController.cs | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Oqtane.Client/UI/ThemeBuilder.razor b/Oqtane.Client/UI/ThemeBuilder.razor
index 0719a546..ebe824ab 100644
--- a/Oqtane.Client/UI/ThemeBuilder.razor
+++ b/Oqtane.Client/UI/ThemeBuilder.razor
@@ -26,7 +26,7 @@
         }
         else
         {
-            SiteState.Properties.PageTitle = PageState.Site.Name + " - " + PageState.Page.Name;
+            SiteState.Properties.PageTitle = PageState.Page.Name + " - " + PageState.Site.Name;
         }
 
         // set page head content
diff --git a/Oqtane.Server/Controllers/PageController.cs b/Oqtane.Server/Controllers/PageController.cs
index c3501345..f22f7467 100644
--- a/Oqtane.Server/Controllers/PageController.cs
+++ b/Oqtane.Server/Controllers/PageController.cs
@@ -14,6 +14,7 @@ using Oqtane.Modules.Admin.Users;
 using System.IO;
 using Oqtane.Services;
 using Oqtane.UI;
+using System;
 
 namespace Oqtane.Controllers
 {
@@ -182,9 +183,9 @@ namespace Oqtane.Controllers
                 page = new Page();
                 page.SiteId = parent.SiteId;
                 page.ParentId = parent.PageId;
-                page.Name = user.Username;
-                page.Path = parent.Path + "/" + page.Name;
-                page.Title = parent.Name + " - " + page.Name;
+                page.Name = user.DisplayName;
+                page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(page.Name);
+                page.Title = page.Name + " - " + parent.Name;
                 page.Order = 0;
                 page.IsNavigation = false;
                 page.Url = "";