diff --git a/Oqtane.Client/App.razor b/Oqtane.Client/App.razor
index 405bbd3a..01022680 100644
--- a/Oqtane.Client/App.razor
+++ b/Oqtane.Client/App.razor
@@ -40,7 +40,14 @@
var interop = new Interop(JSRuntime);
SiteState.AntiForgeryToken = await interop.GetElementByName(Constants.RequestVerificationToken);
_installation = await InstallationService.IsInstalled();
- SiteState.Alias = _installation.Alias;
+ if (_installation.Alias != null)
+ {
+ SiteState.Alias = _installation.Alias;
+ }
+ else
+ {
+ _installation.Message = "Site Not Configured Correctly - No Matching Alias Exists For Host Name";
+ }
_initialized = true;
StateHasChanged();
}
diff --git a/Oqtane.Client/Localization/SharedResources.cs b/Oqtane.Client/Localization/SharedResources.cs
deleted file mode 100644
index 77cb9d36..00000000
--- a/Oqtane.Client/Localization/SharedResources.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-namespace Oqtane
-{
- public class SharedResources
- {
- public static readonly string UserLogin = "User Login";
-
- public static readonly string UserRegistration = "User Registration";
-
- public static readonly string PasswordReset = "Password Reset";
-
- public static readonly string UserProfile = "User Profile";
-
- public static readonly string AdminDashboard = "Admin Dashboard";
-
- public static readonly string SiteSettings = "Site Settings";
-
- public static readonly string PageManagement = "Page Management";
-
- public static readonly string UserManagement = "User Management";
-
- public static readonly string ProfileManagement = "Profile Management";
-
- public static readonly string RoleManagement = "Role Management";
-
- public static readonly string FileManagement = "File Management";
-
- public static readonly string RecycleBin = "Recycle Bin";
-
- public static readonly string EventLog = "Event Log";
-
- public static readonly string SiteManagement = "Site Management";
-
- public static readonly string ModuleManagement = "Module Management";
-
- public static readonly string ThemeManagement = "Theme Management";
-
- public static readonly string LanguageManagement = "Language Management";
-
- public static readonly string ScheduledJobs = "Scheduled Jobs";
-
- public static readonly string SqlManagement = "Sql Management";
-
- public static readonly string SystemInfo = "System Info";
-
- public static readonly string SystemUpdate = "System Update";
- }
-}
diff --git a/Oqtane.Client/Resources/.gitkeep b/Oqtane.Client/Resources/.gitkeep
deleted file mode 100644
index e69de29b..00000000
diff --git a/Oqtane.Client/Resources/SharedResources.cs b/Oqtane.Client/Resources/SharedResources.cs
new file mode 100644
index 00000000..2c1d6f25
--- /dev/null
+++ b/Oqtane.Client/Resources/SharedResources.cs
@@ -0,0 +1,7 @@
+namespace Oqtane
+{
+ public class SharedResources
+ {
+
+ }
+}
diff --git a/Oqtane.Server/Pages/_Host.cshtml b/Oqtane.Server/Pages/_Host.cshtml
index ccb24679..cfd3b78c 100644
--- a/Oqtane.Server/Pages/_Host.cshtml
+++ b/Oqtane.Server/Pages/_Host.cshtml
@@ -34,13 +34,6 @@
🗙
- @if (Model.Message != "")
- {
-
- @Model.Message
-
- }
-
@if (Model.Runtime == "WebAssembly")
diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs
index 7537831f..c0333760 100644
--- a/Oqtane.Server/Pages/_Host.cshtml.cs
+++ b/Oqtane.Server/Pages/_Host.cshtml.cs
@@ -38,7 +38,6 @@ namespace Oqtane.Pages
public RenderMode RenderMode = RenderMode.Server;
public string HeadResources = "";
public string BodyResources = "";
- public string Message = "";
public void OnGet()
{
diff --git a/Oqtane.Server/Repository/SiteRepository.cs b/Oqtane.Server/Repository/SiteRepository.cs
index 98c5feab..6200de2c 100644
--- a/Oqtane.Server/Repository/SiteRepository.cs
+++ b/Oqtane.Server/Repository/SiteRepository.cs
@@ -5,7 +5,6 @@ using System.Linq;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Localization;
using Oqtane.Extensions;
using Oqtane.Infrastructure;
using Oqtane.Models;
@@ -67,7 +66,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = SharedResources.UserLogin, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Login.Index).ToModuleDefinitionName(), Title = "User Login", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -96,7 +95,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = SharedResources.UserRegistration, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Register.Index).ToModuleDefinitionName(), Title = "User Registration", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -126,7 +125,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = SharedResources.PasswordReset, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Reset.Index).ToModuleDefinitionName(), Title = "Password Reset", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -155,7 +154,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = SharedResources.UserProfile, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.UserProfile.Index).ToModuleDefinitionName(), Title = "User Profile", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -180,7 +179,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = SharedResources.AdminDashboard, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Dashboard.Index).ToModuleDefinitionName(), Title = "Admin Dashboard", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -207,7 +206,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = SharedResources.SiteSettings, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Site.Index).ToModuleDefinitionName(), Title = "Site Settings", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -234,7 +233,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = SharedResources.PageManagement, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Pages.Index).ToModuleDefinitionName(), Title = "Page Management", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -261,7 +260,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = SharedResources.UserManagement, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Users.Index).ToModuleDefinitionName(), Title = "User Management", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -288,7 +287,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = SharedResources.ProfileManagement, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Profiles.Index).ToModuleDefinitionName(), Title = "Profile Management", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -315,7 +314,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = SharedResources.RoleManagement, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Roles.Index).ToModuleDefinitionName(), Title = "Role Management", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -342,7 +341,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = SharedResources.FileManagement, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Files.Index).ToModuleDefinitionName(), Title = "File Management", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -369,7 +368,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = SharedResources.RecycleBin, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.RecycleBin.Index).ToModuleDefinitionName(), Title = "Recycle Bin", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Admin, true),
@@ -398,7 +397,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = SharedResources.EventLog, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Logs.Index).ToModuleDefinitionName(), Title = "Event Log", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -420,7 +419,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = SharedResources.SiteManagement, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sites.Index).ToModuleDefinitionName(), Title = "Site Management", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -442,7 +441,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = SharedResources.ModuleManagement, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.ModuleDefinitions.Index).ToModuleDefinitionName(), Title = "Module Management", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -464,7 +463,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = SharedResources.ThemeManagement, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Themes.Index).ToModuleDefinitionName(), Title = "Theme Management", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -493,7 +492,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = SharedResources.LanguageManagement, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Languages.Index).ToModuleDefinitionName(), Title = "Language Management", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -517,7 +516,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = SharedResources.ScheduledJobs, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Jobs.Index).ToModuleDefinitionName(), Title = "Scheduled Jobs", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -539,7 +538,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = SharedResources.SqlManagement, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Sql.Index).ToModuleDefinitionName(), Title = "Sql Management", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -561,7 +560,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = SharedResources.SystemInfo, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.SystemInfo.Index).ToModuleDefinitionName(), Title = "System Info", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Host, true),
@@ -583,7 +582,7 @@ namespace Oqtane.Repository
{
new PageTemplateModule
{
- ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = SharedResources.SystemUpdate, Pane = PaneNames.Admin,
+ ModuleDefinitionName = typeof(Oqtane.Modules.Admin.Upgrade.Index).ToModuleDefinitionName(), Title = "System Update", Pane = PaneNames.Admin,
ModulePermissions = new List
{
new Permission(PermissionNames.View, RoleNames.Host, true),