Merge pull request #2461 from oqtane/master

Merge pull request #2460 from oqtane/dev

.deployment

@@ -0,0 +1,2 @@
+[config]
+project = Oqtane.Server/Oqtane.Server.csproj

.editorconfig

@@ -0,0 +1,53 @@
+root = true
+
+[*]
+end_of_line = crlf
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+[*.{json,csproj,props,targets}]
+indent_size = 2
+
+[*.cs]
+# Prefer "var" everywhere
+csharp_style_var_for_built_in_types                   = true : suggestion
+csharp_style_var_when_type_is_apparent                = true : suggestion
+csharp_style_var_elsewhere                            = true : suggestion
+
+# Newline settings
+csharp_new_line_before_open_brace                     = all
+csharp_new_line_before_else                           = true
+csharp_new_line_before_catch                          = true
+csharp_new_line_before_finally                        = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types     = true
+
+# Sort using and Import directives with System.* appearing first
+dotnet_sort_system_directives_first                        = true
+
+# Avoid "this." if not necessary
+dotnet_style_qualification_for_field                       = false : suggestion
+dotnet_style_qualification_for_property                    = false : suggestion
+dotnet_style_qualification_for_method                      = false : suggestion
+dotnet_style_qualification_for_event                       = false : suggestion
+
+# Use language keywords instead of framework type names for type references
+dotnet_style_predefined_type_for_locals_parameters_members = true : suggestion
+dotnet_style_predefined_type_for_member_access             = false : suggestion
+
+# Suggest more modern language features when available
+csharp_style_pattern_matching_over_is_with_cast_check = true : none
+csharp_style_pattern_matching_over_as_with_null_check = true : none
+csharp_style_inlined_variable_declaration             = true : none
+csharp_style_throw_expression                         = true : none
+csharp_style_conditional_delegate_call                = true : none
+
+dotnet_style_object_initializer                            = true : suggestion
+dotnet_style_collection_initializer                        = true : suggestion
+dotnet_style_coalesce_expression                           = true : suggestion
+dotnet_style_null_propagation                              = true : suggestion
+dotnet_style_explicit_tuple_names                          = true : suggestion
+
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitignore

@@ -7,9 +7,25 @@ msbuild.binlog
 .vscode/
 *.binlog
 *.nupkg
+*.zip
+
+*.idea
+_ReSharper.Caches
+.DS_Store
 
 Oqtane.Server/appsettings.json
-Oqtane.Server/Data/*.mdf
-Oqtane.Server/Data/*.ldf
+Oqtane.Server/Data
 
 /Oqtane.Server/Properties/PublishProfiles/FolderProfile.pubxml
+Oqtane.Server/Content
+Oqtane.Server/Packages
+Oqtane.Server/wwwroot/Content
+Oqtane.Server/wwwroot/Packages/*.log
+
+Oqtane.Server/wwwroot/Modules
+!Oqtane.Server/wwwroot/Modules/Oqtane.Modules.*
+!Oqtane.Server/wwwroot/Modules/Templates
+
+Oqtane.Server/wwwroot/Themes
+!Oqtane.Server/wwwroot/Themes/Oqtane.Themes.*
+!Oqtane.Server/wwwroot/Themes/Templates

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2020 .NET Foundation
+Copyright (c) 2018-2022 .NET Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Oqtane.Client/App.razor

@@ -1,34 +1,82 @@
-@inject IInstallationService InstallationService
+@inject IInstallationService InstallationService
+@inject IJSRuntime JSRuntime
+@inject SiteState SiteState
 
 @if (_initialized)
 {
-    @if (!_installed)
+    @if (!_installation.Success)
     {
         <Installer />
     }
     else
     {
-        <CascadingAuthenticationState>
-            <CascadingValue Value="@PageState">
-                <SiteRouter OnStateChange="@ChangeState" />
-            </CascadingValue>
-        </CascadingAuthenticationState>
+        @if (string.IsNullOrEmpty(_installation.Message))
+        {
+            <div style="@_display">
+                <CascadingAuthenticationState>
+                    <CascadingValue Value="@PageState">
+                        <SiteRouter Runtime="@Runtime" RenderMode="@RenderMode" VisitorId="@VisitorId" OnStateChange="@ChangeState" />
+                    </CascadingValue>
+                </CascadingAuthenticationState>
+            </div>
+        }
+        else
+        {
+            <div class="app-alert">
+                @_installation.Message
+            </div>
+        }
     }
 }
 
 @code {
-    private bool _initialized;
-    private bool _installed;
+	[Parameter]
+	public string AntiForgeryToken { get; set; }
 
-    private PageState PageState { get; set; }
+	[Parameter]
+	public string Runtime { get; set; }
 
-    protected override async Task OnParametersSetAsync()
-    {
-        var installation = await InstallationService.IsInstalled();
-        _installed = installation.Success;
+	[Parameter]
+	public string RenderMode { get; set; }
+
+	[Parameter]
+	public int VisitorId { get; set; }
+
+	[Parameter]
+	public string RemoteIPAddress { get; set; }
+
+	[Parameter]
+	public string AuthorizationToken { get; set; }
+
+	private bool _initialized = false;
+	private string _display = "display: none;";
+	private Installation _installation = new Installation { Success = false, Message = "" };
+
+	private PageState PageState { get; set; }
+
+	protected override async Task OnParametersSetAsync()
+	{
+		SiteState.RemoteIPAddress = RemoteIPAddress;
+		SiteState.AntiForgeryToken = AntiForgeryToken;
+		SiteState.AuthorizationToken = AuthorizationToken;
+
+        _installation = await InstallationService.IsInstalled();
+        if (_installation.Alias != null)
+        {
+            SiteState.Alias = _installation.Alias;
+        }
         _initialized = true;
     }
 
+    protected override void OnAfterRender(bool firstRender)
+    {
+        if (firstRender)
+        {
+            _display = "";
+            StateHasChanged();
+        }
+    }
+
     private void ChangeState(PageState pageState)
     {
         PageState = pageState;

Oqtane.Client/AssemblyInfo.cs

@@ -0,0 +1,5 @@
+using System.Runtime.CompilerServices;
+using Microsoft.Extensions.Localization;
+
+[assembly: RootNamespace("Oqtane")]
+[assembly: InternalsVisibleTo("Oqtane.Server")]

Oqtane.Client/Extensions/OqtaneLocalizationExtensions.cs

@@ -0,0 +1,61 @@
+using System;
+
+namespace Microsoft.Extensions.Localization
+{
+    public static class OqtaneLocalizationExtensions
+    {
+        /// <summary>
+        /// Gets the string resource for the specified key and returns the value if the resource does not exist
+        /// </summary>
+        /// <param name="localizer"></param>
+        /// <param name="key">the static key used to identify the string resource</param>
+        /// <param name="value">the default value if the resource for the static key does not exist</param>
+        /// <returns></returns>
+        public static string GetString(this IStringLocalizer localizer, string key, string value)
+        {
+            string localizedValue = localizer[key];
+            if (localizedValue == key && !string.IsNullOrEmpty(value)) // not localized
+            {
+                localizedValue = value;
+            }
+            return localizedValue;
+        }
+
+        /// <summary>
+        /// Creates an IStringLocalizer based on a type name. This extension method is useful in scenarios where the default IStringLocalizer is unable to locate the resources.
+        /// </summary>
+        /// <param name="localizerFactory"></param>
+        /// <param name="fullTypeName">the full type name ie. GetType().FullName</param>
+        /// <returns></returns>
+        public static IStringLocalizer Create(this IStringLocalizerFactory localizerFactory, string fullTypeName)
+        {
+            var typename = fullTypeName;
+
+            // handle generic types
+            var type = Type.GetType(fullTypeName);
+            if (type.IsGenericType)
+            {
+                typename = type.GetGenericTypeDefinition().FullName;
+                typename = typename.Substring(0, typename.IndexOf("`")); // remove generic type info
+            }
+
+            // format typename
+            if (typename.Contains(","))
+            {
+                typename = typename.Substring(0, typename.IndexOf(",")); // remove assembly info
+            }
+
+            // remove rootnamespace
+            var rootnamespace = "";
+            var attributes = type.Assembly.GetCustomAttributes(typeof(RootNamespaceAttribute), false);
+            if (attributes.Length > 0)
+            {
+                rootnamespace = ((RootNamespaceAttribute)attributes[0]).RootNamespace;
+            }
+            typename = typename.Replace(rootnamespace + ".", "");
+
+            // create IStringLocalizer using factory
+            return localizerFactory.Create(typename, type.Assembly.GetName().Name);
+        }    
+    }
+}

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -0,0 +1,56 @@
+using Microsoft.AspNetCore.Components.Authorization;
+using Oqtane.Providers;
+using Oqtane.Services;
+using Oqtane.Shared;
+
+namespace Microsoft.Extensions.DependencyInjection
+{
+    public static class OqtaneServiceCollectionExtensions
+    {
+        public static IServiceCollection AddOqtaneAuthorization(this IServiceCollection services)
+        {
+            services.AddAuthorizationCore();
+            services.AddScoped<IdentityAuthenticationStateProvider>();
+            services.AddScoped<AuthenticationStateProvider>(s => s.GetRequiredService<IdentityAuthenticationStateProvider>());
+
+            return services;
+        }
+
+        public static IServiceCollection AddOqtaneScopedServices(this IServiceCollection services)
+        {
+            services.AddScoped<SiteState>();
+            services.AddScoped<IInstallationService, InstallationService>();
+            services.AddScoped<IModuleDefinitionService, ModuleDefinitionService>();
+            services.AddScoped<IThemeService, ThemeService>();
+            services.AddScoped<IAliasService, AliasService>();
+            services.AddScoped<ITenantService, TenantService>();
+            services.AddScoped<ISiteService, SiteService>();
+            services.AddScoped<IPageService, PageService>();
+            services.AddScoped<IModuleService, ModuleService>();
+            services.AddScoped<IPageModuleService, PageModuleService>();
+            services.AddScoped<IUserService, UserService>();
+            services.AddScoped<IProfileService, ProfileService>();
+            services.AddScoped<IRoleService, RoleService>();
+            services.AddScoped<IUserRoleService, UserRoleService>();
+            services.AddScoped<ISettingService, SettingService>();
+            services.AddScoped<IPackageService, PackageService>();
+            services.AddScoped<ILogService, LogService>();
+            services.AddScoped<IJobService, JobService>();
+            services.AddScoped<IJobLogService, JobLogService>();
+            services.AddScoped<INotificationService, NotificationService>();
+            services.AddScoped<IFolderService, FolderService>();
+            services.AddScoped<IFileService, FileService>();
+            services.AddScoped<ISiteTemplateService, SiteTemplateService>();
+            services.AddScoped<ISqlService, SqlService>();
+            services.AddScoped<ISystemService, SystemService>();
+            services.AddScoped<ILocalizationService, LocalizationService>();
+            services.AddScoped<ILanguageService, LanguageService>();
+            services.AddScoped<IDatabaseService, DatabaseService>();
+            services.AddScoped<IUrlMappingService, UrlMappingService>();
+            services.AddScoped<IVisitorService, VisitorService>();
+            services.AddScoped<ISyncService, SyncService>();
+
+            return services;
+        }
+    }
+}

Oqtane.Client/Installer/Controls/LocalDBConfig.razor

@@ -0,0 +1,32 @@
+@namespace Oqtane.Installer.Controls
+@implements Oqtane.Interfaces.IDatabaseConfigControl
+
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
+    <div class="col-sm-9">
+        <input id="server" type="text" class="form-control" @bind="@_server" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="database" HelpText="Enter the name of the database" ResourceKey="Database">Database:</Label>
+    <div class="col-sm-9">
+        <input id="database" type="text" class="form-control" @bind="@_database" />
+    </div>
+</div>
+
+@code {
+    private string _server = "(LocalDb)\\MSSQLLocalDB";
+    private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
+
+    public string GetConnectionString()
+    {
+        var connectionString = String.Empty;
+
+        if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database))
+        {
+            connectionString = $"Data Source={_server};AttachDbFilename=|DataDirectory|\\{_database}.mdf;Initial Catalog={_database};Integrated Security=SSPI;Encrypt=false;";
+        }
+
+        return connectionString;
+    }
+}

Oqtane.Client/Installer/Controls/MySQLConfig.razor

@@ -0,0 +1,58 @@
+@namespace Oqtane.Installer.Controls
+@implements Oqtane.Interfaces.IDatabaseConfigControl
+
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
+    <div class="col-sm-9">
+        <input id="server" type="text" class="form-control" @bind="@_server" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="port" HelpText="Enter the port used to connect to the server" ResourceKey="Port">Port:</Label>
+    <div class="col-sm-9">
+        <input id="port" type="text" class="form-control" @bind="@_port" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="database" HelpText="Enter the name of the database" ResourceKey="Database">Database:</Label>
+    <div class="col-sm-9">
+        <input id="database" type="text" class="form-control" @bind="@_database" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="uid" HelpText="Enter the username to use for the database" ResourceKey="Uid">User Id:</Label>
+    <div class="col-sm-9">
+        <input id="uid" type="text" class="form-control" @bind="@_uid" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="pwd" HelpText="Enter the password to use for the database" ResourceKey="Pwd">Password:</Label>
+    <div class="col-sm-9">
+        <input id="pwd" type="password" class="form-control" @bind="@_pwd" autocomplete="new-password" />
+    </div>
+</div>
+
+@code {
+    private string _server = "127.0.0.1";
+    private string _port = "3306";
+    private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
+    private string _uid = String.Empty;
+    private string _pwd = String.Empty;
+
+    public string GetConnectionString()
+    {
+        var connectionString = String.Empty;
+
+        if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database) && !String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd))
+        {
+            connectionString = $"Server={_server};Database={_database};Uid={_uid};Pwd={_pwd};";
+        }
+
+        if (!String.IsNullOrEmpty(_port))
+        {
+            connectionString += $"Port={_port};";
+        }
+
+        return connectionString;
+    }
+}

Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor

@@ -0,0 +1,83 @@
+@namespace Oqtane.Installer.Controls
+@implements Oqtane.Interfaces.IDatabaseConfigControl
+@inject IStringLocalizer<PostgreSQLConfig> Localizer
+
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
+    <div class="col-sm-9">
+        <input id="server" type="text" class="form-control" @bind="@_server" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="port" HelpText="Enter the port used to connect to the server" ResourceKey="Port">Port:</Label>
+    <div class="col-sm-9">
+        <input id="port" type="text" class="form-control" @bind="@_port" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="database" HelpText="Enter the name of the database" ResourceKey="Database">Database:</Label>
+    <div class="col-sm-9">
+        <input id="database" type="text" class="form-control" @bind="@_database" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="security" HelpText="Select your security method" ResourceKey="Security">Security:</Label>
+    <div class="col-sm-9">
+        <select id="security" class="form-select custom-select" @bind="@_security">
+            <option value="integrated" selected>@Localizer["Integrated"]</option>
+            <option value="custom">@Localizer["Custom"]</option>
+        </select>
+    </div>
+</div>
+@if (_security == "custom")
+{
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="uid" HelpText="Enter the username to use for the database" ResourceKey="Uid">User Id:</Label>
+        <div class="col-sm-9">
+            <input id="uid" type="text" class="form-control" @bind="@_uid" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="pwd" HelpText="Enter the password to use for the database" ResourceKey="Pwd">Password:</Label>
+        <div class="col-sm-9">
+            <input id="pwd" type="password" class="form-control" @bind="@_pwd" autocomplete="new-password" />
+        </div>
+    </div>
+}
+
+@code {
+    private string _server = "127.0.0.1";
+    private string _port = "5432";
+    private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
+    private string _security = "integrated";
+    private string _uid = String.Empty;
+    private string _pwd = String.Empty;
+
+    public string GetConnectionString()
+    {
+        var connectionString = String.Empty;
+
+        if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database) && !String.IsNullOrEmpty(_port))
+        {
+            connectionString = $"Server={_server};Port={_port};Database={_database};";
+        }
+
+        if (_security == "integrated")
+        {
+            connectionString += "Integrated Security=true;";
+        }
+        else
+        {
+            if (!String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd))
+            {
+                connectionString += $"User ID={_uid};Password={_pwd};";
+            }
+            else
+            {
+                connectionString = String.Empty;
+            }
+        }
+
+        return connectionString;
+    }
+}

Oqtane.Client/Installer/Controls/SqlServerConfig.razor

@@ -0,0 +1,95 @@
+@namespace Oqtane.Installer.Controls
+@implements Oqtane.Interfaces.IDatabaseConfigControl
+@inject IStringLocalizer<SqlServerConfig> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<div class="row mb-1 align-items-center">
+	<Label Class="col-sm-3" For="server" HelpText="Enter the database server name. This might include a port number as well if you are using a cloud service (ie. servername.database.windows.net,1433) " ResourceKey="Server">Server:</Label>
+    <div class="col-sm-9">
+        <input id="server" type="text" class="form-control" @bind="@_server" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="database" HelpText="Enter the name of the database" ResourceKey="Database">Database:</Label>
+    <div class="col-sm-9">
+        <input id="database" type="text" class="form-control" @bind="@_database" />
+    </div>
+</div>
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="security" HelpText="Select your security method" ResourceKey="Security">Security:</Label>
+    <div class="col-sm-9">
+        <select id="security" class="form-select custom-select" @bind="@_security">
+            <option value="integrated" selected>@Localizer["Integrated"]</option>
+            <option value="custom">@Localizer["Custom"]</option>
+        </select>
+    </div>
+</div>
+@if (_security == "custom")
+{
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="uid" HelpText="Enter the username to use for the database" ResourceKey="Uid">User Id:</Label>
+        <div class="col-sm-9">
+            <input id="uid" type="text" class="form-control" @bind="@_uid" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="pwd" HelpText="Enter the password to use for the database" ResourceKey="Pwd">Password:</Label>
+        <div class="col-sm-9">
+            <input id="pwd" type="password" class="form-control" @bind="@_pwd" autocomplete="new-password" />
+        </div>
+    </div>
+}
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="encryption" HelpText="Specify if you are using an encrypted database connection. It is highly recommended to use encryption in a production environment." ResourceKey="Encryption">Encryption:</Label>
+    <div class="col-sm-9">
+        <select id="encryption" class="form-select custom-select" @bind="@_encryption">
+            <option value="true">@SharedLocalizer["True"]</option>
+            <option value="false">@SharedLocalizer["False"]</option>
+        </select>
+    </div>
+</div>
+@if (_encryption == "true")
+{
+	<div class="row mb-1 align-items-center">
+		<Label Class="col-sm-3" For="trustservercertificate" HelpText="Specify the type of certificate you are using for encryption. Verifiable is equivalent to False. Self Signed is equivalent to True." ResourceKey="TrustServerCertificate">Certificate:</Label>
+		<div class="col-sm-9">
+			<select id="encryption" class="form-select custom-select" @bind="@_trustservercertificate">
+				<option value="true">@Localizer["Self Signed"]</option>
+				<option value="false">@Localizer["Verifiable"]</option>
+			</select>
+		</div>
+	</div>
+}
+
+@code {
+    private string _server = String.Empty;
+    private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
+    private string _security = "integrated";
+    private string _uid = String.Empty;
+    private string _pwd = String.Empty;
+    private string _encryption = "false";
+    private string _trustservercertificate = "false";
+
+    public string GetConnectionString()
+    {
+        var connectionString = String.Empty;
+
+        if (!String.IsNullOrEmpty(_server) && !String.IsNullOrEmpty(_database))
+        {
+            connectionString = $"Data Source={_server};Initial Catalog={_database};";
+        }
+
+        if (_security == "integrated")
+        {
+            connectionString += "Integrated Security=SSPI;";
+        }
+        else
+        {
+            connectionString += $"User ID={_uid};Password={_pwd};";
+        }
+		connectionString += $"Encrypt={_encryption};";
+		connectionString += $"TrustServerCertificate={_trustservercertificate};";
+
+        return connectionString;
+    }
+}

Oqtane.Client/Installer/Controls/SqliteConfig.razor

@@ -0,0 +1,25 @@
+@namespace Oqtane.Installer.Controls
+@implements Oqtane.Interfaces.IDatabaseConfigControl
+
+<div class="row mb-1 align-items-center">
+    <Label Class="col-sm-3" For="server" HelpText="Enter the file name to use for the database" ResourceKey="Server">File Name:</Label>
+    <div class="col-sm-9">
+        <input id="server" type="text" class="form-control" @bind="@_server" />
+    </div>
+</div>
+
+@code {
+    private string _server = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm") + ".db";
+
+    public string GetConnectionString()
+    {
+        var connectionstring = String.Empty;
+
+        if (!String.IsNullOrEmpty(_server))
+        {
+            connectionstring = $"Data Source={_server};";
+        }
+
+        return connectionstring;
+    }
+}

Oqtane.Client/Installer/Installer.razor

@@ -0,0 +1,294 @@
+@namespace Oqtane.Installer
+@using Oqtane.Interfaces
+@inject NavigationManager NavigationManager
+@inject IInstallationService InstallationService
+@inject ISiteService SiteService
+@inject IUserService UserService
+@inject IDatabaseService DatabaseService
+@inject IJSRuntime JSRuntime
+@inject IStringLocalizer<Installer> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<div class="container">
+    <div class="row">
+        <div class="mx-auto text-center">
+            <img src="oqtane-black.png" />
+            <div style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version</div>
+        </div>
+    </div>
+    <hr class="app-rule" />
+    <div class="row justify-content-center">
+        <div class="col text-center">
+            <h2>@Localizer["DatabaseConfig"]</h2><br />
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="databasetype" HelpText="Select the type of database you wish to use" ResourceKey="DatabaseType">Database:</Label>
+                    <div class="col-sm-9">
+                        @if (_databases != null)
+                        {
+							<div class="input-group">
+								<select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required>
+									@foreach (var database in _databases)
+									{
+										<option value="@database.Name">@Localizer[@database.Name]</option>
+									}
+								</select>
+								@if (!_showConnectionString)
+								{
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
+								}
+								else
+								{
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
+								}
+							</div>
+                        }
+                    </div>
+                </div>
+				@if (!_showConnectionString)
+				{
+					if (_databaseConfigType != null)
+					{
+						@DatabaseConfigComponent
+					}
+				}
+				else
+				{
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">String:</Label>
+						<div class="col-sm-9">
+							<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
+						</div>
+					</div>
+				}
+			</div>
+        </div>
+        <div class="col text-center">
+            <h2>@Localizer["ApplicationAdmin"]</h2><br />
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="username" HelpText="Provide a username for the primary user accountt" ResourceKey="Username">Username:</Label>
+                    <div class="col-sm-9">
+                        <input id="username" type="text" class="form-control" @bind="@_hostUsername" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="password" HelpText="Provide a password for the primary user account" ResourceKey="Password">Password:</Label>
+                    <div class="col-sm-9">
+						<div class="input-group">
+							<input id="password" type="@_passwordType" class="form-control" @bind="@_hostPassword" autocomplete="new-password" />
+							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglePassword</button>
+						</div>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="confirm" HelpText="Please confirm the password entered above by entering it again" ResourceKey="Confirm">Confirm:</Label>
+                    <div class="col-sm-9">
+						<div class="input-group">
+							<input id="confirm" type="@_confirmPasswordType" class="form-control" @bind="@_confirmPassword" autocomplete="new-password" />
+							<button type="button" class="btn btn-secondary" @onclick="@ToggleConfirmPassword">@_toggleConfirmPassword</button>
+						</div>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="email" HelpText="Provide the email address for the host user account" ResourceKey="Email">Email:</Label>
+                    <div class="col-sm-9">
+                        <input type="text" class="form-control" @bind="@_hostEmail" />
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <hr class="app-rule" />
+    <div class="row">
+        <div class="mx-auto text-center">
+            <button type="button" class="btn btn-success" @onclick="Install">@Localizer["InstallNow"]</button><br /><br />
+            <ModuleMessage Message="@_message" Type="MessageType.Error"></ModuleMessage>
+        </div>
+        <div class="app-progress-indicator" style="@_loadingDisplay"></div>
+    </div>
+    <div class="row">
+        <div class="mx-auto text-center">
+            <input type="checkbox" @bind="@_register" /> @Localizer["Register"]
+        </div>
+    </div>
+</div>
+
+@code {
+	private List<Database> _databases;
+	private string _databaseName;
+	private Type _databaseConfigType;
+	private object _databaseConfig;
+	private RenderFragment DatabaseConfigComponent { get; set; }
+	private bool _showConnectionString = false;
+	private string _connectionString = string.Empty;
+
+	private string _hostUsername = string.Empty;
+	private string _hostPassword = string.Empty;
+	private string _passwordType = "password";
+	private string _confirmPasswordType = "password";
+	private string _togglePassword = string.Empty;
+	private string _toggleConfirmPassword = string.Empty;
+	private string _confirmPassword = string.Empty;
+	private string _hostEmail = string.Empty;
+	private bool _register = true;
+	private string _message = string.Empty;
+	private string _loadingDisplay = "display: none;";
+
+	protected override async Task OnInitializedAsync()
+	{
+		_togglePassword = SharedLocalizer["ShowPassword"];
+		_toggleConfirmPassword = SharedLocalizer["ShowPassword"];
+
+		_databases = await DatabaseService.GetDatabasesAsync();
+		if (_databases.Exists(item => item.IsDefault))
+		{
+			_databaseName = _databases.Find(item => item.IsDefault).Name;
+		}
+		else
+		{
+			_databaseName = "LocalDB";
+		}
+		LoadDatabaseConfigComponent();
+	}
+
+	private void DatabaseChanged(ChangeEventArgs eventArgs)
+	{
+		try
+		{
+			_databaseName = (string)eventArgs.Value;
+			_showConnectionString = false;
+			LoadDatabaseConfigComponent();
+		}
+		catch
+		{
+			_message = Localizer["Error.DbConfig.Load"];
+		}
+	}
+
+	private void LoadDatabaseConfigComponent()
+	{
+		var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+		if (database != null)
+		{
+			_databaseConfigType = Type.GetType(database.ControlType);
+			DatabaseConfigComponent = builder =>
+			{
+				builder.OpenComponent(0, _databaseConfigType);
+				builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+				builder.CloseComponent();
+			};
+		}
+	}
+
+	protected override async Task OnAfterRenderAsync(bool firstRender)
+	{
+		if (firstRender)
+		{
+			var interop = new Interop(JSRuntime);
+			await interop.IncludeLink("", "stylesheet", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.2.0/css/bootstrap.min.css", "text/css", "sha512-XWTTruHZEYJsxV3W/lSXG1n3Q39YIWOstqvmFsdNEEQfHoZ6vm6E9GK2OrF6DSJSpIbRbi+Nn0WDPID9O7xB2Q==", "anonymous", "");
+			await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.2.0/js/bootstrap.bundle.min.js", "sha512-9GacT4119eY3AcosfWtHMsT5JyZudrexyEVzTBWV3viP/YfB9e2pEy3N7WXL3SV6ASXpTU0vzzSxsbfsuUH4sQ==", "anonymous", "", "head");
+		}
+	}
+
+	private async Task Install()
+	{
+		var connectionString = String.Empty;
+		if (_showConnectionString)
+		{
+			connectionString = _connectionString;
+		}
+		else
+		{
+			if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+			{
+				connectionString = databaseConfigControl.GetConnectionString();
+			}
+		}
+
+		if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && !string.IsNullOrEmpty(_hostPassword) && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@"))
+		{
+			if (await UserService.ValidatePasswordAsync(_hostPassword))
+			{
+				_loadingDisplay = "";
+				StateHasChanged();
+
+				Uri uri = new Uri(NavigationManager.Uri);
+
+				var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+
+				var config = new InstallConfig
+				{
+					DatabaseType = database.DBType,
+					ConnectionString = connectionString,
+					Aliases = uri.Authority,
+					HostUsername = _hostUsername,
+					HostPassword = _hostPassword,
+					HostEmail = _hostEmail,
+					HostName = _hostUsername,
+					TenantName = TenantNames.Master,
+					IsNewTenant = true,
+					SiteName = Constants.DefaultSite,
+					Register = _register
+				};
+
+				var installation = await InstallationService.Install(config);
+				if (installation.Success)
+				{
+					NavigationManager.NavigateTo(uri.Scheme + "://" + uri.Authority, true);
+				}
+				else
+				{
+					_message = installation.Message;
+					_loadingDisplay = "display: none;";
+				}				
+			}
+			else
+			{
+				_message = Localizer["Message.Password.Invalid"];				
+			}
+		}
+		else
+		{
+			_message = Localizer["Message.Require.DbInfo"];
+		}
+	}
+
+	private void TogglePassword()
+	{
+		if (_passwordType == "password")
+		{
+			_passwordType = "text";
+			_togglePassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordType = "password";
+			_togglePassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+	private void ToggleConfirmPassword()
+	{
+		if (_confirmPasswordType == "password")
+		{
+			_confirmPasswordType = "text";
+			_toggleConfirmPassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_confirmPasswordType = "password";
+			_toggleConfirmPassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+	private void ToggleConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionString = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
+
+}

Oqtane.Client/Modules/Admin/Dashboard/Index.razor

@@ -1,7 +1,8 @@
-@namespace Oqtane.Modules.Admin.Dashboard
+@namespace Oqtane.Modules.Admin.Dashboard
 @inherits ModuleBase
 @inject IPageService PageService
 @inject IUserService UserService
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="row">
     @foreach (var p in _pages)
@@ -9,9 +10,9 @@
         if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
         {
             string url = NavigateUrl(p.Path);
-            <div class="col-md-2 mx-auto text-center">
-                <NavLink class="nav-link" href="@url" Match="NavLinkMatch.All">
-                    <h2><span class="oi oi-@p.Icon" aria-hidden="true"></span></h2>@p.Name
+            <div class="col-md-2 mx-auto text-center mb-3">
+                <NavLink class="nav-link text-primary" href="@url" Match="NavLinkMatch.All">
+                    <h2><span class="@p.Icon" aria-hidden="true"></span></h2>@SharedLocalizer[p.Name]
                 </NavLink>
             </div>
         }
@@ -20,7 +21,7 @@
 
 @code {
     private List<Page> _pages;
-    
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override void OnInitialized()

Oqtane.Client/Modules/Admin/Error/Index.razor

@@ -1,6 +1,7 @@
-@namespace Oqtane.Modules.Admin.Error
+@namespace Oqtane.Modules.Admin.Error
 @inherits ModuleBase
 @inject IModuleService ModuleService
+@inject IStringLocalizer<Index> Localizer
 
 @code {
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
@@ -8,12 +9,11 @@
     protected override async Task OnInitializedAsync()
     {
         Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
-        if (UserSecurity.IsAuthorized(PageState.User, Constants.HostRole))
+        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-            string message = "A Problem Was Encountered Loading Module " + module.ModuleDefinitionName;
-            AddModuleMessage(message, MessageType.Error);
+			AddModuleMessage(string.Format(Localizer["Error.Module.Load"], module.ModuleDefinitionName), MessageType.Error);
         }
-        
+
         await logger.LogCritical("Error Loading Module {Module}", module);
     }
 }

Oqtane.Client/Modules/Admin/Files/Add.razor

@@ -1,60 +1,68 @@
-@namespace Oqtane.Modules.Admin.Files
+@namespace Oqtane.Modules.Admin.Files
+@using System.IO
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IFileService FileService
 @inject IFolderService FolderService
+@inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
-    <TabPanel Name="Upload" Heading="Upload Files">
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <Label For="upload" HelpText="Upload the file you want">Upload: </Label>
-                </td>
-                <td>
-                    <FileManager UploadMultiple="true" ShowFiles="false" FolderId="@_folderId.ToString()" />
-                </td>
-            </tr>
-        </table>
-        <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    <TabPanel Name="Upload" Heading="Upload Files" ResourceKey="UploadFiles">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="upload" HelpText="Upload the file you want" ResourceKey="Upload">Upload: </Label>
+                <div class="col-sm-9">
+                    <FileManager UploadMultiple="true" ShowFiles="false" FolderId="@_folderId" ShowSuccess="true" />
+                </div>
+            </div>
+        </div>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
     </TabPanel>
-    <TabPanel Name="Download" Heading="Download Files">
+    <TabPanel Name="Download" Heading="Download Files" ResourceKey="DownloadFiles">
         @if (_folders != null)
         {
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label For="url" HelpText="Enter the url of the file you wish to download">Url: </Label>
-                    </td>
-                    <td>
-                        <input id="url" class="form-control" @bind="@url" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="folder" HelpText="Select the folder to save the file in">Folder: </Label>
-                    </td>
-                    <td>
-                        <select id="folder" class="form-control" @bind="@_folderId">
-                            <option value="-1">&lt;Select Folder&gt;</option>
-                            @foreach (Folder folder in _folders)
-                            {
-                                <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
-                            }
-                        </select>
-                    </td>
-                </tr>
-            </table>
-            <button type="button" class="btn btn-success" @onclick="Download">Download</button>
-            <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+            <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="url" HelpText="Enter the url of the file you wish to download" ResourceKey="Url">Url: </Label>
+                        <div class="col-sm-9">
+                            <input id="url" class="form-control" @bind="@_url" required />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="folder" HelpText="Select the folder to save the file in" ResourceKey="Folder">Folder: </Label>
+                        <div class="col-sm-9">
+                            <select id="folder" class="form-select" @bind="@_folderId" required>
+                                <option value="-1">&lt;@Localizer["Folder.Select"]&gt;</option>
+                                @foreach (Folder folder in _folders)
+                                {
+                                    <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="name" HelpText="Enter the name of the file being downloaded" ResourceKey="Name">Name: </Label>
+                        <div class="col-sm-9">
+                            <input id="name" class="form-control" @bind="@_name" />
+                        </div>
+                    </div>
+                </div>
+                <button type="button" class="btn btn-success" @onclick="Download">@SharedLocalizer["Download"]</button>
+                <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+            </form>
         }
     </TabPanel>
 </TabStrip>
 
 @code {
-    private string url = string.Empty;
+    private ElementReference form;
+    private bool validated = false;
+    private string _url = string.Empty;
     private List<Folder> _folders;
     private int _folderId = -1;
+    private string _name = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -70,23 +78,48 @@
 
     private async Task Download()
     {
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            if (url != string.Empty && _folderId != -1)
+            if (_url == string.Empty || _folderId == -1)
             {
-                await FileService.UploadFileAsync(url, _folderId);
-                await logger.LogInformation("File Downloaded Successfully From Url {Url}", url);
-                AddModuleMessage("File Downloaded Successfully From Url", MessageType.Success);
+                AddModuleMessage(Localizer["Message.Required.UrlFolder"], MessageType.Warning);
+                return;
             }
-            else
+
+            if (string.IsNullOrEmpty(_name))
             {
-                AddModuleMessage("You Must Enter A Url And Select A Folder", MessageType.Warning);
+                _name = _url.Substring(_url.LastIndexOf("/", StringComparison.Ordinal) + 1);
+            }
+
+            if (!Constants.UploadableFiles.Split(',').Contains(Path.GetExtension(_name).ToLower().Replace(".", "")))
+            {
+                AddModuleMessage(Localizer["Message.Download.InvalidExtension"], MessageType.Warning);
+                return;
+            }
+
+            if (!_name.IsPathOrFileValid())
+            {
+                AddModuleMessage(Localizer["Message.Required.UrlName"], MessageType.Warning);
+                return;
+            }
+
+            try
+            {
+                await FileService.UploadFileAsync(_url, _folderId, _name);
+                await logger.LogInformation("File Downloaded Successfully From Url {Url}", _url);
+                AddModuleMessage(Localizer["Success.Download.File"], MessageType.Success);
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Downloading File From Url {Url} {Error}", _url, ex.Message);
+                AddModuleMessage(Localizer["Error.Download.InvalidUrl"], MessageType.Error);
             }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Downloading File From Url {Url} {Error}", url, ex.Message);
-            AddModuleMessage("Error Downloading File From Url. Please Verify That The Url Is Valid.", MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
-}
+}

Oqtane.Client/Modules/Admin/Files/Details.razor

@@ -0,0 +1,129 @@
+@namespace Oqtane.Modules.Admin.Files
+@inherits ModuleBase
+@inject IFileService FileService
+@inject IFolderService FolderService
+@inject NavigationManager NavigationManager
+@inject IStringLocalizer<Details> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_folders != null)
+{
+    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="name" HelpText="The name of the file" ResourceKey="Name">Name: </Label>
+                <div class="col-sm-9">
+                    <input id="name" class="form-control" @bind="@_name" maxlength="50" required />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="parent" HelpText="The folder where the file is located" ResourceKey="Folder">Folder: </Label>
+                <div class="col-sm-9">
+                    <select id="parent" class="form-select" @bind="@_folderId" required>
+                        @foreach (Folder folder in _folders)
+                        {
+                            <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="description" HelpText="A description of the file. This can be used as a caption for image files." ResourceKey="Description">Description: </Label>
+                <div class="col-sm-9">
+                    <input id="description" class="form-control" @bind="@_description" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="size" HelpText="The size of the file (in bytes)" ResourceKey="Size">Size: </Label>
+                <div class="col-sm-9">
+                    <input id="size" class="form-control" @bind="@_size" readonly />
+                </div>
+            </div>
+        </div>
+        <button type="button" class="btn btn-success" @onclick="SaveFile">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+        <br />
+        <br />
+        <AuditInfo CreatedBy="@_createdBy" CreatedOn="@_createdOn" ModifiedBy="@_modifiedBy" ModifiedOn="@_modifiedOn"></AuditInfo>
+    </form>
+}
+
+@code {
+    private ElementReference form;
+    private bool validated = false;
+    private int _fileId = -1;
+    private string _name;
+    private List<Folder> _folders;
+    private int _folderId = -1;
+    private string _description = string.Empty;
+    private int _size;
+    private string _createdBy;
+    private DateTime _createdOn;
+    private string _modifiedBy;
+    private DateTime _modifiedOn;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+    public override string Title => "File Management";
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            _folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId);
+            _fileId = Int32.Parse(PageState.QueryString["id"]);
+            File file = await FileService.GetFileAsync(_fileId);
+            if (file != null)
+            {
+                _name = file.Name;
+                _folderId = file.FolderId;
+                _description = file.Description;
+                _size = file.Size;
+                _createdBy = file.CreatedBy;
+                _createdOn = file.CreatedOn;
+                _modifiedBy = file.ModifiedBy;
+                _modifiedOn = file.ModifiedOn;
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading File {FileId} {Error}", _fileId, ex.Message);
+            AddModuleMessage(Localizer["Error.File.Load"], MessageType.Error);
+        }
+    }
+
+    private async Task SaveFile()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            try
+            {
+                if (_name.IsPathOrFileValid())
+                {
+                    File file = await FileService.GetFileAsync(_fileId);
+                    file.Name = _name;
+                    file.FolderId = _folderId;
+                    file.Description = _description;
+                    file = await FileService.UpdateFileAsync(file);
+                    await logger.LogInformation("File Saved {File}", file);
+                    NavigationManager.NavigateTo(NavigateUrl());
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.File.InvalidName"], MessageType.Warning);
+                }
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving File {FileId} {Error}", _fileId, ex.Message);
+                AddModuleMessage(Localizer["Error.File.Save"], MessageType.Error);
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+}

Oqtane.Client/Modules/Admin/Files/Edit.razor

@@ -1,51 +1,84 @@
-@namespace Oqtane.Modules.Admin.Files
+@namespace Oqtane.Modules.Admin.Files
 @inherits ModuleBase
 @inject IFolderService FolderService
+@inject IFileService FileService
 @inject NavigationManager NavigationManager
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_folders != null)
 {
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label For="parent" HelpText="Select the parent folder">Parent: </Label>
-            </td>
-            <td>
-                <select id="parent" class="form-control" @bind="@_parentId">
+    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="parent" HelpText="Select the parent folder" ResourceKey="Parent">Parent: </Label>
+                <div class="col-sm-9">
+                    <select id="parent" class="form-select" @bind="@_parentId" required>
+                        @if (PageState.QueryString.ContainsKey("id"))
+                        {
+                            <option value="-1">&lt;@Localizer["NoParent"]&gt;</option>
+                        }
+                        @foreach (Folder folder in _folders)
+                        {
+                            <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="name" HelpText="Enter the folder name" ResourceKey="Name">Name: </Label>
+                <div class="col-sm-9">
+                    <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="type" HelpText="Select the folder type. Private folders are only accessible by authorized users. Public folders can be accessed by all users" ResourceKey="Type">Type: </Label>
+                <div class="col-sm-9">
                     @if (PageState.QueryString.ContainsKey("id"))
                     {
-                        <option value="-1">&lt;No Parent&gt;</option>
+                        <input id="type" class="form-control" readonly @bind="@_type" />
                     }
-                    @foreach (Folder folder in _folders)
+                    else
                     {
-                        <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
+                        <select id="type" class="form-select" @bind="@_type" required>
+                            <option value="@FolderTypes.Private">@Localizer[FolderTypes.Private]</option>
+                            <option value="@FolderTypes.Public">@Localizer[FolderTypes.Public]</option>
+                        </select>
                     }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label for="name" HelpText="Enter the file name">Name: </Label>
-            </td>
-            <td>
-                <input id="name" class="form-control" @bind="@_name" />
-            </td>
-        </tr>
-        <tr>
-            <td colspan="2" align="center">
-                <Label For="permissions" HelpText="Select the permissions you want for the folder">Permissions: </Label>
-                <PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="Browse,View,Edit" Permissions="@_permissions" @ref="_permissionGrid" />
-            </td>
-        </tr>
-    </table>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="imagesizes" HelpText="Enter a list of image sizes which can be generated dynamically from uploaded images (ie. 200x200,x200,200x)" ResourceKey="ImageSizes">Image Sizes: </Label>
+                <div class="col-sm-9">
+                    <input id="imagesizes" class="form-control" @bind="@_imagesizes" maxlength="512" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="capacity" HelpText="Enter the maximum folder capacity (in megabytes). Specify zero if the capacity is unlimited." ResourceKey="Capacity">Capacity: </Label>
+                <div class="col-sm-9">
+                    <input id="capacity" class="form-control" @bind="@_capacity" required />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <div class="col-sm-12">
+                    <Label Class="col-sm-3" For="permissions" HelpText="Select the permissions you want for the folder" ResourceKey="Permissions">Permissions: </Label>
+                    <PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="@(PermissionNames.Browse + "," + PermissionNames.View + "," + PermissionNames.Edit)" Permissions="@_permissions" @ref="_permissionGrid" />
+
+                </div>
+            </div>
+        </div>
+    </form>
+
     @if (!_isSystem)
     {
-        <button type="button" class="btn btn-success" @onclick="SaveFolder">Save</button>
+        <button type="button" class="btn btn-success" @onclick="SaveFolder">@SharedLocalizer["Save"]</button>
+        @((MarkupString)"&nbsp;")
     }
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
     @if (!_isSystem && PageState.QueryString.ContainsKey("id"))
     {
-        <button type="button" class="btn btn-danger" @onclick="DeleteFolder">Delete</button>
+        @((MarkupString)"&nbsp;")
+        <ActionDialog Header="Delete Folder" Message="Are You Sure You Wish To Delete This Folder?" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFolder())" ResourceKey="DeleteFolder" />
     }
     <br />
     <br />
@@ -56,10 +89,15 @@
 }
 
 @code {
+    private ElementReference form;
+    private bool validated = false;
     private List<Folder> _folders;
     private int _folderId = -1;
-    private string _name;
     private int _parentId = -1;
+    private string _name;
+    private string _type = FolderTypes.Private;
+    private string _imagesizes = string.Empty;
+    private string _capacity = "0";
     private bool _isSystem;
     private string _permissions = string.Empty;
     private string _createdBy;
@@ -89,6 +127,9 @@
                 {
                     _parentId = folder.ParentId ?? -1;
                     _name = folder.Name;
+                    _type = folder.Type;
+                    _imagesizes = folder.ImageSizes;
+                    _capacity = folder.Capacity.ToString();
                     _isSystem = folder.IsSystem;
                     _permissions = folder.Permissions;
                     _createdBy = folder.CreatedBy;
@@ -100,21 +141,34 @@
             else
             {
                 _parentId = _folders[0].FolderId;
-                _permissions = string.Empty;
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Folder {FolderId} {Error}", _folderId, ex.Message);
-            AddModuleMessage("Error Loading Folder", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Folder.Load"], MessageType.Error);
         }
     }
 
     private async Task SaveFolder()
     {
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            if (_name != string.Empty && _parentId != -1)
+            if (_name == string.Empty || _parentId == -1)
+            {
+                AddModuleMessage(Localizer["Message.Required.FolderParent"], MessageType.Warning);
+                return;
+            }
+
+            if (!_name.IsPathOrFileValid())
+            {
+                AddModuleMessage(Localizer["Message.Folder.InvalidName"], MessageType.Warning);
+                return;
+            }
+
+            try
             {
                 Folder folder;
                 if (_folderId != -1)
@@ -138,6 +192,9 @@
                 }
 
                 folder.Name = _name;
+                folder.Type = _type;
+                folder.ImageSizes = _imagesizes;
+                folder.Capacity = int.Parse(_capacity);
                 folder.IsSystem = _isSystem;
                 folder.Permissions = _permissionGrid.GetPermissions();
 
@@ -150,19 +207,26 @@
                     folder = await FolderService.AddFolderAsync(folder);
                 }
 
-                await FolderService.UpdateFolderOrderAsync(folder.SiteId, folder.FolderId, folder.ParentId);
-                await logger.LogInformation("Folder Saved {Folder}", folder);
-                NavigationManager.NavigateTo(NavigateUrl());
+                if (folder != null)
+                {
+                    await FolderService.UpdateFolderOrderAsync(folder.SiteId, folder.FolderId, folder.ParentId);
+                    await logger.LogInformation("Folder Saved {Folder}", folder);
+                    NavigationManager.NavigateTo(NavigateUrl());
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error);
+                }
             }
-            else
+            catch (Exception ex)
             {
-                AddModuleMessage("Folders Must Have A Parent And A Name", MessageType.Warning);
+                await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message);
+                AddModuleMessage(Localizer["Error.Folder.Save"], MessageType.Error);
             }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Saving Folder {FolderId} {Error}", _folderId, ex.Message);
-            AddModuleMessage("Error Saving Module", MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
@@ -170,14 +234,38 @@
     {
         try
         {
-            await FolderService.DeleteFolderAsync(_folderId);
-            await logger.LogInformation("Folder Deleted {Folder}", _folderId);
-            AddModuleMessage("Folder Deleted", MessageType.Success);
+            bool isparent = false;
+            foreach (Folder folder in _folders)
+            {
+                if (folder.ParentId == _folderId)
+                {
+                    isparent = true;
+                    break;
+                }
+            }
+            if (!isparent)
+            {
+                var files = await FileService.GetFilesAsync(_folderId);
+                if (files.Count == 0)
+                {
+                    await FolderService.DeleteFolderAsync(_folderId);
+                    await logger.LogInformation("Folder Deleted {Folder}", _folderId);
+                    NavigationManager.NavigateTo(NavigateUrl());
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.Folder.Files.InvalidDelete"], MessageType.Warning);
+                }
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.Folder.Subfolders.InvalidDelete"], MessageType.Warning);
+            }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Folder {Folder} {Error}", _folderId, ex.Message);
-            AddModuleMessage("Error Deleting Folder", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Folder.Delete"], MessageType.Error);
         }
     }
-}
+}

Oqtane.Client/Modules/Admin/Files/Index.razor

@@ -1,50 +1,54 @@
-@namespace Oqtane.Modules.Admin.Files
+@namespace Oqtane.Modules.Admin.Files
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IFolderService FolderService
 @inject IFileService FileService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_files != null)
 {
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label  class="control-label">Folder: </label>
-            </td>
-            <td>
-                <select class="form-control" @onchange="(e => FolderChanged(e))">
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <div class="col-sm-2">
+                <label class="control-label">@Localizer["Folder"] </label>
+            </div>            
+            <div class="col-sm-6">
+                <select class="form-select" @onchange="(e => FolderChanged(e))">
                     @foreach (Folder folder in _folders)
                     {
                         <option value="@(folder.FolderId)">@(new string('-', folder.Level * 2))@(folder.Name)</option>
                     }
                 </select>
-            </td>
-            <td>
-                <ActionLink Action="Edit" Text="Edit Folder" Class="btn btn-secondary" Parameters="@($"id=" + _folderId.ToString())" />&nbsp;
-                <ActionLink Action="Edit" Text="Add Folder" Class="btn btn-secondary" />&nbsp;
-                <ActionLink Action="Add" Text="Upload Files" Parameters="@($"id=" + _folderId.ToString())" />
-            </td>
-        </tr>
-    </table>
+            </div>            
+            <div class="col-sm-4">
+                <ActionLink Action="Edit" Text="Edit Folder" Class="btn btn-secondary" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="EditFolder" />&nbsp;
+                <ActionLink Action="Edit" Text="Add Folder" Class="btn btn-secondary" ResourceKey="AddFolder" />&nbsp;
+                <ActionLink Action="Add" Text="Upload Files" Parameters="@($"id=" + _folderId.ToString())" ResourceKey="UploadFiles" />
+            </div>
+        </div>
+    </div>
     <Pager Items="@_files">
         <Header>
-            <th>&nbsp;</th>
-            <th>Name</th>
-            <th>Modified</th>
-            <th>Type</th>
-            <th>Size</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th>@SharedLocalizer["Name"]</th>
+        <th>@Localizer["Modified"]</th>
+        <th>@Localizer["Type"]</th>
+        <th>@Localizer["Size"]</th>
         </Header>
         <Row>
-            <td><ActionDialog Header="Delete File" Message="@("Are You Sure You Wish To Delete " + context.Name + "?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" /></td>
-            <td><a href="@(ContentUrl(context.FileId))" target="_new">@context.Name</a></td>
+            <td><ActionLink Action="Details" Text="Edit" Parameters="@($"id=" + context.FileId.ToString())" ResourceKey="Details" /></td>
+            <td><ActionDialog Header="Delete File" Message="@string.Format(Localizer["Confirm.File.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteFile(context))" ResourceKey="DeleteFile" /></td>
+            <td><a href="@context.Url" target="_new">@context.Name</a></td>
             <td>@context.ModifiedOn</td>
-            <td>@context.Extension.ToUpper() File</td>
-            <td>@(context.Size / 1000) KB</td>
+            <td>@context.Extension.ToUpper() @SharedLocalizer["File"]</td>
+            <td>@string.Format("{0:0.00}", ((decimal)context.Size / 1000)) KB</td>
         </Row>
     </Pager>
     @if (_files.Count == 0)
     {
-        <div class="text-center">No Files Exist In Selected Folder</div>
+        <div class="text-center">@Localizer["NoFiles"]</div>
     }
 }
 
@@ -60,7 +64,7 @@
         try
         {
             _folders = await FolderService.GetFoldersAsync(PageState.Site.SiteId);
-            
+
             if (_folderId == -1 && _folders.Count > 0)
             {
                 _folderId = _folders[0].FolderId;
@@ -70,7 +74,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
-            AddModuleMessage("Error Loading Files", MessageType.Error);
+            AddModuleMessage(Localizer["Error.File.Load"], MessageType.Error);
         }
     }
 
@@ -90,7 +94,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
-            AddModuleMessage("Error Loading Files", MessageType.Error);
+            AddModuleMessage(Localizer["Error.File.Load"], MessageType.Error);
         }
     }
 
@@ -100,14 +104,14 @@
         {
             await FileService.DeleteFileAsync(file.FileId);
             await logger.LogInformation("File Deleted {File}", file.Name);
-            AddModuleMessage("File " + file.Name + " Deleted", MessageType.Success);
+            AddModuleMessage(string.Format(Localizer["Success.File.Delete"], file.Name), MessageType.Success);
             await GetFiles();
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting File {File} {Error}", file.Name, ex.Message);
-            AddModuleMessage("Error Deleting File " + file.Name, MessageType.Error);
+            AddModuleMessage(string.Format(Localizer["Error.File.Delete"], file.Name), MessageType.Error);
         }
     }
 }

Oqtane.Client/Modules/Admin/Jobs/Add.razor

@@ -1,140 +0,0 @@
-@namespace Oqtane.Modules.Admin.Jobs
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject IJobService JobService
-
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="name" HelpText="Enter the job name">Name: </Label>
-        </td>
-        <td>
-            <input id="name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="type" HelpText="Enter the job type">Type: </Label>
-        </td>
-        <td>
-            <input id="type" class="form-control" @bind="@_jobType" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="enabled" HelpText="Select whether you want the job enabled or not">Enabled? </Label>
-        </td>
-        <td>
-            <select id="enabled" class="form-control" @bind="@_isEnabled">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="runs-every" HelpText="Select how often you want the job to run">Runs Every: </Label>
-        </td>
-        <td>
-            <input id="runs-every" class="form-control" @bind="@_interval" />
-            <select id="runs-every" class="form-control" @bind="@_frequency">
-                <option value="m">Minute(s)</option>
-                <option value="H">Hour(s)</option>
-                <option value="d">Day(s)</option>
-                <option value="M">Month(s)</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="starting" HelpText="What time do you want the job to start">Starting: </Label>
-        </td>
-        <td>
-            <input id="starting" class="form-control" @bind="@_startDate" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="ending" HelpText="When do you want the job to end">Ending: </Label>
-        </td>
-        <td>
-            <input id="ending" class="form-control" @bind="@_endDate" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="retention-log" HelpText="What items do you want in the retention log">Retention Log (Items): </Label>
-        </td>
-        <td>
-            <input id="retention-log" class="form-control" @bind="@_retentionHistory" />
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="SaveJob">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-
-@code {
-    private string _name = string.Empty;
-    private string _jobType = string.Empty;
-    private string _isEnabled = "True";
-    private string _interval = string.Empty;
-    private string _frequency = string.Empty;
-    private string _startDate = string.Empty;
-    private string _endDate = string.Empty;
-    private string _retentionHistory = "10";
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
-
-    private async Task SaveJob()
-    {
-        if (_name != string.Empty && !string.IsNullOrEmpty(_jobType) && _frequency != string.Empty && _interval != string.Empty && _retentionHistory != string.Empty)
-        {
-            var job = new Job();
-            job.Name = _name;
-            job.JobType = _jobType;
-            job.IsEnabled = Boolean.Parse(_isEnabled);
-            job.Frequency = _frequency;
-            job.Interval = int.Parse(_interval);
-
-            if (_startDate == string.Empty)
-            {
-                job.StartDate = null;
-            }
-            else
-            {
-                job.StartDate = DateTime.Parse(_startDate);
-            }
-
-            if (_endDate == string.Empty)
-            {
-                job.EndDate = null;
-            }
-            else
-            {
-                job.EndDate = DateTime.Parse(_endDate);
-            }
-
-            job.RetentionHistory = int.Parse(_retentionHistory);
-            job.IsStarted = false;
-            job.IsExecuting = false;
-            job.NextExecution = null;
-
-            try
-            {
-                job = await JobService.AddJobAsync(job);
-                await logger.LogInformation("Job Added {Job}", job);
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Adding Job {Job} {Error}", job, ex.Message);
-                AddModuleMessage("Error Adding Job", MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage("You Must Provide The Job Name, Type, Frequency, and Retention", MessageType.Warning);
-        }
-    }
-
-}

Oqtane.Client/Modules/Admin/Jobs/Edit.razor

@@ -1,163 +1,194 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IJobService JobService
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="name" HelpText="Enter the job name">Name: </Label>
-        </td>
-        <td>
-            <input id="name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="type" HelpText="Enter the job type">Type: </Label>
-        </td>
-        <td>
-            <input id="type" class="form-control" @bind="@_jobType" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="enabled" HelpText="Select whether you want the job enabled or not">Enabled? </Label>
-        </td>
-        <td>
-            <select id="enabled" class="form-control" @bind="@_isEnabled">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="runs-every" HelpText="Select how often you want the job to run">Runs Every: </Label>
-        </td>
-        <td>
-            <input id="runs-every" class="form-control" @bind="@_interval" />
-            <select id="runs-every" class="form-control" @bind="@_frequency">
-                <option value="m">Minute(s)</option>
-                <option value="H">Hour(s)</option>
-                <option value="d">Day(s)</option>
-                <option value="M">Month(s)</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="starting" HelpText="What time do you want the job to start">Starting: </Label>
-        </td>
-        <td>
-            <input id="starting" class="form-control" @bind="@_startDate" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="ending" HelpText="When do you want the job to end">Ending: </Label>
-        </td>
-        <td>
-            <input id="ending" class="form-control" @bind="@_endDate" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="retention-log" HelpText="What items do you want in the retention log">Retention Log (Items): </Label>
-        </td>
-        <td>
-            <input id="retention-log" class="form-control" @bind="@_retentionHistory" />
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="SaveJob">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="name" HelpText="Enter the job name" ResourceKey="Name">Name: </Label>
+            <div class="col-sm-9">
+                <input id="name" class="form-control" @bind="@_name" maxlength="200" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="type" HelpText="The fully qualified job type name" ResourceKey="Type">Type: </Label>
+            <div class="col-sm-9">
+                <input id="type" class="form-control" @bind="@_jobType" readonly />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="enabled" HelpText="Select whether you want the job enabled or not" ResourceKey="Enabled">Enabled? </Label>
+            <div class="col-sm-9">
+                <select id="enabled" class="form-select" @bind="@_isEnabled" required>
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
+                </select>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="runs-every" HelpText="Select how often you want the job to run" ResourceKey="RunsEvery">Runs Every: </Label>
+            <div class="col-sm-9">
+                <input id="runs-every" class="form-control" @bind="@_interval" maxlength="4" required />
+                <select id="runs-every" class="form-select" @bind="@_frequency" required>
+                    <option value="m">@Localizer["Minute(s)"]</option>
+                    <option value="H">@Localizer["Hour(s)"]</option>
+                    <option value="d">@Localizer["Day(s)"]</option>
+                    <option value="w">@Localizer["Week(s)"]</option>
+                    <option value="M">@Localizer["Month(s)"]</option>
+                    <option value="O">@Localizer["Once"]</option>
+                </select>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="retention" HelpText="Number of log entries to retain for this job" ResourceKey="RetentionLog">Retention Log (Items): </Label>
+            <div class="col-sm-9">
+                <input id="retention" class="form-control" @bind="@_retentionHistory" maxlength="4" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="starting" HelpText="Optionally enter the date and time when this job should start executing" ResourceKey="Starting">Starting: </Label>
+            <div class="col-sm-9">
+                <div class="row">
+                    <div class="col">
+                        <input id="starting" type="date" class="form-control" @bind="@_startDate" />
+                    </div>
+                    <div class="col">
+                        <input id="starting" type="text" class="form-control" placeholder="hh:mm" @bind="@_startTime" />
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="ending" HelpText="Optionally enter the date and time when this job should stop executing" ResourceKey="Ending">Ending: </Label>
+            <div class="col-sm-9">
+                <div class="row">
+                    <div class="col">
+                        <input id="ending" type="date" class="form-control" @bind="@_endDate" />
+                    </div>
+                    <div class="col">
+                        <input id="ending" type="text" class="form-control" placeholder="hh:mm" @bind="@_endTime" />
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="next" HelpText="Optionally modify the date and time when this job should execute next" ResourceKey="NextExecution">Next Execution: </Label>
+            <div class="col-sm-9">
+                <div class="row">
+                    <div class="col">
+                        <input id="next" type="date" class="form-control" @bind="@_nextDate" />
+                    </div>
+                    <div class="col">
+                        <input id="next" type="text" class="form-control" placeholder="hh:mm" @bind="@_nextTime" />
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <br />
+    <button type="button" class="btn btn-success" @onclick="SaveJob">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    <br />
+    <br />
+    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
+</form>
 
 @code {
-    private int _jobId;
-    private string _name = string.Empty;
-    private string _jobType = string.Empty;
-    private string _isEnabled = "True";
-    private string _interval = string.Empty;
-    private string _frequency = string.Empty;
-    private string _startDate = string.Empty;
-    private string _endDate = string.Empty;
-    private string _retentionHistory = string.Empty;
+	private ElementReference form;
+	private bool validated = false;
+	private int _jobId;
+	private string _name = string.Empty;
+	private string _jobType = string.Empty;
+	private string _isEnabled = "True";
+	private string _interval = string.Empty;
+	private string _frequency = string.Empty;
+	private DateTime? _startDate = null;
+	private string _startTime = string.Empty;
+	private DateTime? _endDate = null;
+	private string _endTime = string.Empty;
+	private string _retentionHistory = string.Empty;
+	private DateTime? _nextDate = null;
+	private string _nextTime = string.Empty;
+	private string createdby;
+	private DateTime createdon;
+	private string modifiedby;
+	private DateTime modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _jobId = Int32.Parse(PageState.QueryString["id"]);
-            Job job = await JobService.GetJobAsync(_jobId);
-            if (job != null)
-            {
-                _name = job.Name;
-                _jobType = job.JobType;
-                _isEnabled = job.IsEnabled.ToString();
-                _interval = job.Interval.ToString();
-                _frequency = job.Frequency;
-                _startDate = (job.StartDate != null) ? job.StartDate.ToString() : string.Empty;
-                _endDate = (job.EndDate != null) ? job.EndDate.ToString() : string.Empty;
-                _retentionHistory = job.RetentionHistory.ToString();
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
-            AddModuleMessage("Error Loading Job", MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_jobId = Int32.Parse(PageState.QueryString["id"]);
+			Job job = await JobService.GetJobAsync(_jobId);
+			if (job != null)
+			{
+				_name = job.Name;
+				_jobType = job.JobType;
+				_isEnabled = job.IsEnabled.ToString();
+				_interval = job.Interval.ToString();
+				_frequency = job.Frequency;
+				(_startDate, _startTime) = Utilities.UtcAsLocalDateAndTime(job.StartDate);
+				(_endDate, _endTime) = Utilities.UtcAsLocalDateAndTime(job.EndDate);
+				_retentionHistory = job.RetentionHistory.ToString();
+				(_nextDate, _nextTime) = Utilities.UtcAsLocalDateAndTime(job.NextExecution);
+				createdby = job.CreatedBy;
+				createdon = job.CreatedOn;
+				modifiedby = job.ModifiedBy;
+				modifiedon = job.ModifiedOn;
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
+			AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
+		}
+	}
 
-    private async Task SaveJob()
-    {
-        if (_name != string.Empty && !string.IsNullOrEmpty(_jobType) && _frequency != string.Empty && _interval != string.Empty && _retentionHistory != string.Empty)
-        {
-            var job = await JobService.GetJobAsync(_jobId);
-            job.Name = _name;
-            job.JobType = _jobType;
-            job.IsEnabled = Boolean.Parse(_isEnabled);
-            job.Frequency = _frequency;
-            job.Interval = int.Parse(_interval);
+	private async Task SaveJob()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			var job = await JobService.GetJobAsync(_jobId);
+			job.Name = _name;
+			job.JobType = _jobType;
+			job.IsEnabled = Boolean.Parse(_isEnabled);
+			job.Frequency = _frequency;
+			if (job.Frequency == "O") // once
+			{
+				job.Interval = 1;
+			}
+			else
+			{
+				job.Interval = int.Parse(_interval);
+			}
+			job.StartDate = Utilities.LocalDateAndTimeAsUtc(_startDate, _startTime);
+			job.EndDate = Utilities.LocalDateAndTimeAsUtc(_endDate, _endTime);
+			job.RetentionHistory = int.Parse(_retentionHistory);
+			job.NextExecution = Utilities.LocalDateAndTimeAsUtc(_nextDate, _nextTime);
 
-            if (_startDate == string.Empty)
-            {
-                job.StartDate = null;
-            }
-            else
-            {
-                job.StartDate = DateTime.Parse(_startDate);
-            }
-
-            if (_endDate == string.Empty)
-            {
-                job.EndDate = null;
-            }
-            else
-            {
-                job.EndDate = DateTime.Parse(_endDate);
-            }
-
-            job.RetentionHistory = int.Parse(_retentionHistory);
-
-            try
-            {
-                job = await JobService.UpdateJobAsync(job);
-                await logger.LogInformation("Job Updated {Job}", job);
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Udate Job {Job} {Error}", job, ex.Message);
-                AddModuleMessage("Error Updating Job", MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage("You Must Provide The Job Name, Type, Frequency, and Retention", MessageType.Warning);
-        }
-    }
+			try
+			{
+				job = await JobService.UpdateJobAsync(job);
+				await logger.LogInformation("Job Updated {Job}", job);
+				NavigationManager.NavigateTo(NavigateUrl());
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Udate Job {Job} {Error}", job, ex.Message);
+				AddModuleMessage(Localizer["Error.Job.Update"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(Localizer["Message.Required.JobInfo"], MessageType.Warning);
+		}
+	}
 
 }

Oqtane.Client/Modules/Admin/Jobs/Index.razor

@@ -1,45 +1,47 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject IJobService JobService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_jobs == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
-    <ActionLink Action="Add" Text="Add Job" />
-    <ActionLink Action="Log" Class="btn btn-secondary" Text="View Logs" />
+    <ActionLink Action="Log" Class="btn btn-secondary" Text="View Logs" ResourceKey="ViewJobs" />
     <button type="button" class="btn btn-secondary" @onclick="(async () => await Refresh())">Refresh</button>
-    <br /><br />
+    <br />
+    <br />
 
     <Pager Items="@_jobs">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>Name</th>
-            <th>Status</th>
-            <th>Frequency</th>
-            <th>Next Execution</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th>@SharedLocalizer["Name"]</th>
+            <th>@SharedLocalizer["Status"]</th>
+            <th>@Localizer["Frequency"]</th>
+            <th>@Localizer["NextExecution"]</th>
+            <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Job" Message="@("Are You Sure You Wish To Delete This Job?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteJob(context))" /></td>
-            <td><ActionLink Action="Log" Class="btn btn-secondary" Parameters="@($"id=" + context.JobId.ToString())" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="EditJob" /></td>
+            <td><ActionDialog Header="Delete Job" Message="Are You Sure You Wish To Delete This Job?" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteJob(context))" ResourceKey="DeleteJob" /></td>
+            <td><ActionLink Action="Log" Class="btn btn-secondary" Parameters="@($"id=" + context.JobId.ToString())" ResourceKey="JobLog" /></td>
             <td>@context.Name</td>
             <td>@DisplayStatus(context.IsEnabled, context.IsExecuting)</td>
             <td>@DisplayFrequency(context.Interval, context.Frequency)</td>
-            <td>@context.NextExecution</td>
+            <td>@context.NextExecution?.ToLocalTime()</td>
             <td>
                 @if (context.IsStarted)
                 {
-                    <button type="button" class="btn btn-danger" @onclick="(async () => await StopJob(context.JobId))">Stop</button>
+                    <button type="button" class="btn btn-danger" @onclick="(async () => await StopJob(context.JobId))">@Localizer["Stop"]</button>
                 }
                 else
                 {
-                    <button type="button" class="btn btn-success" @onclick="(async () => await StartJob(context.JobId))">Start</button>
+                    <button type="button" class="btn btn-success" @onclick="(async () => await StartJob(context.JobId))">@Localizer["Start"]</button>
                 }
             </td>
         </Row>
@@ -47,62 +49,66 @@ else
 }
 
 @code {
-    private List<Job> _jobs;
-    
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+	private List<Job> _jobs;
 
-    protected override async Task OnParametersSetAsync()
-    {
-        _jobs = await JobService.GetJobsAsync();
-    }
+	public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
 
-    private string DisplayStatus(bool isEnabled, bool isExecuting)
-    {
-        var status = string.Empty;
-        if (!isEnabled)
-        {
-            status = "Disabled";
-        }
-        else
-        {
-            if (isExecuting)
-            {
-                status = "Executing";
-            }
-            else
-            {
-                status = "Idle";
-            }
-        }
+	protected override async Task OnParametersSetAsync()
+	{
+		_jobs = await JobService.GetJobsAsync();
+		if (_jobs.Count == 0)
+		{
+			AddModuleMessage(string.Format(Localizer["Message.NoJobs"], NavigateUrl("admin/system")), MessageType.Warning);
+		}
+	}
 
-        return status;
-    }
+	private string DisplayStatus(bool isEnabled, bool isExecuting)
+	{
+		var status = string.Empty;
+		if (!isEnabled)
+		{
+			status = Localizer["Disabled"];
+		}
+		else
+		{
+			if (isExecuting)
+			{
+				status = Localizer["Executing"];
+			}
+			else
+			{
+				status = Localizer["Idle"];
+			}
+		}
+
+		return status;
+	}
 
 
-    private string DisplayFrequency(int interval, string frequency)
-    {
-        var  result = "Every " + interval.ToString() + " ";
-        switch (frequency)
-        {
-            case "m":
-                result += "Minute";
-                break;
-            case "H":
-                result += "Hour";
-                break;
-            case "d":
-                result += "Day";
-                break;
-            case "M":
-                result += "Month";
-                break;
-        }
-        
-        if (interval > 1)
-        {
-            result += "s";
-        }
-        
+	private string DisplayFrequency(int interval, string frequency)
+	{
+		var result = "";
+		switch (frequency)
+		{
+			case "m":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Minute"];
+				break;
+			case "H":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Hour"];
+				break;
+			case "d":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Day"];
+				break;
+			case "w":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Week"];
+				break;
+			case "M":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Month"];
+				break;
+			case "O":
+				result = Localizer["Once"];
+				break;
+		}
         return result;
     }
 
@@ -112,23 +118,48 @@ else
         {
             await JobService.DeleteJobAsync(job.JobId);
             await logger.LogInformation("Job Deleted {Job}", job);
+			_jobs = await JobService.GetJobsAsync();
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Job {Job} {Error}", job, ex.Message);
-            AddModuleMessage("Error Deleting Job", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Job.Delete"], MessageType.Error);
         }
     }
 
     private async Task StartJob(int jobId)
     {
-        await JobService.StartJobAsync(jobId);
+        try
+        {
+			await JobService.StartJobAsync(jobId);
+            await logger.LogInformation("Job Started {JobId}", jobId);
+            AddModuleMessage(Localizer["Message.Job.Start"], MessageType.Success);
+			_jobs = await JobService.GetJobsAsync();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Starting Job {JobId} {Error}", jobId, ex.Message);
+            AddModuleMessage(Localizer["Error.Job.Start"], MessageType.Error);
+        }
     }
 
     private async Task StopJob(int jobId)
     {
-        await JobService.StopJobAsync(jobId);
+        try
+        {
+			await JobService.StopJobAsync(jobId);
+            await logger.LogInformation("Job Stopped {JobId}", jobId);
+            AddModuleMessage(Localizer["Message.Job.Stop"], MessageType.Success);
+			_jobs = await JobService.GetJobsAsync();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Stopping Job {JobId} {Error}", jobId, ex.Message);
+            AddModuleMessage(Localizer["Error.Job.Stop"], MessageType.Error);
+        }
     }
 
     private async Task Refresh()

Oqtane.Client/Modules/Admin/Jobs/Log.razor

@@ -1,46 +1,48 @@
-@namespace Oqtane.Modules.Admin.Jobs
+@namespace Oqtane.Modules.Admin.Jobs
 @inherits ModuleBase
 @inject IJobLogService JobLogService
+@inject IStringLocalizer<Log> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_jobLogs == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
-<Pager Items="@_jobLogs">
-    <Header>
-        <th>Name</th>
-        <th>Status</th>
-        <th>Started</th>
-        <th>Finished</th>
-    </Header>
-    <Row>
-        <td>@context.Job.Name</td>
-        <td>@DisplayStatus(context.Job.IsExecuting, context.Succeeded)</td>
-        <td>@context.StartDate</td>
-        <td>@context.FinishDate</td>
-    </Row>
-    <Detail>
-        <td colspan="4">@context.Notes</td>
-    </Detail>
-</Pager>
+    <Pager Items="@_jobLogs">
+        <Header>
+            <th>@SharedLocalizer["Name"]</th>
+            <th>@SharedLocalizer["Status"]</th>
+            <th>@Localizer["Started"]</th>
+            <th>@Localizer["Finished"]</th>
+        </Header>
+        <Row>
+            <td>@context.Job.Name</td>
+            <td>@DisplayStatus(context.Job.IsExecuting, context.Succeeded)</td>
+            <td>@context.StartDate</td>
+            <td>@context.FinishDate</td>
+        </Row>
+        <Detail>
+            <td colspan="4">@((MarkupString)context.Notes)</td>
+        </Detail>
+    </Pager>
 }
 
 @code {
     private List<JobLog> _jobLogs;
-    
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
     {
         _jobLogs = await JobLogService.GetJobLogsAsync();
-        
+
         if (PageState.QueryString.ContainsKey("id"))
         {
             _jobLogs = _jobLogs.Where(item => item.JobId == Int32.Parse(PageState.QueryString["id"])).ToList();
         }
-        
+
         _jobLogs = _jobLogs.OrderByDescending(item => item.JobLogId).ToList();
     }
 
@@ -49,20 +51,20 @@ else
         var status = string.Empty;
         if (isExecuting)
         {
-            status = "Executing";
+            status = Localizer["Executing"];
         }
         else
         {
             if (succeeded != null && succeeded.Value)
             {
-                status = "Succeeded";
+                status = Localizer["Succeeded"];
             }
             else
             {
-                status = "Failed";
+                status = Localizer["Failed"];
             }
         }
-        
+
         return status;
     }
 }

Oqtane.Client/Modules/Admin/Languages/Add.razor

@@ -0,0 +1,361 @@
+@namespace Oqtane.Modules.Admin.Languages
+@inherits ModuleBase
+@using System.Globalization
+@using Microsoft.AspNetCore.Localization
+@inject NavigationManager NavigationManager
+@inject ILocalizationService LocalizationService
+@inject ILanguageService LanguageService
+@inject IPackageService PackageService
+@inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_supportedCultures == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+    <TabStrip>
+        <TabPanel Name="Manage" ResourceKey="Manage">
+            @if (_availableCultures.Count() == 0)
+            {
+                <ModuleMessage Type="MessageType.Info" Message="@_message"></ModuleMessage>
+				<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+            }
+            else
+            {
+                <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+                    <div class="container">
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="name" HelpText="Name Of The Language" ResourceKey="Name">Name:</Label>
+                            <div class="col-sm-9">
+                                <select id="_code" class="form-select" @bind="@_code" required>
+                                    @foreach (var culture in _availableCultures)
+                                    {
+                                        <option value="@culture.Name">@(culture.DisplayName + " (" + culture.Name + ")")</option>
+                                    }
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="default" HelpText="Indicates Whether Or Not This Language Is The Default For The Site" ResourceKey="IsDefault">Default?</Label>
+                            <div class="col-sm-9">
+                                <select id="default" class="form-select" @bind="@_isDefault" required>
+                                    <option value="True">@SharedLocalizer["Yes"]</option>
+                                    <option value="False">@SharedLocalizer["No"]</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <button type="button" class="btn btn-success" @onclick="SaveLanguage">@SharedLocalizer["Save"]</button>
+					<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+                </form>
+            }
+        </TabPanel>
+		<TabPanel Name="Translations" Heading="Translations" ResourceKey="Download" Security="SecurityAccessLevel.Host">
+            <div class="row justify-content-center mb-3">
+                <div class="col-sm-6">
+                    <div class="input-group">
+                        <select id="price" class="form-select custom-select" @onchange="(e => PriceChanged(e))">
+                            <option value="free">@SharedLocalizer["Free"]</option>
+                            <option value="paid">@SharedLocalizer["Paid"]</option>
+                        </select>
+                        <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
+                        <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
+                    </div>
+                </div>
+            </div>
+
+            @if (_packages != null)
+            {
+                @if (_packages.Count > 0)
+                {
+                    <Pager Items="@_packages">
+                        <Row>
+                            <td>
+                                <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+                                @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+                                <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
+                                @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
+                                @SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                                @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(context.PackageUrl).Host + "</strong>" : ""))
+                                @((MarkupString)(context.TrialPeriod > 0 ? "&nbsp;&nbsp;|&nbsp;&nbsp;<strong>" + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "</strong>" : ""))
+                            </td>
+                            <td style="width: 1px; vertical-align: middle;">
+                                @if (context.Price != null && !string.IsNullOrEmpty(context.PackageUrl))
+                                {
+                                    <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                                }
+                            </td>
+                            <td style="width: 1px; vertical-align: middle;">
+                                @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                                {
+                                    <a class="btn btn-primary" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@context.Price.Value.ToString("$#,##0.00")</a>
+                                }
+                                else
+                                {
+                                    <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                                }
+                            </td>
+                        </Row>
+                    </Pager>
+                }
+                else
+                {
+                    <br />
+                    <div class="mx-auto text-center">
+                        @Localizer["Search.NoResults"]
+                    </div>
+                }
+                <button type="button" class="btn btn-success" @onclick="InstallLanguages">@SharedLocalizer["Install"]</button>
+                <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+
+				<br />
+				<br />
+				<ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
+            }
+        </TabPanel>
+        <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="LanguageUpload">Translation: </Label>
+                    <div class="col-sm-9">
+                        <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
+                    </div>
+                </div>
+            </div>
+            <button type="button" class="btn btn-success" @onclick="InstallLanguages">@SharedLocalizer["Install"]</button>
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+        </TabPanel>
+    </TabStrip>
+}
+
+@if (_productname != "")
+{
+    <div class="app-actiondialog">
+        <div class="modal" tabindex="-1" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
+                        <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
+                    </div>
+                    <div class="modal-body">
+                        <p style="height: 200px; overflow-y: scroll;">
+                            <h3>@_productname</h3>
+                            @if (!string.IsNullOrEmpty(_license))
+                            {
+                                @((MarkupString)_license)
+                            }
+                            else
+                            {
+                                @SharedLocalizer["License Not Specified"]
+                            }
+                        </p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+
+@code {
+	private ElementReference form;
+	private bool validated = false;
+
+	private string _code = string.Empty;
+	private string _isDefault = "False";
+	private string _message;
+	private IEnumerable<Culture> _supportedCultures;
+	private IEnumerable<Culture> _availableCultures;
+	private List<Package> _packages;
+	private string _price = "free";
+	private string _search = "";
+	private string _productname = "";
+	private string _license = "";
+	private string _packageid = "";
+	private string _version = "";
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnParametersSetAsync()
+	{
+		var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
+		var languagesCodes = languages.Select(l => l.Code).ToList();
+
+		_supportedCultures = await LocalizationService.GetCulturesAsync();
+		_availableCultures = _supportedCultures.Where(c => !c.Name.Equals(Constants.DefaultCulture) && !languagesCodes.Contains(c.Name));
+		await LoadTranslations();
+
+        if (_supportedCultures.Count() == 1)
+        {
+            _message = Localizer["OnlyEnglish"];
+        }
+        else if (_availableCultures.Count() == 0)
+        {
+            _message = Localizer["AllLanguages"];
+        }
+    }
+
+    private async Task LoadTranslations()
+    {
+        _packages = await PackageService.GetPackagesAsync("translation", _search, _price, "");
+    }
+
+    private async void PriceChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _price = (string)e.Value;
+            _search = "";
+            await LoadTranslations();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On PriceChanged");
+        }
+    }
+
+    private async Task Search()
+    {
+        try
+        {
+            await LoadTranslations();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Search");
+        }
+    }
+
+    private async Task Reset()
+    {
+        try
+        {
+            _search = "";
+            await LoadTranslations();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Reset");
+        }
+    }
+
+    private async Task SaveLanguage()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            var language = new Language
+            {
+                SiteId = PageState.Page.SiteId,
+                Name = CultureInfo.GetCultureInfo(_code).DisplayName,
+                Code = _code,
+                IsDefault = (_isDefault == null ? false : Boolean.Parse(_isDefault))
+            };
+
+            try
+            {
+                language = await LanguageService.AddLanguageAsync(language);
+
+                if (language.IsDefault)
+                {
+                    await SetCultureAsync(language.Code);
+                }
+
+                await logger.LogInformation("Language Added {Language}", language);
+
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Adding Language {Language} {Error}", language, ex.Message);
+                AddModuleMessage(Localizer["Error.Language.Add"], MessageType.Error);
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+
+
+    private void HideModal()
+    {
+        _productname = "";
+        _license = "";
+        StateHasChanged();
+    }
+
+    private async Task GetPackage(string packageid, string version)
+    {
+        try
+        {
+            var package = await PackageService.GetPackageAsync(packageid, version);
+            if (package != null)
+            {
+                _productname = package.Name;
+                if (!string.IsNullOrEmpty(package.License))
+                {
+                    _license = package.License.Replace("\n", "<br />");
+                }
+                _packageid = package.PackageId;
+                _version = package.Version;
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version);
+            AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
+        }
+    }
+
+    private async Task DownloadPackage()
+    {
+        try
+        {
+            await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
+            await logger.LogInformation("Language Package {Name} {Version} Downloaded Successfully", _packageid, _version);
+            AddModuleMessage(Localizer["Success.Language.Download"], MessageType.Success);
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Translation {Name} {Version}", _packageid, _version);
+            AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error);
+        }
+    }
+
+    private async Task InstallLanguages()
+    {
+        try
+        {
+            await PackageService.InstallPackagesAsync();
+            AddModuleMessage(string.Format(Localizer["Success.Language.Install"], NavigateUrl("admin/system")), MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Installing Translations");
+        }
+    }
+
+    private async Task SetCultureAsync(string culture)
+    {
+        if (culture != CultureInfo.CurrentUICulture.Name)
+        {
+            var interop = new Interop(JSRuntime);
+            var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
+            await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360);
+
+            NavigationManager.NavigateTo(NavigationManager.Uri, true);
+        }
+    }
+}

Oqtane.Client/Modules/Admin/Languages/Index.razor

@@ -0,0 +1,112 @@
+@namespace Oqtane.Modules.Admin.Languages
+@inherits ModuleBase
+@inject ILanguageService LanguageService
+@inject ILocalizationService LocalizationService
+@inject IPackageService PackageService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_languages == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+    <ActionLink Action="Add" Text="Add Language" ResourceKey="AddLanguage" />
+
+    <Pager Items="@_languages">
+        <Header>
+            <th style="width: 1px;">&nbsp;</th>
+            <th>@SharedLocalizer["Name"]</th>
+            <th>@Localizer["Code"]</th>
+			<th>@Localizer["Translation"]</th>
+            <th>@Localizer["Default"]</th>
+			<th style="width: 1px;">&nbsp;</th>
+        </Header>
+        <Row>
+            <td><ActionDialog Header="Delete Language" Message="@string.Format(Localizer["Confirm.Language.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteLanguage(context))" Disabled="@((context.IsDefault && _languages.Count > 2) || context.Code == Constants.DefaultCulture)" ResourceKey="DeleteLanguage" /></td>
+            <td>@context.Name</td>
+            <td>@context.Code</td>
+			<td>@context.Version</td>
+			<td><TriStateCheckBox Value="@(context.IsDefault)" Disabled="true"></TriStateCheckBox></td>
+			<td>
+                @if (UpgradeAvailable(context.Code, context.Version))
+                {
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadLanguage(context.Code))>@SharedLocalizer["Upgrade"]</button>
+                }
+            </td>
+        </Row>
+    </Pager>
+}
+
+@code {
+	private List<Language> _languages;
+	private List<Package> _packages;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnParametersSetAsync()
+	{
+		_languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId, Constants.ClientId);
+
+		var cultures = await LocalizationService.GetCulturesAsync();
+        var culture = cultures.First(c => c.Name.Equals(Constants.DefaultCulture));
+
+        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        {
+            _packages = await PackageService.GetPackagesAsync("translation");			
+        }
+    }
+
+    private async Task DeleteLanguage(Language language)
+    {
+        try
+        {
+            await LanguageService.DeleteLanguageAsync(language.LanguageId);
+            await logger.LogInformation("Language Deleted {Language}", language);
+
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Language {Language} {Error}", language, ex.Message);
+
+            AddModuleMessage(Localizer["Error.Language.Delete"], MessageType.Error);
+        }
+    }
+
+    private bool UpgradeAvailable(string code, string version)
+    {
+        var upgradeavailable = false;
+        if (_packages != null && version != null)
+        {
+			var package = _packages.Where(item => item.PackageId == (Constants.PackageId + "." + code)).FirstOrDefault();
+			if (package != null)
+            {
+				upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) == 0) &&
+					(Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+            }
+
+        }
+        return upgradeavailable;
+    }
+
+    private async Task DownloadLanguage(string code)
+    {
+        try
+        {
+            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+            {
+                await PackageService.DownloadPackageAsync(Constants.PackageId + "." + code, Constants.Version, Constants.PackagesFolder);
+                await logger.LogInformation("Translation Downloaded {Code} {Version}", code, Constants.Version);
+                await PackageService.InstallPackagesAsync();
+                AddModuleMessage(string.Format(Localizer["Success.Language.Install"], NavigateUrl("admin/system")), MessageType.Success);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Translation {Code} {Version} {Error}", code, Constants.Version, ex.Message);
+            AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error);
+        }
+    }
+}

Oqtane.Client/Modules/Admin/Login/Index.razor

@@ -1,161 +1,326 @@
-@namespace Oqtane.Modules.Admin.Login
+@namespace Oqtane.Modules.Admin.Login
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
-@inject IJSRuntime JsRuntime
 @inject IUserService UserService
 @inject IServiceProvider ServiceProvider
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_message != string.Empty)
-{
-    <ModuleMessage Message="@_message" Type="@_type" />
-}
-<AuthorizeView>
+<AuthorizeView Roles="@RoleNames.Registered">
     <Authorizing>
         <text>...</text>
     </Authorizing>
     <Authorized>
-        <ModuleMessage Message="You Are Already Logged In" Type="MessageType.Info" />
+		<div>@Localizer["Info.SignedIn"]</div>
     </Authorized>
     <NotAuthorized>
-        <div class="container">
-            <div class="form-group">
-                <label for="Username" class="control-label">Username: </label>
-                <input type="text" name="Username" class="form-control" placeholder="Username" @bind="@_username" id="Username" />
-            </div>
-            <div class="form-group">
-                <label for="Password" class="control-label">Password: </label>
-                <input type="password" name="Password" class="form-control" placeholder="Password" @bind="@_password" id="Password" />
-            </div>
-            <div class="form-group">
-                <div class="form-check form-check-inline">
-                    <label class="form-check-label" for="Remember">Remember Me?</label>&nbsp;
-                    <input type="checkbox" class="form-check-input" name="Remember" @bind="@_remember" id="Remember" />
-                </div>
-            </div>
-            <button type="button" class="btn btn-primary" @onclick="Login">Login</button>
-            <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-            <br /><br />
-            <button type="button" class="btn btn-secondary" @onclick="Forgot">Forgot Password</button>
-        </div>
-    </NotAuthorized>
+		@if (!twofactor)
+		{
+			<form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+				<div class="Oqtane-Modules-Admin-Login" @onkeypress="@(e => KeyPressed(e))">
+				@if (_allowexternallogin)
+				{
+					<button type="button" class="btn btn-primary" @onclick="ExternalLogin">@Localizer["Use"] @PageState.Site.Settings["ExternalLogin:ProviderName"]</button>						
+					<br /><br />
+				}
+				@if (_allowsitelogin)
+				{
+					<div class="form-group">
+						<Label Class="control-label" For="username" HelpText="Please enter your Username" ResourceKey="Username">Username:</Label>
+						<input id="username" type="text" @ref="username" class="form-control" placeholder="@Localizer["Username.Placeholder"]" @bind="@_username" required />
+					</div>
+					<div class="form-group mt-2">
+						<Label Class="control-label" For="password" HelpText="Please enter your Password" ResourceKey="Password">Password:</Label>
+						<div class="input-group">
+							<input id="password" type="@_passwordtype" name="Password" class="form-control" placeholder="@Localizer["Password.Placeholder"]" @bind="@_password" required />
+							<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+						</div>
+					</div>
+					<div class="form-group mt-2">
+						<div class="form-check">
+							<input id="remember" type="checkbox" class="form-check-input" @bind="@_remember" />
+							<Label Class="control-label" For="remember" HelpText="Specify if you would like to be signed back in automatically the next time you visit this site" ResourceKey="Remember">Remember Me?</Label>
+						</div>
+					</div>
+					<button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
+					<button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+					<br /><br />
+					<button type="button" class="btn btn-secondary" @onclick="Forgot">@Localizer["ForgotPassword"]</button>		
+				}
+				</div>
+			</form>
+		}
+		else
+		{
+			<form @ref="login" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+				<div class="container Oqtane-Modules-Admin-Login">
+					<div class="form-group">
+						<Label Class="control-label" For="code" HelpText="Please enter the secure verification code which was sent to you by email" ResourceKey="Code">Verification Code:</Label>
+						<input id="code" class="form-control" @bind="@_code" placeholder="@Localizer["Code.Placeholder"]" maxlength="6" required />
+					</div>
+					<br />
+					<button type="button" class="btn btn-primary" @onclick="Login">@SharedLocalizer["Login"]</button>
+					<button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Cancel"]</button>
+				</div>
+			</form>
+		}
+	</NotAuthorized>
 </AuthorizeView>
 
 @code {
-    private string _returnUrl = string.Empty;
-    private string _message = string.Empty;
-    private MessageType _type = MessageType.Info;
-    private string _username = string.Empty;
-    private string _password = string.Empty;
-    private bool _remember = false;
+	private bool _allowsitelogin = true;
+	private bool _allowexternallogin = false;
+	private ElementReference login;
+	private bool validated = false;
+	private bool twofactor = false;
+	private string _username = string.Empty;
+	private ElementReference username;
+	private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
+	private bool _remember = false;
+	private string _code = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	private string _returnUrl = string.Empty;
 
-    protected override async Task OnInitializedAsync()
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+
+	public override List<Resource> Resources => new List<Resource>()
     {
-        if (PageState.QueryString.ContainsKey("returnurl"))
-        {
-            _returnUrl = PageState.QueryString["returnurl"];
-        }
-        
-        if (PageState.QueryString.ContainsKey("name"))
-        {
-            _username = PageState.QueryString["name"];
-        }
-        
-        if (PageState.QueryString.ContainsKey("token"))
-        {
-            var user = new User();
-            user.SiteId = PageState.Site.SiteId;
-            user.Username = _username;
-            user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
+    };
 
-            if (user != null)
-            {
-                _message = "User Account Verified Successfully. You Can Now Login With Your Username And Password Below.";
-            }
-            else
-            {
-                _message = "User Account Could Not Be Verified. Please Contact Your Administrator For Further Instructions.";
-                _type = MessageType.Warning;
-            }
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_togglepassword = SharedLocalizer["ShowPassword"];
 
-    private async Task Login()
-    {
-        if (PageState.Runtime == Runtime.Server)
-        {
-            // server-side Blazor
-            var user = new User();
-            user.SiteId = PageState.Site.SiteId;
-            user.Username = _username;
-            user.Password = _password;
-            user = await UserService.LoginUserAsync(user, false, false);
-            
-            if (user.IsAuthenticated)
-            {
-                await logger.LogInformation("Login Successful For Username {Username}", _username);
-                // complete the login on the server so that the cookies are set correctly on SignalR
-                var interop = new Interop(JsRuntime);
-                string antiforgerytoken = await interop.GetElementByName("__RequestVerificationToken");
-                var fields = new { __RequestVerificationToken = antiforgerytoken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
-                await interop.SubmitForm($"/{PageState.Alias.AliasId}/pages/login/", fields);
-            }
-            else
-            {
-                await logger.LogInformation("Login Failed For Username {Username}", _username);
-                AddModuleMessage("Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Email Verification When They Initially Created.", MessageType.Error);
-            }
-        }
-        else
-        {
-            // client-side Blazor
-            var user = new User();
-            user.SiteId = PageState.Site.SiteId;
-            user.Username = _username;
-            user.Password = _password;
-            user = await UserService.LoginUserAsync(user, true, _remember);
-            if (user.IsAuthenticated)
-            {
-                await logger.LogInformation("Login Successful For Username {Username}", _username);
-                var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
-                authstateprovider.NotifyAuthenticationChanged();
-                NavigationManager.NavigateTo(NavigateUrl(_returnUrl, "reload"));
-            }
-            else
-            {
-                await logger.LogInformation("Login Failed For Username {Username}", _username);
-                AddModuleMessage("Login Failed. Please Remember That Passwords Are Case Sensitive And User Accounts Require Verification When They Are Initially Created So You May Wish To Check Your Email.", MessageType.Error);
-            }
-        }
-    }
+			if (PageState.Site.Settings.ContainsKey("LoginOptions:AllowSiteLogin") && !string.IsNullOrEmpty(PageState.Site.Settings["LoginOptions:AllowSiteLogin"]))
+			{
+				_allowsitelogin = bool.Parse(PageState.Site.Settings["LoginOptions:AllowSiteLogin"]);
+			}
 
-    private void Cancel()
-    {
-        NavigationManager.NavigateTo(_returnUrl);
-    }
+			if (PageState.Site.Settings.ContainsKey("ExternalLogin:ProviderType") && !string.IsNullOrEmpty(PageState.Site.Settings["ExternalLogin:ProviderType"]))
+			{
+				_allowexternallogin = true;
+			}
+
+			if (PageState.QueryString.ContainsKey("returnurl"))
+			{
+				_returnUrl = PageState.QueryString["returnurl"];
+			}
+
+			if (PageState.QueryString.ContainsKey("name"))
+			{
+				_username = PageState.QueryString["name"];
+			}
+
+			if (PageState.QueryString.ContainsKey("token") && !string.IsNullOrEmpty(_username))
+			{
+				var user = new User();
+				user.SiteId = PageState.Site.SiteId;
+				user.Username = _username;
+
+				if (PageState.QueryString.ContainsKey("key"))
+				{
+					user = await UserService.LinkUserAsync(user, PageState.QueryString["token"], PageState.Site.Settings["ExternalLogin:ProviderType"], PageState.QueryString["key"], PageState.Site.Settings["ExternalLogin:ProviderName"]);
+					if (user != null)
+					{
+						await logger.LogInformation(LogFunction.Security, "External Login Linkage Successful For Username {Username}", _username);
+						AddModuleMessage(Localizer["Success.Account.Linked"], MessageType.Info);						
+					}
+					else
+					{
+						await logger.LogError(LogFunction.Security, "External Login Linkage Failed For Username {Username}", _username);
+						AddModuleMessage(Localizer["Message.Account.NotLinked"], MessageType.Warning);						
+					}
+					_username = "";
+				}
+				else
+				{
+					user = await UserService.VerifyEmailAsync(user, PageState.QueryString["token"]);
+					if (user != null)
+					{
+						await logger.LogInformation(LogFunction.Security, "Email Verified For For Username {Username}", _username);
+						AddModuleMessage(Localizer["Success.Account.Verified"], MessageType.Info);						
+					}
+					else
+					{
+						await logger.LogError(LogFunction.Security, "Email Verification Failed For Username {Username}", _username);
+						AddModuleMessage(Localizer["Message.Account.NotVerified"], MessageType.Warning);						
+					}
+				}
+			}
+			else
+			{
+				if (PageState.QueryString.ContainsKey("status"))
+				{
+					AddModuleMessage(Localizer["ExternalLoginStatus." + PageState.QueryString["status"]], MessageType.Info);
+				}
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Login {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.LoadLogin"], MessageType.Error);
+		}
+	}
+
+	protected override async Task OnAfterRenderAsync(bool firstRender)
+	{
+		if (firstRender && PageState.User == null)
+		{
+			await username.FocusAsync();
+		}
+	}
+
+	private async Task Login()
+	{
+		try
+		{
+			validated = true;
+			var interop = new Interop(JSRuntime);
+			if (await interop.FormValid(login))
+			{
+				var hybrid = (PageState.Runtime == Shared.Runtime.Hybrid);
+				var user = new User { SiteId = PageState.Site.SiteId, Username = _username, Password = _password, LastIPAddress = SiteState.RemoteIPAddress};
+			
+				if (!twofactor)
+				{
+					user = await UserService.LoginUserAsync(user, hybrid, _remember);
+				}
+				else
+				{
+					user = await UserService.VerifyTwoFactorAsync(user, _code);
+				}
+
+				if (user.IsAuthenticated)
+				{
+					await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
+
+					if (hybrid)
+					{
+						// hybrid apps utilize an interactive login
+						var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider
+							.GetService(typeof(IdentityAuthenticationStateProvider));
+						authstateprovider.NotifyAuthenticationChanged();
+						NavigationManager.NavigateTo(NavigateUrl(_returnUrl, true));
+					}
+					else
+					{
+						// post back to the Login page so that the cookies are set correctly
+						var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, username = _username, password = _password, remember = _remember, returnurl = _returnUrl };
+						string url = Utilities.TenantUrl(PageState.Alias, "/pages/login/");
+						await interop.SubmitForm(url, fields);
+					}
+				}
+				else
+				{
+					if ((PageState.Site.Settings.ContainsKey("LoginOptions:TwoFactor") && PageState.Site.Settings["LoginOptions:TwoFactor"] == "required") || user.TwoFactorRequired)
+					{
+						twofactor = true;
+						validated = false;
+						AddModuleMessage(Localizer["Message.TwoFactor"], MessageType.Info);
+					}
+					else
+					{
+						if (!twofactor)
+						{
+							await logger.LogInformation(LogFunction.Security, "Login Failed For Username {Username}", _username);
+							AddModuleMessage(Localizer["Error.Login.Fail"], MessageType.Error);						
+						}
+						else
+						{
+							await logger.LogInformation(LogFunction.Security, "Two Factor Verification Failed For Username {Username}", _username);
+							AddModuleMessage(Localizer["Error.TwoFactor.Fail"], MessageType.Error);						
+						}
+					}
+				}
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Performing Login {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Login"], MessageType.Error);
+		}
+	}
+
+	private void Cancel()
+	{
+		NavigationManager.NavigateTo(_returnUrl);
+	}
+
+	private async Task Forgot()
+	{
+		try
+		{
+			if (_username != string.Empty)
+			{
+				var user = await UserService.GetUserAsync(_username, PageState.Site.SiteId);
+				if (user != null)
+				{
+					await UserService.ForgotPasswordAsync(user);
+					await logger.LogInformation(LogFunction.Security, "Password Reset Notification Sent For Username {Username}", _username);
+					AddModuleMessage(Localizer["Message.ForgotUser"], MessageType.Info);
+				}
+				else
+				{
+					AddModuleMessage(Localizer["Message.UserDoesNotExist"], MessageType.Warning);
+				}
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Message.ForgotPassword"], MessageType.Info);
+			}
+
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Resetting Password {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.ResetPassword"], MessageType.Error);
+		}
+	}
+
+	private void Reset()
+	{
+		twofactor = false;
+		_username = "";
+		_password = "";
+		ClearModuleMessage();
+		StateHasChanged();
+	}
+
+	private async Task KeyPressed(KeyboardEventArgs e)
+	{
+		if (e.Code == "Enter" || e.Code == "NumpadEnter")
+		{
+			await Login();
+		}
+	}
+
+	private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+	private void ExternalLogin()
+	{
+        NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/external?returnurl=" + _returnUrl), true);
+	}
 
-    private async Task Forgot()
-    {
-        if (_username != string.Empty)
-        {
-            var user = await UserService.GetUserAsync(_username, PageState.Site.SiteId);
-            if (user != null)
-            {
-                await UserService.ForgotPasswordAsync(user);
-                _message = "Please Check The Email Address Associated To Your User Account For A Password Reset Notification";
-            }
-            else
-            {
-                _message = "User Does Not Exist";
-                _type = MessageType.Warning;
-            }
-        }
-        else
-        {
-            _message = "Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again";
-        }
-        
-        StateHasChanged();
-    }
 }

Oqtane.Client/Modules/Admin/Logs/Detail.razor

@@ -1,4 +1,4 @@
-@namespace Oqtane.Modules.Admin.Logs
+@namespace Oqtane.Modules.Admin.Logs
 @using System.Globalization
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
@@ -6,136 +6,114 @@
 @inject IPageService PageService
 @inject IPageModuleService PageModuleService
 @inject IUserService UserService
+@inject IStringLocalizer<Detail> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label For="dateTime" HelpText="The date and time of this log">Date/Time: </Label>
-            </td>
-            <td>
-                <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="level" HelpText="The level of this log">Level: </Label>
-            </td>
-            <td>
-                <input id="level" class="form-control" @bind="@_level" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="feature" HelpText="The feature that was affected">Feature: </Label>
-            </td>
-            <td>
-                <input id="feature" class="form-control" @bind="@_feature" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="function" HelpText="The function that was performed">Function: </Label>
-            </td>
-            <td>
-                <input id="function" class="form-control" @bind="@_function" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="category" HelpText="The categories that were affected">Category: </Label>
-            </td>
-            <td>
-                <input id="category" class="form-control" @bind="@_category" readonly />
-            </td>
-        </tr>
-        @if (_pageName != string.Empty)
-        {
-            <tr>
-                <td>
-                    <Label For="page" HelpText="The page that was affected">Page: </Label>
-                </td>
-                <td>
-                    <input id="page" class="form-control" @bind="@_pageName" readonly />
-                </td>
-            </tr>
-        }
-        @if (_moduleTitle != string.Empty)
-        {
-            <tr>
-                <td>
-                    <Label For="module" HelpText="The module that was affected">Module: </Label>
-                </td>
-                <td>
-                    <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
-                </td>
-            </tr>
-        }
-        @if (_username != string.Empty)
-        {
-            <tr>
-                <td>
-                    <Label For="user" HelpText="The user that caused this log">User: </Label>
-                </td>
-                <td>
-                    <input id="user" class="form-control" @bind="@_username" readonly />
-                </td>
-            </tr>
-        }
-        <tr>
-            <td>
-                <Label For="url" HelpText="The url the log comes from">Url: </Label>
-            </td>
-            <td>
-                <input id="url" class="form-control" @bind="@_url" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="template" HelpText="What the log is about">Template: </Label>
-            </td>
-            <td>
-                <input id="template" class="form-control" @bind="@_template" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="message" HelpText="The message that the system generated"class="control-label">Message: </Label>
-            </td>
-            <td>
-                <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
-            </td>
-        </tr>
-        @if (!string.IsNullOrEmpty(_exception))
-        {
-            <tr>
-                <td>
-                    <Label For="exception" HelpText="The exceptions generated by the system">Exception: </Label>
-                </td>
-                <td>
+@if (_initialized)
+{
+	<div class="container">
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
+			<div class="col-sm-9">
+				<input id="dateTime" class="form-control" @bind="@_logDate" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
+			<div class="col-sm-9">
+				<input id="level" class="form-control" @bind="@_level" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
+			<div class="col-sm-9">
+				<input id="feature" class="form-control" @bind="@_feature" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
+			<div class="col-sm-9">
+				<input id="function" class="form-control" @bind="@_function" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
+			<div class="col-sm-9">
+				<input id="category" class="form-control" @bind="@_category" readonly />
+			</div>
+		</div>
+		@if (_pageName != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
+				<div class="col-sm-9">
+					<input id="page" class="form-control" @bind="@_pageName" readonly />
+				</div>
+			</div>
+		}
+		@if (_moduleTitle != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
+				<div class="col-sm-9">
+					<input id="module" class="form-control" @bind="@_moduleTitle" readonly />
+				</div>
+			</div>
+		}
+		@if (_username != string.Empty)
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
+				<div class="col-sm-9">
+					<input id="user" class="form-control" @bind="@_username" readonly />
+				</div>
+			</div>
+		}
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
+			<div class="col-sm-9">
+				<input id="url" class="form-control" @bind="@_url" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
+			<div class="col-sm-9">
+				<input id="template" class="form-control" @bind="@_template" readonly />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="message" HelpText="The message that the system generated" ResourceKey="Message">Message: </Label>
+			<div class="col-sm-9">
+				<textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
+			</div>
+		</div>
+		@if (!string.IsNullOrEmpty(_exception))
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
+				<div class="col-sm-9">
                     <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
-                </td>
-            </tr>
+                </div>
+           </div>
         }
-        <tr>
-            <td>
-                <Label For="properties" HelpText="The properties that were affected">Properties: </Label>
-            </td>
-            <td>
+       <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
+            <div class="col-sm-9">
                 <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="server" HelpText="The server that was affected">Server: </Label>
-            </td>
-            <td>
+            </div>
+       </div>
+       <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
+			<div class="col-sm-9">
                 <input id="server" class="form-control" @bind="@_server" readonly />
-            </td>
-        </tr>
-    </table>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+            </div>
+        </div>
+    </div>
+}
+<NavLink class="btn btn-secondary" href="@CloseUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
+	private bool _initialized = false;
     private int _logId;
     private string _logDate = string.Empty;
     private string _level = string.Empty;
@@ -152,13 +130,14 @@
     private string _properties = string.Empty;
     private string _server = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override string UrlParametersTemplate => "/{id}";
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
-            _logId = Int32.Parse(PageState.QueryString["id"]);
+            _logId = Int32.Parse(UrlParameters["id"]);
             var log = await LogService.GetLogAsync(_logId);
             if (log != null)
             {
@@ -167,7 +146,7 @@
                 _feature = log.Feature;
                 _function = log.Function;
                 _category = log.Category;
-                
+
                 if (log.PageId != null)
                 {
                     var page = await PageService.GetPageAsync(log.PageId.Value);
@@ -176,8 +155,8 @@
                         _pageName = page.Name;
                     }
                 }
-                
-                if (log.PageId != null && log.ModuleId != null)
+
+                if (log.PageId != null && log.ModuleId != null && log.ModuleId != -1)
                 {
                     var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value);
                     if (pagemodule != null)
@@ -185,7 +164,7 @@
                         _moduleTitle = pagemodule.Title;
                     }
                 }
-                
+
                 if (log.UserId != null)
                 {
                     var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId);
@@ -194,19 +173,25 @@
                         _username = user.Username;
                     }
                 }
-                
+
                 _url = log.Url;
                 _template = log.MessageTemplate;
                 _message = log.Message;
                 _exception = log.Exception;
                 _properties = log.Properties;
                 _server = log.Server;
+				_initialized = true;
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message);
-            AddModuleMessage("Error Loading Log", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
+
+	private string CloseUrl()
+	{
+		return (!string.IsNullOrEmpty(PageState.ReturnUrl)) ? PageState.ReturnUrl : NavigateUrl();
+	}
 }

Oqtane.Client/Modules/Admin/Logs/Index.razor

@@ -1,93 +1,143 @@
-@namespace Oqtane.Modules.Admin.Logs
+@namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
+@inject NavigationManager NavigationManager
 @inject ILogService LogService
+@inject ISettingService SettingService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_logs == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label>Level: </label>
-                <select class="form-control" @onchange="(e => LevelChanged(e))">
-                    <option value="-">&lt;All Levels&gt;</option>
-                    <option value="Trace">Trace</option>
-                    <option value="Debug">Debug</option>
-                    <option value="Information">Information</option>
-                    <option value="Warning">Warning</option>
-                    <option value="Error">Error</option>
-                    <option value="Critical">Critical</option>
-                </select>
-            </td>
-            <td>
-                <label>Function: </label>
-                <select class="form-control" @onchange="(e => FunctionChanged(e))">
-                    <option value="-">&lt;All Functions&gt;</option>
-                    <option value="Create">Create</option>
-                    <option value="Read">Read</option>
-                    <option value="Update">Update</option>
-                    <option value="Delete">Delete</option>
-                    <option value="Security">Security</option>
-                    <option value="Other">Other</option>
-                </select>
-            </td>
-            <td>
-                <label>Rows: </label>
-                <select class="form-control" @onchange="(e => RowsChanged(e))">
-                    <option value="10">10</option>
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                </select>
-            </td>
-        </tr>
-    </table>
+    <TabStrip>
+        <TabPanel Name="Events" Heading="Events" ResourceKey="Events">
+			<div class="container g-0">
+				<div class="row mb-1 align-items-center">
+					<div class="col-sm-4">
+						<Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
+						<select id="level" class="form-select" value="@_level" @onchange="(e => LevelChanged(e))">
+							<option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
+							<option value="Trace">@Localizer["Trace"]</option>
+							<option value="Debug">@Localizer["Debug"]</option>
+							<option value="Information">@Localizer["Information"]</option>
+							<option value="Warning">@Localizer["Warning"]</option>
+							<option value="Error">@Localizer["Error"]</option>
+							<option value="Critical">@Localizer["Critical"]</option>
+						</select>
+					</div>            
+					<div class="col-sm-4">
+						<Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
+						<select id="function" class="form-select" value="@_function" @onchange="(e => FunctionChanged(e))">
+							<option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
+							<option value="Create">@Localizer["Create"]</option>
+							<option value="Read">@Localizer["Read"]</option>
+							<option value="Update">@SharedLocalizer["Update"]</option>
+							<option value="Delete">@SharedLocalizer["Delete"]</option>
+							<option value="Security">@Localizer["Security"]</option>
+							<option value="Other">@Localizer["Other"]</option>
+						</select>
+					</div>            
+					<div class="col-sm-4">
+						<Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br />
+						<select id="rows" class="form-select" value="@_rows" @onchange="(e => RowsChanged(e))">
+							<option value="10">10</option>
+							<option value="50">50</option>
+							<option value="100">100</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<br />
 
-    @if (_logs.Any())
-    {
-        <Pager Items="@_logs">
-            <Header>
-                <th>&nbsp;</th>
-                <th>Date</th>
-                <th>Level</th>
-                <th>Feature</th>
-                <th>Function</th>
-            </Header>
-            <Row>
-                <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" /></td>
-                <td class="@GetClass(context.Function)">@context.LogDate</td>
-                <td class="@GetClass(context.Function)">@context.Level</td>
-                <td class="@GetClass(context.Function)">@context.Feature</td>
-                <td class="@GetClass(context.Function)">@context.Function</td>
-            </Row>
-        </Pager>
-    }
-    else
-    {
-        <p><em>No Logs Match The Criteria Specified</em></p>
-    }
+			@if (_logs.Any())
+			{
+				<Pager Items="@_logs" CurrentPage="@_page.ToString()" OnPageChange="OnPageChange">
+					<Header>
+						<th style="width: 1px;">&nbsp;</th>
+						<th>@Localizer["Date"]</th>
+						<th>@Localizer["Level"]</th>
+						<th>@Localizer["Feature"]</th>
+						<th>@Localizer["Function"]</th>
+					</Header>
+					<Row>
+						<td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"/{context.LogId}")" ReturnUrl="@(NavigateUrl(PageState.Page.Path, AddUrlParameters(_level, _function, _rows, _page)))" ResourceKey="LogDetails" /></td>
+						<td class="@GetClass(context.Function)">@context.LogDate</td>
+						<td class="@GetClass(context.Function)">@context.Level</td>
+						<td class="@GetClass(context.Function)">@context.Feature</td>
+						<td class="@GetClass(context.Function)">@context.Function</td>
+					</Row>
+				</Pager>
+			}
+			else
+			{
+				<p><em>@Localizer["NoLogs"]</em></p>
+			}
+		</TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="retention" HelpText="Number of days of events to retain" ResourceKey="Retention">Retention (Days): </Label>
+					<div class="col-sm-9">
+						<input id="retention" class="form-control" @bind="@_retention" />
+					</div>
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+		</TabPanel>
+	</TabStrip>
 }
 
 @code {
-    private string _level = "-";
-    private string _function = "-";
-    private string _rows = "10";
-    private List<Log> _logs;
+	private string _level = "-";
+	private string _function = "-";
+	private string _rows = "10";
+	private int _page = 1;
+	private List<Log> _logs;
+	private string _retention = "";
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override string UrlParametersTemplate => "/{level}/{function}/{rows}/{page}";
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+	protected override async Task OnParametersSetAsync()
+	{
+		try
+		{
+			// external link to log item will display Details component
+			if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id))
+			{
+				NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"/{id}"));
+			}
+
+			if (UrlParameters.ContainsKey("level"))
+			{
+				_level = UrlParameters["level"];
+			}
+			if (UrlParameters.ContainsKey("function"))
+			{
+				_function = UrlParameters["function"];
+			}
+			if (UrlParameters.ContainsKey("rows"))
+			{
+				_rows = UrlParameters["rows"];
+			}
+			if (UrlParameters.ContainsKey("page") && int.TryParse(UrlParameters["page"], out int page))
+			{
+				_page = page;
+			}
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
             await GetLogs();
+
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			_retention = SettingService.GetSetting(settings, "LogRetention", "30");
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message);
-            AddModuleMessage("Error Loading Logs", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
 
@@ -102,7 +152,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message);
-            AddModuleMessage("Error Loading Logs", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
 
@@ -117,7 +167,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message);
-            AddModuleMessage("Error Loading Logs", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
 
@@ -133,7 +183,7 @@ else
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Logs {Error}", ex.Message);
-            AddModuleMessage("Error Loading Logs", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error);
         }
     }
 
@@ -168,4 +218,27 @@ else
         }
         return classname;
     }
+
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			settings = SettingService.SetSetting(settings, "LogRetention", _retention, true);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+
+			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
+		}
+	}
+
+	private void OnPageChange(int page)
+	{
+		_page = page;	
+	}
+
 }

Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor

@@ -1,80 +1,203 @@
-@namespace Oqtane.Modules.Admin.ModuleCreator
+@namespace Oqtane.Modules.Admin.ModuleCreator
 @inherits ModuleBase
+@using System.Text.RegularExpressions
 @inject NavigationManager NavigationManager
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IModuleService ModuleService
+@inject ISettingService SettingService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation.">Owner Name: </Label>
-            </td>
-            <td>
-                <input id="owner" class="form-control" @bind="@_owner" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="module" HelpText="Enter a name for this module. It should be in singular form (ie. Car) and not contain spaces or punctuation.">Module Name: </Label>
-            </td>
-            <td>
-                <input id="module" class="form-control" @bind="@_module" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="description" HelpText="Enter s short description for the module">Description: </Label>
-            </td>
-            <td>
-                <textarea id="description" class="form-control" @bind="@_description" rows="3"></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="template" HelpText="Select a module template. Internal modules are created inside of the Oqtane solution. External modules are created outside of the Oqtane solution.">Template: </Label>
-            </td>
-            <td>
-                <select id="template" class="form-control" @bind="@_template">
-                    <option value="">&lt;Select Template&gt;</option>
-                    <option value="internal">Internal</option>
-                    <option value="external">External</option>
-                </select>
-            </td>
-        </tr>
-    </table>
+@if (string.IsNullOrEmpty(_moduledefinitionname) && _templates != null)
+{
+	<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+		<div class="container">
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
+				<div class="col-sm-9">
+					<input id="owner" class="form-control" @bind="@_owner" required />
+				</div>
+			</div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="module" HelpText="Enter a name for this module. It should not contain spaces or punctuation." ResourceKey="ModuleName">Module Name: </Label>
+				<div class="col-sm-9">
+					<input id="module" class="form-control" @bind="@_module" required />
+				</div>
+			</div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="description" HelpText="Enter a short description for the module" ResourceKey="Description">Description: </Label>
+				<div class="col-sm-9">
+					<textarea id="description" class="form-control" @bind="@_description" rows="3" ></textarea>
+				</div>
+			</div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label>
+				<div class="col-sm-9">
+					<select id="template" class="form-select" @onchange="(e => TemplateChanged(e))" required>
+						<option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
+						@foreach (Template template in _templates)
+						{
+							<option value="@template.Name">@template.Title</option>
+						}
+					</select>
+				</div>
+			</div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
+				<div class="col-sm-9">
+					<select id="reference" class="form-select" @bind="@_reference" required>
+						@foreach (string version in _versions)
+						{
+							if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
+							{
+								<option value="@(version)">@(version)</option>
+							}
+						}
+						<option value="local">@SharedLocalizer["LocalVersion"]</option>
+					</select>
+				</div>
+			</div>
+			@if (!string.IsNullOrEmpty(_location))
+			{
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="location" HelpText="Location where the module will be created" ResourceKey="Location">Location: </Label>
+					<div class="col-sm-9">
+						<input id="module" class="form-control" @bind="@_location" readonly />
+					</div>
+				</div>
+			}
+		</div>
+	</form>
+	<button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["Module.Create"]</button>
+}
+else
+{
+    <button type="button" class="btn btn-success" @onclick="ActivateModule">@Localizer["Module.Activate"]</button>
+}
 
-<button type="button" class="btn btn-success" @onclick="CreateModule">Create Module</button>
+@code {
+	private ElementReference form;
+	private bool validated = false;
+	private string _moduledefinitionname = string.Empty;
+	private string _owner = string.Empty;
+	private string _module = string.Empty;
+	private string _description = string.Empty;
+	private List<Template> _templates;
+	private string _template = "-";
+	private string[] _versions;
+	private string _reference = "local";
+	private string _minversion = "2.0.0";
+	private string _location = string.Empty;
 
-@code {    
-    private string _owner = string.Empty;
-    private string _module = string.Empty;
-    private string _description = string.Empty;
-    private string _template = string.Empty;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	protected override void OnInitialized()
+	{
+		_moduledefinitionname = SettingService.GetSetting(ModuleState.Settings, "ModuleDefinitionName", "");
+		if (string.IsNullOrEmpty(_moduledefinitionname))
+		{
+			AddModuleMessage(Localizer["Info.Module.Creator"], MessageType.Info);
+		}
+		else
+		{
+			AddModuleMessage(Localizer["Info.Module.Activate"], MessageType.Info);
+		}
+	}
 
-    protected override void OnInitialized()
-    {
-        AddModuleMessage("Please Note That Once You Select The Create Module Button The Application Must Restart In Order To Complete The Process. If You Create An External Module You Will Need To Compile The Source Code In Order To Make It Functional.", MessageType.Info);
+	protected override async Task OnParametersSetAsync()
+	{
+		try
+		{
+			_templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
+			_versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Module Creator");
+		}
+	}
+
+	private async Task CreateModule()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			try
+			{
+				if (IsValid(_owner) && IsValid(_module) && _owner != _module && _template != "-")
+				{
+					var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
+					moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
+
+					var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+					SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName);
+					await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+
+					GetLocation();
+					AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
+				}
+                else
+                {
+                    AddModuleMessage(Localizer["Message.Require.ValidName"], MessageType.Warning);
+                }
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Creating Module");
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
     }
 
-    private async Task CreateModule()
+    private async Task ActivateModule()
     {
         try
         {
-            if (!string.IsNullOrEmpty(_owner) && !string.IsNullOrEmpty(_module) && !string.IsNullOrEmpty(_template))
+            if (!string.IsNullOrEmpty(_moduledefinitionname))
             {
-                var moduleDefinition = new ModuleDefinition { Owner = _owner.Replace(" ",""), Name = _module.Replace(" ", ""), Description = _description, Template = _template };
-                await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition, ModuleState.ModuleId);
-            }
-            else
-            {
-                AddModuleMessage("You Must Provide An Owner, Module Name, And Template", MessageType.Warning);
+                Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
+                module.ModuleDefinitionName = _moduledefinitionname;
+                await ModuleService.UpdateModuleAsync(module);
+                NavigationManager.NavigateTo(NavigateUrl(), true);
             }
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Creating Module");
+            await logger.LogError(ex, "Error Activating Module");
         }
     }
+
+    private bool IsValid(string name)
+    {
+        // must contain letters, underscores and digits and first character must be letter or underscore
+        return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+    }
+
+    private void TemplateChanged(ChangeEventArgs e)
+    {
+        _template = (string)e.Value;
+        _minversion = "2.0.0";
+        if (_template != "-")
+        {
+            var template = _templates.FirstOrDefault(item => item.Name == _template);
+            _minversion = template.Version;
+        }
+        GetLocation();
+    }
+
+    private void GetLocation()
+    {
+        _location = string.Empty;
+        if (_owner != "" && _module != "" && _template != "-")
+        {
+            var template = _templates.FirstOrDefault(item => item.Name == _template);
+            _location = template.Location + _owner + "." + _module;
+
+        }
+        StateHasChanged();
+    }
 }

Oqtane.Client/Modules/Admin/ModuleCreator/ModuleInfo.cs

@@ -1,7 +1,9 @@
-using Oqtane.Models;
+using Oqtane.Documentation;
+using Oqtane.Models;
 
 namespace Oqtane.Modules.Admin.ModuleCreator
 {
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
     public class ModuleInfo : IModule
     {
         public ModuleDefinition ModuleDefinition => new ModuleDefinition

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Edit.razor

@@ -1,95 +0,0 @@
-@using Oqtane.Modules.Controls
-@using [Owner].[Module]s.Services
-@using [Owner].[Module]s.Models
-
-@namespace [Owner].[Module]s.Modules
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject HttpClient http
-@inject SiteState sitestate
-
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <label class="control-label">Name: </label>
-        </td>
-        <td>
-            <input id="_name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="Save">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-<br />
-<br />
-@if (PageState.Action == "Edit")
-{
-    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
-}
-
-@code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
-    public override string Actions => "Add,Edit";
-
-    I[Module]Service [Module]Service;
-    int _id;
-    string _name;
-    string _createdby;
-    DateTime _createdon;
-    string _modifiedby;
-    DateTime _modifiedon;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            [Module]Service = new [Module]Service(http, sitestate);
-            if (PageState.Action == "Edit")
-            {
-                _id = Int32.Parse(PageState.QueryString["id"]);
-                [Module] [Module] = await [Module]Service.Get[Module]Async(_id);
-                if ([Module] != null)
-                {
-                    _name = [Module].Name;
-                    _createdby = [Module].CreatedBy;
-                    _createdon = [Module].CreatedOn;
-                    _modifiedby = [Module].ModifiedBy;
-                    _modifiedon = [Module].ModifiedOn;
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading [Module] {[Module]Id} {Error}", _id, ex.Message);
-            AddModuleMessage("Error Loading [Module]", MessageType.Error);
-        }
-    }
-
-    private async Task Save()
-    {
-        try
-        {
-            if (PageState.Action == "Add")
-            {
-                [Module] [Module] = new [Module]();
-                [Module].ModuleId = ModuleState.ModuleId;
-                [Module].Name = _name;
-                [Module] = await [Module]Service.Add[Module]Async([Module]);
-                await logger.LogInformation("[Module] Added {[Module]}", [Module]);
-            }
-            else
-            {
-                [Module] [Module] = await [Module]Service.Get[Module]Async(_id);
-                [Module].Name = _name;
-                await [Module]Service.Update[Module]Async([Module]);
-                await logger.LogInformation("[Module] Updated {[Module]}", [Module]);
-            }
-            NavigationManager.NavigateTo(NavigateUrl());
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Saving [Module] {Error}", ex.Message);
-            AddModuleMessage("Error Saving [Module]", MessageType.Error);
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Index.razor

@@ -1,106 +0,0 @@
-@using [Owner].[Module]s.Services
-@using [Owner].[Module]s.Models
-
-@namespace [Owner].[Module]s.Modules
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject HttpClient http
-@inject SiteState sitestate
-
-@if (_[Module]s == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add [Module]" />
-    <br />
-    <br />
-    @if (@_[Module]s.Count != 0)
-    {
-        <Pager Items="@_[Module]s" Format="Grid">
-            <Header>
-                <div class="col"><strong>[Module]s</strong></div>
-            </Header>
-            <Row>
-                <div class="col">
-                    <ActionLink Action="Edit" Parameters="@($"id=" + context.[Module]Id.ToString())" />
-                    <ActionDialog Header="Delete [Module]" Message="@("Are You Sure You Wish To Delete The " + context.Name + " [Module]?")" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" />
-                    @context.Name
-                </div>
-            </Row>
-        </Pager>
-    }
-    else
-    {
-        <p>No [Module]s To Display</p>
-    }
-}
-
-<!-- The content below is for informational purposes only and can be safely removed -->
-
-<hr />
-[Module] Module Created Successfully. Use Edit Mode To Add A [Module]. You Can Access The Files At The Following Locations:<br /><br />
-[RootPath]Client\<br />
-- [Owner].[Module]s.Client.csproj - client project<br />
-- _Imports.razor - global imports for module components<br />
-- Edit.razor - component for adding or editing content<br />
-- Index.razor - main component for your module **the content you are reading is in this file**<br />
-- ModuleInfo.cs - implements IModule interface to provide configuration settings for your module<br />
-- Settings.razor - component for managing module settings<br />
-- Services\I[Module]Service.cs - interface for defining service API methods<br />
-- Services\[Module]Service.cs - implements service API interface methods<br /><br />
-[RootPath]Package\<br />
-- [Owner].[Module]s.nuspec - nuget manifest for packaging module<br />
-- [Owner].[Module]s.Package.csproj - packaging project<br />
-- debug.cmd - copies assemblies to Oqtane bin folder when in Debug mode<br />
-- release.cmd - creates nuget package and deploys to Oqtane wwwroot/modules folder when in Release mode<br /><br />
-[RootPath]Server\<br />
-- [Owner].[Module]s.Server.csproj - server project<br />
-- Controllers\[Module]Controller.cs - API methods implemented using a REST pattern<br />
-- Manager\[Module]Manager.cs - implements optional module interfaces for features such as import/export of content<br />
-- Repository\I[Module]Repository.cs - interface for defining repository methods<br />
-- Repository\[Module]Respository.cs - implements repository interface methods for data access using EF Core<br />
-- Repository\[Module]Context.cs - provides a DB Context for data access<br />
-- Scripts\[Owner].[Module].1.0.0.sql - database schema definition script<br /><br />
-- Scripts\[Owner].[Module].Uninstall.sql - database uninstall script<br /><br />
-[RootPath]Shared\<br />
-- [Owner].[Module]s.csproj - shared project<br />
-- Models\[Module].cs - model definition<br /><br />
-
-<!-- The content above is for informational purposes only and can be safely removed -->
-
-@code {
-    I[Module]Service [Module]Service;
-    List<[Module]> _[Module]s;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            [Module]Service = new [Module]Service(http, sitestate);
-            _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId);
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading [Module] {Error}", ex.Message);
-            AddModuleMessage("Error Loading [Module]", MessageType.Error);
-        }
-    }
-
-    private async Task Delete([Module] [Module])
-    {
-        try
-        {
-            await [Module]Service.Delete[Module]Async([Module].[Module]Id);
-            await logger.LogInformation("[Module] Deleted {[Module]}", [Module]);
-            _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId);
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting [Module] {[Module]} {Error}", [Module], ex.Message);
-            AddModuleMessage("Error Deleting [Module]", MessageType.Error);
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/ModuleInfo.cs

@@ -1,18 +0,0 @@
-using Oqtane.Models;
-using Oqtane.Modules;
-
-namespace [Owner].[Module]s.Modules
-{
-    public class ModuleInfo : IModule
-    {
-        public ModuleDefinition ModuleDefinition => new ModuleDefinition
-        {
-            Name = "[Module]",
-            Description = "[Module]",
-            Version = "1.0.0",
-            Dependencies = "[Owner].[Module]s.Shared.Oqtane",
-            ServerManagerType = "[ServerManagerType]",
-            ReleaseVersions = "1.0.0"
-        };
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Services/I[Module]Service.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using [Owner].[Module]s.Models;
-
-namespace [Owner].[Module]s.Services
-{
-    public interface I[Module]Service 
-    {
-        Task<List<[Module]>> Get[Module]sAsync(int ModuleId);
-
-        Task<[Module]> Get[Module]Async(int [Module]Id);
-
-        Task<[Module]> Add[Module]Async([Module] [Module]);
-
-        Task<[Module]> Update[Module]Async([Module] [Module]);
-
-        Task Delete[Module]Async(int [Module]Id);
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/Services/[Module]Service.cs

@@ -1,49 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Oqtane.Modules;
-using Oqtane.Services;
-using Oqtane.Shared;
-using [Owner].[Module]s.Models;
-
-namespace [Owner].[Module]s.Services
-{
-    public class [Module]Service : ServiceBase, I[Module]Service, IService
-    {
-        private readonly SiteState _siteState;
-
-        public [Module]Service(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-         private string Apiurl=> CreateApiUrl(_siteState.Alias, "[Module]");
-
-        public async Task<List<[Module]>> Get[Module]sAsync(int ModuleId)
-        {
-            List<[Module]> [Module]s = await GetJsonAsync<List<[Module]>>($"{Apiurl}?moduleid={ModuleId}");
-            return [Module]s.OrderBy(item => item.Name).ToList();
-        }
-
-        public async Task<[Module]> Get[Module]Async(int [Module]Id)
-        {
-            return await GetJsonAsync<[Module]>($"{Apiurl}/{[Module]Id}");
-        }
-
-        public async Task<[Module]> Add[Module]Async([Module] [Module])
-        {
-            return await PostJsonAsync<[Module]>($"{Apiurl}?entityid={[Module].ModuleId}", [Module]);
-        }
-
-        public async Task<[Module]> Update[Module]Async([Module] [Module])
-        {
-            return await PutJsonAsync<[Module]>($"{Apiurl}/{[Module].[Module]Id}?entityid={[Module].ModuleId}", [Module]);
-        }
-
-        public async Task Delete[Module]Async(int [Module]Id)
-        {
-            await DeleteAsync($"{Apiurl}/{[Module]Id}");
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Client/[Owner].[Module]s.Client.csproj

@@ -1,40 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RazorLangVersion>3.0</RazorLangVersion>
-    <Version>1.0.0</Version>
-    <Authors>[Owner]</Authors>
-    <Company>[Owner]</Company>
-    <Description>[Description]</Description>
-    <Product>[Owner].[Module]s</Product>
-    <Copyright>[Owner]</Copyright>
-    <AssemblyName>[Owner].[Module]s.Client.Oqtane</AssemblyName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0-rc1.20223.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0-rc1.20223.4" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http.Json" Version="3.2.0-rc1.20217.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Shared\[Owner].[Module]s.Shared.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Oqtane.Client">
-      <HintPath>..\..\[RootFolder]\Oqtane.Client\bin\Debug\netstandard2.1\Oqtane.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Oqtane.Shared">
-      <HintPath>..\..\[RootFolder]\Oqtane.Client\bin\Debug\netstandard2.1\Oqtane.Shared.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <!-- there may be other elements here -->
-    <BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-  </PropertyGroup>
-
-</Project>

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/[Owner].[Module]s.nuspec

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>[Owner].[Module]s</id>
-    <version>1.0.0</version>
-    <authors>[Owner]</authors>
-    <owners>[Owner]</owners>
-    <title>[Module]s</title>
-    <description>[Module]s</description>
-    <copyright>[Owner]</copyright>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <license type="expression">MIT</license>
-    <projectUrl>https://github.com/oqtane/oqtane.framework</projectUrl>
-    <iconUrl>https://www.oqtane.org/Portals/0/icon.jpg</iconUrl>
-    <tags>oqtane module</tags>
-    <releaseNotes></releaseNotes>
-    <summary></summary>
-    <dependencies>
-      <dependency id="Oqtane.Framework" version="[FrameworkVersion]" />
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="..\Client\bin\Release\netstandard2.1\[Owner].[Module]s.Client.Oqtane.dll" target="lib" /> 
-    <file src="..\Client\bin\Release\netstandard2.1\[Owner].[Module]s.Client.Oqtane.pdb" target="lib" /> 
-    <file src="..\Server\bin\Release\netcoreapp3.1\[Owner].[Module]s.Server.Oqtane.dll" target="lib" /> 
-    <file src="..\Server\bin\Release\netcoreapp3.1\[Owner].[Module]s.Server.Oqtane.pdb" target="lib" /> 
-    <file src="..\Shared\bin\Release\netstandard2.1\[Owner].[Module]s.Shared.Oqtane.dll" target="lib" /> 
-    <file src="..\Shared\bin\Release\netstandard2.1\[Owner].[Module]s.Shared.Oqtane.pdb" target="lib" /> 
-    <file src="..\wwwroot\**\*.*" target="wwwroot" /> 
-  </files>
-</package>

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/debug.cmd

@@ -1,6 +0,0 @@
-XCOPY "..\Client\bin\Debug\netstandard2.1\[Owner].[Module]s.Client.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
-XCOPY "..\Client\bin\Debug\netstandard2.1\[Owner].[Module]s.Client.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
-XCOPY "..\Server\bin\Debug\netcoreapp3.1\[Owner].[Module]s.Server.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
-XCOPY "..\Server\bin\Debug\netcoreapp3.1\[Owner].[Module]s.Server.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
-XCOPY "..\Shared\bin\Debug\netstandard2.1\[Owner].[Module]s.Shared.Oqtane.dll" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y
-XCOPY "..\Shared\bin\Debug\netstandard2.1\[Owner].[Module]s.Shared.Oqtane.pdb" "..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\" /Y

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Package/release.cmd

@@ -1,2 +0,0 @@
-"..\..\[RootFolder]\oqtane.package\nuget.exe" pack [Owner].[Module]s.nuspec 
-XCOPY "*.nupkg" "..\..\[RootFolder]\Oqtane.Server\wwwroot\Modules\" /Y

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Controllers/[Module]Controller.cs

@@ -1,75 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authorization;
-using System.Collections.Generic;
-using Oqtane.Shared;
-using Oqtane.Enums;
-using Oqtane.Infrastructure;
-using [Owner].[Module]s.Models;
-using [Owner].[Module]s.Repository;
-
-namespace [Owner].[Module]s.Controllers
-{
-    [Route("{site}/api/[controller]")]
-    public class [Module]Controller : Controller
-    {
-        private readonly I[Module]Repository _[Module]s;
-        private readonly ILogManager _logger;
-
-        public [Module]Controller(I[Module]Repository [Module]s, ILogManager logger)
-        {
-            _[Module]s = [Module]s;
-            _logger = logger;
-        }
-
-        // GET: api/<controller>?moduleid=x
-        [HttpGet]
-        [Authorize(Roles = Constants.RegisteredRole)]
-        public IEnumerable<[Module]> Get(string moduleid)
-        {
-            return _[Module]s.Get[Module]s(int.Parse(moduleid));
-        }
-
-        // GET api/<controller>/5
-        [HttpGet("{id}")]
-        [Authorize(Roles = Constants.RegisteredRole)]
-        public [Module] Get(int id)
-        {
-            return _[Module]s.Get[Module](id);
-        }
-
-        // POST api/<controller>
-        [HttpPost]
-        [Authorize(Roles = Constants.AdminRole)]
-        public [Module] Post([FromBody] [Module] [Module])
-        {
-            if (ModelState.IsValid)
-            {
-                [Module] = _[Module]s.Add[Module]([Module]);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "[Module] Added {[Module]}", [Module]);
-            }
-            return [Module];
-        }
-
-        // PUT api/<controller>/5
-        [HttpPut("{id}")]
-        [Authorize(Roles = Constants.AdminRole)]
-        public [Module] Put(int id, [FromBody] [Module] [Module])
-        {
-            if (ModelState.IsValid)
-            {
-                [Module] = _[Module]s.Update[Module]([Module]);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "[Module] Updated {[Module]}", [Module]);
-            }
-            return [Module];
-        }
-
-        // DELETE api/<controller>/5
-        [HttpDelete("{id}")]
-        [Authorize(Roles = Constants.AdminRole)]
-        public void Delete(int id)
-        {
-            _[Module]s.Delete[Module](id);
-            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "[Module] Deleted {[Module]Id}", id);
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Manager/[Module]Manager.cs

@@ -1,64 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using Oqtane.Modules;
-using Oqtane.Models;
-using Oqtane.Infrastructure;
-using Oqtane.Repository;
-using [Owner].[Module]s.Models;
-using [Owner].[Module]s.Repository;
-
-namespace [Owner].[Module]s.Manager
-{
-    public class [Module]Manager : IInstallable, IPortable
-    {
-        private I[Module]Repository _[Module]s;
-        private ISqlRepository _sql;
-
-        public [Module]Manager(I[Module]Repository [Module]s, ISqlRepository sql)
-        {
-            _[Module]s = [Module]s;
-            _sql = sql;
-        }
-
-        public bool Install(Tenant tenant, string version)
-        {
-            return _sql.ExecuteScript(tenant, GetType().Assembly, "[Owner].[Module]." + version + ".sql");
-        }
-
-        public bool Uninstall(Tenant tenant)
-        {
-            return _sql.ExecuteScript(tenant, GetType().Assembly, "[Owner].[Module].Uninstall.sql");
-        }
-
-        public string ExportModule(Module module)
-        {
-            string content = "";
-            List<[Module]> [Module]s = _[Module]s.Get[Module]s(module.ModuleId).ToList();
-            if ([Module]s != null)
-            {
-                content = JsonSerializer.Serialize([Module]s);
-            }
-            return content;
-        }
-
-        public void ImportModule(Module module, string content, string version)
-        {
-            List<[Module]> [Module]s = null;
-            if (!string.IsNullOrEmpty(content))
-            {
-                [Module]s = JsonSerializer.Deserialize<List<[Module]>>(content);
-            }
-            if ([Module]s != null)
-            {
-                foreach([Module] [Module] in [Module]s)
-                {
-                    [Module] _[Module] = new [Module]();
-                    _[Module].ModuleId = module.ModuleId;
-                    _[Module].Name = [Module].Name;
-                    _[Module]s.Add[Module](_[Module]);
-                }
-            }
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/I[Module]Repository.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using [Owner].[Module]s.Models;
-
-namespace [Owner].[Module]s.Repository
-{
-    public interface I[Module]Repository
-    {
-        IEnumerable<[Module]> Get[Module]s(int ModuleId);
-        [Module] Get[Module](int [Module]Id);
-        [Module] Add[Module]([Module] [Module]);
-        [Module] Update[Module]([Module] [Module]);
-        void Delete[Module](int [Module]Id);
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/[Module]Context.cs

@@ -1,18 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.AspNetCore.Http;
-using Oqtane.Modules;
-using Oqtane.Repository;
-using [Owner].[Module]s.Models;
-
-namespace [Owner].[Module]s.Repository
-{
-    public class [Module]Context : DBContextBase, IService
-    {
-        public virtual DbSet<[Module]> [Module] { get; set; }
-
-        public [Module]Context(ITenantResolver tenantResolver, IHttpContextAccessor accessor) : base(tenantResolver, accessor)
-        {
-            // ContextBase handles multi-tenant database connections
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Repository/[Module]Repository.cs

@@ -1,49 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System.Linq;
-using System.Collections.Generic;
-using Oqtane.Modules;
-using [Owner].[Module]s.Models;
-
-namespace [Owner].[Module]s.Repository
-{
-    public class [Module]Repository : I[Module]Repository, IService
-    {
-        private readonly [Module]Context _db;
-
-        public [Module]Repository([Module]Context context)
-        {
-            _db = context;
-        }
-
-        public IEnumerable<[Module]> Get[Module]s(int ModuleId)
-        {
-            return _db.[Module].Where(item => item.ModuleId == ModuleId);
-        }
-
-        public [Module] Get[Module](int [Module]Id)
-        {
-            return _db.[Module].Find([Module]Id);
-        }
-
-        public [Module] Add[Module]([Module] [Module])
-        {
-            _db.[Module].Add([Module]);
-            _db.SaveChanges();
-            return [Module];
-        }
-
-        public [Module] Update[Module]([Module] [Module])
-        {
-            _db.Entry([Module]).State = EntityState.Modified;
-            _db.SaveChanges();
-            return [Module];
-        }
-
-        public void Delete[Module](int [Module]Id)
-        {
-            [Module] [Module] = _db.[Module].Find([Module]Id);
-            _db.[Module].Remove([Module]);
-            _db.SaveChanges();
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Scripts/[Owner].[Module].1.0.0.sql

@@ -1,26 +0,0 @@
-/*  
-Create [Owner][Module] table
-*/
-
-CREATE TABLE [dbo].[[Owner][Module]](
-	[[Module]Id] [int] IDENTITY(1,1) NOT NULL,
-	[ModuleId] [int] NOT NULL,
-	[Name] [nvarchar](256) NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_[Owner][Module]] PRIMARY KEY CLUSTERED 
-  (
-	[[Module]Id] ASC
-  )
-)
-GO
-
-/*  
-Create foreign key relationships
-*/
-ALTER TABLE [dbo].[[Owner][Module]]  WITH CHECK ADD  CONSTRAINT [FK_[Owner][Module]_Module] FOREIGN KEY([ModuleId])
-REFERENCES [dbo].Module ([ModuleId])
-ON DELETE CASCADE
-GO

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/Scripts/[Owner].[Module].Uninstall.sql

@@ -1,6 +0,0 @@
-/*  
-Remove [Owner][Module] table
-*/
-
-DROP TABLE [dbo].[[Owner][Module]]
-GO

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Server/[Owner].[Module]s.Server.csproj

@@ -1,42 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <Version>1.0.0</Version>
-    <Product>[Owner].[Module]s</Product>
-    <Authors>[Owner]</Authors>
-    <Company>[Owner]</Company>
-    <Description>[Description]</Description>
-    <Copyright>[Owner]</Copyright>
-    <AssemblyName>[Owner].[Module]s.Server.Oqtane</AssemblyName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Scripts\[Owner].[Module].1.0.0.sql" />
-    <EmbeddedResource Include="Scripts\[Owner].[Module].Uninstall.sql" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0-rc1.20223.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Shared\[Owner].[Module]s.Shared.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Oqtane.Server">
-      <HintPath>..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\Oqtane.Server.dll</HintPath>
-    </Reference>
-    <Reference Include="Oqtane.Shared">
-      <HintPath>..\..\[RootFolder]\Oqtane.Server\bin\Debug\netcoreapp3.1\Oqtane.Shared.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-</Project>

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Shared/Models/[Module].cs

@@ -1,19 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations.Schema;
-using Oqtane.Models;
-
-namespace [Owner].[Module]s.Models
-{
-    [Table("[Owner][Module]")]
-    public class [Module] : IAuditable
-    {
-        public int [Module]Id { get; set; }
-        public int ModuleId { get; set; }
-        public string Name { get; set; }
-
-        public string CreatedBy { get; set; }
-        public DateTime CreatedOn { get; set; }
-        public string ModifiedBy { get; set; }
-        public DateTime ModifiedOn { get; set; }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/External/Shared/[Owner].[Module]s.Shared.csproj

@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>    
-    <LangVersion>7.3</LangVersion>
-    <Version>1.0.0</Version>
-    <Product>[Owner].[Module]s</Product>
-    <Authors>[Owner]</Authors>
-    <Company>[Owner]</Company>
-    <Description>[Description]</Description>
-    <Copyright>[Owner]</Copyright>
-    <AssemblyName>[Owner].[Module]s.Shared.Oqtane</AssemblyName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="Oqtane.Shared">
-      <HintPath>..\..\[RootFolder]\Oqtane.Shared\bin\Debug\netstandard2.1\Oqtane.Shared.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-
-</Project>

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Edit.razor

@@ -1,95 +0,0 @@
-@using Oqtane.Modules.Controls
-@using [Owner].[Module]s.Services
-@using [Owner].[Module]s.Models
-
-@namespace [Owner].[Module]s.Modules
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject HttpClient http
-@inject SiteState sitestate
-
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <label class="control-label">Name: </label>
-        </td>
-        <td>
-            <input id="_name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="Save">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-<br />
-<br />
-@if (PageState.Action == "Edit")
-{
-    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
-}
-
-@code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
-    public override string Actions => "Add,Edit";
-
-    I[Module]Service [Module]Service;
-    int _id;
-    string _name;
-    string _createdby;
-    DateTime _createdon;
-    string _modifiedby;
-    DateTime _modifiedon;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            [Module]Service = new [Module]Service(http, sitestate);
-            if (PageState.Action == "Edit")
-            {
-                _id = Int32.Parse(PageState.QueryString["id"]);
-                [Module] [Module] = await [Module]Service.Get[Module]Async(_id);
-                if ([Module] != null)
-                {
-                    _name = [Module].Name;
-                    _createdby = [Module].CreatedBy;
-                    _createdon = [Module].CreatedOn;
-                    _modifiedby = [Module].ModifiedBy;
-                    _modifiedon = [Module].ModifiedOn;
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading [Module] {[Module]Id} {Error}", _id, ex.Message);
-            AddModuleMessage("Error Loading [Module]", MessageType.Error);
-        }
-    }
-
-    private async Task Save()
-    {
-        try
-        {
-            if (PageState.Action == "Add")
-            {
-                [Module] [Module] = new [Module]();
-                [Module].ModuleId = ModuleState.ModuleId;
-                [Module].Name = _name;
-                [Module] = await [Module]Service.Add[Module]Async([Module]);
-                await logger.LogInformation("[Module] Added {[Module]}", [Module]);
-            }
-            else
-            {
-                [Module] [Module] = await [Module]Service.Get[Module]Async(_id);
-                [Module].Name = _name;
-                await [Module]Service.Update[Module]Async([Module]);
-                await logger.LogInformation("[Module] Updated {[Module]}", [Module]);
-            }
-            NavigationManager.NavigateTo(NavigateUrl());
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Saving [Module] {Error}", ex.Message);
-            AddModuleMessage("Error Saving [Module]", MessageType.Error);
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Index.razor

@@ -1,97 +0,0 @@
-@using [Owner].[Module]s.Services
-@using [Owner].[Module]s.Models
-
-@namespace [Owner].[Module]s.Modules
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject HttpClient http
-@inject SiteState sitestate
-
-@if (_[Module]s == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <ActionLink Action="Add" Security="SecurityAccessLevel.Edit" Text="Add [Module]" />
-    <br />
-    <br />
-    @if (@_[Module]s.Count != 0)
-    {
-        <Pager Items="@_[Module]s" Format="Grid">
-            <Header>
-                <div class="col"><strong>[Module]s</strong></div>
-            </Header>
-            <Row>
-                <div class="col">
-                    <ActionLink Action="Edit" Parameters="@($"id=" + context.[Module]Id.ToString())" />
-                    <ActionDialog Header="Delete [Module]" Message="@("Are You Sure You Wish To Delete The " + context.Name + " [Module]?")" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" />
-                    @context.Name
-                </div>
-            </Row>
-        </Pager>
-    }
-    else
-    {
-        <p>No [Module]s To Display</p>
-    }
-}
-
-<!-- The content below is for informational purposes only and can be safely removed -->
-
-<hr />
-[Module] Module Created Successfully. Use Edit Mode To Add A [Module]. You Can Access The Files At The Following Locations:<br /><br />
-[RootPath]Oqtane.Client\Modules\[Module]\<br />
-- Edit.razor - component for adding or editing content<br />
-- Index.razor - main component for your module **the content you are reading is in this file**<br />
-- ModuleInfo.cs - implements IModule interface to provide configuration settings for your module<br />
-- Settings.razor - component for managing module settings<br />
-- Services\I[Module]Service.cs - interface for defining service API methods<br />
-- Services\[Module]Service.cs - implements service API interface methods<br /><br />
-[RootPath]Oqtane.Server\Modules\[Module]\<br />
-- Controllers\[Module]Controller.cs - API methods implemented using a REST pattern<br />
-- Manager\[Module]Manager.cs - implements optional module interfaces for features such as import/export of content<br />
-- Repository\I[Module]Repository.cs - interface for defining repository methods<br />
-- Repository\[Module]Respository.cs - implements repository interface methods for data access using EF Core<br />
-- Repository\[Module]Context.cs - provides a DB Context for data access<br />
-- Scripts\[Owner].[Module].1.0.0.sql - database schema definition script<br /><br />
-- Scripts\[Owner].[Module].Uninstall.sql - database uninstall script<br /><br />
-[RootPath]Oqtane.Shared\Modules\[Module]\<br />
-- Models\[Module].cs - model definition<br /><br />
-
-<!-- The content above is for informational purposes only and can be safely removed -->
-
-@code {
-    I[Module]Service [Module]Service;
-    List<[Module]> _[Module]s;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            [Module]Service = new [Module]Service(http, sitestate);
-            _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId);
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading [Module] {Error}", ex.Message);
-            AddModuleMessage("Error Loading [Module]", MessageType.Error);
-        }
-    }
-
-    private async Task Delete([Module] [Module])
-    {
-        try
-        {
-            await [Module]Service.Delete[Module]Async([Module].[Module]Id);
-            await logger.LogInformation("[Module] Deleted {[Module]}", [Module]);
-            _[Module]s = await [Module]Service.Get[Module]sAsync(ModuleState.ModuleId);
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting [Module] {[Module]} {Error}", [Module], ex.Message);
-            AddModuleMessage("Error Deleting [Module]", MessageType.Error);
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Services/I[Module]Service.cs

@@ -1,19 +0,0 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using [Owner].[Module]s.Models;
-
-namespace [Owner].[Module]s.Services
-{
-    public interface I[Module]Service 
-    {
-        Task<List<[Module]>> Get[Module]sAsync(int ModuleId);
-
-        Task<[Module]> Get[Module]Async(int [Module]Id);
-
-        Task<[Module]> Add[Module]Async([Module] [Module]);
-
-        Task<[Module]> Update[Module]Async([Module] [Module]);
-
-        Task Delete[Module]Async(int [Module]Id);
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Services/[Module]Service.cs

@@ -1,49 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Http;
-using System.Threading.Tasks;
-using Oqtane.Modules;
-using Oqtane.Services;
-using Oqtane.Shared;
-using [Owner].[Module]s.Models;
-
-namespace [Owner].[Module]s.Services
-{
-    public class [Module]Service : ServiceBase, I[Module]Service, IService
-    {
-        private readonly SiteState _siteState;
-
-        public [Module]Service(HttpClient http, SiteState siteState) : base(http)
-        {
-            _siteState = siteState;
-        }
-
-         private string Apiurl=> CreateApiUrl(_siteState.Alias, "[Module]");
-
-        public async Task<List<[Module]>> Get[Module]sAsync(int ModuleId)
-        {
-            List<[Module]> [Module]s = await GetJsonAsync<List<[Module]>>($"{Apiurl}?moduleid={ModuleId}");
-            return [Module]s.OrderBy(item => item.Name).ToList();
-        }
-
-        public async Task<[Module]> Get[Module]Async(int [Module]Id)
-        {
-            return await GetJsonAsync<[Module]>($"{Apiurl}/{[Module]Id}");
-        }
-
-        public async Task<[Module]> Add[Module]Async([Module] [Module])
-        {
-            return await PostJsonAsync<[Module]>($"{Apiurl}?entityid={[Module].ModuleId}", [Module]);
-        }
-
-        public async Task<[Module]> Update[Module]Async([Module] [Module])
-        {
-            return await PutJsonAsync<[Module]>($"{Apiurl}/{[Module].[Module]Id}?entityid={[Module].ModuleId}", [Module]);
-        }
-
-        public async Task Delete[Module]Async(int [Module]Id)
-        {
-            await DeleteAsync($"{Apiurl}/{[Module]Id}");
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Client/Modules/[Module]/Settings.razor

@@ -1,47 +0,0 @@
-@namespace [Owner].[Module]s.Modules
-@inherits ModuleBase
-@inject ISettingService SettingService
-
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <label for="Setting" class="control-label">Setting: </label>
-        </td>
-        <td>
-            <input type="text" class="form-control" @bind="_value" />
-        </td>
-    </tr>
-</table>
-
-@code {
-    public override string Title => "[Module] Settings";
-
-    string _value;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
-            _value = SettingService.GetSetting(settings, "SettingName", "");
-        }
-        catch (Exception ex)
-        {
-            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-
-    public async Task UpdateSettings()
-    {
-        try
-        {
-            Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
-            SettingService.SetSetting(settings, "SettingName", _value);
-            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-        }
-        catch (Exception ex)
-        {
-            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Controllers/[Module]Controller.cs

@@ -1,75 +0,0 @@
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Authorization;
-using System.Collections.Generic;
-using Oqtane.Shared;
-using Oqtane.Enums;
-using Oqtane.Infrastructure;
-using [Owner].[Module]s.Models;
-using [Owner].[Module]s.Repository;
-
-namespace [Owner].[Module]s.Controllers
-{
-    [Route("{site}/api/[controller]")]
-    public class [Module]Controller : Controller
-    {
-        private readonly I[Module]Repository _[Module]s;
-        private readonly ILogManager _logger;
-
-        public [Module]Controller(I[Module]Repository [Module]s, ILogManager logger)
-        {
-            _[Module]s = [Module]s;
-            _logger = logger;
-        }
-
-        // GET: api/<controller>?moduleid=x
-        [HttpGet]
-        [Authorize(Roles = Constants.RegisteredRole)]
-        public IEnumerable<[Module]> Get(string moduleid)
-        {
-            return _[Module]s.Get[Module]s(int.Parse(moduleid));
-        }
-
-        // GET api/<controller>/5
-        [HttpGet("{id}")]
-        [Authorize(Roles = Constants.RegisteredRole)]
-        public [Module] Get(int id)
-        {
-            return _[Module]s.Get[Module](id);
-        }
-
-        // POST api/<controller>
-        [HttpPost]
-        [Authorize(Roles = Constants.AdminRole)]
-        public [Module] Post([FromBody] [Module] [Module])
-        {
-            if (ModelState.IsValid)
-            {
-                [Module] = _[Module]s.Add[Module]([Module]);
-                _logger.Log(LogLevel.Information, this, LogFunction.Create, "[Module] Added {[Module]}", [Module]);
-            }
-            return [Module];
-        }
-
-        // PUT api/<controller>/5
-        [HttpPut("{id}")]
-        [Authorize(Roles = Constants.AdminRole)]
-        public [Module] Put(int id, [FromBody] [Module] [Module])
-        {
-            if (ModelState.IsValid)
-            {
-                [Module] = _[Module]s.Update[Module]([Module]);
-                _logger.Log(LogLevel.Information, this, LogFunction.Update, "[Module] Updated {[Module]}", [Module]);
-            }
-            return [Module];
-        }
-
-        // DELETE api/<controller>/5
-        [HttpDelete("{id}")]
-        [Authorize(Roles = Constants.AdminRole)]
-        public void Delete(int id)
-        {
-            _[Module]s.Delete[Module](id);
-            _logger.Log(LogLevel.Information, this, LogFunction.Delete, "[Module] Deleted {[Module]Id}", id);
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Manager/[Module]Manager.cs

@@ -1,64 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json;
-using Oqtane.Modules;
-using Oqtane.Models;
-using Oqtane.Infrastructure;
-using Oqtane.Repository;
-using [Owner].[Module]s.Models;
-using [Owner].[Module]s.Repository;
-
-namespace [Owner].[Module]s.Manager
-{
-    public class [Module]Manager : IInstallable, IPortable
-    {
-        private I[Module]Repository _[Module]s;
-        private ISqlRepository _sql;
-
-        public [Module]Manager(I[Module]Repository [Module]s, ISqlRepository sql)
-        {
-            _[Module]s = [Module]s;
-            _sql = sql;
-        }
-
-        public bool Install(Tenant tenant, string version)
-        {
-            return _sql.ExecuteScript(tenant, GetType().Assembly, "[Owner].[Module]." + version + ".sql");
-        }
-
-        public bool Uninstall(Tenant tenant)
-        {
-            return _sql.ExecuteScript(tenant, GetType().Assembly, "[Owner].[Module].Uninstall.sql");
-        }
-
-        public string ExportModule(Module module)
-        {
-            string content = "";
-            List<[Module]> [Module]s = _[Module]s.Get[Module]s(module.ModuleId).ToList();
-            if ([Module]s != null)
-            {
-                content = JsonSerializer.Serialize([Module]s);
-            }
-            return content;
-        }
-
-        public void ImportModule(Module module, string content, string version)
-        {
-            List<[Module]> [Module]s = null;
-            if (!string.IsNullOrEmpty(content))
-            {
-                [Module]s = JsonSerializer.Deserialize<List<[Module]>>(content);
-            }
-            if ([Module]s != null)
-            {
-                foreach([Module] [Module] in [Module]s)
-                {
-                    [Module] _[Module] = new [Module]();
-                    _[Module].ModuleId = module.ModuleId;
-                    _[Module].Name = [Module].Name;
-                    _[Module]s.Add[Module](_[Module]);
-                }
-            }
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/I[Module]Repository.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-using [Owner].[Module]s.Models;
-
-namespace [Owner].[Module]s.Repository
-{
-    public interface I[Module]Repository
-    {
-        IEnumerable<[Module]> Get[Module]s(int ModuleId);
-        [Module] Get[Module](int [Module]Id);
-        [Module] Add[Module]([Module] [Module]);
-        [Module] Update[Module]([Module] [Module]);
-        void Delete[Module](int [Module]Id);
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/[Module]Context.cs

@@ -1,18 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.AspNetCore.Http;
-using Oqtane.Modules;
-using Oqtane.Repository;
-using [Owner].[Module]s.Models;
-
-namespace [Owner].[Module]s.Repository
-{
-    public class [Module]Context : DBContextBase, IService
-    {
-        public virtual DbSet<[Module]> [Module] { get; set; }
-
-        public [Module]Context(ITenantResolver tenantResolver, IHttpContextAccessor accessor) : base(tenantResolver, accessor)
-        {
-            // ContextBase handles multi-tenant database connections
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Repository/[Module]Repository.cs

@@ -1,49 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using System.Linq;
-using System.Collections.Generic;
-using Oqtane.Modules;
-using [Owner].[Module]s.Models;
-
-namespace [Owner].[Module]s.Repository
-{
-    public class [Module]Repository : I[Module]Repository, IService
-    {
-        private readonly [Module]Context _db;
-
-        public [Module]Repository([Module]Context context)
-        {
-            _db = context;
-        }
-
-        public IEnumerable<[Module]> Get[Module]s(int ModuleId)
-        {
-            return _db.[Module].Where(item => item.ModuleId == ModuleId);
-        }
-
-        public [Module] Get[Module](int [Module]Id)
-        {
-            return _db.[Module].Find([Module]Id);
-        }
-
-        public [Module] Add[Module]([Module] [Module])
-        {
-            _db.[Module].Add([Module]);
-            _db.SaveChanges();
-            return [Module];
-        }
-
-        public [Module] Update[Module]([Module] [Module])
-        {
-            _db.Entry([Module]).State = EntityState.Modified;
-            _db.SaveChanges();
-            return [Module];
-        }
-
-        public void Delete[Module](int [Module]Id)
-        {
-            [Module] [Module] = _db.[Module].Find([Module]Id);
-            _db.[Module].Remove([Module]);
-            _db.SaveChanges();
-        }
-    }
-}

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module].1.0.0.sql

@@ -1,26 +0,0 @@
-/*  
-Create [Owner][Module] table
-*/
-
-CREATE TABLE [dbo].[[Owner][Module]](
-	[[Module]Id] [int] IDENTITY(1,1) NOT NULL,
-	[ModuleId] [int] NOT NULL,
-	[Name] [nvarchar](256) NOT NULL,
-	[CreatedBy] [nvarchar](256) NOT NULL,
-	[CreatedOn] [datetime] NOT NULL,
-	[ModifiedBy] [nvarchar](256) NOT NULL,
-	[ModifiedOn] [datetime] NOT NULL,
-  CONSTRAINT [PK_[Owner][Module]] PRIMARY KEY CLUSTERED 
-  (
-	[[Module]Id] ASC
-  )
-)
-GO
-
-/*  
-Create foreign key relationships
-*/
-ALTER TABLE [dbo].[[Owner][Module]]  WITH CHECK ADD  CONSTRAINT [FK_[Owner][Module]_Module] FOREIGN KEY([ModuleId])
-REFERENCES [dbo].Module ([ModuleId])
-ON DELETE CASCADE
-GO

Oqtane.Client/Modules/Admin/ModuleCreator/Templates/Internal/Oqtane.Server/Modules/[Module]/Scripts/[Owner].[Module].Uninstall.sql

@@ -1,6 +0,0 @@
-/*  
-Remove [Owner][Module] table
-*/
-
-DROP TABLE [dbo].[[Owner][Module]]
-GO

Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor

@@ -1,104 +1,263 @@
-@namespace Oqtane.Modules.Admin.ModuleDefinitions
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IFileService FileService
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
+@inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_packages != null)
-{
-    <TabStrip>
-        @if (_packages.Count > 0)
+<TabStrip>
+    <TabPanel Name="Download" ResourceKey="Download">
+        <div class="row justify-content-center mb-3">
+            <div class="col-sm-6">
+                <div class="input-group">
+                    <select id="price" class="form-select custom-select" @onchange="(e => PriceChanged(e))">
+                        <option value="free">@SharedLocalizer["Free"]</option>
+                        <option value="paid">@SharedLocalizer["Paid"]</option>
+                    </select>
+                    <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
+                    <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
+                </div>
+            </div>
+        </div>
+
+        @if (_packages != null)
         {
-        <TabPanel Name="Download">
-            <ModuleMessage Type="MessageType.Info" Message="Download one or more modules from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
-            <Pager Items="@_packages">
-                <Header>
-                    <th>Name</th>
-                    <th>Version</th>
-                    <th></th>
-                </Header>
-                <Row>
-                    <td>@context.Name</td>
-                    <td>@context.Version</td>
-                    <td>
-                        <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadModule(context.PackageId, context.Version))>Download</button>
-                    </td>
-                </Row>
-            </Pager>
-        </TabPanel>
-        }
-        <TabPanel Name="Upload">
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation.">Module: </Label>
-                    </td>
-                    <td>
-                        <FileManager Filter="nupkg" ShowFiles="false" Folder="Modules" UploadMultiple="True" />
-                    </td>
-                </tr>
-            </table>
-        </TabPanel>
-    </TabStrip>
-
-    <button type="button" class="btn btn-success" @onclick="InstallModules">Install</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-}
-
-@code {
-    private List<Package> _packages;
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
-            _packages = await PackageService.GetPackagesAsync("module");
-
-            foreach (Package package in _packages.ToArray())
+            if (_packages.Count > 0)
             {
-                if (moduledefinitions.Exists(item => Utilities.GetTypeName(item.ModuleDefinitionName) == package.PackageId))
-                {
-                    _packages.Remove(package);
-                }
+                <Pager Items="@_packages">
+                    <Row>
+                        <td>
+                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;by:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+                            @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+                            <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
+                            @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
+                            @SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                            @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(context.PackageUrl).Host + "</strong>" : ""))
+                            @((MarkupString)(context.TrialPeriod > 0 ? "&nbsp;&nbsp;|&nbsp;&nbsp;<strong>" + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "</strong>" : ""))
+                        </td>
+                        <td style="width: 1px; vertical-align: middle;">
+                            @if (context.Price != null && !string.IsNullOrEmpty(context.PackageUrl))
+                            {
+                                <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                            }
+                        </td>
+                        <td style="width: 1px; vertical-align: middle;">
+                            @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                            {
+                                <a class="btn btn-primary" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@context.Price.Value.ToString("$#,##0.00")</a>
+                            }
+                            else
+                            {
+                                <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                            }
+                        </td>
+                    </Row>
+                </Pager>
+            }
+            else
+            {
+                <br />
+                <div class="mx-auto text-center">
+                    @Localizer["Search.NoResults"]
+                </div>
             }
         }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
-            AddModuleMessage("Error Loading Packages", MessageType.Error);
-        }
-    }
+    </TabPanel>
+    <TabPanel Name="Upload" ResourceKey="Upload">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" HelpText="Upload one or more module packages. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Module: </Label>
+                <div class="col-sm-9">
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
+                </div>
+            </div>
+        </div>
+    </TabPanel>
+</TabStrip>
 
-    private async Task InstallModules()
-    {
-        try
-        {
-            await ModuleDefinitionService.InstallModuleDefinitionsAsync();
-            NavigationManager.NavigateTo(NavigateUrl());
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Installating Module");
-        }
-    }
-
-    private async Task DownloadModule(string packageid, string version)
-    {
-        try
-        {
-            await PackageService.DownloadPackageAsync(packageid, version, "Modules");
-            await logger.LogInformation("Module {ModuleDefinitionName} {Version} Downloaded Successfully", packageid, version);
-            AddModuleMessage("Modules Downloaded Successfully. Click Install To Complete Installation.", MessageType.Success);
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version}", packageid, version);
-            AddModuleMessage("Error Downloading Module", MessageType.Error);
-        }
-    }
+@if (_productname != "")
+{
+    <div class="app-actiondialog">
+        <div class="modal" tabindex="-1" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
+                        <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
+                    </div>
+                    <div class="modal-body">
+                        <p style="height: 200px; overflow-y: scroll;">
+                            <h3>@_productname</h3>
+                            @if (!string.IsNullOrEmpty(_packagelicense))
+                            {
+								@((MarkupString)_packagelicense)
+                            }
+                            else
+                            {
+                                @SharedLocalizer["License Not Specified"]
+                            }
+                        </p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+
+<button type="button" class="btn btn-success" @onclick="InstallModules">@SharedLocalizer["Install"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+
+<br />
+<br />
+<ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
+
+@code {
+	private List<Package> _packages;
+	private string _price = "free";
+	private string _search = "";
+	private string _productname = "";
+	private string _packageid = "";
+	private string _packagelicense = "";
+	private string _packageversion = "";
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			await LoadModuleDefinitions();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Package.Load"], MessageType.Error);
+		}
+	}
+
+	private async Task LoadModuleDefinitions()
+	{
+		var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+		_packages = await PackageService.GetPackagesAsync("module", _search, _price, "");
+
+		if (_packages != null)
+		{
+			foreach (Package package in _packages.ToArray())
+			{
+				if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
+				{
+					_packages.Remove(package);
+				}
+			}
+		}
+	}
+
+	private async void PriceChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_price = (string)e.Value;
+			_search = "";
+			await LoadModuleDefinitions();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error On PriceChanged");
+		}
+	}
+
+	private async Task Search()
+	{
+		try
+		{
+			await LoadModuleDefinitions();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error On Search");
+		}
+	}
+
+	private async Task Reset()
+	{
+		try
+		{
+			_search = "";
+			await LoadModuleDefinitions();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error On Reset");
+		}
+	}
+
+	private void HideModal()
+	{
+		_productname = "";
+		_packagelicense = "";
+		StateHasChanged();
+	}
+
+	private async Task GetPackage(string packageid, string version)
+	{
+		try
+		{
+			var package = await PackageService.GetPackageAsync(packageid, version);
+			if (package != null)
+			{
+				_productname = package.Name;
+				_packageid = package.PackageId;
+				if (!string.IsNullOrEmpty(package.License))
+				{
+					_packagelicense = package.License.Replace("\n", "<br />");
+				}
+				_packageversion = package.Version;
+			}
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version);
+			AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
+		}
+	}
+
+	private async Task DownloadPackage()
+	{
+		try
+		{
+			await PackageService.DownloadPackageAsync(_packageid, _packageversion, Constants.PackagesFolder);
+			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _packageversion);
+			AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success);
+			_productname = "";
+			_packagelicense = "";
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _packageversion);
+			AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
+		}
+	}
+
+	private async Task InstallModules()
+	{
+		try
+		{
+			await ModuleDefinitionService.InstallModuleDefinitionsAsync();
+			AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Installing Modules");
+		}
+	}
 }

Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor

@@ -0,0 +1,168 @@
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
+@inherits ModuleBase
+@using System.Text.RegularExpressions
+@inject NavigationManager NavigationManager
+@inject IModuleDefinitionService ModuleDefinitionService
+@inject IModuleService ModuleService
+@inject ISettingService SettingService
+@inject IStringLocalizer<Create> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_templates != null)
+{
+    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="owner" HelpText="Enter the name of the organization who is developing this module. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
+                <div class="col-sm-9">
+                    <input id="owner" class="form-control" @bind="@_owner" required />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="module" HelpText="Enter a name for this module. It should not contain spaces or punctuation." ResourceKey="ModuleName">Module Name: </Label>
+                <div class="col-sm-9">
+                    <input id="module" class="form-control" @bind="@_module" required />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="description" HelpText="Enter a short description for the module" ResourceKey="Description">Description: </Label>
+                <div class="col-sm-9">
+                    <textarea id="description" class="form-control" @bind="@_description" rows="3" maxlength="2000" required></textarea>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="template" HelpText="Select a module template. Templates are located in the wwwroot/Modules/Templates folder on the server." ResourceKey="Template">Template: </Label>
+                <div class="col-sm-9">
+                    <select id="template" class="form-select" @onchange="(e => TemplateChanged(e))" required>
+                        <option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
+                        @foreach (Template template in _templates)
+                        {
+                            <option value="@template.Name">@template.Title</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
+                <div class="col-sm-9">
+                    <select id="reference" class="form-select" @bind="@_reference" required>
+                        @foreach (string version in _versions)
+                        {
+                            if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
+                            {
+                                <option value="@(version)">@(version)</option>
+                            }
+                        }
+                        <option value="local">@SharedLocalizer["LocalVersion"]</option>
+                    </select>
+                </div>
+            </div>
+            @if (!string.IsNullOrEmpty(_location))
+            {
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="location" HelpText="Location where the module will be created" ResourceKey="Location">Location: </Label>
+                    <div class="col-sm-9">
+                        <input id="module" class="form-control" @bind="@_location" readonly />
+                    </div>
+                </div>
+            }
+        </div>
+        <button type="button" class="btn btn-success" @onclick="CreateModule">@Localizer["CreateModule"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </form>
+}
+
+@code {
+    private ElementReference form;
+    private bool validated = false;
+    private string _owner = string.Empty;
+    private string _module = string.Empty;
+    private string _description = string.Empty;
+    private List<Template> _templates;
+    private string _template = "-";
+    private string[] _versions;
+    private string _reference = "local";
+    private string _minversion = "2.0.0";
+    private string _location = string.Empty;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    protected override void OnInitialized()
+    {
+        AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
+    }
+
+    protected override async Task OnParametersSetAsync()
+    {
+        try
+        {
+            _templates = await ModuleDefinitionService.GetModuleDefinitionTemplatesAsync();
+            _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Module Creator");
+        }
+    }
+
+    private async Task CreateModule()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            try
+            {
+                if (IsValid(_owner) && IsValid(_module) && _owner != _module && _template != "-")
+                {
+                    var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
+                    moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
+                    GetLocation();
+                    AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.Require.ValidName"], MessageType.Warning);
+                }
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Creating Module");
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+
+    private bool IsValid(string name)
+    {
+        // must contain letters, underscores and digits and first character must be letter or underscore
+        return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+    }
+
+    private void TemplateChanged(ChangeEventArgs e)
+    {
+        _template = (string)e.Value;
+        _minversion = "2.0.0";
+        if (_template != "-")
+        {
+            var template = _templates.FirstOrDefault(item => item.Name == _template);
+            _minversion = template.Version;
+        }
+		GetLocation();
+    }
+
+    private void GetLocation()
+    {
+        _location = string.Empty;
+        if (_owner != "" && _module != "" && _template != "-")
+        {
+            var template = _templates.FirstOrDefault(item => item.Name == _template);
+            _location = template.Location + _owner + "." + _module;
+
+        }
+        StateHasChanged();
+    }
+}

Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor

@@ -1,184 +1,375 @@
-@namespace Oqtane.Modules.Admin.ModuleDefinitions
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
+@using System.Globalization
+@using Microsoft.AspNetCore.Localization
 @inject IModuleDefinitionService ModuleDefinitionService
+@inject IPackageService PackageService
+@inject ILanguageService LanguageService
 @inject NavigationManager NavigationManager
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
-    <TabPanel Name="Definition">
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <Label For="name" HelpText="The name of the module">Name: </Label>
-                </td>
-                <td>
-                    <input id="name" class="form-control" @bind="@_name" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="description" HelpText="The description of the module">Description: </Label>
-                </td>
-                <td>
-                    <textarea id="description" class="form-control" @bind="@_description" rows="2"></textarea>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="categories" HelpText="Comma delimited list of module categories">Categories: </Label>
-                </td>
-                <td>
-                    <input id="categories" class="form-control" @bind="@_categories" />
-                </td>
-            </tr>
-        </table>
-        <Section Name="Information">
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label For="moduledefinitionname" HelpText="The internal name of the module">Internal Name: </Label>
-                    </td>
-                    <td>
+    <TabPanel Name="Definition" ResourceKey="Definition">
+        <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="name" HelpText="The name of the module" ResourceKey="Name">Name: </Label>
+                    <div class="col-sm-9">
+                        <input id="name" class="form-control" @bind="@_name" maxlength="200" required />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="description" HelpText="The description of the module" ResourceKey="Description">Description: </Label>
+                    <div class="col-sm-9">
+                        <textarea id="description" class="form-control" @bind="@_description" rows="2" maxlength="2000" required></textarea>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="categories" HelpText="Comma delimited list of module categories" ResourceKey="Categories">Categories: </Label>
+                    <div class="col-sm-9">
+                        <input id="categories" class="form-control" @bind="@_categories" maxlength="200" required />
+                    </div>
+                </div>
+            </div>
+        </form>
+        <Section Name="Information" ResourceKey="Information">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="moduledefinitionname" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
+                    <div class="col-sm-9">
                         <input id="moduledefinitionname" class="form-control" @bind="@_moduledefinitionname" disabled />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="version" HelpText="The version of the module">Version: </Label>
-                    </td>
-                    <td>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="version" HelpText="The version of the module" ResourceKey="Version">Version: </Label>
+                    <div class="col-sm-9">
                         <input id="version" class="form-control" @bind="@_version" disabled />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="owner" HelpText="The owner or creator of the module">Owner: </Label>
-                    </td>
-                    <td>
+                    </div>
+                </div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="packagename" HelpText="The unique name of the package from which this module was installed" ResourceKey="PackageName">Package Name: </Label>
+					<div class="col-sm-9">
+						<input id="packagename" class="form-control" @bind="@_packagename" disabled />
+					</div>
+				</div>
+				<div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="owner" HelpText="The owner or creator of the module" ResourceKey="Owner">Owner: </Label>
+                    <div class="col-sm-9">
                         <input id="owner" class="form-control" @bind="@_owner" disabled />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="url" HelpText="The reference url of the module">Reference Url: </Label>
-                    </td>
-                    <td>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="url" HelpText="The reference url of the module" ResourceKey="ReferenceUrl">Reference Url: </Label>
+                    <div class="col-sm-9">
                         <input id="url" class="form-control" @bind="@_url" disabled />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="contact" HelpText="The contact for the module">Contact: </Label>
-                    </td>
-                    <td>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="contact" HelpText="The contact for the module" ResourceKey="Contact">Contact: </Label>
+                    <div class="col-sm-9">
                         <input id="contact" class="form-control" @bind="@_contact" disabled />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="license" HelpText="The license of the module">License: </Label>
-                    </td>
-                    <td>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="license" HelpText="The module license terms" ResourceKey="License">License: </Label>
+                    <div class="col-sm-9">
                         <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
-                    </td>
-                </tr>
-            </table>
-        </Section>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="runtimes" HelpText="The Blazor runtimes which this module supports" ResourceKey="Runtimes">Runtimes: </Label>
+                    <div class="col-sm-9">
+                        <input id="runtimes" class="form-control" @bind="@_runtimes" disabled />
+                    </div>
+                </div>
+            </div>
+		</Section>
+		<br />
+		<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
+		<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+		<br />
+		<br />
+		<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
     </TabPanel>
-    <TabPanel Name="Permissions">
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames="@PermissionNames.Utilize" Permissions="@_permissions" @ref="_permissionGrid" />
-                </td>
-            </tr>
-        </table>
+    <TabPanel Name="Permissions" ResourceKey="Permissions">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames="@PermissionNames.Utilize" Permissions="@_permissions" @ref="_permissionGrid" />
+            </div>
+        </div>
+		<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">@SharedLocalizer["Save"]</button>
+		<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
     </TabPanel>
+	<TabPanel Name="Translations" ResourceKey="Translations">
+		@if (_languages != null && _languages.Count > 0)
+		{
+			<Pager Items="@_languages">
+				<Header>
+					<th>@SharedLocalizer["Name"]</th>
+					<th>@Localizer["Code"]</th>
+					<th>@Localizer["Version"]</th>
+					<th style="width: 1px;">&nbsp;</th>
+				</Header>
+				<Row>
+					<td>@context.Name</td>
+					<td>@context.Code</td>
+					<td>@context.Version</td>
+					<td>
+						@if (context.IsDefault)
+						{
+							<button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Download"]</button>
+						}
+						else
+						{
+							if (UpgradeAvailable(_packagename + "." + context.Code, context.Version))
+							{
+								<button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadPackage(_packagename + "." + context.Code))>@SharedLocalizer["Upgrade"]</button>
+							}
+						}
+					</td>
+				</Row>
+			</Pager>
+			<button type="button" class="btn btn-success" @onclick="InstallTranslations">@SharedLocalizer["Install"]</button>
+		}
+		else
+		{
+			<br />
+			<div class="mx-auto text-center">
+				@Localizer["Search.NoResults"]
+			</div>
+			<br />
+		}
+	</TabPanel>
 </TabStrip>
-<button type="button" class="btn btn-success" @onclick="SaveModuleDefinition">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-<br /><br />
-<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+
+@if (_productname != "")
+{
+	<div class="app-actiondialog">
+		<div class="modal" tabindex="-1" role="dialog">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
+						<button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
+					</div>
+					<div class="modal-body">
+						<p style="height: 200px; overflow-y: scroll;">
+							<h3>@_productname</h3>
+							@if (!string.IsNullOrEmpty(_packagelicense))
+							{
+								@((MarkupString)_packagelicense)
+							}
+							else
+							{
+								@SharedLocalizer["License Not Specified"]
+							}
+						</p>
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-success" @onclick=@(async () => await DownloadPackage(_packageid))>@SharedLocalizer["Accept"]</button>
+						<button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+}
 
 @code {
-    private int _moduleDefinitionId;
-    private string _name;
-    private string _version;
-    private string _categories;
-    private string _moduledefinitionname = "";
-    private string _description = "";
-    private string _owner = "";
-    private string _url = "";
-    private string _contact = "";
-    private string _license = "";
-    private string _permissions;
-    private string _createdby;
-    private DateTime _createdon;
-    private string _modifiedby;
-    private DateTime _modifiedon;
+	private ElementReference form;
+	private bool validated = false;
+	private int _moduleDefinitionId;
+	private string _name;
+	private string _description = "";
+	private string _categories;
+	private string _moduledefinitionname = "";
+	private string _version;
+	private string _packagename = "";
+	private string _owner = "";
+	private string _url = "";
+	private string _contact = "";
+	private string _license = "";
+	private string _runtimes = "";
+	private string _permissions;
+	private string _createdby;
+	private DateTime _createdon;
+	private string _modifiedby;
+	private DateTime _modifiedon;
 
 #pragma warning disable 649
-    private PermissionGrid _permissionGrid;
+	private PermissionGrid _permissionGrid;
 #pragma warning restore 649
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	private List<Package> _packages;
+	private List<Language> _languages;
+	private string _productname = "";
+	private string _packagelicense = "";
+	private string _packageid = "";
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _moduleDefinitionId = Int32.Parse(PageState.QueryString["id"]);
-            var moduleDefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
-            if (moduleDefinition != null)
-            {
-                _name = moduleDefinition.Name;
-                _version = moduleDefinition.Version;
-                _categories = moduleDefinition.Categories;
-                _moduledefinitionname = moduleDefinition.ModuleDefinitionName;
-                _description = moduleDefinition.Description;
-                _owner = moduleDefinition.Owner;
-                _url = moduleDefinition.Url;
-                _contact = moduleDefinition.Contact;
-                _license = moduleDefinition.License;
-                _permissions = moduleDefinition.Permissions;
-                _createdby = moduleDefinition.CreatedBy;
-                _createdon = moduleDefinition.CreatedOn;
-                _modifiedby = moduleDefinition.ModifiedBy;
-                _modifiedon = moduleDefinition.ModifiedOn;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
-            AddModuleMessage("Error Loading Module", MessageType.Error);
-        }
-    }
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    private async Task SaveModuleDefinition()
-    {
-        try
-        {
-            var moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
-            if (moduledefinition.Name != _name)
-            {
-                moduledefinition.Name = _name;
-            }
-            if (moduledefinition.Description != _description)
-            {
-                moduledefinition.Description = _description;
-            }
-            if (moduledefinition.Categories != _categories)
-            {
-                moduledefinition.Categories = _categories;
-            }
-            moduledefinition.Permissions = _permissionGrid.GetPermissions();
-            await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition);
-            await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition);
-            NavigationManager.NavigateTo(NavigateUrl());
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
-            AddModuleMessage("Error Saving Module", MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_moduleDefinitionId = Int32.Parse(PageState.QueryString["id"]);
+			var moduleDefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
+			if (moduleDefinition != null)
+			{
+				_name = moduleDefinition.Name;
+				_description = moduleDefinition.Description;
+				_categories = moduleDefinition.Categories;
+				_moduledefinitionname = moduleDefinition.ModuleDefinitionName;
+				_version = moduleDefinition.Version;
+				_packagename = moduleDefinition.PackageName;
+				_owner = moduleDefinition.Owner;
+				_url = moduleDefinition.Url;
+				_contact = moduleDefinition.Contact;
+				_license = moduleDefinition.License;
+				_runtimes = moduleDefinition.Runtimes;
+				_permissions = moduleDefinition.Permissions;
+				_createdby = moduleDefinition.CreatedBy;
+				_createdon = moduleDefinition.CreatedOn;
+				_modifiedby = moduleDefinition.ModifiedBy;
+				_modifiedon = moduleDefinition.ModifiedOn;
+
+				if (!string.IsNullOrEmpty(_packagename))
+				{
+					_packages = await PackageService.GetPackagesAsync("translation", "", "", _packagename);
+					_languages = await LanguageService.GetLanguagesAsync(-1, _packagename);
+					foreach (var package in _packages)
+					{
+						var code = package.PackageId.Split('.').Last();
+						if (!_languages.Any(item => item.Code == code))
+						{
+							_languages.Add(new Language { Code = code, Name = CultureInfo.GetCultureInfo(code).DisplayName, Version = package.Version, IsDefault = true });
+						}
+					}
+					_languages = _languages.OrderBy(item => item.Name).ToList();
+				}
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
+			AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
+		}
+	}
+
+	private async Task SaveModuleDefinition()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			try
+			{
+				var moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
+				if (moduledefinition.Name != _name)
+				{
+					moduledefinition.Name = _name;
+				}
+				if (moduledefinition.Description != _description)
+				{
+					moduledefinition.Description = _description;
+				}
+				if (moduledefinition.Categories != _categories)
+				{
+					moduledefinition.Categories = _categories;
+				}
+				moduledefinition.Permissions = _permissionGrid.GetPermissions();
+				await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition);
+				await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition);
+				NavigationManager.NavigateTo(NavigateUrl());
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Saving ModuleDefinition {ModuleDefinitionId} {Error}", _moduleDefinitionId, ex.Message);
+				AddModuleMessage(Localizer["Error.Module.Save"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+		}
+	}
+
+	private void HideModal()
+	{
+		_productname = "";
+		_packagelicense = "";
+		StateHasChanged();
+	}
+
+	private bool UpgradeAvailable(string packagename, string version)
+	{
+		var upgradeavailable = false;
+		if (_packages != null)
+		{
+			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+			if (package != null)
+			{
+				upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+			}
+
+		}
+		return upgradeavailable;
+	}
+
+	private async Task GetPackage(string packagename)
+	{
+		var version = _packages.Where(item => item.PackageId == packagename).FirstOrDefault().Version;
+		try
+		{
+			var package = await PackageService.GetPackageAsync(packagename, version);
+			if (package != null)
+			{
+				_productname = package.Name;
+				if (!string.IsNullOrEmpty(package.License))
+				{
+					_packagelicense = package.License.Replace("\n", "<br />");
+				}
+				_packageid = package.PackageId;
+			}
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packagename, version);
+			AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+		}
+	}
+
+	private async Task DownloadPackage(string packagename)
+	{
+		try
+		{
+			var version = _packages.Where(item => item.PackageId == packagename).FirstOrDefault().Version;
+			await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
+			await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", packagename, version);
+			AddModuleMessage(Localizer["Success.Translation.Download"], MessageType.Success);
+			_productname = "";
+			_packagelicense = "";
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packagename, _version);
+			AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+		}
+	}
+
+	private async Task InstallTranslations()
+	{
+		try
+		{
+			await PackageService.InstallPackagesAsync();
+			AddModuleMessage(string.Format(Localizer["Success.Translation.Install"], NavigateUrl("admin/system")), MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Installing Translations");
+		}
+	}
 }

Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor

@@ -1,39 +1,82 @@
-@namespace Oqtane.Modules.Admin.ModuleDefinitions
+@namespace Oqtane.Modules.Admin.ModuleDefinitions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IModuleDefinitionService ModuleDefinitionService
 @inject IPackageService PackageService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_moduleDefinitions == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
-    <ActionLink Action="Add" Text="Install Module" />
-
-    <Pager Items="@_moduleDefinitions">
+	<div class="container">
+		<div class="row mb-3 align-items-center">
+			<div class="col-sm-6">
+				<ActionLink Action="Add" Text="Install Module" ResourceKey="InstallModule" />
+				@((MarkupString)"&nbsp;")
+				<ActionLink Action="Create" Text="Create Module" ResourceKey="CreateModule" Class="btn btn-secondary" />
+			</div>
+			<div class="col-sm-6">
+				<select class="form-select" @onchange="(e => CategoryChanged(e))">
+					@foreach (var category in _categories)
+					{
+						if (category == _category)
+						{
+							<option value="@category" selected>@category @Localizer["Modules"]</option>
+						}
+						else
+						{
+							<option value="@category">@category @Localizer["Modules"]</option>
+						}
+					}
+				</select>
+			</div>
+		</div>
+	</div>
+			
+	<Pager Items="@_moduleDefinitions.Where(item => item.Categories.Contains(_category))">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>Name</th>
-            <th>Version</th>
-            <th>&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th>@SharedLocalizer["Name"]</th>
+            <th>@SharedLocalizer["Version"]</th>
+            <th>@Localizer["InUse"]</th>
+            <th>@SharedLocalizer["Expires"]</th>
+            <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ModuleDefinitionId.ToString())" ResourceKey="EditModule" /></td>
             <td>
-                @if (context.AssemblyName != "Oqtane.Client")
+                @if (context.AssemblyName != Constants.ClientId)
                 {
-                    <ActionDialog Header="Delete Module" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Module?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" />
+                    <ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete", context.Name])" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" />
                 }
             </td>
             <td>@context.Name</td>
             <td>@context.Version</td>
             <td>
-                @if (UpgradeAvailable(context.ModuleDefinitionName, context.Version))
+				@if (context.AssemblyName == Constants.ClientId || PageState.Modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
                 {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.ModuleDefinitionName, context.Version))>Upgrade</button>
+                    <span>@SharedLocalizer["Yes"]</span>
+                }
+                else
+                {
+                    <span>@SharedLocalizer["No"]</span>
+                }
+            </td>
+            <td>
+                @((MarkupString)PurchaseLink(context.PackageName))
+            </td>
+            <td>
+				@{ 
+					var version = UpgradeAvailable(context.PackageName, context.Version);
+				} 
+                @if (version != context.Version)
+                {
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadModule(context.PackageName, version))>@SharedLocalizer["Upgrade"]</button>
                 }
             </td>
         </Row>
@@ -41,65 +84,99 @@ else
 }
 
 @code {
-    private List<ModuleDefinition> _moduleDefinitions;
-    private List<Package> _packages;
+	private List<ModuleDefinition> _moduleDefinitions;
+	private List<Package> _packages;
+	private List<string> _categories = new List<string>();
+	private string _category = "Common";
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
-            _packages = await PackageService.GetPackagesAsync("module");
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
-            AddModuleMessage("Error Loading Modules", MessageType.Error);
-        }
-    }
+	protected override async Task OnParametersSetAsync()
+	{
+		try
+		{
+			_moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+			_packages = await PackageService.GetPackagesAsync("module");
+			_categories = _moduleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
+		}
+		catch (Exception ex)
+		{
+			if (_moduleDefinitions == null)
+			{
+				await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
+				AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
+			}
+		}
+	}
 
-    private bool UpgradeAvailable(string moduledefinitionname, string version)
-    {
-        var upgradeavailable = false;
-        var package = _packages.Where(item => item.PackageId == Utilities.GetTypeName(moduledefinitionname)).FirstOrDefault();
-        if (package != null)
-        {
-            upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
-        }
-        
-        return upgradeavailable;
-    }
+	private string PurchaseLink(string packagename)
+	{
+		string link = "";
+		if (!string.IsNullOrEmpty(packagename) && _packages != null)
+		{
+			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+			if (package != null)
+			{
+				if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
+				{
+					link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+					if (!string.IsNullOrEmpty(package.PaymentUrl))
+					{
+						link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>";
+					}
+				}
+			}
+		}
+		return link;
+	}
 
-    private async Task DownloadModule(string moduledefinitionname, string version)
-    {
-        try
-        {
-            await PackageService.DownloadPackageAsync(moduledefinitionname, version, "Modules");
-            await ModuleDefinitionService.InstallModuleDefinitionsAsync();
-            await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", moduledefinitionname, version);
-            NavigationManager.NavigateTo(NavigateUrl());
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", moduledefinitionname, version, ex.Message);
-            AddModuleMessage("Error Downloading Module", MessageType.Error);
-        }
-  }
+	private string UpgradeAvailable(string packagename, string version)
+	{
+		if (!string.IsNullOrEmpty(packagename) && _packages != null)
+		{
+			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+			if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+			{
+				return package.Version;
+			}
+		}
+		return version;
+	}
 
-    private async Task DeleteModule(ModuleDefinition moduleDefinition)
-    {
-        try
-        {
-            await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId);
-            await logger.LogInformation("Module Deleted {ModuleDefinition}", moduleDefinition);
-            NavigationManager.NavigateTo(NavigateUrl());
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message);
-            AddModuleMessage("Error Deleting Module", MessageType.Error);
-        }
-    }
+	private async Task DownloadModule(string packagename, string version)
+	{
+		try
+		{
+			await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
+			await logger.LogInformation("Module Downloaded {ModuleDefinitionName} {Version}", packagename, version);
+			await ModuleDefinitionService.InstallModuleDefinitionsAsync();
+			AddModuleMessage(string.Format(Localizer["Success.Module.Install"], NavigateUrl("admin/system")), MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version} {Error}", packagename, version, ex.Message);
+			AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
+		}
+	}
+
+	private async Task DeleteModule(ModuleDefinition moduleDefinition)
+	{
+		try
+		{
+			await ModuleDefinitionService.DeleteModuleDefinitionAsync(moduleDefinition.ModuleDefinitionId, moduleDefinition.SiteId);
+			AddModuleMessage(Localizer["Success.Module.Delete"], MessageType.Success);
+			NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting Module {ModuleDefinition} {Error}", moduleDefinition, ex.Message);
+			AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
+		}
+	}
+
+	private void CategoryChanged(ChangeEventArgs e)
+	{
+		_category = (string)e.Value;
+		StateHasChanged();
+	}
 }

Oqtane.Client/Modules/Admin/Modules/Export.razor

@@ -1,33 +1,39 @@
-@namespace Oqtane.Modules.Admin.Modules
+@namespace Oqtane.Modules.Admin.Modules
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IModuleService ModuleService
+@inject IStringLocalizer<Export> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tbody>
-        <tr>
-            <td>
-                <Label For="content" HelpText="Enter the module content">Content: </Label>
-            </td>
-            <td>
-                <textarea id="content" class="form-control" @bind="@_content" rows="5"></textarea>
-            </td>
-        </tr>
-    </tbody>
-</table>
-<button type="button" class="btn btn-success" @onclick="ExportModule">Export</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="content" HelpText="The Exported Module Content" ResourceKey="Content">Content: </Label>
+        <div class="col-sm-9">
+            <textarea id="content" class="form-control" @bind="@_content" rows="5" readonly></textarea>
+        </div>
+    </div>
+</div>
 
+<button type="button" class="btn btn-success" @onclick="ExportModule">@Localizer["Export"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
     private string _content = string.Empty;
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
-    public override string Title => "Export Module";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+    public override string Title => "Export Content";
 
 
     private async Task ExportModule()
     {
-        _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId);
+        try
+        {
+            _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId, PageState.Page.PageId);
+            AddModuleMessage(Localizer["Success.Content.Export"], MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Exporting Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message);
+            AddModuleMessage(Localizer["Error.Module.Export"], MessageType.Error);
+        }
     }
 }

Oqtane.Client/Modules/Admin/Modules/Import.razor

@@ -1,49 +1,67 @@
-@namespace Oqtane.Modules.Admin.Modules
+@namespace Oqtane.Modules.Admin.Modules
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IModuleService ModuleService
+@inject IStringLocalizer<Import> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tbody>
-        <tr>
-            <td>
-                <Label For="content" HelpText="Enter the module content">Content: </Label>
-            </td>
-            <td>
-                <textarea id="content" class="form-control" @bind="@_content" rows="5"></textarea>
-            </td>
-        </tr>
-    </tbody>
-</table>
-<button type="button" class="btn btn-success" @onclick="ImportModule">Import</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="content" HelpText="Enter The Module Content To Import" ResourceKey="Content">Content: </Label>
+            <div class="col-sm-9">
+                <textarea id="content" class="form-control" @bind="@_content" rows="5" required></textarea>
 
+            </div>
+        </div>
+    </div>
+
+    <button type="button" class="btn btn-success" @onclick="ImportModule">@Localizer["Import"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+</form>
 
 @code {
     private string _content = string.Empty;
+    private ElementReference form;
+    private bool validated = false;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
-    public override string Title => "Import Module";
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+    public override string Title => "Import Content";
 
     private async Task ImportModule()
     {
-        if (_content != string.Empty)
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            try
+            if (_content != string.Empty)
             {
-                await ModuleService.ImportModuleAsync(ModuleState.ModuleId, _content);
-                StateHasChanged();
-                NavigationManager.NavigateTo(NavigateUrl());
+                try
+                {
+					bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, PageState.Page.PageId, _content);
+                    if (success)
+                    {
+                        AddModuleMessage(Localizer["Success.Content.Import"], MessageType.Success);
+                    }
+                    else
+                    {
+                        AddModuleMessage(Localizer["Message.Content.ImportProblem"], MessageType.Warning);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    await logger.LogError(ex, "Error Importing Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message);
+                    AddModuleMessage(Localizer["Error.Module.Import"], MessageType.Error);
+                }
             }
-            catch (Exception ex)
+            else
             {
-                await logger.LogError(ex, "Error Importing Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message);
-                AddModuleMessage("Error Importing Module", MessageType.Error);
+                AddModuleMessage(Localizer["Message.Required.ImportContent"], MessageType.Warning);
             }
         }
         else
         {
-            AddModuleMessage("You Must Enter Some Content To Import", MessageType.Warning);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 }

Oqtane.Client/Modules/Admin/Modules/Settings.razor

@@ -1,160 +1,245 @@
-@namespace Oqtane.Modules.Admin.Modules
+@namespace Oqtane.Modules.Admin.Modules
+@using Oqtane.Interfaces
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IThemeService ThemeService
 @inject IModuleService ModuleService
 @inject IPageModuleService PageModuleService
+@inject IStringLocalizer<Settings> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Settings" Heading="Module Settings">
-        @if (_containers != null)
-        {
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label For="title" HelpText="Enter the title of the module">Title: </Label>
-                    </td>
-                    <td>
-                        <input id="title" type="text" name="Title" class="form-control" @bind="@_title" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="container" HelpText="Select the module's container">Container: </Label>
-                    </td>
-                    <td>
-                        <select id="container" class="form-control" @bind="@_containerType">
-                            <option value="">&lt;Select Container&gt;</option>
-                            @foreach (KeyValuePair<string, string> container in _containers)
-                            {
-                                <option value="@container.Key">@container.Value</option>
-                            }
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="allpages" HelpText="Indicate if this module should be displayed on all pages">Display On All Pages? </Label>
-                    </td>
-                    <td>
-                        <select id="allpages" class="form-control" @bind="@_allPages">
-                            <option value="True">Yes</option>
-                            <option value="False">No</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="page" HelpText="The page that the module is on">Page: </Label>
-                    </td>
-                    <td>
-                        <select id="page" class="form-control" @bind="@_pageId">
-                            @foreach (Page p in PageState.Pages)
-                            {
-                                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <TabStrip>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+            @if (_containers != null)
+            {
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="title" HelpText="Enter the title of the module" ResourceKey="Title">Title: </Label>
+                        <div class="col-sm-9">
+                            <input id="title" type="text" name="Title" class="form-control" @bind="@_title" required />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="container" HelpText="Select the module's container" ResourceKey="Container">Container: </Label>
+                        <div class="col-sm-9">
+                            <select id="container" class="form-select" @bind="@_containerType" required>
+                                @foreach (var container in _containers)
                                 {
-                                    <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
+                                    <option value="@container.TypeName">@container.Name</option>
                                 }
-                            }
-                        </select>
-                    </td>
-                </tr>
-            </table>
-        }
-    </TabPanel>
-    <TabPanel Name="Permissions">
-        @if (_containers != null)
-        {
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
-                    </td>
-                </tr>
-            </table>
-        }
-    </TabPanel>
-    @if (_settingsModuleType != null)
-    {
-        <TabPanel Name="ModuleSettings" Heading="@_settingstitle">
-            @DynamicComponent
+                            </select>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="allpages" HelpText="Indicate if this module should be displayed on all pages" ResourceKey="DisplayOnAllPages">Display On All Pages? </Label>
+                        <div class="col-sm-9">
+                            <select id="allpages" class="form-select" @bind="@_allPages" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="page" HelpText="The page that the module is located on" ResourceKey="Page">Page: </Label>
+                        <div class="col-sm-9">
+                            <select id="page" class="form-select" @bind="@_pageId" required>
+                                @foreach (Page p in PageState.Pages)
+                                {
+                                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+                                    {
+                                        <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
+                                    }
+                                }
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            }
         </TabPanel>
-    }
-</TabStrip>
-<button type="button" class="btn btn-success" @onclick="SaveModule">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+        <TabPanel Name="Permissions" ResourceKey="Permissions">
+            @if (_permissions != null)
+            {
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
+                    </div>
+                </div>
+
+            }
+        </TabPanel>
+        @if (_moduleSettingsType != null)
+        {
+            <TabPanel Name="ModuleSettings" Heading="@_moduleSettingsTitle" ResourceKey="ModuleSettings">
+                @ModuleSettingsComponent
+            </TabPanel>
+        }
+        @if (_containerSettingsType != null)
+        {
+            <TabPanel Name="ContainerSettings" Heading="Container Settings" ResourceKey="ContainerSettings">
+                @ContainerSettingsComponent
+            </TabPanel>
+        }
+    </TabStrip>
+    <br />
+    <button type="button" class="btn btn-success" @onclick="SaveModule">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    <br />
+    <br />
+    <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
+</form>
 
 @code {
-    private Dictionary<string, string> _containers;
-    private string _title;
-    private string _containerType;
-    private string _allPages = "false";
-    private string _permissionNames = "";
-    private string _permissions;
-    private string _pageId;
-    private PermissionGrid _permissionGrid;
-    private Type _settingsModuleType;
-    private string _settingstitle = "Other Settings";
-    private object _settings;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+	public override string Title => "Module Settings";
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
-    public override string Title => "Module Settings";
+	private ElementReference form;
+	private bool validated = false;
+	private List<Theme> _themes;
+	private List<ThemeControl> _containers = new List<ThemeControl>();
+	private string _title;
+	private string _containerType;
+	private string _allPages = "false";
+	private string _permissionNames = "";
+	private string _permissions = null;
+	private string _pageId;
+	private PermissionGrid _permissionGrid;
+	private Type _moduleSettingsType;
+	private object _moduleSettings;
+	private string _moduleSettingsTitle = "Module Settings";
+	private RenderFragment ModuleSettingsComponent { get; set; }
+	private Type _containerSettingsType;
+	private object _containerSettings;
+	private RenderFragment ContainerSettingsComponent { get; set; }
+	private string createdby;
+	private DateTime createdon;
+	private string modifiedby;
+	private DateTime modifiedon;
 
-    private RenderFragment DynamicComponent { get; set; }
+	protected override async Task OnInitializedAsync()
+	{
+		_title = ModuleState.Title;
+		_themes = await ThemeService.GetThemesAsync();
+		_containers = ThemeService.GetContainerControls(_themes, PageState.Page.ThemeType);
+		_containerType = ModuleState.ContainerType;
+		_allPages = ModuleState.AllPages.ToString();
+		_permissions = ModuleState.Permissions;
+		_pageId = ModuleState.PageId.ToString();
+		createdby = ModuleState.CreatedBy;
+		createdon = ModuleState.CreatedOn;
+		modifiedby = ModuleState.ModifiedBy;
+		modifiedon = ModuleState.ModifiedOn;
 
-    protected override async Task OnInitializedAsync()
-    {
-        _title = ModuleState.Title;
-        _containers = ThemeService.GetContainerTypes(await ThemeService.GetThemesAsync());
-        _containerType = ModuleState.ContainerType;
-        _allPages = ModuleState.AllPages.ToString();
-        _permissions = ModuleState.Permissions;
-        _permissionNames = ModuleState.ModuleDefinition.PermissionNames;
-        _pageId = ModuleState.PageId.ToString();
+		if (ModuleState.ModuleDefinition != null)
+		{
+			_permissionNames = ModuleState.ModuleDefinition?.PermissionNames;
 
-        _settingsModuleType = Type.GetType(ModuleState.ModuleType);
-        if (_settingsModuleType != null)
-        {
-            var moduleobject = Activator.CreateInstance(_settingsModuleType);
-            _settingstitle = (string)_settingsModuleType.GetProperty("Title").GetValue(moduleobject, null);
-            if (string.IsNullOrEmpty(_settingstitle))
-            {
-                _settingstitle = "Other Settings";
+			if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
+			{
+				// module settings type explicitly declared in IModule interface
+				_moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.SettingsType);
+			}
+			else
+			{
+				// legacy support - module settings type determined by convention ( ie. existence of a "Settings.razor" component in module )
+				_moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.ControlTypeTemplate.Replace(Constants.ActionToken, PageState.Action), false, true);
+			}
+			if (_moduleSettingsType != null)
+			{
+				var moduleobject = Activator.CreateInstance(_moduleSettingsType) as IModuleControl;
+				if (!string.IsNullOrEmpty(moduleobject.Title))
+				{
+					_moduleSettingsTitle = moduleobject.Title;
+				}
+
+				ModuleSettingsComponent = builder =>
+				{
+					builder.OpenComponent(0, _moduleSettingsType);
+					builder.AddComponentReferenceCapture(1, inst => { _moduleSettings = Convert.ChangeType(inst, _moduleSettingsType); });
+					builder.CloseComponent();
+				};
+			}
+		}
+		else
+		{
+			AddModuleMessage(string.Format(Localizer["Error.Module.Load"], ModuleState.ModuleDefinitionName), MessageType.Error);
+		}
+
+		var theme = _themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
+		if (theme != null && !string.IsNullOrEmpty(theme.ContainerSettingsType))
+		{
+			_containerSettingsType = Type.GetType(theme.ContainerSettingsType);
+			if (_containerSettingsType != null)
+			{
+				ContainerSettingsComponent = builder =>
+				{
+					builder.OpenComponent(0, _containerSettingsType);
+					builder.AddComponentReferenceCapture(1, inst => { _containerSettings = Convert.ChangeType(inst, _containerSettingsType); });
+					builder.CloseComponent();
+				};
+			}
+		}
+	}
+
+	private async Task SaveModule()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			if (!string.IsNullOrEmpty(_title))
+			{
+				var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
+				pagemodule.PageId = int.Parse(_pageId);
+				pagemodule.Title = _title;
+				pagemodule.ContainerType = (_containerType != "-") ? _containerType : string.Empty;
+				if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Page.DefaultContainerType)
+				{
+					pagemodule.ContainerType = string.Empty;
+				}
+				if (!string.IsNullOrEmpty(pagemodule.ContainerType) && pagemodule.ContainerType == PageState.Site.DefaultContainerType)
+				{
+					pagemodule.ContainerType = string.Empty;
+				}
+				await PageModuleService.UpdatePageModuleAsync(pagemodule);
+				await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
+
+				var module = ModuleState;
+				module.AllPages = bool.Parse(_allPages);
+				module.PageModuleId = ModuleState.PageModuleId;
+				module.Permissions = _permissionGrid.GetPermissions();
+				await ModuleService.UpdateModuleAsync(module);
+
+                if (_moduleSettingsType != null)
+                {
+                    if (_moduleSettings is ISettingsControl moduleSettingsControl)
+                    {
+                        // module settings updated using explicit interface
+                        await moduleSettingsControl.UpdateSettings();
+                    }
+                    else
+                    {
+                        // legacy support - module settings updated by convention ( ie. by calling a public method named "UpdateSettings" in settings component )
+                        _moduleSettings?.GetType().GetMethod("UpdateSettings")?.Invoke(_moduleSettings, null);
+                    }
+                }
+
+                if (_containerSettingsType != null && _containerSettings is ISettingsControl containerSettingsControl)
+                {
+                    await containerSettingsControl.UpdateSettings();
+                }
+
+                NavigationManager.NavigateTo(NavigateUrl());
             }
-
-            DynamicComponent = builder =>
+            else
             {
-                builder.OpenComponent(0, _settingsModuleType);
-                builder.AddComponentReferenceCapture(1, inst => { _settings = Convert.ChangeType(inst, _settingsModuleType); });
-                builder.CloseComponent();
-            };
-        }
-    }
-
-    private async Task SaveModule()
-    {
-        var pagemodule = await PageModuleService.GetPageModuleAsync(ModuleState.PageModuleId);
-        pagemodule.PageId = int.Parse(_pageId);
-        pagemodule.Title = _title;
-        pagemodule.ContainerType = _containerType;
-        await PageModuleService.UpdatePageModuleAsync(pagemodule);
-        await PageModuleService.UpdatePageModuleOrderAsync(pagemodule.PageId, pagemodule.Pane);
-
-        var module = ModuleState;
-        module.AllPages = bool.Parse(_allPages);
-        module.Permissions = _permissionGrid.GetPermissions();
-        await ModuleService.UpdateModuleAsync(module);
-
-        if (_settingsModuleType != null)
-        {
-            var moduleType = Type.GetType(ModuleState.ModuleType);
-            if (moduleType != null)
-            {
-                moduleType.GetMethod("UpdateSettings")?.Invoke(_settings, null); // method must be public in settings component
+                AddModuleMessage(Localizer["Message.Required.Title"], MessageType.Warning);
             }
         }
-
-        NavigationManager.NavigateTo(NavigateUrl());
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
     }
 
 }

Oqtane.Client/Modules/Admin/Pages/Add.razor

@@ -1,388 +1,427 @@
-@namespace Oqtane.Modules.Admin.Pages
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
 @inject IThemeService  ThemeService
+@inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Settings">
-        @if (_themeList != null)
-        {
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <Label For="Name" HelpText="Enter the page name">Name: </Label>
-                    </td>
-                    <td>
-                        <input id="Name" class="form-control" @bind="@_name" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="Parent" HelpText="Select the parent for the page in the site hierarchy">Parent: </Label>
-                    </td>
-                    <td>
-                        <select id="Parent" class="form-control" @onchange="(e => ParentChanged(e))">
-                            <option value="-1">&lt;Site Root&gt;</option>
-                            @foreach (Page page in _pageList)
+
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <TabStrip Refresh="@_refresh">
+        <TabPanel Name="Settings" ResourceKey="Settings">
+            @if (_themeList != null)
+            {
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="name" HelpText="Enter the page name" ResourceKey="Name">Name: </Label>
+                        <div class="col-sm-9">
+                            <input id="name" class="form-control" @bind="@_name" required />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="parent" HelpText="Select the parent for the page in the site hierarchy" ResourceKey="Parent">Parent: </Label>
+                        <div class="col-sm-9">
+                            <select id="parent" class="form-select" @onchange="(e => ParentChanged(e))" required>
+                                <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
+                                @foreach (Page page in PageState.Pages)
+                                {
+                                    <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages" ResourceKey="Insert">Insert: </Label>
+                        <div class="col-sm-9">
+                            <select id="insert" class="form-select" @bind="@_insert" required>
+                                <option value="<<">@Localizer["AtBeginning"]</option>
+                                @if (_children != null && _children.Count > 0)
+                                {
+                                    <option value="<">@Localizer["Before"]</option>
+                                    <option value=">">@Localizer["After"]</option>
+                                }
+                                <option value=">>">@Localizer["AtEnd"]</option>
+                            </select>
+                            @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
                             {
-                                <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
+                                <select class="form-select" @bind="@_childid">
+                                    <option value="-1">&lt;@Localizer["Page.Select"]&gt;</option>
+                                    @foreach (Page page in _children)
+                                    {
+                                        <option value="@(page.PageId)">@(page.Name)</option>
+                                    }
+                                </select>
                             }
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="Insert" HelpText="Select the location where you would like the page to be inserted in relation to other pages">Insert: </Label>
-                    </td>
-                    <td>
-                        <select id="Insert" class="form-control" @bind="@_insert">
-                            <option value="<<">At Beginning</option>
-                            @if (_children != null && _children.Count > 0)
-                            {
-                                <option value="<">Before</option>
-                                <option value=">">After</option>
-                            }
-                            <option value=">>">At End</option>
-                        </select>
-                        @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
-                        {
-                            <select class="form-control" @bind="@_childid">
-                                <option value="-1">&lt;Select Page&gt;</option>
-                                @foreach (Page page in _children)
-                                {
-                                    <option value="@(page.PageId)">@(page.Name)</option>
-                                }
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="navigation" HelpText="Select whether the page is part of the site navigation or hidden" ResourceKey="Navigation">Navigation? </Label>
+                        <div class="col-sm-9">
+                            <select id="navigation" class="form-select" @bind="@_isnavigation" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
                             </select>
-                        }
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="Navigation" HelpText="Select whether the page is part of the site navigation or hidden">Navigation? </Label>
-                    </td>
-                    <td>
-                        <select id="Navigation" class="form-control" @bind="@_isnavigation">
-                            <option value="True">Yes</option>
-                            <option value="False">No</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="Path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used.">Url Path: </Label>
-                    </td>
-                    <td>
-                        <input id="Path" class="form-control" @bind="@_path" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <Label For="Url" HelpText="Optionally enter a url which this page should redirect to when a user navigates to it">Redirect: </Label>
-                    </td>
-                    <td>
-                        <input id="Url" class="form-control" @bind="@_url" />
-                    </td>
-                </tr>
-            </table>
-            <Section Name="Appearance">
-                <table class="table table-borderless">
-                    <tr>
-                        <td>
-                            <Label For="Title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used.">Title: </Label>
-                        </td>
-                        <td>
-                            <input id="Title" class="form-control" @bind="@_title" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="Theme" HelpText="Select the theme for this page">Theme: </Label>
-                        </td>
-                        <td>
-                            <select id="Theme" class="form-control" @onchange="(e => ThemeChanged(e))">
-                                <option value="-">&lt;Select Theme&gt;</option>
-                                @foreach (KeyValuePair<string, string> item in _themes)
-                                {
-                                    if (item.Key == _themetype)
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="clickable" HelpText="Select whether the link in the site navigation is enabled or disabled" ResourceKey="Clickable">Clickable? </Label>
+                        <div class="col-sm-9">
+                            <select id="clickable" class="form-select" @bind="@_isclickable" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="path" HelpText="Optionally enter a url path for this page (ie. home ). If you do not provide a url path, the page name will be used. If the page is intended to be the root path specify '/'." ResourceKey="UrlPath">Url Path: </Label>
+                        <div class="col-sm-9">
+                            <input id="path" class="form-control" @bind="@_path" />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="url" HelpText="Optionally enter a url which this page should redirect to when a user navigates to it" ResourceKey="Redirect">Redirect: </Label>
+                        <div class="col-sm-9">
+                            <input id="url" class="form-control" @bind="@_url" />
+                        </div>
+                    </div>
+                </div>
+
+                <Section Name="Appearance" ResourceKey="Appearance">
+                    <div class="container">
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="title" HelpText="Optionally enter the page title. If you do not provide a page title, the page name will be used." ResourceKey="Title">Title: </Label>
+                            <div class="col-sm-9">
+                                <input id="title" class="form-control" @bind="@_title" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="meta" HelpText="Optionally enter meta tags (in exactly the form you want them to be included in the page output)." ResourceKey="Meta">Meta: </Label>
+                            <div class="col-sm-9">
+								<textarea id="meta" class="form-control" @bind="@_meta" rows="3"></textarea>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="theme" HelpText="Select the theme for this page" ResourceKey="Theme">Theme: </Label>
+                            <div class="col-sm-9">
+                                <select id="theme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
+                                    @foreach (var theme in _themes)
                                     {
-                                        <option value="@item.Key" selected>@item.Value</option>
+                                        <option value="@theme.TypeName">@theme.Name</option>
                                     }
-                                    else
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="container" HelpText="Select the default container for the page" ResourceKey="DefaultContainer">Default Container: </Label>
+                            <div class="col-sm-9">
+                                <select id="container" class="form-select" @bind="@_containertype" required>
+                                    <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
+                                    @foreach (var container in _containers)
                                     {
-                                        <option value="@item.Key">@item.Value</option>
+                                        <option value="@container.TypeName">@container.Name</option>
                                     }
-                                }
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="Layout" HelpText="Select a layout for the page (if the selected theme supports it)">Layout: </Label>
-                        </td>
-                        <td>
-                            <select id="Layout" class="form-control" @bind="@_layouttype">
-                                <option value="-">&lt;Select Layout&gt;</option>
-                                @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
-                                {
-                                    if (panelayout.Key == _layouttype)
-                                    {
-                                        <option value="@panelayout.Key" selected>@panelayout.Value</option>
-                                    }
-                                    else
-                                    {
-                                        <option value="@panelayout.Key">@panelayout.Value</option>
-                                    }
-                                }
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="Icon" HelpText="Optionally provide an icon for this page which will be displayed in the site navigation">Icon: </Label>
-                        </td>
-                        <td>
-                            <input id="Icon" class="form-control" @bind="@_icon" />
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="Default-Mode" HelpText="Select the default administration mode you want for this page">Default Mode? </Label>
-                        </td>
-                        <td>
-                            <select id="Default-Mode" class="form-control" @bind="@_mode">
-                                <option value="view">View Mode</option>
-                                <option value="edit">Edit Mode</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td>
-                            <Label For="Personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content">Personalizable? </Label>
-                        </td>
-                        <td>
-                            <select id="Personalizable" class="form-control" @bind="@_ispersonalizable">
-                                <option value="True">Yes</option>
-                                <option value="False">No</option>
-                            </select>
-                        </td>
-                    </tr>
-                </table>
-            </Section>
-        }
-    </TabPanel>
-    <TabPanel Name="Permissions">
-        <table class="table table-borderless">
-            <tr>
-                <td>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="icon" HelpText="Optionally provide an icon class name for this page which will be displayed in the site navigation" ResourceKey="Icon">Icon: </Label>
+                            <div class="col-sm-9">
+                                <input id="icon" class="form-control" @bind="@_icon" />
+                            </div>
+                        </div>
+                        <div class="row mb-1 align-items-center">
+                            <Label Class="col-sm-3" For="personalizable" HelpText="Select whether you would like users to be able to personalize this page with their own content" ResourceKey="Personalizable">Personalizable? </Label>
+                            <div class="col-sm-9">
+                                <select id="personalizable" class="form-select" @bind="@_ispersonalizable" required>
+                                    <option value="True">@SharedLocalizer["Yes"]</option>
+                                    <option value="False">@SharedLocalizer["No"]</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </Section>
+            }
+        </TabPanel>
+        <TabPanel Name="Permissions" ResourceKey="Permissions">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
                     <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
-                </td>
-            </tr>
-        </table>
-    </TabPanel>
-</TabStrip>
-<button type="button" class="btn btn-success" @onclick="SavePage">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+                </div>
+            </div>
+        </TabPanel>
+        @if (_themeSettingsType != null)
+        {
+            <TabPanel Name="ThemeSettings" Heading="Theme Settings" ResourceKey="ThemeSettings">
+                @ThemeSettingsComponent
+            </TabPanel>
+        }
+    </TabStrip>
+    <button type="button" class="btn btn-success" @onclick="SavePage">@SharedLocalizer["Save"]</button>
+    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+</form>
 
 @code {
-    private Dictionary<string, string> _themes;
-    private Dictionary<string, string> _panelayouts;
-    private List<Theme> _themeList;
-    private List<Page> _pageList;
-    private string _name;
-    private string _title;
-    private string _path = string.Empty;
-    private string _parentid;
-    private string _insert = ">>";
-    private List<Page> _children;
-    private int _childid = -1;
-    private string _isnavigation = "True";
-    private string _url;
-    private string _ispersonalizable = "False";
-    private string _mode = "view";
-    private string _themetype = "-";
-    private string _layouttype = "-";
-    private string _icon = string.Empty;
-    private string _permissions = string.Empty;
-    private PermissionGrid _permissionGrid;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	private List<Theme> _themeList;
+	private List<ThemeControl> _themes = new List<ThemeControl>();
+	private List<ThemeControl> _containers = new List<ThemeControl>();
+	private string _name;
+	private string _title;
+	private string _meta;
+	private string _path = string.Empty;
+	private string _parentid = "-1";
+	private string _insert = ">>";
+	private List<Page> _children;
+	private int _childid = -1;
+	private string _isnavigation = "True";
+	private string _isclickable = "True";
+	private string _url;
+	private string _ispersonalizable = "False";
+	private string _themetype = string.Empty;
+	private string _containertype = string.Empty;
+	private string _icon = string.Empty;
+	private string _permissions = string.Empty;
+	private PermissionGrid _permissionGrid;
+	private Type _themeSettingsType;
+	private object _themeSettings;
+	private RenderFragment ThemeSettingsComponent { get; set; }
+	private bool _refresh = false;
+	private ElementReference form;
+	private bool validated = false;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _themeList = await ThemeService.GetThemesAsync();
-            _pageList = PageState.Pages;
-            _children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_themeList = await ThemeService.GetThemesAsync();
+			_themes = ThemeService.GetThemeControls(_themeList);
+			_themetype = PageState.Site.DefaultThemeType;
+			_containers = ThemeService.GetContainerControls(_themeList, _themetype);
+			_containertype = PageState.Site.DefaultContainerType;
+			_children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+			_permissions = string.Empty;
+			ThemeSettings();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Page.Initialize"], MessageType.Error);
+		}
+	}
 
-            _themetype = PageState.Site.DefaultThemeType;
-            _layouttype = PageState.Site.DefaultLayoutType;
+	private async void ParentChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_parentid = (string)e.Value;
+			_children = new List<Page>();
+			if (_parentid == "-1")
+			{
+				foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
+				{
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					{
+						_children.Add(p);
+					}
+				}
+			}
+			else
+			{
+				foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
+				{
+					if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+					{
+						_children.Add(p);
+					}
+				}
+			}
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
+			AddModuleMessage(Localizer["Error.ChildPage.Load"], MessageType.Error);
+		}
+	}
 
-            _themes = ThemeService.GetThemeTypes(_themeList);
-            _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
+	private async void ThemeChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_themetype = (string)e.Value;
+			_containers = ThemeService.GetContainerControls(_themeList, _themetype);
+			_containertype = "-";
+			ThemeSettings();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
+			AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
+		}
+	}
 
-            _permissions = string.Empty;
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message);
-            AddModuleMessage("Error Initializing Page", MessageType.Error);
-        }
-    }
+	private void ThemeSettings()
+	{
+		_themeSettingsType = null;
+		var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
+		if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
+		{
+			_themeSettingsType = Type.GetType(theme.ThemeSettingsType);
+			if (_themeSettingsType != null)
+			{
+				ThemeSettingsComponent = builder =>
+				{
+					builder.OpenComponent(0, _themeSettingsType);
+					builder.AddComponentReferenceCapture(1, inst => { _themeSettings = Convert.ChangeType(inst, _themeSettingsType); });
+					builder.CloseComponent();
+				};
+			}
+			_refresh = true;
+		}
+	}
 
-    private async void ParentChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _parentid = (string)e.Value;
-            _children = new List<Page>();
-            if (_parentid == "-1")
-            {
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == null))
-                {
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+	private async Task SavePage()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			Page page = null;
+			try
+			{
+				if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
+				{
+					page = new Page();
+					page.SiteId = PageState.Page.SiteId;
+					page.Name = _name;
+					page.Title = _title;
+
+					if (string.IsNullOrEmpty(_path))
+					{
+						_path = _name;
+					}
+					if (_path.Contains("/"))
+					{
+						if (_path.EndsWith("/") && _path != "/")
+						{
+							_path = _path.Substring(0, _path.Length - 1);
+						}
+						_path = _path.Substring(_path.LastIndexOf("/") + 1);
+					}
+
+					if (_parentid == "-1")
+					{
+						page.ParentId = null;
+						page.Path = Utilities.GetFriendlyUrl(_path);
+					}
+					else
+					{
+						page.ParentId = Int32.Parse(_parentid);
+						var parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault();
+						if (parent.Path == string.Empty)
+						{
+							page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
+						}
+						else
+						{
+							page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
+						}
+					}
+
+					var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+					if (_pages.Any(item => item.Path == page.Path))
+					{
+						AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
+						return;
+					}
+
+					if (page.ParentId == null && Constants.ReservedRoutes.Contains(page.Name.ToLower()))
+					{
+						AddModuleMessage(string.Format(Localizer["Message.Page.Reserved"], page.Name), MessageType.Warning);
+						return;
+					}
+
+					Page child;
+					switch (_insert)
+					{
+						case "<<":
+							page.Order = 0;
+							break;
+						case "<":
+							child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
+							page.Order = child.Order - 1;
+							break;
+						case ">":
+							child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
+							page.Order = child.Order + 1;
+							break;
+						case ">>":
+							page.Order = int.MaxValue;
+							break;
+					}
+
+					page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
+					page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
+					page.Url = _url;
+					page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
+					if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
+					{
+						page.ThemeType = string.Empty;
+					}
+					page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
+					if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
+					{
+						page.DefaultContainerType = string.Empty;
+					}
+					page.Icon = (_icon == null ? string.Empty : _icon);
+					page.Permissions = _permissionGrid.GetPermissions();
+					page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
+					page.UserId = null;
+					page.Meta = _meta;
+
+                    page = await PageService.AddPageAsync(page);
+                    await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);
+
+                    await logger.LogInformation("Page Added {Page}", page);
+                    if (PageState.QueryString.ContainsKey("cp"))
                     {
-                        _children.Add(p);
-                    }
-                }
-            }
-            else
-            {
-                foreach (Page p in PageState.Pages.Where(item => item.ParentId == int.Parse(_parentid)))
-                {
-                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                    {
-                        _children.Add(p);
-                    }
-                }
-            }
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Child Pages For Parent {PageId} {Error}", _parentid, ex.Message);
-            AddModuleMessage("Error Loading Child Pages For Parent", MessageType.Error);
-        }
-    }
-
-    private async void ThemeChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _themetype = (string)e.Value;
-            if (_themetype != "-")
-            {
-                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
-            }
-            else
-            {
-                _panelayouts = new Dictionary<string, string>();
-            }
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error);
-        }
-    }
-
-    private async Task SavePage()
-    {
-        Page page = null;
-        try
-        {
-            if (_name != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)))
-            {
-                page = new Page();
-                page.SiteId = PageState.Page.SiteId;
-                page.Name = _name;
-                page.Title = _title;
-                if (_path == "")
-                {
-                    _path = _name;
-                }
-
-                if (_path.Contains("/"))
-                {
-                    _path = _path.Substring(_path.LastIndexOf("/") + 1);
-                }
-
-                if (string.IsNullOrEmpty(_parentid))
-                {
-                    page.ParentId = null;
-                    page.Path = Utilities.GetFriendlyUrl(_path);
-                }
-                else
-                {
-                    page.ParentId = Int32.Parse(_parentid);
-                    var parent = PageState.Pages.Where(item => item.PageId == page.ParentId).FirstOrDefault();
-                    if (parent.Path == string.Empty)
-                    {
-                        page.Path = Utilities.GetFriendlyUrl(parent.Name) + "/" + Utilities.GetFriendlyUrl(_path);
+                        NavigationManager.NavigateTo(NavigateUrl(PageState.Pages.First(item => item.PageId == int.Parse(PageState.QueryString["cp"])).Path));
                     }
                     else
                     {
-                        page.Path = parent.Path + "/" + Utilities.GetFriendlyUrl(_path);
+                        NavigationManager.NavigateTo(NavigateUrl(page.Path));
                     }
                 }
-
-                Page child;
-                switch (_insert)
+                else
                 {
-                    case "<<":
-                        page.Order = 0;
-                        break;
-                    case "<":
-                        child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
-                        page.Order = child.Order - 1;
-                        break;
-                    case ">":
-                        child = PageState.Pages.Where(item => item.PageId == _childid).FirstOrDefault();
-                        page.Order = child.Order + 1;
-                        break;
-                    case ">>":
-                        page.Order = int.MaxValue;
-                        break;
+                    AddModuleMessage(Localizer["Message.Required.PageInfo"], MessageType.Warning);
                 }
 
-                page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
-                page.Url = _url;
-                page.EditMode = (_mode == "edit" ? true : false);
-                page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
-                page.LayoutType = (_layouttype != "-") ? _layouttype : string.Empty;
-                if (page.ThemeType == PageState.Site.DefaultThemeType)
-                {
-                    page.ThemeType = string.Empty;
-                }
-
-                if (page.LayoutType == PageState.Site.DefaultLayoutType)
-                {
-                    page.LayoutType = string.Empty;
-                }
-                page.Icon = (_icon == null ? string.Empty : _icon);
-                page.Permissions = _permissionGrid.GetPermissions();
-                page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
-                page.UserId = null;
-
-                page = await PageService.AddPageAsync(page);
-                await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);
-
-                await logger.LogInformation("Page Added {Page}", page);
-                NavigationManager.NavigateTo(NavigateUrl(page.Path));
             }
-            else
+            catch (Exception ex)
             {
-                AddModuleMessage("You Must Provide Page Name And Theme", MessageType.Warning);
+                await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message);
+                AddModuleMessage(Localizer["Error.Page.Save"], MessageType.Error);
             }
-
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Saving Page {Page} {Error}", page, ex.Message);
-            AddModuleMessage("Error Saving Page", MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
+    private void Cancel()
+    {
+        if (PageState.QueryString.ContainsKey("cp"))
+        {
+            NavigationManager.NavigateTo(NavigateUrl(PageState.Pages.First(item => item.PageId == int.Parse(PageState.QueryString["cp"])).Path));
+        }
+        else
+        {
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+    }
 }

Oqtane.Client/Modules/Admin/Pages/Index.razor

@@ -1,21 +1,25 @@
-@namespace Oqtane.Modules.Admin.Pages
+@namespace Oqtane.Modules.Admin.Pages
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (PageState.Pages != null)
 {
-    <ActionLink Action="Add" Text="Add Page" />
+    <ActionLink Action="Add" Text="Add Page" ResourceKey="AddPage" />
 
     <Pager Items="@PageState.Pages.Where(item => !item.IsDeleted)">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>Name</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th style="width: 1px;">&nbsp;</th>
+        <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.PageId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Page" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Page?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.PageId.ToString())" ResourceKey="EditPage" /></td>
+            <td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
+            <td><button type="button" class="btn btn-secondary" @onclick="@(async () => NavigationManager.NavigateTo(Browse(context)))">@Localizer["Browse"]</button></td>
             <td>@(new string('-', context.Level * 2))@(context.Name)</td>
         </Row>
     </Pager>
@@ -29,7 +33,7 @@
         try
         {
             page.IsDeleted = true;
-            
+
             await PageService.UpdatePageAsync(page);
             await logger.LogInformation("Page Deleted {Page}", page);
             NavigationManager.NavigateTo(NavigateUrl("admin/pages"));
@@ -37,7 +41,11 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Page {Page} {Error}", page, ex.Message);
-            AddModuleMessage("Error Deleting Page", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Page.Delete"], MessageType.Error);
         }
     }
+    protected string Browse(Page page)
+    {
+        return string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url;
+    }
 }

Oqtane.Client/Modules/Admin/Profiles/Edit.razor

@@ -1,93 +1,94 @@
-@namespace Oqtane.Modules.Admin.Profiles
+@namespace Oqtane.Modules.Admin.Profiles
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IProfileService ProfileService
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label For="name" HelpText="The name of this field">Name: </Label>
-            </td>
-            <td>
-                <input id="name" class="form-control" @bind="@_name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="title" HelpText="The title of the field">Title: </Label>
-            </td>
-            <td>
-                <input id="title" class="form-control" @bind="@_title" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="description" HelpText="What the profile field is">Description: </Label>
-            </td>
-            <td>
-                <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="category" HelpText="What larger category does this field belong to">Category: </Label>
-            </td>
-            <td>
-                <input id="category" class="form-control" @bind="@_category" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="order" HelpText="What place is this field in a larger category list">Order: </Label>
-            </td>
-            <td>
-                <input id="order" class="form-control" @bind="@_vieworder" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="length" HelpText="What is the max amount of characters should this field accept">Length: </Label>
-            </td>
-            <td>
-                <input id="length" class="form-control" @bind="@_maxlength" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="defaultVal" HelpText="What value do you want this field to start with">Default Value: </Label>
-            </td>
-            <td>
-                <input id="defaultVal" class="form-control" @bind="@_defaultvalue" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="required" HelpText="Is a user required to input something into this field?">Required? </Label>
-            </td>
-            <td>
-                <select id="required" class="form-control" @bind="@_isrequired">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="name" HelpText="The name of this profile item" ResourceKey="Name">Name: </Label>
+            <div class="col-sm-9">
+                <input id="name" class="form-control" @bind="@_name" maxlength="50" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="title" HelpText="The title of the profile item to display to the user" ResourceKey="Title">Title: </Label>
+            <div class="col-sm-9">
+                <input id="title" class="form-control" @bind="@_title" maxlength="50" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="description" HelpText="The help text displayed to the user for this profile item" ResourceKey="Description">Description: </Label>
+            <div class="col-sm-9">
+                <textarea id="description" class="form-control" @bind="@_description" rows="5" maxlength="256" required ></textarea>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="category" HelpText="The category of this profile item (for grouping)" ResourceKey="Category">Category: </Label>
+            <div class="col-sm-9">
+                <input id="category" class="form-control" @bind="@_category" maxlength="50" />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="order" HelpText="The index order of where this profile item should be displayed" ResourceKey="Order">Order: </Label>
+            <div class="col-sm-9">
+                <input id="order" class="form-control" @bind="@_vieworder" maxlength="4" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="length" HelpText="The max number of characters this profile item should accept (enter zero for unlimited)" ResourceKey="Length">Length: </Label>
+            <div class="col-sm-9">
+                <input id="length" class="form-control" @bind="@_maxlength" maxlength="4" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="defaultVal" HelpText="The default value for this profile item" ResourceKey="DefaultValue">Default Value: </Label>
+            <div class="col-sm-9">
+                <input id="defaultVal" class="form-control" @bind="@_defaultvalue" maxlength="2000"/>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="options" HelpText="A comma delimited list of options the user can select from" ResourceKey="Options">Options: </Label>
+            <div class="col-sm-9">
+                <input id="options" class="form-control" @bind="@_options" maxlength="2000" />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="required" HelpText="Should a user be required to provide a value for this profile item?" ResourceKey="Required">Required? </Label>
+            <div class="col-sm-9">
+                <select id="required" class="form-select" @bind="@_isrequired" required>
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
                 </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="private" HelpText="Is this field private?">Private? </Label>
-            </td>
-            <td>
-                <select id="private" class="form-control" @bind="@_isprivate">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="private" HelpText="Should this profile item be visible to all users?" ResourceKey="Private">Private? </Label>
+            <div class="col-sm-9">
+                <select id="private" class="form-select" @bind="@_isprivate" required>
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
                 </select>
-            </td>
-        </tr>
-    </table>
-<button type="button" class="btn btn-success" @onclick="SaveProfile">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+            </div>
+        </div>
+    </div>
+    <br />
+    <button type="button" class="btn btn-success" @onclick="SaveProfile">@SharedLocalizer["Save"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    @if (PageState.QueryString.ContainsKey("id"))
+    {
+        <br />
+        <br />
+        <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon"></AuditInfo>
+    }
+</form>
 
 @code {
     private int _profileid = -1;
+    private ElementReference form;
+    private bool validated = false;
     private string _name = string.Empty;
     private string _title = string.Empty;
     private string _description = string.Empty;
@@ -95,8 +96,13 @@
     private string _vieworder = "0";
     private string _maxlength = "0";
     private string _defaultvalue = string.Empty;
+    private string _options = string.Empty;
     private string _isrequired = "False";
     private string _isprivate = "False";
+    private string createdby;
+    private DateTime createdon;
+    private string modifiedby;
+    private DateTime modifiedon;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -119,56 +125,73 @@
                     _vieworder = profile.ViewOrder.ToString();
                     _maxlength = profile.MaxLength.ToString();
                     _defaultvalue = profile.DefaultValue;
+                    _options = profile.Options;
                     _isrequired = profile.IsRequired.ToString();
                     _isprivate = profile.IsPrivate.ToString();
+                    createdby = profile.CreatedBy;
+                    createdon = profile.CreatedOn;
+                    modifiedby = profile.ModifiedBy;
+                    modifiedon = profile.ModifiedOn;
                 }
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Profile {ProfileId} {Error}", _profileid, ex.Message);
-            AddModuleMessage("Error Loading Profile", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Profile.Load"], MessageType.Error);
         }
     }
 
     private async Task SaveProfile()
     {
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            Profile profile;
-            if (_profileid != -1)
+            try
             {
-                profile = await ProfileService.GetProfileAsync(_profileid);
-            }
-            else
-            {
-                profile = new Profile();
-            }
+                Profile profile;
+                if (_profileid != -1)
+                {
+                    profile = await ProfileService.GetProfileAsync(_profileid);
+                }
+                else
+                {
+                    profile = new Profile();
+                }
 
-            profile.Name = _name;
-            profile.Title = _title;
-            profile.Description = _description;
-            profile.Category = _category;
-            profile.ViewOrder = int.Parse(_vieworder);
-            profile.MaxLength = int.Parse(_maxlength);
-            profile.DefaultValue = _defaultvalue;
-            profile.IsRequired = (_isrequired == null ? false : Boolean.Parse(_isrequired));
-            profile.IsPrivate = (_isprivate == null ? false : Boolean.Parse(_isprivate));
-            if (_profileid != -1)
-            {
-                profile = await ProfileService.UpdateProfileAsync(profile);
-            }else
-            {
-                profile = await ProfileService.AddProfileAsync(profile);
-            }
+                profile.SiteId = PageState.Site.SiteId;
+                profile.Name = _name;
+                profile.Title = _title;
+                profile.Description = _description;
+                profile.Category = _category;
+                profile.ViewOrder = int.Parse(_vieworder);
+                profile.MaxLength = int.Parse(_maxlength);
+                profile.DefaultValue = _defaultvalue;
+                profile.Options = _options;
+                profile.IsRequired = (_isrequired == null ? false : Boolean.Parse(_isrequired));
+                profile.IsPrivate = (_isprivate == null ? false : Boolean.Parse(_isprivate));
+                if (_profileid != -1)
+                {
+                    profile = await ProfileService.UpdateProfileAsync(profile);
+                }
+                else
+                {
+                    profile = await ProfileService.AddProfileAsync(profile);
+                }
 
-            await logger.LogInformation("Profile Saved {Profile}", profile);
-            NavigationManager.NavigateTo(NavigateUrl());
+                await logger.LogInformation("Profile Saved {Profile}", profile);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Profile {ProfleId} {Error}", _profileid, ex.Message);
+                AddModuleMessage(Localizer["Error.Profile.Save"], MessageType.Error);
+            }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Saving Profile {ProfleId} {Error}", _profileid, ex.Message);
-            AddModuleMessage("Error Saving Profile", MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 }

Oqtane.Client/Modules/Admin/Profiles/Index.razor

@@ -1,24 +1,26 @@
-@namespace Oqtane.Modules.Admin.Profiles
+@namespace Oqtane.Modules.Admin.Profiles
 @inherits ModuleBase
 @inject IProfileService ProfileService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_profiles == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
-    <ActionLink Action="Add" Security="SecurityAccessLevel.Admin" Text="Add Profile" />
+    <ActionLink Action="Add" Security="SecurityAccessLevel.Admin" Text="Add Profile" ResourceKey="AddProfile" />
 
     <Pager Items="@_profiles">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>Name</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Profile" Message="@("Are You Sure You Wish To Delete " + context.Name + "?")" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" ResourceKey="EditProfile" /></td>
+            <td><ActionDialog Header="Delete Profile" Message="@string.Format(Localizer["Confirm.Profile.Delete"], context.Name)" Action="Delete" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
@@ -29,9 +31,9 @@ else
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnParametersSetAsync()
     {
-        _profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+        await GetProfilesAsync();
     }
 
     private async Task DeleteProfile(int profileId)
@@ -40,12 +42,22 @@ else
         {
             await ProfileService.DeleteProfileAsync(profileId);
             await logger.LogInformation("Profile Deleted {ProfileId}", profileId);
-            AddModuleMessage("Profile Deleted", MessageType.Success);
+
+            AddModuleMessage(Localizer["Success.Profile.Delete"], MessageType.Success);
+
+            await GetProfilesAsync();
+
+            StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Profile {ProfileId} {Error}", profileId, ex.Message);
-            AddModuleMessage("Error Deleting Profile", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Profile.Delete"], MessageType.Error);
         }
     }
+
+    private async Task GetProfilesAsync()
+    {
+        _profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+    }
 }

Oqtane.Client/Modules/Admin/RecycleBin/Index.razor

@@ -1,70 +1,83 @@
-@namespace Oqtane.Modules.Admin.RecycleBin
+@namespace Oqtane.Modules.Admin.RecycleBin
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageModuleService PageModuleService
 @inject IModuleService ModuleService
 @inject IPageService PageService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Pages">
-        @if (_pages == null)
-        {
-            <br />
-            <p>No Deleted Pages</p>
-        }
-        else
-        {
-            <Pager Items="@_pages">
-                <Header>
-                    <th>&nbsp;</th>
-                    <th>&nbsp;</th>
-                    <th>Name</th>
-                    <th>Deleted By</th>
-                    <th>Deleted On</th>
-                </Header>
-                <Row>
-                    <td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></td>
-                    <td><ActionDialog Header="Delete Page" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Name + " Page?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" /></td>
-                    <td>@context.Name</td>
-                    <td>@context.DeletedBy</td>
-                    <td>@context.DeletedOn</td>
-                </Row>
-            </Pager>
-        }
-    </TabPanel>
-    <TabPanel Name="Modules">
-        @if (_modules == null)
-        {
-            <br />
-            <p>No Deleted Modules</p>
-        }
-        else
-        {
-            <Pager Items="@_modules">
-                <Header>
-                    <th>&nbsp;</th>
-                    <th>&nbsp;</th>
-                    <th>Page</th>
-                    <th>Module</th>
-                    <th>Deleted By</th>
-                    <th>Deleted On</th>
-                </Header>
-                <Row>
-                    <td><button @onclick="@(() => RestoreModule(context))" class="btn btn-info" title="Restore">Restore</button></td>
-                    <td><ActionDialog Header="Delete Module" Message="@("Are You Sure You Wish To Permanently Delete The " + context.Title + " Module?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" /></td>
-                    <td>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
-                    <td>@context.Title</td>
-                    <td>@context.DeletedBy</td>
-                    <td>@context.DeletedOn</td>
-                </Row>
-            </Pager>
-        }
-    </TabPanel>
-</TabStrip>
+@if (_pages == null || _modules == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+	<TabStrip>
+		<TabPanel Name="Pages" ResourceKey="Pages">
+			@if (!_pages.Where(item => item.IsDeleted).Any())
+			{
+				<br />
+				<p>@Localizer["NoPage.Deleted"]</p>
+			}
+			else
+			{
+				<Pager Items="@_pages.Where(item => item.IsDeleted)">
+					<Header>
+						<th style="width: 1px;">&nbsp;</th>
+						<th style="width: 1px;">&nbsp;</th>
+						<th>@SharedLocalizer["Name"]</th>
+						<th>@Localizer["DeletedBy"]</th>
+						<th>@Localizer["DeletedOn"]</th>
+					</Header>
+					<Row>
+						<td><button type="button" @onclick="@(() => RestorePage(context))" class="btn btn-success" title="Restore">Restore</button></td>
+						<td><ActionDialog Header="Delete Page" Message="@string.Format(Localizer["Confirm.Page.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeletePage(context))" ResourceKey="DeletePage" /></td>
+						<td>@context.Name</td>
+						<td>@context.DeletedBy</td>
+						<td>@context.DeletedOn</td>
+					</Row>
+				</Pager>
+				<br />
+				<ActionDialog Header="Remove All Deleted Pages" Message="Are You Sure You Wish To Permanently Remove All Deleted Pages?" Action="Remove All Deleted Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
+			}
+		</TabPanel>
+		<TabPanel Name="Modules" ResourceKey="Modules">
+			@if (!_modules.Where(item => item.IsDeleted).Any())
+			{
+				<br />
+				<p>@Localizer["NoModule.Deleted"]</p>
+			}
+			else
+			{
+				<Pager Items="@_modules.Where(item => item.IsDeleted)">
+					<Header>
+						<th style="width: 1px;">&nbsp;</th>
+						<th style="width: 1px;">&nbsp;</th>
+						<th>@Localizer["Page"]</th>
+						<th>@Localizer["Module"]</th>
+						<th>@Localizer["DeletedBy"]</th>
+						<th>@Localizer["DeletedOn"]</th>
+					</Header>
+					<Row>
+						<td><button type="button" @onclick="@(() => RestoreModule(context))" class="btn btn-success" title="Restore">@Localizer["Restore"]</button></td>
+						<td><ActionDialog Header="Delete Module" Message="@string.Format(Localizer["Confirm.Module.Delete"], context.Title)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
+						<td>@_pages.Find(item => item.PageId == context.PageId).Name</td>
+						<td>@context.Title</td>
+						<td>@context.DeletedBy</td>
+						<td>@context.DeletedOn</td>
+					</Row>
+				</Pager>
+				<br />
+				<ActionDialog Header="Remove All Deleted Modules" Message="Are You Sure You Wish To Permanently Remove All Deleted Modules?" Action="Remove All Deleted Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
+			}
+		</TabPanel>
+	</TabStrip>
+}
 
 @code {
-    private List<Page> _pages;
-    private List<Module> _modules;
+	private List<Page> _pages;
+	private List<Module> _modules;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -77,17 +90,14 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Deleted Pages Or Modules {Error}", ex.Message);
-            AddModuleMessage("Error Loading Deleted Pages Or Modules", MessageType.Error);
+            AddModuleMessage(Localizer["Error.DeletedModulePage.Load"], MessageType.Error);
         }
     }
 
     private async Task Load()
     {
         _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
-        _pages = _pages.Where(item => item.IsDeleted).ToList();
-
         _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
-        _modules = _modules.Where(item => item.IsDeleted).ToList();
     }
 
     private async Task RestorePage(Page page)
@@ -104,7 +114,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Restoring Deleted Page {Page} {Error}", page, ex.Message);
-            AddModuleMessage("Error Restoring Deleted Page", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Page.Restore"], MessageType.Error);
         }
     }
 
@@ -125,6 +135,31 @@
         }
     }
 
+    private async Task DeleteAllPages()
+    {
+        try
+        {
+            ModuleInstance.ShowProgressIndicator();
+			foreach (Page page in _pages.Where(item => item.IsDeleted))
+            {
+                await PageService.DeletePageAsync(page.PageId);
+                await logger.LogInformation("Page Permanently Deleted {Page}", page);
+            }
+
+            await logger.LogInformation("Pages Permanently Deleted");
+            await Load();
+            ModuleInstance.HideProgressIndicator();
+            StateHasChanged();
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Permanently Deleting Pages {Error}", ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+            ModuleInstance.HideProgressIndicator();
+        }
+    }
+
     private async Task RestoreModule(Module module)
     {
         try
@@ -139,7 +174,7 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Restoring Deleted Module {Module} {Error}", module, ex.Message);
-            AddModuleMessage("Error Restoring Deleted Module", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Restore"], MessageType.Error);
         }
     }
 
@@ -148,14 +183,13 @@
         try
         {
             await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
+
             // check if there are any remaining module instances in the site
-            _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
-            
             if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
             {
                 await ModuleService.DeleteModuleAsync(module.ModuleId);
             }
-            
+
             await logger.LogInformation("Module Permanently Deleted {Module}", module);
             await Load();
             StateHasChanged();
@@ -163,7 +197,36 @@
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Permanently Deleting Module {Module} {Error}", module, ex.Message);
-            AddModuleMessage("Error Permanently Deleting Module", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
+        }
+    }
+
+    private async Task DeleteAllModules()
+    {
+        try
+        {
+            ModuleInstance.ShowProgressIndicator();
+			foreach (Module module in _modules.Where(item => item.IsDeleted))
+            {
+                await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
+
+                // check if there are any remaining module instances in the site
+                if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
+                {
+                    await ModuleService.DeleteModuleAsync(module.ModuleId);
+                }
+            }
+
+            await logger.LogInformation("Modules Permanently Deleted");
+            await Load();
+            ModuleInstance.HideProgressIndicator();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Permanently Deleting Modules {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Modules.Delete"], MessageType.Error);
+            ModuleInstance.HideProgressIndicator();
         }
     }
 }

Oqtane.Client/Modules/Admin/Register/Index.razor

@@ -1,106 +1,145 @@
-@namespace Oqtane.Modules.Admin.Register
+@namespace Oqtane.Modules.Admin.Register
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (PageState.Site.AllowRegistration)
 {
-    <AuthorizeView>
+    <AuthorizeView Roles="@RoleNames.Registered">
         <Authorizing>
             <text>...</text>
         </Authorizing>
         <Authorized>
-            <ModuleMessage Message="You Are Already Registered" Type="MessageType.Info" />            
+            <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
         </Authorized>
         <NotAuthorized>
-            <ModuleMessage Message="Please Note That Registration Requires A Valid Email Address In Order To Verify Your Identity" Type="MessageType.Info" />
-
-            <div class="container">
-                <div class="form-group">
-                    <label for="Username" class="control-label">Username: </label>
-                    <input type="text" class="form-control" placeholder="Username" @bind="@_username" id="Username" />
+            <ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" />
+            <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified once it is saved." ResourceKey="Username"></Label>
+                        <div class="col-sm-9">
+                            <input id="username" class="form-control" @bind="@_username" maxlength="256" required />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="password" HelpText="Please choose a sufficiently secure password and enter it here" ResourceKey="Password"></Label>
+                        <div class="col-sm-9">
+							<div class="input-group">
+								<input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
+								<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+							</div>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="confirm" HelpText="Enter your password again to confirm it matches the value entered above" ResourceKey="Confirm"></Label>
+                        <div class="col-sm-9">
+							<div class="input-group">
+								<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
+								<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+							</div>
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
+                        <div class="col-sm-9">
+							<input id="email" class="form-control" @bind="@_email" maxlength="256" required />
+                        </div>
+                    </div>
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
+                        <div class="col-sm-9">
+                            <input id="displayname" class="form-control" @bind="@_displayname" maxlength="50" />
+                        </div>
+                    </div>
                 </div>
-                <div class="form-group">
-                    <label for="Password" class="control-label">Password: </label>
-                    <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" />
-                </div>
-                <div class="form-group">
-                    <label for="Confirm" class="control-label">Confirm Password: </label>
-                    <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" />
-                </div>
-                <div class="form-group">
-                    <label for="Email" class="control-label">Email: </label>
-                    <input type="text" class="form-control" placeholder="Email" @bind="@_email" id="Email" />
-                </div>
-                <div class="form-group">
-                    <label for="DisplayName" class="control-label">Full Name: </label>
-                    <input type="text" class="form-control" placeholder="Full Name" @bind="@_displayName" id="DisplayName" />
-                </div>
-                <button type="button" class="btn btn-primary" @onclick="Register">Register</button>
-                <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-            </div>
+                <br />
+                <button type="button" class="btn btn-primary" @onclick="Register">@Localizer["Register"]</button>
+                <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+            </form>
         </NotAuthorized>
     </AuthorizeView>
 }
 else
 {
-    <ModuleMessage Message="Registration is Disabled For This Site" Type="MessageType.Info" />
+    <ModuleMessage Message="@Localizer["Info.Registration.Disabled"]" Type="MessageType.Info" />
 }
 
 @code {
-    private string _username = string.Empty;
-    private string _password = string.Empty;
-    private string _confirm = string.Empty;
-    private string _email = string.Empty;
-    private string _displayName = string.Empty;
+	private string _username = string.Empty;
+	private ElementReference form;
+	private bool validated = false;
+	private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
+	private string _confirm = string.Empty;
+	private string _email = string.Empty;
+	private string _displayname = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+
+	protected override void OnParametersSet()
+	{
+		_togglepassword = SharedLocalizer["ShowPassword"];
+	}
 
     private async Task Register()
     {
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            bool _isEmailValid = Utilities.IsValidEmail(_email);
-
-            if (_username != "" && _password != "" && _confirm != "" && _isEmailValid)
+            try
             {
-                if (_password == _confirm)
-                {
-                    var user = new User
-                    {
-                        SiteId = PageState.Site.SiteId,
-                        Username = _username,
-                        DisplayName = (_displayName == string.Empty ? _username : _displayName),
-                        Email = _email,
-                        Password = _password
-                    };
-                    user = await UserService.AddUserAsync(user);
+                bool _isEmailValid = Utilities.IsValidEmail(_email);
 
-                    if (user != null)
+                if (_isEmailValid)
+                {
+                    if (_password == _confirm)
                     {
-                        await logger.LogInformation("User Created {Username} {Email}", _username, _email);
-                        AddModuleMessage("User Account Created. Please Check Your Email For Verification Instructions.", MessageType.Info);
+                        var user = new User
+                        {
+                            SiteId = PageState.Site.SiteId,
+                            Username = _username,
+                            Password = _password,
+                            Email = _email,
+                            DisplayName = (_displayname == string.Empty ? _username : _displayname),
+							PhotoFileId = null
+                        };
+                        user = await UserService.AddUserAsync(user);
+
+                        if (user != null)
+                        {
+                            await logger.LogInformation("User Created {Username} {Email}", _username, _email);
+                            AddModuleMessage(Localizer["Info.User.AccountCreate"], MessageType.Info);
+                        }
+                        else
+                        {
+                            await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
+                            AddModuleMessage(Localizer["Error.User.AddInfo"], MessageType.Error);
+                        }
                     }
                     else
                     {
-                        await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
-                        AddModuleMessage("Error Adding User. Please Ensure Password Meets Complexity Requirements And Username Is Not Already In Use.", MessageType.Error);
+                        AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
                     }
                 }
                 else
                 {
-                    AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
                 }
             }
-            else
+            catch (Exception ex)
             {
-                AddModuleMessage("You Must Provide A Username, Password, and Email Address", MessageType.Warning);
+                await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
+                AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
             }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
-            AddModuleMessage("Error Adding User", MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
@@ -108,4 +147,18 @@ else
     {
         NavigationManager.NavigateTo(NavigateUrl(string.Empty));
     }
-}
+
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+}

Oqtane.Client/Modules/Admin/Reset/Index.razor

@@ -1,85 +1,118 @@
-@namespace Oqtane.Modules.Admin.Reset
+@namespace Oqtane.Modules.Admin.Reset
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<div class="container">
-    <div class="form-group">
-        <label for="Username" class="control-label">Username: </label>
-        <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username"/>
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="username" HelpText="Your username will be populated from the link you received in the password reset notification" ResourceKey="Username">Username: </Label>
+            <div class="col-sm-9">
+                <input id="username" type="text" class="form-control" @bind="@_username" readonly />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="password" HelpText="The new password. It must satisfy complexity rules for the site." ResourceKey="Password">Password: </Label>
+            <div class="col-sm-9">
+				<div class="input-group">
+					<input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" required />
+					<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+				</div>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="confirm" HelpText="Enter the password again. It must exactly match the password entered above." ResourceKey="Confirm">Confirm: </Label>
+            <div class="col-sm-9">
+				<div class="input-group">
+					<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
+					<button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+				</div>
+            </div>
+        </div>
     </div>
-    <div class="form-group">
-        <label for="Password" class="control-label">Password: </label>
-        <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password"/>
-    </div>
-    <div class="form-group">
-        <label for="Confirm" class="control-label">Confirm Password: </label>
-        <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm"/>
-    </div>
-    <button type="button" class="btn btn-primary" @onclick="Reset">Reset Password</button>
-    <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
-</div>
+    <br />
+    <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button>
+    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
+</form>
 
 @code {
-    private string _username = string.Empty;
-    private string _password = string.Empty;
-    private string _confirm = string.Empty;
+	private ElementReference form;
+	private bool validated = false;
+	private string _username = string.Empty;
+	private string _password = string.Empty;
+	private string _passwordtype = "password";
+	private string _togglepassword = string.Empty;
+	private string _confirm = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
-    protected override void OnInitialized()
-    {
-        if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
+	protected override async Task OnInitializedAsync()
+	{
+		_togglepassword = SharedLocalizer["ShowPassword"];
+
+		if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
         {
             _username = PageState.QueryString["name"];
         }
         else
-        { 
-            NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+        {
+            await logger.LogError(LogFunction.Security, "Invalid Attempt To Access User Password Reset");
+            NavigationManager.NavigateTo(NavigateUrl("")); // home page
         }
     }
 
     private async Task Reset()
     {
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty)
+            try
             {
-                if (_password == _confirm)
+                if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty)
                 {
-                    var user = new User
+                    if (_password == _confirm)
                     {
-                        SiteId = PageState.Site.SiteId,
-                        Username = _username,
-                        Password = _password
-                    };
-                    user = await UserService.ResetPasswordAsync(user, PageState.QueryString["token"]);
+                        var user = new User
+                        {
+                            SiteId = PageState.Site.SiteId,
+                            Username = _username,
+                            Password = _password
+                        };
+                        user = await UserService.ResetPasswordAsync(user, PageState.QueryString["token"]);
 
-                    if (user != null)
-                    {
-                        await logger.LogInformation("User Password Reset {Username}", _username);
-                        NavigationManager.NavigateTo(NavigateUrl("login"));
+                        if (user != null)
+                        {
+                            await logger.LogInformation("User Password Reset {Username}", _username);
+                            NavigationManager.NavigateTo(NavigateUrl("login"));
+                        }
+                        else
+                        {
+                            await logger.LogError("Error Resetting User Password {Username}", _username);
+                            AddModuleMessage(Localizer["Error.Password.ResetInfo"], MessageType.Error);
+                        }
                     }
                     else
                     {
-                        await logger.LogError("Error Resetting User Password {Username}", _username);
-                        AddModuleMessage("Error Resetting User Password. Please Ensure Password Meets Complexity Requirements.", MessageType.Error);
+                        AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
                     }
                 }
                 else
                 {
-                    AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
                 }
             }
-            else
+            catch (Exception ex)
             {
-                AddModuleMessage("You Must Provide A Username, Password, and Email Address", MessageType.Warning);
+                await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message);
+                AddModuleMessage(Localizer["Error.Password.Reset"], MessageType.Error);
             }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message);
-            AddModuleMessage("Error Resetting User Password", MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
@@ -87,4 +120,18 @@
     {
         NavigationManager.NavigateTo(NavigateUrl(string.Empty));
     }
+
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
 }

Oqtane.Client/Modules/Admin/Roles/Add.razor

@@ -1,41 +1,43 @@
-@namespace Oqtane.Modules.Admin.Roles
+@namespace Oqtane.Modules.Admin.Roles
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IRoleService RoleService
+@inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="name" HelpText="Name Of The Role">Name:</Label>
-        </td>
-        <td>
-            <input id="name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose">Description:</Label>
-        </td>
-        <td>
-            <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role">Auto Assigned?</Label>
-        </td>
-        <td>
-            <select id="isautoassigned" class="form-control" @bind="@_isautoassigned">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
-            </select>
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="SaveRole">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
+            <div class="col-sm-9">
+                <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose" ResourceKey="Description">Description:</Label>
+            <div class="col-sm-9">
+                <textarea id="description" class="form-control" @bind="@_description" rows="5" maxlength="256" required></textarea>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
+            <div class="col-sm-9">
+                <select id="isautoassigned" class="form-select" @bind="@_isautoassigned" required>
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
+                </select>
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveRole">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </div>
+</form>
+
+@code {
+    private ElementReference form;
+    private bool validated = false;
 
-@code { 
     private string _name = string.Empty;
     private string _description = string.Empty;
     private string _isautoassigned = "False";
@@ -44,24 +46,33 @@
 
     private async Task SaveRole()
     {
-        var role = new Role();
-        role.SiteId = PageState.Page.SiteId;
-        role.Name = _name;
-        role.Description = _description;
-        role.IsAutoAssigned = (_isautoassigned == null ? false : Boolean.Parse(_isautoassigned));
-        role.IsSystem = false;
-
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            role = await RoleService.AddRoleAsync(role);
-            await logger.LogInformation("Role Added {Role}", role);
+            var role = new Role();
+            role.SiteId = PageState.Page.SiteId;
+            role.Name = _name;
+            role.Description = _description;
+            role.IsAutoAssigned = (_isautoassigned == null ? false : Boolean.Parse(_isautoassigned));
+            role.IsSystem = false;
 
-            NavigationManager.NavigateTo(NavigateUrl());
+            try
+            {
+                role = await RoleService.AddRoleAsync(role);
+                await logger.LogInformation("Role Added {Role}", role);
+
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Adding Role {Role} {Error}", role, ex.Message);
+                AddModuleMessage(Localizer["Error.AddRole"], MessageType.Error);
+            }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Adding Role {Role} {Error}", role, ex.Message);
-            AddModuleMessage("Error Adding Role", MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 

Oqtane.Client/Modules/Admin/Roles/Edit.razor

@@ -1,45 +1,53 @@
-@namespace Oqtane.Modules.Admin.Roles
+@namespace Oqtane.Modules.Admin.Roles
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IRoleService RoleService
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="name" HelpText="Name Of The Role">Name:</Label>
-        </td>
-        <td>
-            <input id="name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose">Description:</Label>
-        </td>
-        <td>
-            <textarea id="description" class="form-control" @bind="@_description" rows="5"></textarea>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role">Auto Assigned?</Label>
-        </td>
-        <td>
-            <select id="isautoassigned" class="form-control" @bind="@_isautoassigned">
-                <option value="True">Yes</option>
-                <option value="False">No</option>
-            </select>
-        </td>
-    </tr>
-</table>
-<button type="button" class="btn btn-success" @onclick="SaveRole">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="name" HelpText="Name Of The Role" ResourceKey="Name">Name:</Label>
+            <div class="col-sm-9">
+                <input id="name" class="form-control" @bind="@_name" maxlength="256" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="description" HelpText="A Short Description Of The Role Which Describes Its Purpose" ResourceKey="Description">Description:</Label>
+            <div class="col-sm-9">
+                <textarea id="description" class="form-control" @bind="@_description" rows="5" maxlength="256" required></textarea>
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="isautoassigned" HelpText="Indicates Whether Or Not New Users Are Automatically Assigned To This Role" ResourceKey="AutoAssigned">Auto Assigned?</Label>
+            <div class="col-sm-9">
+                <select id="isautoassigned" class="form-select" @bind="@_isautoassigned" required>
+                    <option value="True">@SharedLocalizer["Yes"]</option>
+                    <option value="False">@SharedLocalizer["No"]</option>
+                </select>
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveRole">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+        <br /><br />
+        <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
+    </div>
+</form>
 
 @code {
+    private ElementReference form;
+    private bool validated = false;
+
     private int _roleid;
     private string _name = string.Empty;
     private string _description = string.Empty;
     private string _isautoassigned = "False";
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -54,33 +62,46 @@
                 _name = role.Name;
                 _description = role.Description;
                 _isautoassigned = role.IsAutoAssigned.ToString();
+                _createdby = role.CreatedBy;
+                _createdon = role.CreatedOn;
+                _modifiedby = role.ModifiedBy;
+                _modifiedon = role.ModifiedOn;
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Role {RoleId} {Error}", _roleid, ex.Message);
-            AddModuleMessage("Error Loading Role", MessageType.Error);
+            AddModuleMessage(Localizer["Error.LoadRole"], MessageType.Error);
         }
     }
 
     private async Task SaveRole()
     {
-        var role = await RoleService.GetRoleAsync(_roleid);
-        role.Name = _name;
-        role.Description = _description;
-        role.IsAutoAssigned = (_isautoassigned != null && Boolean.Parse(_isautoassigned));
-        role.IsSystem = false;
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            var role = await RoleService.GetRoleAsync(_roleid);
+            role.Name = _name;
+            role.Description = _description;
+            role.IsAutoAssigned = (_isautoassigned != null && Boolean.Parse(_isautoassigned));
+            role.IsSystem = false;
 
-        try
-        {
-            role = await RoleService.UpdateRoleAsync(role);
-            await logger.LogInformation("Role Saved {Role}", role);
-            NavigationManager.NavigateTo(NavigateUrl());
+            try
+            {
+                role = await RoleService.UpdateRoleAsync(role);
+                await logger.LogInformation("Role Saved {Role}", role);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Role {Role} {Error}", role, ex.Message);
+                AddModuleMessage(Localizer["Error.SaveRole"], MessageType.Error);
+            }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Saving Role {Role} {Error}", role, ex.Message);
-            AddModuleMessage("Error Saving Role", MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 }

Oqtane.Client/Modules/Admin/Roles/Index.razor

@@ -1,26 +1,28 @@
-@namespace Oqtane.Modules.Admin.Roles
+@namespace Oqtane.Modules.Admin.Roles
 @inherits ModuleBase
 @inject IRoleService RoleService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_roles == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
-    <ActionLink Action="Add" Text="Add Role" />
+    <ActionLink Action="Add" Text="Add Role" ResourceKey="AddRole" />
 
     <Pager Items="@_roles">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>Name</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Disabled="@(context.IsSystem)" /></td>
-            <td><ActionDialog Header="Delete Role" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Role?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" /></td>
-            <td><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Disabled="@(context.IsSystem)" ResourceKey="Edit" /></td>
+            <td><ActionDialog Header="Delete Role" Message="@string.Format(Localizer["Confirm.DeleteUser"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" ResourceKey="DeleteRole" /></td>
+            <td><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" ResourceKey="Users" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
@@ -33,7 +35,7 @@ else
 
     protected override async Task OnParametersSetAsync()
     {
-        _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId);
+        await GetRoles();
     }
 
     private async Task DeleteRole(Role role)
@@ -42,12 +44,26 @@ else
         {
             await RoleService.DeleteRoleAsync(role.RoleId);
             await logger.LogInformation("Role Deleted {Role}", role);
+            await GetRoles();
             StateHasChanged();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Deleting Role {Role} {Error}", role, ex.Message);
-            AddModuleMessage("Error Deleting Role", MessageType.Error);
+            AddModuleMessage(Localizer["Error.DeleteRole"], MessageType.Error);
+        }
+    }
+
+    private async Task GetRoles()
+    {
+        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        {
+            _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId, true);
+			_roles.RemoveAll(item => item.Name == RoleNames.Everyone || item.Name == RoleNames.Unauthenticated);
+        }
+        else
+        {
+            _roles = await RoleService.GetRolesAsync(PageState.Site.SiteId);
         }
     }
 }

Oqtane.Client/Modules/Admin/Roles/Users.razor

@@ -1,81 +1,89 @@
-@namespace Oqtane.Modules.Admin.Roles
+@namespace Oqtane.Modules.Admin.Roles
 @inherits ModuleBase
 @inject IRoleService RoleService
 @inject IUserRoleService UserRoleService
+@inject IStringLocalizer<Users> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (userroles == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label For="role" HelpText="The role you are assigning users to">Role: </Label>
-            </td>
-            <td>
-                <input id="role" class="form-control" @bind="@name" disabled />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="user" HelpText="Select a user">User: </Label>
-            </td>
-            <td>
-                <select id="user" class="form-control" @bind="@userid">
-                    <option value="-1">&lt;Select User&gt;</option>
-                    @foreach (UserRole userrole in users)
-                    {
-                        <option value="@(userrole.UserId)">@userrole.User.DisplayName</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="effectiveDate" HelpText="The date that this role assignment is active">Effective Date: </Label>
-            </td>
-            <td>
-                <input id="effectiveDate" class="form-control" @bind="@effectivedate" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="expiryDate" HelpText="The date that this role assignment expires">Expiry Date: </Label>
-            </td>
-            <td>
-                <input id="expiryDate" class="form-control" @bind="@expirydate" />
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-success" @onclick="SaveUserRole">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
 
-    <hr class="app-rule" />
-    <p align="center">
-        <Pager Items="@userroles">
-            <Header>
-                <th>Users</th>
-                <th>&nbsp;</th>
-            </Header>
-            <Row>
-                <td>@context.User.DisplayName</td>
-                <td>
-                    <button type="button" class="btn btn-danger" @onclick=@(async () => await DeleteUserRole(context.UserRoleId))>Delete</button>
-                </td>
-            </Row>
-        </Pager>
-    </p>
+    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="role" HelpText="The role you are assigning users to" ResourceKey="Role">Role: </Label>
+                <div class="col-sm-9">
+                    <input id="role" class="form-control" @bind="@name" disabled />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="user" HelpText="Select a user" ResourceKey="User">User: </Label>
+                <div class="col-sm-9">
+                    <select id="user" class="form-select" @bind="@userid" required>
+                        <option value="-1">&lt;@Localizer["User.Select"]&gt;</option>
+                        @foreach (UserRole userrole in users)
+                        {
+                            <option value="@(userrole.UserId)">@userrole.User.DisplayName</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="effectiveDate" HelpText="The date that this role assignment is active" ResourceKey="EffectiveDate">Effective Date: </Label>
+                <div class="col-sm-9">
+                    <input type="date" id="effectiveDate" class="form-control" @bind="@effectivedate" />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="expiryDate" HelpText="The date that this role assignment expires" ResourceKey="ExpiryDate">Expiry Date: </Label>
+                <div class="col-sm-9">
+                    <input type="date" id="expiryDate" class="form-control" @bind="@expirydate" />
+                </div>
+            </div>
+            <br /><br />
+            <button type="button" class="btn btn-success" @onclick="SaveUserRole">@SharedLocalizer["Save"]</button>
+            <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+            <hr class="app-rule" />
+            <div class="row mb-1 align-items-center">
+                <p align="center">
+                    <Pager Items="@userroles">
+                        <Header>
+                            <th>@Localizer["Users"]</th>
+                            <th>@SharedLocalizer["Username"]</th>
+                            <th>@Localizer["Effective"]</th>
+                            <th>@Localizer["Expiry"]</th>
+                            <th>&nbsp;</th>
+                        </Header>
+                        <Row>
+                            <td>@context.User.DisplayName</td>
+                            <td>@context.User.Username</td>
+                            <td>@context.EffectiveDate</td>
+                            <td>@context.ExpiryDate</td>
+                            <td>
+                                <ActionDialog Header="Remove User" Message="@string.Format(Localizer["Confirm.User.DeleteRole"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || PageState.User.Username == UserNames.Host)" ResourceKey="DeleteUserRole" />
+                            </td>
+                        </Row>
+                    </Pager>
+                </p>
+            </div>
+        </div>
+    </form>
 }
 
 @code {
+    private ElementReference form;
+    private bool validated = false;
+
     private int roleid;
     private string name = string.Empty;
     private List<UserRole> users;
     private int userid = -1;
-    private string effectivedate = string.Empty;
-    private string expirydate = string.Empty;
+    private DateTime? effectivedate = null;
+    private DateTime? expirydate = null;
     private List<UserRole> userroles;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
@@ -87,14 +95,13 @@ else
             roleid = Int32.Parse(PageState.QueryString["id"]);
             Role role = await RoleService.GetRoleAsync(roleid);
             name = role.Name;
-            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            users = users.Where(item => item.Role.Name == Constants.RegisteredRole).ToList();
+            users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
             await GetUserRoles();
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
-            AddModuleMessage("Error Loading Users", MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
         }
     }
 
@@ -102,100 +109,89 @@ else
     {
         try
         {
-            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            userroles = userroles.Where(item => item.RoleId == roleid).ToList();
+            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, name);
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading User Roles {RoleId} {Error}", roleid, ex.Message);
-            AddModuleMessage("Error Loading User Roles", MessageType.Error);
+            AddModuleMessage(Localizer["Error.User.LoadRole"], MessageType.Error);
         }
     }
 
     private async Task SaveUserRole()
     {
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            if (userid != -1)
+            try
             {
-                var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
-                if (userrole != null)
+                if (userid != -1)
                 {
-                    if (string.IsNullOrEmpty(effectivedate))
+                    var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
+                    if (userrole != null)
                     {
-                        userrole.EffectiveDate = null;
+                        userrole.EffectiveDate = effectivedate;
+                        userrole.ExpiryDate = expirydate;
+                        await UserRoleService.UpdateUserRoleAsync(userrole);
                     }
                     else
                     {
-                        userrole.EffectiveDate = DateTime.Parse(effectivedate);
+                        userrole = new UserRole();
+                        userrole.UserId = userid;
+                        userrole.RoleId = roleid;
+                        userrole.EffectiveDate = effectivedate;
+                        userrole.ExpiryDate = expirydate;
+
+                        await UserRoleService.AddUserRoleAsync(userrole);
                     }
 
-                    if (string.IsNullOrEmpty(expirydate))
-                    {
-                        userrole.ExpiryDate = null;
-                    }
-                    else
-                    {
-                        userrole.ExpiryDate = DateTime.Parse(expirydate);
-                    }
-                    await UserRoleService.UpdateUserRoleAsync(userrole);
+                    await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
+                    AddModuleMessage(Localizer["Success.User.AssignedRole"], MessageType.Success);
+                    await GetUserRoles();
+                    StateHasChanged();
                 }
                 else
                 {
-                    userrole = new UserRole();
-                    userrole.UserId = userid;
-                    userrole.RoleId = roleid;
-
-                    if (string.IsNullOrEmpty(effectivedate))
-                    {
-                        userrole.EffectiveDate = null;
-                    }
-                    else
-                    {
-                        userrole.EffectiveDate = DateTime.Parse(effectivedate);
-                    }
-
-                    if (string.IsNullOrEmpty(expirydate))
-                    {
-                        userrole.ExpiryDate = null;
-                    }
-                    else
-                    {
-                        userrole.ExpiryDate = DateTime.Parse(expirydate);
-                    }
-
-                    await UserRoleService.AddUserRoleAsync(userrole);
+                    AddModuleMessage(Localizer["Message.Required.UserSelect"], MessageType.Warning);
                 }
-
-                await GetUserRoles();
-                await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
-                AddModuleMessage("User Assigned To Role", MessageType.Success);
             }
-            else
+            catch (Exception ex)
             {
-                AddModuleMessage("You Must Select A User", MessageType.Warning);
+                await logger.LogError(ex, "Error Saving User Roles {RoleId} {Error}", roleid, ex.Message);
+                AddModuleMessage(Localizer["Error.User.SaveRole"], MessageType.Error);
             }
         }
-        catch (Exception ex)
+
+        else
         {
-            await logger.LogError(ex, "Error Saving User Roles {RoleId} {Error}", roleid, ex.Message);
-            AddModuleMessage("Error Saving User Roles", MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 
     private async Task DeleteUserRole(int UserRoleId)
     {
-        try
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
         {
-            await UserRoleService.DeleteUserRoleAsync(UserRoleId);
-            await GetUserRoles();
-            await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId);
-            AddModuleMessage("User Removed From Role", MessageType.Success);
+            try
+            {
+                await UserRoleService.DeleteUserRoleAsync(UserRoleId);
+                await logger.LogInformation("User Removed From Role {UserRoleId}", UserRoleId);
+                AddModuleMessage(Localizer["Confirm.User.RoleRemoved"], MessageType.Success);
+                await GetUserRoles();
+                StateHasChanged();
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message);
+                AddModuleMessage(Localizer["Error.User.RemoveRole"], MessageType.Error);
+            }
         }
-        catch (Exception ex)
+        else
         {
-            await logger.LogError(ex, "Error Removing User From Role {UserRoleId} {Error}", UserRoleId, ex.Message);
-            AddModuleMessage("Error Removing User From Role", MessageType.Error);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
 }

Oqtane.Client/Modules/Admin/Sites/Add.razor

@@ -1,4 +1,6 @@
-@namespace Oqtane.Modules.Admin.Sites
+@namespace Oqtane.Modules.Admin.Sites
+@using Oqtane.Interfaces
+@using System.Text.RegularExpressions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject ITenantService TenantService
@@ -8,396 +10,436 @@
 @inject ISiteTemplateService SiteTemplateService
 @inject IUserService UserService
 @inject IInstallationService InstallationService
+@inject IDatabaseService DatabaseService
+@inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_tenants == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="name" HelpText="Enter the name of the site">Site Name: </Label>
-        </td>
-        <td>
-            <input id="name" class="form-control" @bind="@_name" />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="alias" HelpText="Enter the alias for the server">Aliases: </Label>
-        </td>
-        <td>
-            <textarea id="alias" class="form-control" @bind="@_urls" rows="3"></textarea>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="defaultTheme" HelpText="Select the default theme for the website">Default Theme: </Label>
-        </td>
-        <td>
-            <select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
-                <option value="">&lt;Select Theme&gt;</option>
-                @foreach (KeyValuePair<string, string> item in _themes)
-                {
-                    <option value="@item.Key">@item.Value</option>
-                }
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="defaultLayout" HelpText="Select the default layout for the site">Default Layout: </Label>
-        </td>
-        <td>
-            <select id="defaultLayout" class="form-control" @bind="@_layouttype">
-                <option value="">&lt;Select Layout&gt;</option>
-                @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
-                {
-                    <option value="@panelayout.Key">@panelayout.Value</option>
-                }
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="defaultContainer" HelpText="Select the default container for the site">Default Container: </Label>
-        </td>
-        <td>
-            <select id="defaultContainer" class="form-control" @bind="@_containertype">
-                <option value="">&lt;Select Container&gt;</option>
-                @foreach (KeyValuePair<string, string> container in _containers)
-                {
-                    <option value="@container.Key">@container.Value</option>
-                }
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="siteTemplate" HelpText="Select the site template">Site Template: </Label>
-        </td>
-        <td>
-            <select id="siteTemplate" class="form-control" @bind="@_sitetemplatetype">
-                <option value="">&lt;Select Site Template&gt;</option>
-                @foreach (SiteTemplate siteTemplate in _siteTemplates)
-                {
-                    <option value="@siteTemplate.TypeName">@siteTemplate.Name</option>
-                }
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="tenant" HelpText="Select the tenant for the site">Tenant: </Label>
-        </td>
-        <td>
-            <select id="tenant" class="form-control" @onchange="(e => TenantChanged(e))">
-                <option value="-">&lt;Select Tenant&gt;</option>
-                <option value="+">&lt;Create New Tenant&gt;</option>
-                @foreach (Tenant tenant in _tenants)
-                {
-                    <option value="@tenant.TenantId">@tenant.Name</option>
-                }
-            </select>
-        </td>
-    </tr>
-    @if (_tenantid == "+")
-    {
-        <tr>
-            <td colspan="2">
-                <hr class="app-rule" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="name" HelpText="Enter the name for the tenant">Tenant Name: </Label>
-            </td>
-            <td>
-                <input id="name" class="form-control" @bind="@_tenantname" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="databaseType" HelpText="Select the database type for the tenant">Database Type: </Label>
-            </td>
-            <td>
-                <select id="databaseType" class="custom-select" @bind="@_databasetype">
-                    <option value="LocalDB">Local Database</option>
-                    <option value="SQLServer">SQL Server</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="server" HelpText="Enter the server for the tenant">Server: </Label>
-            </td>
-            <td>
-                <input id="server" type="text" class="form-control" @bind="@_server" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="database" HelpText="Enter the database for the tenant">Database: </Label>
-            </td>
-            <td>
-                <input id="database" type="text" class="form-control" @bind="@_database" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="integratedSecurity" HelpText="Select if you want integrated security or not">Integrated Security: </Label>
-            </td>
-            <td>
-                <select id="integratedSecurity" class="custom-select" @onchange="SetIntegratedSecurity">
-                    <option value="true" selected>True</option>
-                    <option value="false">False</option>
-                </select>
-            </td>
-        </tr>
-        @if (!_integratedsecurity)
-        {
-            <tr>
-                <td>
-                    <Label For="username" HelpText="Enter the username for the integrated security">Database Username: </Label>
-                </td>
-                <td>
-                    <input id="username" type="text" class="form-control" @bind="@_username" />
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <Label For="password" HelpText="Enter the password for the integrated security">Database Password: </Label>
-                </td>
-                <td>
-                    <input id="password" type="password" class="form-control" @bind="@_password" />
-                </td>
-            </tr>
-        }
-        <tr>
-            <td>
-                <Label For="hostUsername" HelpText="Enter the username of the host for this site">Host Username:</Label>
-            </td>
-            <td>
-                <input id="hostUsername" class="form-control" @bind="@_hostusername" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="hostPassword" HelpText="Enter the password for the host of this site">Host Password:</Label>
-            </td>
-            <td>
-                <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" />
-            </td>
-        </tr>
-    }
-</table>
-    <button type="button" class="btn btn-success" @onclick="SaveSite">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="name" HelpText="Enter the name of the site" ResourceKey="Name">Site Name: </Label>
+                <div class="col-sm-9">
+                    <input id="name" class="form-control" @bind="@_name" maxlength="200" required />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="alias" HelpText="Enter the aliases for the site. An alias can be a domain name (www.site.com) or a virtual folder (ie. www.site.com/folder)." ResourceKey="Aliases">Aliases: </Label>
+                <div class="col-sm-9">
+                    <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the default theme for the website" ResourceKey="DefaultTheme">Default Theme: </Label>
+                <div class="col-sm-9">
+                    <select id="defaultTheme" class="form-select" @onchange="(e => ThemeChanged(e))" required>
+                        <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
+                        @foreach (var theme in _themes)
+                        {
+                            <option value="@theme.TypeName">@theme.Name</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="defaultContainer" HelpText="Select the default container for the site" ResourceKey="DefaultContainer">Default Container: </Label>
+                <div class="col-sm-9">
+                    <select id="defaultContainer" class="form-select" @bind="@_containertype" required>
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
+                        @foreach (var container in _containers)
+                        {
+                            <option value="@container.TypeName">@container.Name</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="adminContainer" HelpText="Select the admin container for the site" ResourceKey="AdminContainer">Admin Container: </Label>
+                <div class="col-sm-9">
+                    <select id="adminContainer" class="form-select" @bind="@_admincontainertype" required>
+                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
+                        <option value="">&lt;@Localizer["DefaultContainer.Admin"]&gt;</option>
+                        @foreach (var container in _containers)
+                        {
+                            <option value="@container.TypeName">@container.Name</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="siteTemplate" HelpText="Select the site template" ResourceKey="SiteTemplate">Site Template: </Label>
+                <div class="col-sm-9">
+                    <select id="siteTemplate" class="form-select" @bind="@_sitetemplatetype" required>
+                        <option value="-">&lt;@Localizer["SiteTemplate.Select"]&gt;</option>
+                        @foreach (SiteTemplate siteTemplate in _siteTemplates)
+                        {
+                            <option value="@siteTemplate.TypeName">@siteTemplate.Name</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="runtime" HelpText="The runtime hosting model" ResourceKey="Runtime">Runtime: </Label>
+                <div class="col-sm-9">
+                    <select id="runtime" class="form-select" @bind="@_runtime" required>
+                        <option value="Server">@SharedLocalizer["BlazorServer"]</option>
+                        <option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
+						<option value="Hybrid">@SharedLocalizer["BlazorHybrid"]</option>
+					</select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="prerender" HelpText="Specifies if the site should be prerendered (for search crawlers, etc...)" ResourceKey="Prerender">Prerender? </Label>
+                <div class="col-sm-9">
+                    <select id="prerender" class="form-select" @bind="@_prerender" required>
+                        <option value="Prerendered">@SharedLocalizer["Yes"]</option>
+                        <option value="">@SharedLocalizer["No"]</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="tenant" HelpText="Select the tenant for the site" ResourceKey="Tenant">Tenant: </Label>
+                <div class="col-sm-9">
+                    <select id="tenant" class="form-select" @onchange="(e => TenantChanged(e))" required>
+                        <option value="-">&lt;@Localizer["Tenant.Select"]&gt;</option>
+                        <option value="+">&lt;@Localizer["Tenant.Add"]&gt;</option>
+                        @foreach (Tenant tenant in _tenants)
+                        {
+                            <option value="@tenant.TenantId">@tenant.Name</option>
+                        }
+                    </select>
+                </div>
+            </div>
+            @if (_tenantid == "+")
+            {
+                <div class="row mb-1 align-items-center">
+                    <hr class="app-rule" />
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="name" HelpText="Enter the name for the tenant" ResourceKey="TenantName">Tenant Name: </Label>
+                    <div class="col-sm-9">
+                        <input id="name" class="form-control" @bind="@_tenantName" maxlength="100" required />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="databaseType" HelpText="Select the database type for the tenant" ResourceKey="DatabaseType">Database Type: </Label>
+                    <div class="col-sm-9">
+                        @if (_databases != null)
+						{
+							<div class="input-group">
+								<select id="databaseType" class="form-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))" required>
+									@foreach (var database in _databases)
+									{
+										<option value="@database.Name">@Localizer[@database.Name]</option>
+									}
+								</select>
+								@if (!_showConnectionString)
+								{
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionString"]</button>
+								}
+								else
+								{
+									<button type="button" class="btn btn-secondary" @onclick="ToggleConnectionString">@Localizer["EnterConnectionParameters"]</button>
+								}
+							</div>
+						}
+					</div>
+                </div>
+				@if (!_showConnectionString)
+				{
+					if (_databaseConfigType != null)
+					{
+						@DatabaseConfigComponent
+					}
+				}
+				else
+				{
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="connectionstring" HelpText="Enter a complete connection string including all parameters and delimiters" ResourceKey="ConnectionString">String:</Label>
+						<div class="col-sm-9">
+							<textarea id="connectionstring" class="form-control" @bind="@_connectionString" rows="3"></textarea>
+						</div>
+					</div>
+				}
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="hostUsername" HelpText="Enter the username of an existing host user" ResourceKey="HostUsername">Host Username:</Label>
+                    <div class="col-sm-9">
+                        <input id="hostUsername" class="form-control" @bind="@_hostusername" required />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="hostPassword" HelpText="Enter the password of an existing host user" ResourceKey="HostPassword">Host Password:</Label>
+                    <div class="col-sm-9">
+                        <input id="hostPassword" type="password" class="form-control" @bind="@_hostpassword" autocomplete="new-password" required />
+                    </div>
+                </div>
+            }
+        </div>
+        <br />
+        <br />
+        <button type="button" class="btn btn-success" @onclick="SaveSite">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </form>
 }
 
 @code {
-    private Dictionary<string, string> _themes = new Dictionary<string, string>();
-    private Dictionary<string, string> _panelayouts = new Dictionary<string, string>();
-    private Dictionary<string, string> _containers = new Dictionary<string, string>();
-    private List<SiteTemplate> _siteTemplates;
-    private List<Theme> _themeList;
-    private List<Tenant> _tenants;
-    private string _tenantid = "-";
+	private List<Database> _databases;
+	private ElementReference form;
+	private bool validated = false;
+	private string _databaseName;
+	private Type _databaseConfigType;
+	private object _databaseConfig;
+	private RenderFragment DatabaseConfigComponent { get; set; }
+	private bool _showConnectionString = false;
+	private string _connectionString = string.Empty;
 
-    private string _tenantname = string.Empty;
-    private string _databasetype = "LocalDB";
-    private string _server = "(LocalDb)\\MSSQLLocalDB";
-    private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
-    private string _username = string.Empty;
-    private string _password = string.Empty;
-    private bool _integratedsecurity = true;
-    private string _hostusername = Constants.HostUser;
-    private string _hostpassword = string.Empty;
+	private List<Theme> _themeList;
+	private List<ThemeControl> _themes = new List<ThemeControl>();
+	private List<ThemeControl> _containers = new List<ThemeControl>();
+	private List<SiteTemplate> _siteTemplates;
+	private List<Tenant> _tenants;
+	private string _tenantid = "-";
 
-    private string _name = string.Empty;
-    private string _urls = string.Empty;
-    private string _themetype = string.Empty;
-    private string _layouttype = string.Empty;
-    private string _containertype = string.Empty;
-    private string _sitetemplatetype = string.Empty;
+	private string _tenantName = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	private string _hostusername = string.Empty;
+	private string _hostpassword = string.Empty;
 
-    protected override async Task OnInitializedAsync()
-    {
-        _themeList = await ThemeService.GetThemesAsync();
-        _tenants = await TenantService.GetTenantsAsync();
-        _urls = PageState.Alias.Name;
-        _themes = ThemeService.GetThemeTypes(_themeList);
-        _containers = ThemeService.GetContainerTypes(_themeList);
-        _siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync();
-    }
+	private string _name = string.Empty;
+	private string _urls = string.Empty;
+	private string _themetype = "-";
+	private string _containertype = "-";
+	private string _admincontainertype = "";
+	private string _sitetemplatetype = "-";
+	private string _runtime = "Server";
+	private string _prerender = "Prerendered";
 
-    private void TenantChanged(ChangeEventArgs e)
-    {
-        _tenantid = (string)e.Value;
-        if (string.IsNullOrEmpty(_tenantname))
-        {
-            _tenantname = _name;
-        }
-        StateHasChanged();
-    }
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    private void SetIntegratedSecurity(ChangeEventArgs e)
-    {
-        if (Convert.ToBoolean((string)e.Value))
-        {
-            _integratedsecurity = true;
-        }
-        else
-        {
-            _integratedsecurity = false;
-        }
-        StateHasChanged();
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		_tenants = await TenantService.GetTenantsAsync();
+		_urls = PageState.Alias.Name;
+		_themeList = await ThemeService.GetThemesAsync();
+		_themes = ThemeService.GetThemeControls(_themeList);
+		_siteTemplates = await SiteTemplateService.GetSiteTemplatesAsync();
 
-    private async void ThemeChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _themetype = (string)e.Value;
-            if (_themetype != string.Empty)
-            {
-                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
-            }
-            else
-            {
-                _panelayouts = new Dictionary<string, string>();
-            }
+		_databases = await DatabaseService.GetDatabasesAsync();
+		if (_databases.Exists(item => item.IsDefault))
+		{
+			_databaseName = _databases.Find(item => item.IsDefault).Name;
+		}
+		else
+		{
+			_databaseName = "LocalDB";
+		}
+		LoadDatabaseConfigComponent();
+	}
 
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error);
-        }
-    }
+	private void DatabaseChanged(ChangeEventArgs eventArgs)
+	{
+		try
+		{
+			_databaseName = (string)eventArgs.Value;
+			_showConnectionString = false;
+			LoadDatabaseConfigComponent();
+		}
+		catch
+		{
+			AddModuleMessage(Localizer["Error.Database.LoadConfig"], MessageType.Error);
+		}
+	}
 
-    private async Task SaveSite()
-    {
-        if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)) && !string.IsNullOrEmpty(_containertype) && !string.IsNullOrEmpty(_sitetemplatetype))
-        {
-            var duplicates = new List<string>();
-            var aliases = await AliasService.GetAliasesAsync();
-            foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
-            {
-                if (aliases.Exists(item => item.Name == name))
-                {
-                    duplicates.Add(name);
-                }
-            }
+	private void LoadDatabaseConfigComponent()
+	{
+		var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+		if (database != null)
+		{
+			_databaseConfigType = Type.GetType(database.ControlType);
+			DatabaseConfigComponent = builder =>
+			{
+				builder.OpenComponent(0, _databaseConfigType);
+				builder.AddComponentReferenceCapture(1, inst => { _databaseConfig = Convert.ChangeType(inst, _databaseConfigType); });
+				builder.CloseComponent();
+			};
+		}
+	}
 
-            if (duplicates.Count == 0)
-            {
-                InstallConfig config = new InstallConfig();
+	private void TenantChanged(ChangeEventArgs e)
+	{
+		_tenantid = (string)e.Value;
+		if (string.IsNullOrEmpty(_tenantName))
+		{
+			_tenantName = _name;
+		}
+		StateHasChanged();
+	}
 
-                if (_tenantid == "+")
-                {
-                    if (!string.IsNullOrEmpty(_tenantname) && _tenants.FirstOrDefault(item => item.Name == _tenantname) == null)
-                    {
-                        // validate host credentials
-                        var user = new User();
-                        user.SiteId = PageState.Site.SiteId;
-                        user.Username = Constants.HostUser;
-                        user.Password = _hostpassword;
-                        user = await UserService.LoginUserAsync(user, false, false);
-                        if (user.IsAuthenticated)
-                        {
-                            if (!string.IsNullOrEmpty(_server) && !string.IsNullOrEmpty(_database))
+	private async void ThemeChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_themetype = (string)e.Value;
+			if (_themetype != "-")
+			{
+				_containers = ThemeService.GetContainerControls(_themeList, _themetype);
+			}
+			else
+			{
+				_containers = new List<ThemeControl>();
+			}
+			_containertype = "-";
+			_admincontainertype = "";
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Containers For Theme {ThemeType} {Error}", _themetype, ex.Message);
+			AddModuleMessage(Localizer["Error.Theme.LoadContainers"], MessageType.Error);
+		}
+	}
+
+	private async Task SaveSite()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-")
+			{
+				_urls = Regex.Replace(_urls, @"\r\n?|\n", ",");
+				var duplicates = new List<string>();
+				var aliases = await AliasService.GetAliasesAsync();
+				foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+				{
+					if (aliases.Exists(item => item.Name == name))
+					{
+						duplicates.Add(name);
+					}
+				}
+
+				if (duplicates.Count == 0)
+				{
+					InstallConfig config = new InstallConfig();
+
+					if (_tenantid == "+")
+					{
+						if (!string.IsNullOrEmpty(_tenantName) && _tenants.FirstOrDefault(item => item.Name == _tenantName) == null)
+						{
+							// validate host credentials
+							var user = new User();
+							user.SiteId = PageState.Site.SiteId;
+							user.Username = _hostusername;
+							user.Password = _hostpassword;
+							user.LastIPAddress = PageState.RemoteIPAddress;
+							user = await UserService.LoginUserAsync(user, false, false);
+                            if (user.IsAuthenticated)
                             {
-                                var connectionString = string.Empty;
-                                if (_databasetype == "LocalDB")
+								var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+								var connectionString = String.Empty;
+								if (_showConnectionString)
+								{
+									connectionString = _connectionString;
+								}
+								else
+								{
+									if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+									{
+										connectionString = databaseConfigControl.GetConnectionString();
+									}
+								}
+
+                                if (connectionString != "")
                                 {
-                                    connectionString = "Data Source=" + _server + ";AttachDbFilename=|DataDirectory|\\" + _database + ".mdf;Initial Catalog=" + _database + ";Integrated Security=SSPI;";
+                                    config.TenantName = _tenantName;
+                                    config.DatabaseType = database.DBType;
+                                    config.ConnectionString = connectionString;
+									config.HostUsername = _hostusername;
+                                    config.HostPassword = _hostpassword;
+                                    config.HostEmail = user.Email;
+                                    config.HostName = user.DisplayName;
+                                    config.IsNewTenant = true;
                                 }
                                 else
                                 {
-                                    connectionString = "Data Source=" + _server + ";Initial Catalog=" + _database + ";";
-
-                                    if (_integratedsecurity)
-                                    {
-                                        connectionString += "Integrated Security=SSPI;";
-                                    }
-                                    else
-                                    {
-                                        connectionString += "User ID=" + _username + ";Password=" + _password;
-                                    }
+                                    AddModuleMessage(Localizer["Error.Required.ServerDatabase"], MessageType.Error);
                                 }
-
-                                config.ConnectionString = connectionString;
-                                config.HostPassword = _hostpassword;
-                                config.HostEmail = user.Email;
-                                config.HostName = user.DisplayName;
-                                config.TenantName = _tenantname;
-                                config.IsNewTenant = true;
                             }
                             else
                             {
-                                AddModuleMessage("You Must Specify A Server And Database", MessageType.Error);
+                                AddModuleMessage(Localizer["Error.InvalidPassword"], MessageType.Error);
                             }
                         }
                         else
                         {
-                            AddModuleMessage("Invalid Host Password", MessageType.Error);
+                            AddModuleMessage(Localizer["Error.TenantName.Exists"], MessageType.Error);
                         }
                     }
                     else
                     {
-                        AddModuleMessage("Tenant Name Is Missing Or Already Exists", MessageType.Error);
+                        var tenant = _tenants.FirstOrDefault(item => item.TenantId == int.Parse(_tenantid));
+                        if (tenant != null)
+                        {
+                            config.TenantName = tenant.Name;
+                            config.DatabaseType = tenant.DBType;
+                            config.ConnectionString = tenant.DBConnectionString;
+                            config.IsNewTenant = false;
+                        }
+                    }
+
+                    if (!string.IsNullOrEmpty(config.TenantName))
+                    {
+                        config.SiteName = _name;
+                        config.Aliases = _urls;
+                        config.DefaultTheme = _themetype;
+                        config.DefaultContainer = _containertype;
+                        config.DefaultAdminContainer = _admincontainertype;
+                        config.SiteTemplate = _sitetemplatetype;
+                        config.Runtime = _runtime;
+                        config.RenderMode = _runtime + _prerender;
+
+                        ShowProgressIndicator();
+
+                        var installation = await InstallationService.Install(config);
+                        if (installation.Success)
+                        {
+                            var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
+                            NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliasname, true);
+                        }
+                        else
+                        {
+                            await logger.LogError("Error Creating Site {Error}", installation.Message);
+                            AddModuleMessage(installation.Message, MessageType.Error);
+                        }
                     }
                 }
                 else
                 {
-                    var tenant = _tenants.FirstOrDefault(item => item.TenantId == int.Parse(_tenantid));
-                    if (tenant != null)
-                    {
-                        config.TenantName = tenant.Name;
-                        config.ConnectionString= tenant.DBConnectionString;
-                        config.IsNewTenant = false;
-                    }
-                }
-
-                if  (!string.IsNullOrEmpty(config.TenantName))
-                {
-                    config.SiteName = _name;
-                    config.Aliases = _urls.Replace("\n", ",");
-                    config.DefaultTheme = _themetype;
-                    config.DefaultLayout = _layouttype;
-                    config.DefaultContainer = _containertype;
-                    config.SiteTemplate = _sitetemplatetype;
-
-                    ShowProgressIndicator();
-
-                    var installation = await InstallationService.Install(config);
-                    if (installation.Success)
-                    {
-                        var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
-                        var uri = new Uri(NavigationManager.Uri);
-                        NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true);
-                    }
-                    else
-                    {
-                        await logger.LogError("Error Creating Site {Error}", installation.Message);
-                        AddModuleMessage(installation.Message, MessageType.Error);
-                    }
+                    AddModuleMessage(string.Format(Localizer["Message.SiteName.InUse"], string.Join(", ", duplicates.ToArray())), MessageType.Warning);
                 }
             }
             else
             {
-                AddModuleMessage(string.Join(", ", duplicates.ToArray()) + " Already Used For Another Site", MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.Tenant"], MessageType.Warning);
             }
         }
         else
         {
-            AddModuleMessage("You Must Provide A Tenant, Site Name, Alias, Default Theme/Container, And Site Template", MessageType.Warning);
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
+
+	private void ToggleConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionString = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
 }

Oqtane.Client/Modules/Admin/Sites/Edit.razor

@@ -1,272 +0,0 @@
-@namespace Oqtane.Modules.Admin.Sites
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject ISiteService SiteService
-@inject ITenantService TenantService
-@inject IAliasService AliasService
-@inject IThemeService  ThemeService
-
-@if (_themes != null)
-{
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label For="name" HelpText="Enter the name of the site">Name: </Label>
-            </td>
-            <td>
-                <input id="name" class="form-control" @bind="@_name" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="tenant" HelpText="Enter the tenant for the site">Tenant: </Label>
-            </td>
-            <td>
-                <input id="tenant" class="form-control" @bind="@_tenant" readonly />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="alias" HelpText="Enter the alias for the server">Aliases: </Label>
-            </td>
-            <td>
-                <textarea id="alias" class="form-control" @bind="@_urls" rows="3" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="defaultTheme" HelpText="Select the default theme for the website">Default Theme: </Label>
-            </td>
-            <td>
-                <select id="defaultTheme" class="form-control" @onchange="(e => ThemeChanged(e))">
-                    <option value="">&lt;Select Theme&gt;</option>
-                    @foreach (KeyValuePair<string, string> item in _themes)
-                    {
-                        if (item.Key == _themetype)
-                        {
-                            <option value="@item.Key" selected>@item.Value</option>
-                        }
-                        else
-                        {
-                            <option value="@item.Key">@item.Value</option>
-                        }
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="defaultLayout" HelpText="Select the default layout for the site">Default Layout: </Label>
-            </td>
-            <td>
-                <select id="defaultLayout" class="form-control" @bind="@_layouttype">
-                    <option value="">&lt;Select Layout&gt;</option>
-                    @foreach (KeyValuePair<string, string> panelayout in _panelayouts)
-                    {
-                        <option value="@panelayout.Key">@panelayout.Value</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="defaultContainer" HelpText="Select the default container for the site">Default Container: </Label>
-            </td>
-            <td>
-                <select id="defaultIdea" class="form-control" @bind="@_containertype">
-                    <option value="">&lt;Select Container&gt;</option>
-                    @foreach (KeyValuePair<string, string> container in _containers)
-                    {
-                        <option value="@container.Key">@container.Value</option>
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="isDeleted" HelpText="Has this site been deleted?">Is Deleted? </Label>
-            </td>
-            <td>
-                <select id="isDeleted" class="form-control" @bind="@_isdeleted">
-                    <option value="True">Yes</option>
-                    <option value="False">No</option>
-                </select>
-            </td>
-        </tr>
-    </table>
-    <br />
-    <button type="button" class="btn btn-success" @onclick="SaveSite">Save</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-    <br />
-    <br />
-    <AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon" DeletedBy="@_deletedby" DeletedOn="@_deletedon"></AuditInfo>
-}
-
-@code {
-    private Dictionary<string, string> _themes;
-    private Dictionary<string, string> _panelayouts;
-    private Dictionary<string, string> _containers;
-    private Alias _alias;
-    private List<Theme> _themeList;
-    private string _name = string.Empty;
-    private List<Tenant> _tenantList;
-    private string _tenant = string.Empty;
-    private List<Alias> _aliasList;
-    private string _urls = string.Empty;
-    private string _themetype;
-    private string _layouttype;
-    private string _containertype;
-    private string _createdby;
-    private DateTime _createdon;
-    private string _modifiedby;
-    private DateTime _modifiedon;
-    private string _deletedby;
-    private DateTime? _deletedon;
-    private string _isdeleted;
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _themeList = await ThemeService.GetThemesAsync();
-            _aliasList = await AliasService.GetAliasesAsync();
-
-            _alias = _aliasList.Find(item => item.AliasId == Int32.Parse(PageState.QueryString["id"]));
-            SiteService.SetAlias(_alias);
-            var site = await SiteService.GetSiteAsync(_alias.SiteId);
-            if (site != null)
-            {
-                _name = site.Name;
-                _tenantList = await TenantService.GetTenantsAsync();
-                _tenant = _tenantList.Find(item => item.TenantId == site.TenantId).Name;
-
-                foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
-                {
-                    _urls += alias.Name + "\n";
-                }
-
-                _themetype = site.DefaultThemeType;
-                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
-                _layouttype = site.DefaultLayoutType;
-                _containertype = site.DefaultContainerType;
-                _createdby = site.CreatedBy;
-                _createdon = site.CreatedOn;
-                _modifiedby = site.ModifiedBy;
-                _modifiedon = site.ModifiedOn;
-                _deletedby = site.DeletedBy;
-                _deletedon = site.DeletedOn;
-                _isdeleted = site.IsDeleted.ToString();
-            }
-
-            _themes = ThemeService.GetThemeTypes(_themeList);
-            _containers = ThemeService.GetContainerTypes(_themeList);
-        }
-        catch (Exception ex)
-        {
-            await Log(_alias, LogLevel.Error, string.Empty, ex, "Error Loading Site {SiteId} {Error}", _alias.SiteId, ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
-
-    private async void ThemeChanged(ChangeEventArgs e)
-    {
-        try
-        {
-            _themetype = (string)e.Value;
-            if (_themetype != string.Empty)
-            {
-                _panelayouts = ThemeService.GetPaneLayoutTypes(_themeList, _themetype);
-            }
-            else
-            {
-                _panelayouts = new Dictionary<string, string>();
-            }
-
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-            AddModuleMessage("Error Loading Pane Layouts For Theme", MessageType.Error);
-        }
-    }
-
-    private async Task SaveSite()
-    {
-        try
-        {
-            if (_name != string.Empty && _urls != string.Empty && !string.IsNullOrEmpty(_themetype) && (_panelayouts.Count == 0 || !string.IsNullOrEmpty(_layouttype)) && !string.IsNullOrEmpty(_containertype))
-            {
-                var unique = true;
-                foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
-                {
-                    if (_aliasList.Exists(item => item.Name == name && item.SiteId != _alias.SiteId && item.TenantId != _alias.TenantId))
-                    {
-                        unique = false;
-                    }
-                }
-
-                if (unique)
-                {
-                    SiteService.SetAlias(_alias);
-                    var site = await SiteService.GetSiteAsync(_alias.SiteId);
-                    if (site != null)
-                    {
-                        site.Name = _name;
-                        site.LogoFileId = null;
-                        site.DefaultThemeType = _themetype;
-                        site.DefaultLayoutType = _layouttype ?? string.Empty;
-                        site.DefaultContainerType = _containertype;
-                        site.IsDeleted = (_isdeleted == null || Boolean.Parse(_isdeleted));
-
-                        site = await SiteService.UpdateSiteAsync(site);
-
-                        _urls = _urls.Replace("\n", ",");
-                        var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-
-                        foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
-                        {
-                            if (!names.Contains(alias.Name))
-                            {
-                                await AliasService.DeleteAliasAsync(alias.AliasId);
-                            }
-                        }
-
-                        foreach (string name in names)
-                        {
-                            if (!_aliasList.Exists(item => item.Name == name))
-                            {
-                                Alias alias = new Alias
-                                {
-                                    Name = name,
-                                    TenantId = site.TenantId,
-                                    SiteId = site.SiteId
-                                };
-                                await AliasService.AddAliasAsync(alias);
-                            }
-                        }
-
-                        await Log(_alias, LogLevel.Information,PermissionNames.Edit, null, "Site Saved {Site}", site);
-
-                        NavigationManager.NavigateTo(NavigateUrl());
-                    }
-                }
-                else
-                {
-                    AddModuleMessage("An Alias Specified Has Already Been Used For Another Site", MessageType.Warning);
-                }
-            }
-            else
-            {
-                AddModuleMessage("You Must Provide A Site Name, Alias, And Default Theme/Container", MessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            await Log(_alias, LogLevel.Error, string.Empty, ex, "Error Saving Site {SiteId} {Error}", _alias.SiteId, ex.Message);
-            AddModuleMessage("Error Saving Site", MessageType.Error);
-        }
-    }
- }

Oqtane.Client/Modules/Admin/Sites/Index.razor

@@ -1,8 +1,10 @@
-@namespace Oqtane.Modules.Admin.Sites
+@namespace Oqtane.Modules.Admin.Sites
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IAliasService AliasService
 @inject ISiteService SiteService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_sites == null)
 {
@@ -10,71 +12,47 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Add Site" />
+    <ActionLink Action="Add" Text="Add Site" ResourceKey="AddSite" />
 
     <Pager Items="@_sites">
         <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>Name</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.AliasId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Site" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Site?")" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteSite(context))" /></td>
-            <td><a href="@(_scheme + context.Name)">@context.Name</a></td>
+            <td><button type="button" class="btn btn-primary" @onclick="@(async () => Edit(context.Name))">@SharedLocalizer["Edit"]</button></td>
+            <td><button type="button" class="btn btn-secondary" @onclick="@(async () => Browse(context.Name))">@Localizer["Browse"]</button></td>
+            <td>@context.Name</td>
         </Row>
     </Pager>
 }
 
 @code {
     private List<Alias> _sites;
-    private string _scheme;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
     {
-        var uri = new Uri(NavigationManager.Uri);
-        _scheme = uri.Scheme + "://";
-
         var aliases = await AliasService.GetAliasesAsync();
         _sites = new List<Alias>();
         foreach (Alias alias in aliases)
         {
-            if (!_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
+            if (alias.IsDefault && !_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
             {
                 _sites.Add(alias);
             }
         }
     }
 
-    private async Task DeleteSite(Alias alias)
+    private void Edit(string name)
     {
-        try
-        {
-            if (alias.SiteId != PageState.Site.SiteId || alias.TenantId != PageState.Site.TenantId)
-            {
-                SiteService.SetAlias(alias);
-                await SiteService.DeleteSiteAsync(alias.SiteId);
-                await Log(alias, LogLevel.Information, "", null, "Site Deleted {SiteId}", alias.SiteId);
-                
-                var aliases = await AliasService.GetAliasesAsync();
-                foreach (Alias a in aliases.Where(item => item.SiteId == alias.SiteId && item.TenantId == alias.TenantId))
-                {
-                    await AliasService.DeleteAliasAsync(a.AliasId);
-                }
-                
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-            else
-            {
-                AddModuleMessage("You Can Not Delete The Current Site", MessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            await Log(alias, LogLevel.Error, "", ex, "Error Deleting Site {SiteId} {Error}", alias.SiteId, ex.Message);
-            AddModuleMessage("Error Deleting Site", MessageType.Error);
-        }
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name + "/admin/site", true);
+    }
+
+    private void Browse(string name)
+    {
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name, true);
     }
 }

Oqtane.Client/Modules/Admin/Sql/Index.razor

@@ -1,111 +1,151 @@
-@namespace Oqtane.Modules.Admin.Sql
+@namespace Oqtane.Modules.Admin.Sql
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject ITenantService TenantService
+@inject IDatabaseService DatabaseService
 @inject ISqlService SqlService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_tenants == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label For="tenant" HelpText="Select the tenant for the SQL server">Tenant: </Label>
-            </td>
-            <td>
-                <select id="teneant" class="form-control" @bind="_tenantid">
-                    <option value="-1">&lt;Select Tenant&gt;</option>
+    <div class="container">
+
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="tenant" HelpText="Select the tenant for the SQL server" ResourceKey="Tenant">Tenant: </Label>
+            <div class="col-sm-9">
+                <select id="tenant" class="form-select" value="@_tenantid" @onchange="(e => TenantChanged(e))">
+                    <option value="-1">&lt;@Localizer["Tenant.Select"]&gt;</option>
                     @foreach (Tenant tenant in _tenants)
                     {
                         <option value="@tenant.TenantId">@tenant.Name</option>
                     }
                 </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="sqlQeury" HelpText="Enter the query for the SQL server">SQL Query: </Label>
-            </td>
-            <td>
-                <textarea id="sqlQeury" class="form-control" @bind="@_sql" rows="5"></textarea>
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-success" @onclick="Execute">Execute</button>
-    <br /><br />
-    @if (!string.IsNullOrEmpty(_results))
+            </div>
+        </div>
+        @if (_tenantid != "-1")
+        {
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="database" HelpText="The database for the tenant" ResourceKey="Database">Database: </Label>
+                <div class="col-sm-9">
+                    <input id="database" class="form-control" @bind="@_database" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="connectionstring" HelpText="The connection information for the database" ResourceKey="ConnectionString">Connection: </Label>
+                <div class="col-sm-9">
+                    <textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="2" readonly></textarea>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="sqlQeury" HelpText="Enter the query for the SQL server" ResourceKey="SqlQuery">SQL Query: </Label>
+                <div class="col-sm-9">
+                    <textarea id="sqlQeury" class="form-control" @bind="@_sql" rows="3"></textarea>
+                </div>
+            </div>
+        }
+    </div>
+    <br />
+    <button type="button" class="btn btn-success" @onclick="Execute">@Localizer["Execute"]</button>
+    <br />
+    <br />
+    @if (_results != null)
     {
-        @((MarkupString)_results)
+        @if (_results.Count > 0)
+        {
+            <Pager Class="table table-bordered" Items="@_results">
+                <Header>
+                    @foreach (KeyValuePair<string, string> kvp in _results.First())
+                    {
+                        <th>@kvp.Key</th>
+                    }
+                </Header>
+                <Row>
+                    @foreach (KeyValuePair<string, string> kvp in context)
+                    {
+                        <td>@kvp.Value</td>
+                    }
+                </Row>
+            </Pager>
+        }
+        else
+        {
+            @Localizer["Return.NoResult"]
+        }
+        <br />
+        <br />
     }
 }
 
 @code {
     private List<Tenant> _tenants;
     private string _tenantid = "-1";
+    private string _database = string.Empty;
+    private string _connectionstring = string.Empty;
     private string _sql = string.Empty;
-    private string _results = string.Empty;
+    private List<Dictionary<string, string>> _results;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnInitializedAsync()
     {
-        _tenants = await TenantService.GetTenantsAsync();
+        try
+        {
+            _tenants = await TenantService.GetTenantsAsync();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Tenants {Error}", ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+
+    private async void TenantChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _tenantid = (string)e.Value;
+            var tenants = await TenantService.GetTenantsAsync();
+            var _databases = await DatabaseService.GetDatabasesAsync();
+            var tenant = tenants.Find(item => item.TenantId == int.Parse(_tenantid));
+            if (tenant != null)
+            {
+                _database = _databases.Find(item => item.DBType == tenant.DBType)?.Name;
+                _connectionstring = tenant.DBConnectionString;
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Tenant {TenantId} {Error}", _tenantid, ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
     }
 
     private async Task Execute()
     {
-        if (_tenantid != "-1" && !string.IsNullOrEmpty(_sql))
+        try
         {
-            var sqlquery = new SqlQuery { TenantId = int.Parse(_tenantid), Query = _sql };
-            sqlquery = await SqlService.ExecuteQueryAsync(sqlquery);
-            _results = DisplayResults(sqlquery.Results);
-        }
-        else
-        {
-            AddModuleMessage("You Must Select A Tenant And Provide A SQL Query", MessageType.Warning);
-        }
-    }
-
-    private string DisplayResults(List<Dictionary<string, string>> results)
-    {
-        var table = string.Empty;
-        foreach (Dictionary<string, string> item in results)
-        {
-            if (table == string.Empty)
+            if (_tenantid != "-1" && !string.IsNullOrEmpty(_sql))
             {
-                table = "<div class=\"table-responsive\">";
-                table += "<table class=\"table table-bordered\"><thead><tr>";
-                
-                foreach (KeyValuePair<string, string> kvp in item)
-                {
-                    table += "<th scope=\"col\">" + kvp.Key + "</th>";
-                }
-                
-                table += "</tr></thead><tbody>";
+                var sqlquery = new SqlQuery { TenantId = int.Parse(_tenantid), Query = _sql };
+                sqlquery = await SqlService.ExecuteQueryAsync(sqlquery);
+                _results = sqlquery.Results;
+                AddModuleMessage(Localizer["Success.QueryExecuted"], MessageType.Success);
             }
-            
-            table += "<tr>";
-            
-            foreach (KeyValuePair<string, string> kvp in item)
+            else
             {
-                table += "<td>" + kvp.Value + "</td>";
+                AddModuleMessage(Localizer["Message.Required.Tenant"], MessageType.Warning);
             }
-            
-            table += "</tr>";
         }
-        
-        if (table != string.Empty)
+        catch (Exception ex)
         {
-            table += "</tbody></table></div>";
+            await logger.LogError(ex, "Error Executing SQL Query {SQL} {Error}", _sql, ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
         }
-        else
-        {
-            table = "No Results Returned";
-        }
-        
-        return table;
     }
 }

Oqtane.Client/Modules/Admin/SystemInfo/Index.razor

@@ -1,81 +1,240 @@
-@namespace Oqtane.Modules.Admin.SystemInfo
+@namespace Oqtane.Modules.Admin.SystemInfo
 @inherits ModuleBase
 @inject ISystemService SystemService
+@inject IInstallationService InstallationService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="version" HelpText="Framework Version">Framework Version: </Label>
-        </td>
-        <td>
-            <input id="version" class="form-control" @bind="@_version" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="runtime" HelpText="Blazor Runtime (Server or WebAssembly)">Blazor Runtime: </Label>
-        </td>
-        <td>
-            <input id="runtime" class="form-control" @bind="@_runtime" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="clrversion" HelpText="Common Language Runtime Version">CLR Version: </Label>
-        </td>
-        <td>
-            <input id="clrversion" class="form-control" @bind="@_clrversion" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="osversion" HelpText="Operating System Version">OS Version: </Label>
-        </td>
-        <td>
-            <input id="osversion" class="form-control" @bind="@_osversion" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="serverpath" HelpText="Server Path">Server Path: </Label>
-        </td>
-        <td>
-            <input id="serverpath" class="form-control" @bind="@_serverpath" disabled />
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="servertime" HelpText="Server Time">Server Time: </Label>
-        </td>
-        <td>
-            <input id="servertime" class="form-control" @bind="@_servertime" disabled />
-        </td>
-    </tr>
-</table>
-<a class="btn btn-primary" href="swagger/index.html" target="_new">Access Framework API</a>
+<TabStrip>
+    <TabPanel Name="Info" Heading="Info" ResourceKey="Info">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="version" HelpText="Framework Version" ResourceKey="FrameworkVersion">Framework Version: </Label>
+                <div class="col-sm-9">
+                    <input id="version" class="form-control" @bind="@_version" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="clrversion" HelpText="Common Language Runtime Version" ResourceKey="CLRVersion">CLR Version: </Label>
+                <div class="col-sm-9">
+                    <input id="clrversion" class="form-control" @bind="@_clrversion" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="osversion" HelpText="Operating System Version" ResourceKey="OSVersion">OS Version: </Label>
+                <div class="col-sm-9">
+                    <input id="osversion" class="form-control" @bind="@_osversion" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="machinename" HelpText="Machine Name" ResourceKey="MachineName">Machine Name: </Label>
+                <div class="col-sm-9">
+                    <input id="machinename" class="form-control" @bind="@_machinename" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="ipaddress" HelpText="Server IP Address" ResourceKey="IPAddress">IP Address: </Label>
+                <div class="col-sm-9">
+                    <input id="ipaddress" class="form-control" @bind="@_ipaddress" readonly />
+                </div>
+            </div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="environment" HelpText="Environment name" ResourceKey="Environment">Environment: </Label>
+				<div class="col-sm-9">
+					<input id="environment" class="form-control" @bind="@_environment" readonly />
+				</div>
+			</div>
+			<div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="contentrootpath" HelpText="Root Path" ResourceKey="ContentRootPath">Root Path: </Label>
+                <div class="col-sm-9">
+                    <input id="contentrootpath" class="form-control" @bind="@_contentrootpath" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="webrootpath" HelpText="Web Path" ResourceKey="WebRootPath">Web Path: </Label>
+                <div class="col-sm-9">
+                    <input id="webrootpath" class="form-control" @bind="@_webrootpath" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="servertime" HelpText="Server Date/Time (in UTC)" ResourceKey="ServerTime">Server Date/Time: </Label>
+                <div class="col-sm-9">
+                    <input id="servertime" class="form-control" @bind="@_servertime" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="tickcount" HelpText="Amount Of Time The Service Has Been Available And Operational" ResourceKey="TickCount">Service Uptime: </Label>
+                <div class="col-sm-9">
+                    <input id="tickcount" class="form-control" @bind="@_tickcount" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="workingset" HelpText="Memory Allocation Of Service (in MB)" ResourceKey="WorkingSet">Memory Allocation: </Label>
+                <div class="col-sm-9">
+                    <input id="workingset" class="form-control" @bind="@_workingset" readonly />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="installationid" HelpText="The Unique Identifier For Your Installation" ResourceKey="InstallationId">Installation ID: </Label>
+                <div class="col-sm-9">
+                    <input id="installationid" class="form-control" @bind="@_installationid" readonly />
+                </div>
+            </div>
+        </div>
+        <br /><br />
+        <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
+    </TabPanel>
+    <TabPanel Name="Options" Heading="Options" ResourceKey="Options">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="detailederrors" HelpText="Specify If Detailed Errors Are Enabled For Blazor. This Option Should Not Not Be Enabled In Production." ResourceKey="DetailedErrors">Detailed Errors? </Label>
+                <div class="col-sm-9">
+                    <select id="detailederrors" class="form-select" @bind="@_detailederrors">
+                        <option value="true">@SharedLocalizer["True"]</option>
+                        <option value="false">@SharedLocalizer["False"]</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="logginglevel" HelpText="The Minimum Logging Level For The Event Log. This Option Can Be Used To Control The Volume Of Items Stored In Your Event Log." ResourceKey="LoggingLevel">Logging Level: </Label>
+                <div class="col-sm-9">
+                    <select id="logginglevel" class="form-select" @bind="@_logginglevel">
+                        <option value="Trace">@Localizer["Trace"]</option>
+                        <option value="Debug">@Localizer["Debug"]</option>
+                        <option value="Information">@Localizer["Information"]</option>
+                        <option value="Warning">@Localizer["Warning"]</option>
+                        <option value="Error">@Localizer["Error"]</option>
+                        <option value="Critical">@Localizer["Critical"]</option>
+                        <option value="None">@Localizer["None"]</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="notificationlevel" HelpText="The Minimum Logging Level For Which Notifications Should Be Sent To Host Users." ResourceKey="NotificationLevel">Notification Level: </Label>
+                <div class="col-sm-9">
+                    <select id="notificationlevel" class="form-select" @bind="@_notificationlevel">
+                        <option value="Trace">@Localizer["Trace"]</option>
+                        <option value="Debug">@Localizer["Debug"]</option>
+                        <option value="Information">@Localizer["Information"]</option>
+                        <option value="Warning">@Localizer["Warning"]</option>
+                        <option value="Error">@Localizer["Error"]</option>
+                        <option value="Critical">@Localizer["Critical"]</option>
+                        <option value="None">@Localizer["None"]</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="swagger" HelpText="Specify If Swagger Is Enabled For Your Server API" ResourceKey="Swagger">Swagger Enabled? </Label>
+                <div class="col-sm-9">
+                    <select id="swagger" class="form-select" @bind="@_swagger">
+                        <option value="true">@SharedLocalizer["True"]</option>
+                        <option value="false">@SharedLocalizer["False"]</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="packageservice" HelpText="Specify If The Package Service Is Enabled For Installing Modules, Themes, And Translations" ResourceKey="PackageService">Enable Package Service? </Label>
+                <div class="col-sm-9">
+                    <select id="packageservice" class="form-select" @bind="@_packageservice">
+                        <option value="true">@SharedLocalizer["True"]</option>
+                        <option value="false">@SharedLocalizer["False"]</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveConfig">@SharedLocalizer["Save"]</button>&nbsp;
+        <a class="btn btn-primary" href="swagger/index.html" target="_new">@Localizer["Access.ApiFramework"]</a>&nbsp;
+        <ActionDialog Header="Restart Application" Message="Are You Sure You Wish To Restart The Application?" Action="Restart Application" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await RestartApplication())" ResourceKey="RestartApplication" />
+    </TabPanel>
+</TabStrip>
+<br /><br />
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    private string _version = string.Empty;
-    private string _runtime = string.Empty;
-    private string _clrversion = string.Empty;
-    private string _osversion = string.Empty;
-    private string _serverpath = string.Empty;
-    private string _servertime = string.Empty;
+	private string _version = string.Empty;
+	private string _clrversion = string.Empty;
+	private string _osversion = string.Empty;
+	private string _machinename = string.Empty;
+	private string _ipaddress = string.Empty;
+	private string _environment = string.Empty;
+	private string _contentrootpath = string.Empty;
+	private string _webrootpath = string.Empty;
+	private string _servertime = string.Empty;
+	private string _tickcount = string.Empty;
+	private string _workingset = string.Empty;
+	private string _installationid = string.Empty;
 
-    protected override async Task OnInitializedAsync()
+	private string _detailederrors = string.Empty;
+	private string _logginglevel = string.Empty;
+	private string _notificationlevel = string.Empty;
+	private string _swagger = string.Empty;
+	private string _packageservice = string.Empty;
+
+	protected override async Task OnInitializedAsync()
+	{
+		_version = Constants.Version;
+
+		Dictionary<string, object> systeminfo = await SystemService.GetSystemInfoAsync("environment");
+		if (systeminfo != null)
+		{
+			_clrversion = systeminfo["CLRVersion"].ToString();
+			_osversion = systeminfo["OSVersion"].ToString();
+			_machinename = systeminfo["MachineName"].ToString();
+			_ipaddress = systeminfo["IPAddress"].ToString();
+			_environment = systeminfo["Environment"].ToString();
+			_contentrootpath = systeminfo["ContentRootPath"].ToString();
+			_webrootpath = systeminfo["WebRootPath"].ToString();
+			_servertime = systeminfo["ServerTime"].ToString() + " UTC";
+			_tickcount = TimeSpan.FromMilliseconds(Convert.ToInt64(systeminfo["TickCount"].ToString())).ToString();
+			_workingset = (Convert.ToInt64(systeminfo["WorkingSet"].ToString()) / 1000000).ToString() + " MB";
+		}
+
+		systeminfo = await SystemService.GetSystemInfoAsync();
+		if (systeminfo != null)
+		{
+			_installationid = systeminfo["InstallationId"].ToString();
+            _detailederrors = systeminfo["DetailedErrors"].ToString();
+            _logginglevel = systeminfo["Logging:LogLevel:Default"].ToString();
+            _notificationlevel = systeminfo["Logging:LogLevel:Notify"].ToString();
+            _swagger = systeminfo["UseSwagger"].ToString();
+            _packageservice = systeminfo["PackageService"].ToString();
+		}
+	}
+
+    private async Task SaveConfig()
     {
-        _version = Constants.Version;
-        _runtime = PageState.Runtime.ToString();
-
-        Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
-        if (systeminfo != null)
+        try
         {
-            _clrversion = systeminfo["clrversion"];
-            _osversion = systeminfo["osversion"];
-            _serverpath = systeminfo["serverpath"];
-            _servertime = systeminfo["servertime"];
+            var settings = new Dictionary<string, object>();
+            settings.Add("DetailedErrors", _detailederrors);
+            settings.Add("Logging:LogLevel:Default", _logginglevel);
+            settings.Add("Logging:LogLevel:Notify", _notificationlevel);
+            settings.Add("UseSwagger", _swagger);
+            settings.Add("PackageService", _packageservice);
+            await SystemService.UpdateSystemInfoAsync(settings);
+            AddModuleMessage(Localizer["Success.UpdateConfig.Restart"], MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Saving Configuration");
+            AddModuleMessage(Localizer["Error.UpdateConfig"], MessageType.Error);
         }
     }
-}
+
+    private async Task RestartApplication()
+    {
+        try
+        {
+            ShowProgressIndicator();
+            var interop = new Interop(JSRuntime);
+            await interop.RedirectBrowser(NavigateUrl(""), 20);
+            await InstallationService.RestartAsync();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Restarting Application");
+        }
+    }
+}

Oqtane.Client/Modules/Admin/Tenants/Edit.razor

@@ -1,85 +0,0 @@
-@namespace Oqtane.Modules.Admin.Tenants
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject ITenantService TenantService
-
-<table class="table table-borderless">
-    <tr>
-        <td>
-            <Label For="name" HelpText="The name of the tenant">Name: </Label>
-        </td>
-        <td>
-            @if (name == Constants.MasterTenant)
-            {
-                <input id="name" class="form-control" @bind="@name" readonly />
-            }
-            else
-            {
-                <input id="name" class="form-control" @bind="@name" />
-            }
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <Label For="connectionstring" HelpText="The database connection string">Connection String: </Label>
-        </td>
-        <td>
-            <textarea id="connectionstring" class="form-control" @bind="@connectionstring" rows="3" readonly></textarea>
-        </td>
-    </tr>
-
-</table>
-<button type="button" class="btn btn-success" @onclick="SaveTenant">Save</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-
-@code {
-    private int tenantid;
-    private string name = string.Empty;
-    private string connectionstring = string.Empty;
-    private string schema = string.Empty;
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            tenantid = Int32.Parse(PageState.QueryString["id"]);
-            var tenant = await TenantService.GetTenantAsync(tenantid);
-            if (tenant != null)
-            {
-                name = tenant.Name;
-                connectionstring = tenant.DBConnectionString;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Tenant {TenantId} {Error}", tenantid, ex.Message);
-            AddModuleMessage("Error Loading Tenant", MessageType.Error);
-        }
-    }
-
-    private async Task SaveTenant()
-    {
-        try
-        {
-            connectionstring = connectionstring.Replace("\\\\", "\\");
-            var tenant = await TenantService.GetTenantAsync(tenantid);
-            if (tenant != null)
-            {
-                tenant.Name = name;
-                tenant.DBConnectionString = connectionstring;
-                
-                await TenantService.UpdateTenantAsync(tenant);
-                await logger.LogInformation("Tenant Saved {TenantId}", tenantid);
-
-                NavigationManager.NavigateTo(NavigateUrl());
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Saving Tenant {TenantId} {Error}", tenantid, ex.Message);
-            AddModuleMessage("Error Saving Tenant", MessageType.Error);
-        }
-    }
-}

Oqtane.Client/Modules/Admin/Tenants/Index.razor

@@ -1,67 +0,0 @@
-@namespace Oqtane.Modules.Admin.Tenants
-@inherits ModuleBase
-@inject ITenantService TenantService
-@inject IAliasService AliasService
-
-@if (tenants == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <Pager Items="@tenants">
-        <Header>
-            <th>&nbsp;</th>
-            <th>&nbsp;</th>
-            <th>Name</th>
-        </Header>
-        <Row>
-            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.TenantId.ToString())" /></td>
-            <td><ActionDialog Header="Delete Tenant" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Tenant?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTenant(context))" Disabled="@(context.Name == Constants.MasterTenant)" /></td>
-            <td>@context.Name</td>
-        </Row>
-    </Pager>
-
-}
-
-@code {
-    private List<Tenant> tenants;
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
-
-    protected override async Task OnParametersSetAsync()
-    {
-        tenants = await TenantService.GetTenantsAsync();
-    }
-
-    private async Task DeleteTenant(Tenant Tenant)
-    {
-        try
-        {
-            string message = string.Empty;
-            var aliases = await AliasService.GetAliasesAsync();
-            foreach (var alias in aliases)
-            {
-                if (alias.TenantId == Tenant.TenantId)
-                {
-                    message += ", " + alias.Name;
-                }
-            }
-            if (string.IsNullOrEmpty(message))
-            {
-                await TenantService.DeleteTenantAsync(Tenant.TenantId);
-                await logger.LogInformation("Tenant Deleted {Tenant}", Tenant);
-                StateHasChanged();
-            }
-            else
-            {
-                AddModuleMessage("Tenant Cannot Be Deleted Until The Following Sites Are Deleted: " + message.Substring(2), MessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting Tenant {Tenant} {Error}", Tenant, ex.Message);
-            AddModuleMessage("Error Deleting Tenant", MessageType.Error);
-        }
-    }
-}

Oqtane.Client/Modules/Admin/Themes/Add.razor

@@ -1,53 +1,131 @@
-@namespace Oqtane.Modules.Admin.Themes
+@namespace Oqtane.Modules.Admin.Themes
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IFileService FileService
 @inject IThemeService ThemeService
 @inject IPackageService PackageService
+@inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_packages != null)
-{
 <TabStrip>
-    @if (_packages.Count > 0)
-    {
-    <TabPanel Name="Download">
-        <ModuleMessage Type="MessageType.Info" Message="Download one or more themes from the list below. Once you are ready click Install to complete the installation."></ModuleMessage>
-        <Pager Items="@_packages">
-            <Header>
-                <th>Name</th>
-                <th>Version</th>
-                <th></th>
-            </Header>
-            <Row>
-                <td>@context.Name</td>
-                <td>@context.Version</td>
-                <td>
-                    <button type="button" class="btn btn-primary" @onclick=@(async () => await DownloadTheme(context.PackageId, context.Version))>Download</button>
-                </td>
-            </Row>
-        </Pager>
+    <TabPanel Name="Download" ResourceKey="Download">
+        <div class="row justify-content-center mb-3">
+            <div class="col-sm-6">
+                <div class="input-group">
+                    <select id="price" class="form-select custom-select" @onchange="(e => PriceChanged(e))">
+                        <option value="free">@SharedLocalizer["Free"]</option>
+                        <option value="paid">@SharedLocalizer["Paid"]</option>
+                    </select>
+                    <input id="search" class="form-control" placeholder="@SharedLocalizer["Search.Hint"]" @bind="@_search" />
+                    <button type="button" class="btn btn-primary" @onclick="Search">@SharedLocalizer["Search"]</button>
+                    <button type="button" class="btn btn-secondary" @onclick="Reset">@SharedLocalizer["Reset"]</button>
+                </div>
+            </div>
+        </div>
+
+        @if (_packages != null)
+        {
+            if (_packages.Count > 0)
+            {
+                <Pager Items="@_packages">
+                    <Row>
+                        <td>
+                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_new">@context.Name</a></h3>&nbsp;&nbsp;@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+                            @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+                            <strong>@(String.Format("{0:n0}", context.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
+                            @SharedLocalizer["Search.Released"]: <strong>@context.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
+                            @SharedLocalizer["Search.Version"]: <strong>@context.Version</strong>
+                            @((MarkupString)(!string.IsNullOrEmpty(context.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(context.PackageUrl).Host + "</strong>" : ""))
+                            @((MarkupString)(context.TrialPeriod > 0 ? "&nbsp;&nbsp;|&nbsp;&nbsp;<strong>" + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "</strong>" : ""))
+                        </td>
+                        <td style="width: 1px; vertical-align: middle;">
+                            @if (context.Price != null && !string.IsNullOrEmpty(context.PackageUrl))
+                            {
+                                <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                            }
+                        </td>
+                        <td style="width: 1px; vertical-align: middle;">
+                            @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                            {
+                                <a class="btn btn-primary" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@context.Price.Value.ToString("$#,##0.00")</a>
+                            }
+                            else
+                            {
+                                <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                            }
+                        </td>
+                    </Row>
+                </Pager>
+            }
+            else
+            {
+                <br />
+                <div class="mx-auto text-center">
+                    @Localizer["Search.NoResults"]
+                </div>
+            }
+        }
     </TabPanel>
-    }
-    <TabPanel Name="Upload">
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <Label HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation.">Theme: </Label>
-                </td>
-                <td>
-                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Themes" UploadMultiple="True" />
-                </td>
-            </tr>
-        </table>
+    <TabPanel Name="Upload" ResourceKey="Upload">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" HelpText="Upload one or more theme packages. Once they are uploaded click Install to complete the installation." ResourceKey="Theme">Theme: </Label>
+                <div class="col-sm-9">
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
+                </div>
+            </div>
+        </div>
     </TabPanel>
 </TabStrip>
 
-<button type="button" class="btn btn-success" @onclick="InstallThemes">Install</button>
-<NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
+@if (_productname != "")
+{
+    <div class="app-actiondialog">
+        <div class="modal" tabindex="-1" role="dialog">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title">@SharedLocalizer["Review License Terms"]</h5>
+                        <button type="button" class="btn-close" aria-label="Close" @onclick="HideModal"></button>
+                    </div>
+                    <div class="modal-body">
+                        <p style="height: 200px; overflow-y: scroll;">
+                            <h3>@_productname</h3>
+                            @if (!string.IsNullOrEmpty(_license))
+                            {
+                                @((MarkupString)_license)
+                            }
+                            else
+                            {
+                                @SharedLocalizer["License Not Specified"]
+                            }
+                        </p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-success" @onclick="DownloadPackage">@SharedLocalizer["Accept"]</button>
+                        <button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 }
 
+<button type="button" class="btn btn-success" @onclick="InstallThemes">@SharedLocalizer["Install"]</button>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+
+<br />
+<br />
+<ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
+
 @code {
     private List<Package> _packages;
+    private string _price = "free";
+    private string _search = "";
+    private string _productname = "";
+    private string _license = "";
+    private string _packageid = "";
+    private string _version = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -55,21 +133,118 @@
     {
         try
         {
-            var themes = await ThemeService.GetThemesAsync();
-            _packages = await PackageService.GetPackagesAsync("theme");
+            await LoadThemes();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Package.Load"], MessageType.Error);
+        }
+    }
 
+    private async Task LoadThemes()
+    {
+        var themes = await ThemeService.GetThemesAsync();
+        _packages = await PackageService.GetPackagesAsync("theme", _search, _price, "");
+
+        if (_packages != null)
+        {
             foreach (Package package in _packages.ToArray())
             {
-                if (themes.Exists(item => Utilities.GetTypeName(item.ThemeName) == package.PackageId))
+                if (themes.Exists(item => item.PackageName == package.PackageId))
                 {
                     _packages.Remove(package);
                 }
             }
         }
+    }
+
+    private async void PriceChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _price = (string)e.Value;
+            _search = "";
+            await LoadThemes();
+            StateHasChanged();
+        }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Packages {Error}", ex.Message);
-            AddModuleMessage("Error Loading Packages", MessageType.Error);
+            await logger.LogError(ex, "Error On PriceChanged");
+        }
+    }
+
+    private async Task Search()
+    {
+        try
+        {
+            await LoadThemes();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Search");
+        }
+    }
+
+    private async Task Reset()
+    {
+        try
+        {
+            _search = "";
+            await LoadThemes();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error On Reset");
+        }
+    }
+
+    private void HideModal()
+    {
+        _productname = "";
+        _license = "";
+        StateHasChanged();
+    }
+
+    private async Task GetPackage(string packageid, string version)
+    {
+        try
+        {
+            var package = await PackageService.GetPackageAsync(packageid, version);
+            if (package != null)
+            {
+                _productname = package.Name;
+                if (!string.IsNullOrEmpty(package.License))
+                {
+                    _license = package.License.Replace("\n", "<br />");
+                }
+                _packageid = package.PackageId;
+                _version = package.Version;
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version);
+            AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
+        }
+    }
+
+    private async Task DownloadPackage()
+    {
+        try
+        {
+            await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
+            await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version);
+            AddModuleMessage(Localizer["Success.Theme.Download"], MessageType.Success);
+            _productname = "";
+            _license = "";
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version);
+            AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
         }
     }
 
@@ -78,27 +253,11 @@
         try
         {
             await ThemeService.InstallThemesAsync();
-            NavigationManager.NavigateTo(NavigateUrl());
+            AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Installating Theme");
+            await logger.LogError(ex, "Error Installing Theme");
         }
     }
-
-    private async Task DownloadTheme(string packageid, string version)
-    {
-        try
-        {
-            await PackageService.DownloadPackageAsync(packageid, version, "Themes");
-            await logger.LogInformation("Theme {ThemeName} {Version} Downloaded Successfully", packageid, version);
-            AddModuleMessage("Themes Downloaded Successfully. Click Install To Complete Installation.", MessageType.Success);
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Downloading Module {ThemeName} {Version}", packageid, version);
-            AddModuleMessage("Error Downloading Theme", MessageType.Error);
-        }
-    }
-    }
+}

Oqtane.Client/Modules/Admin/Themes/Create.razor

@@ -0,0 +1,150 @@
+@namespace Oqtane.Modules.Admin.Themes
+@inherits ModuleBase
+@using System.Text.RegularExpressions
+@inject NavigationManager NavigationManager
+@inject IThemeService ThemeService
+@inject IModuleService ModuleService
+@inject IPageModuleService PageModuleService
+@inject ISettingService SettingService
+@inject IStringLocalizer<Create> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_templates != null)
+{
+	<div class="container">
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="owner" HelpText="Enter the name of the organization who is developing this theme. It should not contain spaces or punctuation." ResourceKey="OwnerName">Owner Name: </Label>
+			<div class="col-sm-9">
+				<input id="owner" class="form-control" @bind="@_owner" />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="module" HelpText="Enter a name for this theme. It should not contain spaces or punctuation." ResourceKey="ThemeName">Theme Name: </Label>
+			<div class="col-sm-9">
+				<input id="module" class="form-control" @bind="@_theme" />
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="template" HelpText="Select a theme template. Templates are located in the wwwroot/Themes/Templates folder on the server." ResourceKey="Template">Template: </Label>
+			<div class="col-sm-9">
+				<select id="template" class="form-select" @onchange="(e => TemplateChanged(e))">
+					<option value="-">&lt;@Localizer["Template.Select"]&gt;</option>
+					@foreach (Template template in _templates)
+					{
+						<option value="@template.Name">@template.Title</option>
+					}
+				</select>
+			</div>
+		</div>
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="reference" HelpText="Select a framework reference version" ResourceKey="FrameworkReference">Framework Reference: </Label>
+			<div class="col-sm-9">
+				<select id="reference" class="form-select" @bind="@_reference">
+					@foreach (string version in _versions)
+					{
+						if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0)
+						{
+							<option value="@(version)">@(version)</option>
+						}
+					}
+					<option value="local">@SharedLocalizer["LocalVersion"]</option>
+				</select>
+			</div>
+		</div>
+		@if (!string.IsNullOrEmpty(_location)) 
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="location" HelpText="Location where the theme will be created" ResourceKey="Location">Location: </Label>
+				<div class="col-sm-9">
+					<input id="module" class="form-control" @bind="@_location" readonly />
+				</div>
+			</div>
+		}
+	</div>
+    <br />
+    <button type="button" class="btn btn-success" @onclick="CreateTheme">@Localizer["Theme.Create"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+}
+
+@code {
+    private string _owner = string.Empty;
+    private string _theme = string.Empty;
+    private List<Template> _templates;
+    private string _template = "-";
+    private string[] _versions;
+    private string _reference = "local";
+    private string _minversion = "2.0.0";
+    private string _location = string.Empty;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    protected override void OnInitialized()
+    {
+        AddModuleMessage(Localizer["Info.Theme.CreatorIntent"], MessageType.Info);
+    }
+	
+	protected override async Task OnParametersSetAsync()
+    {
+        try
+        {
+            _templates = await ThemeService.GetThemeTemplatesAsync();
+            _versions = Constants.ReleaseVersions.Split(',').Where(item => Version.Parse(item).CompareTo(Version.Parse("2.0.0")) >= 0).ToArray();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Theme Creator");
+        }
+    }
+
+    private async Task CreateTheme()
+    {
+        try
+        {
+            if (IsValid(_owner) && IsValid(_theme) && _owner != _theme && _template != "-")
+            {
+                var theme = new Theme { Owner = _owner, Name = _theme, Template = _template, Version = _reference };
+                theme = await ThemeService.CreateThemeAsync(theme);
+                GetLocation();
+                AddModuleMessage(string.Format(Localizer["Success.Theme.Create"], NavigateUrl("admin/system")), MessageType.Success);
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.Required.ValidName"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Creating Theme");
+        }
+    }
+
+    private bool IsValid(string name)
+    {
+        // must contain letters, underscores and digits and first character must be letter or underscore
+        return !string.IsNullOrEmpty(name) && name.ToLower() != "theme" && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+    }
+
+    private void TemplateChanged(ChangeEventArgs e)
+    {
+        _template = (string)e.Value;
+        _minversion = "2.0.0";
+        if (_template != "-")
+        {
+            var template = _templates.FirstOrDefault(item => item.Name == _template);
+            _minversion = template.Version;
+        }
+        GetLocation();
+    }
+
+    private void GetLocation()
+    {
+        _location = string.Empty;
+        if (_owner != "" && _theme != "" && _template != "-")
+        {
+            var template = _templates.FirstOrDefault(item => item.Name == _template);
+            _location = template.Location + _owner + "." + _theme;
+
+        }
+        StateHasChanged();
+    }
+}

Oqtane.Client/Modules/Admin/Themes/Index.razor

@@ -1,79 +1,143 @@
-@namespace Oqtane.Modules.Admin.Themes
+@namespace Oqtane.Modules.Admin.Themes
+@using System.Net
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IThemeService ThemeService
 @inject IPackageService PackageService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (themes == null)
+@if (_themes == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
     <ActionLink Action="Add" Text="Install Theme" />
+    @((MarkupString)"&nbsp;")
+    <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" Class="btn btn-secondary" />
 
-    <Pager Items="@themes">
+    <Pager Items="@_themes">
         <Header>
-            <th>&nbsp;</th>
-            <th>Name</th>
-            <th>Version</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th style="width: 1px;">&nbsp;</th>
+            <th>@SharedLocalizer["Name"]</th>
+            <th>@SharedLocalizer["Version"]</th>
+            <th>@SharedLocalizer["Expires"]</th>
             <th>&nbsp;</th>
         </Header>
         <Row>
+            <td><ActionLink Action="View" Parameters="@($"name=" + WebUtility.UrlEncode(context.ThemeName))" ResourceKey="ViewTheme" /></td>
             <td>
-                @if (context.AssemblyName != "Oqtane.Client")
-                {
-                    <ActionDialog Header="Delete Theme" Message="@("Are You Sure You Wish To Delete The " + context.Name + " Theme?")" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTheme(context))" />
-                }
+				@if (context.AssemblyName != Constants.ClientId)
+                    {
+                    <ActionDialog Header="Delete Theme" Message="@string.Format(Localizer["Confirm.Theme.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteTheme(context))" ResourceKey="DeleteTheme" />
+                    }
             </td>
             <td>@context.Name</td>
             <td>@context.Version</td>
             <td>
-                @if (UpgradeAvailable(context.ThemeName, context.Version))
+                @((MarkupString)PurchaseLink(context.PackageName))
+            </td>
+            <td>
+				@{ 
+					var version = UpgradeAvailable(context.PackageName, context.Version);
+				} 
+                @if (version != context.Version)
                 {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.ThemeName, context.Version))>Upgrade</button>
+                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadTheme(context.PackageName, version))>@SharedLocalizer["Upgrade"]</button>
                 }
             </td>
+            <td></td>
         </Row>
     </Pager>
 }
 
 @code {
-    private List<Theme> themes;
-    private List<Package> packages;
+    private List<Theme> _themes;
+    private List<Package> _packages;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnParametersSetAsync()
     {
-        themes = await ThemeService.GetThemesAsync();
-        packages = await PackageService.GetPackagesAsync("module");
-    }
-
-    private bool UpgradeAvailable(string themename, string version)
-    {
-        var upgradeavailable = false;
-        var package = packages.Where(item => item.PackageId == Utilities.GetTypeName(themename)).FirstOrDefault();
-        if (package != null)
+        try
         {
-            upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0);
+            _themes = await ThemeService.GetThemesAsync();
+            _packages = await PackageService.GetPackagesAsync("theme");
+        }
+        catch (Exception ex)
+        {
+            if (_themes == null)
+            {
+                await logger.LogError(ex, "Error Loading Themes {Error}", ex.Message);
+                AddModuleMessage(Localizer["Error.Theme.Load"], MessageType.Error);
+            }
         }
-        
-        return upgradeavailable;
     }
 
-    private async Task DownloadTheme(string themename, string version)
+    private string PurchaseLink(string packagename)
     {
-        await PackageService.DownloadPackageAsync(themename, version, "Themes");
-        await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", themename, version);
-        await ThemeService.InstallThemesAsync();
-        NavigationManager.NavigateTo(NavigateUrl());
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null)
+            {
+                if (package.ExpiryDate != null && package.ExpiryDate.Value.Date != DateTime.MaxValue.Date)
+                {
+                    link += "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+                    if (!string.IsNullOrEmpty(package.PaymentUrl))
+                    {
+                        link += "&nbsp;&nbsp;<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + SharedLocalizer["Extend"] + "</a>";
+                    }
+                }
+            }
+        }
+        return link;
+    }
+
+	private string UpgradeAvailable(string packagename, string version)
+	{
+		if (!string.IsNullOrEmpty(packagename) && _packages != null)
+		{
+			var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+			if (package != null && Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+			{
+				return package.Version;
+			}
+        }
+        return version;
+    }
+
+    private async Task DownloadTheme(string packagename, string version)
+    {
+        try
+        {
+            await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
+            await logger.LogInformation("Theme Downloaded {ThemeName} {Version}", packagename, version);
+            await ThemeService.InstallThemesAsync();
+            AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Theme {ThemeName} {Version} {Error}", packagename, version, ex.Message);
+            AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
+        }
     }
 
     private async Task DeleteTheme(Theme Theme)
     {
-        await ThemeService.DeleteThemeAsync(Theme.ThemeName);
-        await logger.LogInformation("Theme Deleted {Theme}", Theme);
-        NavigationManager.NavigateTo(NavigateUrl());
+        try
+        {
+            await ThemeService.DeleteThemeAsync(Theme.ThemeName);
+            AddModuleMessage(Localizer["Success.Theme.Delete"], MessageType.Success);
+            NavigationManager.NavigateTo(NavigateUrl(PageState.Page.Path, true));
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Theme {Theme} {Error}", Theme, ex.Message);
+            AddModuleMessage(Localizer["Error.Theme.Delete"], MessageType.Error);
+        }
     }
 }

Oqtane.Client/Modules/Admin/Themes/View.razor

@@ -0,0 +1,97 @@
+@namespace Oqtane.Modules.Admin.Themes
+@using System.Net
+@inherits ModuleBase
+@inject IThemeService ThemeService
+@inject NavigationManager NavigationManager
+@inject IStringLocalizer<View> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="name" HelpText="The name of the theme" ResourceKey="Name">Name: </Label>
+        <div class="col-sm-9">
+            <input id="name" class="form-control" @bind="@_name" disabled />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="themename" HelpText="The internal name of the module" ResourceKey="InternalName">Internal Name: </Label>
+        <div class="col-sm-9">
+            <input id="themename" class="form-control" @bind="@_themeName" disabled />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="version" HelpText="The version of the theme" ResourceKey="Version">Version: </Label>
+        <div class="col-sm-9">
+            <input id="version" class="form-control" @bind="@_version" disabled />
+        </div>
+    </div>
+	<div class="row mb-1 align-items-center">
+		<Label Class="col-sm-3" For="packagename" HelpText="The unique name of the package from which this module was installed" ResourceKey="PackageName">Package Name: </Label>
+		<div class="col-sm-9">
+			<input id="packagename" class="form-control" @bind="@_packagename" disabled />
+		</div>
+	</div>
+	<div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="owner" HelpText="The owner or creator of the theme" ResourceKey="Owner">Owner: </Label>
+        <div class="col-sm-9">
+            <input id="owner" class="form-control" @bind="@_owner" disabled />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="url" HelpText="The reference url of the theme" ResourceKey="ReferenceUrl">Reference Url: </Label>
+        <div class="col-sm-9">
+            <input id="url" class="form-control" @bind="@_url" disabled />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="contact" HelpText="The contact for the theme" ResourceKey="Contact">Contact: </Label>
+        <div class="col-sm-9">
+            <input id="contact" class="form-control" @bind="@_contact" disabled />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="license" HelpText="The license of the theme" ResourceKey="License">License: </Label>
+        <div class="col-sm-9">
+            <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
+        </div>
+    </div>
+</div>
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+
+@code {
+	private string _themeName = "";
+	private string _name;
+	private string _version;
+	private string _packagename;
+	private string _owner = "";
+	private string _url = "";
+	private string _contact = "";
+	private string _license = "";
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_themeName = WebUtility.UrlDecode(PageState.QueryString["name"]);
+			var themes = await ThemeService.GetThemesAsync();
+			var theme = themes.FirstOrDefault(item => item.ThemeName == _themeName);
+			if (theme != null)
+			{
+				_name = theme.Name;
+				_version = theme.Version;
+				_packagename = theme.PackageName;
+				_owner = theme.Owner;
+                _url = theme.Url;
+                _contact = theme.Contact;
+                _license = theme.License;
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Theme {ThemeName} {Error}", _themeName, ex.Message);
+            AddModuleMessage(Localizer["Error.Theme.Loading"], MessageType.Error);
+        }
+    }
+}

Oqtane.Client/Modules/Admin/Upgrade/Index.razor

@@ -1,39 +1,38 @@
-@namespace Oqtane.Modules.Admin.Upgrade
+@namespace Oqtane.Modules.Admin.Upgrade
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IFileService FileService
 @inject IPackageService PackageService
 @inject IInstallationService InstallationService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_package != null)
-{
 <TabStrip>
-    <TabPanel Name="Download">
-        @if (_upgradeavailable)
+    <TabPanel Name="Download" ResourceKey="Download">
+        @if (_package != null && _upgradeavailable)
         {
-            <ModuleMessage Type="MessageType.Info" Message="Select The Upgrade Button To Install a New Framework Version"></ModuleMessage>
-            @("Framework") @_package.Version <button type="button" class="btn btn-success" @onclick=@(async () => await Download(Constants.PackageId, Constants.Version))>Upgrade</button>
+            <ModuleMessage Type="MessageType.Info" Message="Select The Download Button To Download The Framework Upgrade Package And Then Select Upgrade"></ModuleMessage>
+            <button type="button" class="btn btn-primary" @onclick=@(async () => await Download(Constants.PackageId, @_package.Version))>@SharedLocalizer["Download"] @_package.Version</button>
+            <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
         }
         else
         {
             <ModuleMessage Type="MessageType.Info" Message="Framework Is Already Up To Date"></ModuleMessage>
         }
     </TabPanel>
-    <TabPanel Name="Upload">
-        <table class="table table-borderless">
-            <tr>
-                <td>
-                    <Label HelpText="Upload a framework package and select Install to complete the installation">Framework: </Label>
-                </td>
-                <td>
-                    <FileManager Filter="nupkg" ShowFiles="false" Folder="Framework" />
-                </td>
-            </tr>
-        </table>
-        <button type="button" class="btn btn-success" @onclick="Upgrade">Install</button>
+    <TabPanel Name="Upload" ResourceKey="Upload">
+        <ModuleMessage Type="MessageType.Info" Message="Upload A Framework Package (Oqtane.Framework.version.nupkg) And Then Select Upgrade"></ModuleMessage>
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" HelpText="Upload A Framework Package And Then Select Upgrade" ResourceKey="Framework">Framework: </Label>
+                <div class="col-sm-9">
+                    <FileManager Folder="@Constants.PackagesFolder" />
+                </div>
+            </div>
+        </div>
+        <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
     </TabPanel>
 </TabStrip>
-}
 
 @code {
     private Package _package;
@@ -43,28 +42,57 @@
 
     protected override async Task OnInitializedAsync()
     {
-        List<Package> packages = await PackageService.GetPackagesAsync("framework");
-        _package = packages.FirstOrDefault();
-        if (_package != null)
+        try
         {
-            _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
+            List<Package> packages = await PackageService.GetPackagesAsync("framework", "", "", "");
+            if (packages != null)
+            {
+                _package = packages.Where(item => item.PackageId.StartsWith(Constants.PackageId)).FirstOrDefault();
+                if (_package != null)
+                {
+                    _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
+                }
+                else
+                {
+                    _package = new Package { Name = Constants.PackageId, Version = Constants.Version };
+                }
+            }
         }
-        else
+        catch
         {
-            _package = new Package { Name = Constants.PackageId, Version = Constants.Version };
+            // can be caused by no network connection
         }
     }
 
     private async Task Upgrade()
     {
-        await InstallationService.Upgrade();
-        NavigationManager.NavigateTo(NavigateUrl());
+        try
+        {
+            AddModuleMessage(Localizer["Info.Upgrade.Wait"], MessageType.Info);
+            ShowProgressIndicator();
+            var interop = new Interop(JSRuntime);
+            await interop.RedirectBrowser(NavigateUrl(), 10);
+            await InstallationService.Upgrade();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Executing Upgrade {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Upgrade.Execute"], MessageType.Error);
+        }
     }
 
     private async Task Download(string packageid, string version)
     {
-        await PackageService.DownloadPackageAsync(packageid, version, "Framework");
-        await InstallationService.Upgrade();
-        NavigationManager.NavigateTo(NavigateUrl());
+        try
+        {
+            await PackageService.DownloadPackageAsync(packageid, version, Constants.PackagesFolder);
+            await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version, Constants.PackagesFolder);
+            AddModuleMessage(Localizer["Success.Framework.Download"], MessageType.Success);
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Framework Package {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Framework.Download"], MessageType.Error);
+        }
     }
 }

Oqtane.Client/Modules/Admin/UrlMappings/Add.razor

@@ -0,0 +1,89 @@
+@namespace Oqtane.Modules.Admin.UrlMappings
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUrlMappingService UrlMappingService
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="url" HelpText="The fully qualified Url for this site" ResourceKey="Url">Url:</Label>
+            <div class="col-sm-9">
+                <input id="url" class="form-control" @bind="@_url" maxlength="500" required />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="mappedurl" HelpText="A fully qualified Url where the user will be redirected" ResourceKey="MappedUrl">Redirect To:</Label>
+            <div class="col-sm-9">
+                <input id="mappedurl" class="form-control" @bind="@_mappedurl" maxlength="500" required />
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveUrlMapping">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </div>
+</form>
+
+@code {
+	private ElementReference form;
+	private bool validated = false;
+
+	private string _url = string.Empty;
+	private string _mappedurl = string.Empty;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	private async Task SaveUrlMapping()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			if (_url != _mappedurl)
+			{
+				var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+				url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
+
+				_url = (_url.StartsWith("/")) ? _url.Substring(1) : _url;
+				_url = (!_url.StartsWith("http")) ? url + _url : _url;
+
+				if (_url.StartsWith(url))
+				{
+					var urlmapping = new UrlMapping();
+					urlmapping.SiteId = PageState.Site.SiteId;
+					var route = new Route(_url, PageState.Alias.Path);
+					urlmapping.Url = route.PagePath;
+					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
+					urlmapping.Requests = 0;
+					urlmapping.CreatedOn = DateTime.UtcNow;
+					urlmapping.RequestedOn = DateTime.UtcNow;
+
+					try
+					{
+						urlmapping = await UrlMappingService.AddUrlMappingAsync(urlmapping);
+						await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
+						NavigationManager.NavigateTo(NavigateUrl());
+					}
+					catch (Exception ex)
+					{
+						await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
+						AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
+					}
+				}
+				else
+				{
+					AddModuleMessage(Localizer["Message.SaveUrlMapping"], MessageType.Warning);
+				}
+			}
+			else
+			{
+                AddModuleMessage(Localizer["Message.DuplicateUrlMapping"], MessageType.Warning);
+			}
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+}

Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor

@@ -0,0 +1,92 @@
+@namespace Oqtane.Modules.Admin.UrlMappings
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUrlMappingService UrlMappingService
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="url" HelpText="A fully qualified Url for this site" ResourceKey="Url">Url:</Label>
+            <div class="col-sm-9">
+                <input id="url" class="form-control" @bind="@_url" maxlength="500" readonly />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="mappedurl" HelpText="A fully qualified Url where the user will be redirected" ResourceKey="MappedUrl">Redirect To:</Label>
+            <div class="col-sm-9">
+                <input id="mappedurl" class="form-control" @bind="@_mappedurl" maxlength="500" required />
+            </div>
+        </div>
+        <br /><br />
+        <button type="button" class="btn btn-success" @onclick="SaveUrlMapping">@SharedLocalizer["Save"]</button>
+        <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    </div>
+</form>
+
+@code {
+	private ElementReference form;
+	private bool validated = false;
+
+	private int _urlmappingid;
+	private string _url = string.Empty;
+	private string _mappedurl = string.Empty;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_urlmappingid = Int32.Parse(PageState.QueryString["id"]);
+			var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
+			if (urlmapping != null)
+			{
+				_url = urlmapping.Url;
+				_mappedurl = urlmapping.MappedUrl;
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading UrlMapping {UrlMappingId} {Error}", _urlmappingid, ex.Message);
+			AddModuleMessage(Localizer["Error.LoadUrlMapping"], MessageType.Error);
+		}
+	}
+
+	private async Task SaveUrlMapping()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			if (_url != _mappedurl)
+			{
+				try
+				{
+					var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+					url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
+
+					var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
+					urlmapping.MappedUrl = _mappedurl.Replace(url, "");
+					urlmapping = await UrlMappingService.UpdateUrlMappingAsync(urlmapping);
+					await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
+					NavigationManager.NavigateTo(NavigateUrl());
+				}
+				catch (Exception ex)
+				{
+					await logger.LogError(ex, "Error Saving UrlMapping {UrlMappingId} {Error}", _urlmappingid, ex.Message);
+					AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
+				}
+			}
+			else
+			{
+                AddModuleMessage(Localizer["Message.DuplicateUrlMapping"], MessageType.Warning);
+			}
+		}
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+}

Oqtane.Client/Modules/Admin/UrlMappings/Index.razor

@@ -0,0 +1,135 @@
+@namespace Oqtane.Modules.Admin.UrlMappings
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUrlMappingService UrlMappingService
+@inject ISiteService SiteService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_urlMappings == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+    <TabStrip>
+        <TabPanel Name="Urls" Heading="Urls" ResourceKey="Urls">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<div class="col-sm-6">
+						<ActionLink Action="Add" Text="Add Url Mapping" ResourceKey="AddUrlMapping" />
+					</div>
+					<div class="col-sm-6">
+						<select id="type" class="form-select custom-select" @onchange="(e => MappedChanged(e))">
+							<option value="true">@Localizer["Mapped"]</option>
+							<option value="false">@Localizer["Broken"]</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<br/>
+			<Pager Items="@_urlMappings">
+				<Header>
+					<th style="width: 1px;">&nbsp;</th>
+					<th style="width: 1px;">&nbsp;</th>
+					<th>@Localizer["Url"]</th>
+					<th>@Localizer["Requests"]</th>
+					<th>@Localizer["Requested"]</th>
+				</Header>
+				<Row>
+					<td><ActionLink Action="Edit" Parameters="@($"id=" + context.UrlMappingId.ToString())" ResourceKey="Edit" /></td>
+					<td><ActionDialog Header="Delete Url Mapping" Message="@string.Format(Localizer["Confirm.DeleteUrlMapping"], context.Url)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUrlMapping(context))" ResourceKey="DeleteUrlMapping" /></td>
+					<td>
+						<a href="@Utilities.TenantUrl(PageState.Alias, context.Url)">@context.Url</a>
+						@if (_mapped)
+						{
+							@((MarkupString)"<br />&gt;&gt;&nbsp;")<a href="@((context.MappedUrl.StartsWith("http") ? context.MappedUrl : Utilities.TenantUrl(PageState.Alias, context.MappedUrl)))">@context.MappedUrl</a>
+						}
+					</td>
+					<td>@context.Requests</td>
+					<td>@context.RequestedOn</td>
+				</Row>
+			</Pager>
+		</TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="capturebrokenurls" HelpText="Specify if broken Urls should be captured automatically and saved in Url Mappings" ResourceKey="CaptureBrokenUrls">Capture Broken Urls? </Label>
+					<div class="col-sm-9">
+						<select id="capturebrokenurls" class="form-select" @bind="@_capturebrokenurls" >
+							<option value="True">@SharedLocalizer["Yes"]</option>
+							<option value="False">@SharedLocalizer["No"]</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+		</TabPanel>
+	</TabStrip>
+}
+
+@code {
+	private bool _mapped = true;
+	private List<UrlMapping> _urlMappings;
+	private string _capturebrokenurls;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnParametersSetAsync()
+	{
+		await GetUrlMappings();
+		_capturebrokenurls = PageState.Site.CaptureBrokenUrls.ToString();
+	}
+
+	private async void MappedChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_mapped = bool.Parse(e.Value.ToString());
+			await GetUrlMappings();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error On TypeChanged");
+		}
+	}
+
+	private async Task DeleteUrlMapping(UrlMapping urlMapping)
+	{
+		try
+		{
+			await UrlMappingService.DeleteUrlMappingAsync(urlMapping.UrlMappingId);
+			await logger.LogInformation("UrlMapping Deleted {UrlMapping}", urlMapping);
+			await GetUrlMappings();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting UrlMapping {UrlMapping} {Error}", urlMapping, ex.Message);
+			AddModuleMessage(Localizer["Error.DeleteUrlMapping"], MessageType.Error);
+		}
+	}
+
+	private async Task GetUrlMappings()
+	{
+		_urlMappings = await UrlMappingService.GetUrlMappingsAsync(PageState.Site.SiteId, _mapped);
+	}
+
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var site = PageState.Site;
+			site.CaptureBrokenUrls = bool.Parse(_capturebrokenurls);
+			await SiteService.UpdateSiteAsync(site);
+			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
+		}
+	}
+}

Oqtane.Client/Modules/Admin/UserProfile/Add.razor

@@ -1,101 +1,69 @@
-@namespace Oqtane.Modules.Admin.UserProfile
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject IUserRoleService UserRoleService
-@inject INotificationService NotificationService
-
-@if (PageState.User != null)
-{
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <Label  For="to" HelpText="Select the user it is going to">To: </Label>
-            </td>
-            <td>
-                <select id="to" class="form-control"  @bind="@userid">
-                    <option value="-1">&lt;Select User&gt;</option>
-                    @if (userroles != null)
-                    {
-                        foreach (UserRole userrole in userroles)
-                        {
-                            <option value="@userrole.UserId">@userrole.User.DisplayName</option>
-                        }
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="subject" HelpText="Enter the subject of the message">Subject: </Label>
-            </td>
-            <td>
-                <input id="subject" class="form-control" @bind="@subject" />
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <Label For="message" HelpText="Enter the message">Message: </Label>
-            </td>
-            <td>
-                <textarea id="message" class="form-control" @bind="@body" rows="5" />
-            </td>
-        </tr>
-    </table>
-    <button type="button" class="btn btn-primary" @onclick="Send">Send</button>
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-}
-
-@code {
-    private List<UserRole> userroles;
-    private string userid = "-1";
-    private string subject = "";
-    private string body = "";
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
-
-    public override string Title => "Send Notification";
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            userroles = userroles.Where(item => item.Role.Name == Constants.RegisteredRole || item.Role.Name == Constants.HostRole)
-                .OrderBy(item => item.User.DisplayName).ToList();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
-            AddModuleMessage("Error Loading Users", MessageType.Error);
-        }
-    }
-
-    private async Task Send()
-    {
-        var notification = new Notification();
-        try
-        {
-            notification.SiteId = PageState.Site.SiteId;
-            notification.FromUserId = PageState.User.UserId;
-            notification.ToUserId = int.Parse(userid);
-            notification.ToEmail = "";
-            notification.Subject = subject;
-            notification.Body = body;
-            notification.ParentId = null;
-            notification.CreatedOn = DateTime.UtcNow;
-            notification.IsDelivered = false;
-            notification.DeliveredOn = null;
-
-            notification = await NotificationService.AddNotificationAsync(notification);
-
-            await logger.LogInformation("Notification Created {Notification}", notification);
-            NavigationManager.NavigateTo(NavigateUrl());
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Adding Notification {Notification} {Error}", notification, ex.Message);
-            AddModuleMessage("Error Adding Notification", MessageType.Error);
-        }
-    }
-
-}
+@namespace Oqtane.Modules.Admin.UserProfile
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUserService UserService
+@inject INotificationService NotificationService
+@inject IStringLocalizer<Add> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (PageState.User != null)
+{
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="to" HelpText="Enter the username you wish to send a message to" ResourceKey="To">To: </Label>
+        <div class="col-sm-9">
+            <input id="to" class="form-control" @bind="@username" />
+        </div> 
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="subject" HelpText="Enter the subject of the message" ResourceKey="Subject">Subject: </Label>
+        <div class="col-sm-9">
+            <input id="subject" class="form-control" @bind="@subject" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="message" HelpText="Enter the message" ResourceKey="Message">Message: </Label>
+        <div class="col-sm-9">
+            <textarea id="message" class="form-control" @bind="@body" rows="5" />
+        </div>
+    </div>
+</div>
+<br/>
+    <button type="button" class="btn btn-primary" @onclick="Send">@SharedLocalizer["Send"]</button>
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+}
+
+@code {
+    private string username = "";
+    private string subject = "";
+    private string body = "";
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
+
+    public override string Title => "Send Notification";
+
+    private async Task Send()
+    {
+        try
+        {
+            var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
+            if (user != null)
+            {
+                var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body);
+                notification = await NotificationService.AddNotificationAsync(notification);
+                await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.User.Invalid"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Adding Notification {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Notification.Add"], MessageType.Error);
+        }
+    }
+
+}

Oqtane.Client/Modules/Admin/UserProfile/Index.razor

@@ -1,132 +1,180 @@
-@namespace Oqtane.Modules.Admin.UserProfile
+@namespace Oqtane.Modules.Admin.UserProfile
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
 @inject IProfileService ProfileService
 @inject ISettingService SettingService
 @inject INotificationService NotificationService
+@inject IFileService FileService
+@inject IFolderService FolderService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (PageState.User != null && photofileid != -1)
+@if (PageState.User != null && photo != null)
 {
-    <img src="@(ContentUrl(photofileid))" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
+    <img src="@ImageUrl(photofileid, 400, 400)" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
 }
 else
 {
     <br />
 }
 <TabStrip>
-    <TabPanel Name="Identity">
-        @if (PageState.User != null)
+    <TabPanel Name="Identity" ResourceKey="Identity">
+        @if (profiles != null && settings != null)
         {
-            <table class="table table-borderless">
-                <tr>
-                    <td>
-                        <label for="Name" class="control-label">Username: </label>
-                    </td>
-                    <td>
-                        <input class="form-control" @bind="@username" readonly />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Name" class="control-label">Password: </label>
-                    </td>
-                    <td>
-                        <input type="password" class="form-control" @bind="@password" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Name" class="control-label">Confirm Password: </label>
-                    </td>
-                    <td>
-                        <input type="password" class="form-control" @bind="@confirm" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Name" class="control-label">Email: </label>
-                    </td>
-                    <td>
-                        <input class="form-control" @bind="@email" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Name" class="control-label">Full Name: </label>
-                    </td>
-                    <td>
-                        <input class="form-control" @bind="@displayname" />
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <label for="Name" class="control-label">Photo: </label>
-                    </td>
-                    <td>
-                        <FileManager FileId="@photofileid.ToString()" @ref="filemanager" />
-                    </td>
-                </tr>
-            </table>
-            <button type="button" class="btn btn-primary" @onclick="Save">Save</button>
-            <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="username" HelpText="Your username. Note that this field can not be modified." ResourceKey="Username"></Label>
+                    <div class="col-sm-9">
+                        <input id="username" class="form-control" @bind="@username" readonly />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="password" HelpText="If you wish to change your password you can enter it here. Please choose a sufficiently secure password." ResourceKey="Password"></Label>
+					<div class="col-sm-9">
+                        <div class="input-group">
+						    <input id="password" type="@_passwordtype" class="form-control" @bind="@_password" autocomplete="new-password" />
+						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+					    </div>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="confirm" HelpText="If you are changing your password you must enter it again to confirm it matches" ResourceKey="Confirm"></Label>
+                    <div class="col-sm-9">
+                        <div class="input-group">
+							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@confirm" autocomplete="new-password" />
+						    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword">@_togglepassword</button>
+					    </div>
+                    </div>
+                </div>
+				@if (allowtwofactor)
+				{
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="twofactor" HelpText="Indicates if you are using two factor authentication. Two factor authentication requires you to enter a verification code sent via email after you sign in." ResourceKey="TwoFactor"></Label>
+						<div class="col-sm-9">
+							<select id="twofactor" class="form-select" @bind="@twofactor" required>
+								<option value="True">@SharedLocalizer["Yes"]</option>
+								<option value="False">@SharedLocalizer["No"]</option>
+							</select>
+						</div>
+					</div>
+				}
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="email" HelpText="Your email address where you wish to receive notifications" ResourceKey="Email"></Label>
+                    <div class="col-sm-9">
+                        <input id="email" class="form-control" @bind="@email" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="displayname" HelpText="Your full name" ResourceKey="DisplayName"></Label>
+                    <div class="col-sm-9">
+                        <input id="displayname" class="form-control" @bind="@displayname" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="@photofileid.ToString()" HelpText="A photo of yourself" ResourceKey="Photo"></Label>
+                    <div class="col-sm-9">
+                        <FileManager FileId="@photofileid" Filter="@Constants.ImageFiles" ShowFolders="false" ShowFiles="true" UploadMultiple="false" FolderId="@folderid" @ref="filemanager" />
+                    </div>
+                </div>
+            </div>
+            <br />
+            <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
+            <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
         }
     </TabPanel>
-    <TabPanel Name="Profile">
-        @if (profiles != null)
+    <TabPanel Name="Profile" ResourceKey="Profile">
+        @if (profiles != null && settings != null)
         {
-            <table class="table table-borderless">
-                @foreach (Profile profile in profiles)
-                {
-                    var p = profile;
-                    if (p.Category != category)
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    @foreach (Profile profile in profiles)
                     {
-                        <tr>
-                            <th colspan="2" style="text-align: center;">
-                                @p.Category
-                            </th>
-                        </tr>
-                        category = p.Category;
+                        var p = profile;
+                        if (!p.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+                        {
+                            if (p.Category != category)
+                            {
+                                <div class="col text-center pb-2">
+                                    @p.Category
+                                </div>
+                                category = p.Category;
+                            }
+                            <div class="row mb-1 align-items-center">
+                                <Label Class="col-sm-3" For="@p.Name" HelpText="@p.Description">@p.Title</Label>
+                                <div class="col-sm-9">
+                                    @if (!string.IsNullOrEmpty(p.Options))
+                                    {
+                                        <select id="@p.Name" class="form-select" @onchange="@(e => ProfileChanged(e, p.Name))">
+                                            @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+                                            {
+                                                @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option))
+                                                {
+                                                    <option value="@option" selected>@option</option>
+                                                }
+                                                else
+                                                {
+                                                    <option value="@option">@option</option>
+                                                }
+                                            }
+                                        </select>
+                                    }
+                                    else
+                                    {
+                                        @if (p.IsRequired)
+                                        {
+                                            <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" required @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                        }
+                                        else
+                                        {
+                                            <input id="@p.Name" class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" @onchange="@(e => ProfileChanged(e, p.Name))" />
+                                        }
+                                    }
+                                </div>
+                            </div>
+                        }
                     }
-                    <tr>
-                        <td>
-                            <label for="@p.Name" class="control-label">@p.Title: </label>
-                        </td>
-                        <td>
-                            <input class="form-control" maxlength="@p.MaxLength" value="@GetProfileValue(p.Name, p.DefaultValue)" placeholder="@p.Description" @onchange="@(e => ProfileChanged(e, p.Name))" />
-                        </td>
-                    </tr>
-                }
-            </table>
-            <button type="button" class="btn btn-primary" @onclick="Save">Save</button>
-            <button type="button" class="btn btn-secondary" @onclick="Cancel">Cancel</button>
+                </div>
+            </div>
+            <button type="button" class="btn btn-success" @onclick="Save">@SharedLocalizer["Save"]</button>
+            <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
         }
     </TabPanel>
-    <TabPanel Name="Notifications">
+    <TabPanel Name="Notifications" ResourceKey="Notifications">
         @if (notifications != null)
         {
-            <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" />
+            <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="SendNotification" />
             <br /><br />
             @if (filter == "to")
             {
                 <Pager Items="@notifications">
                     <Header>
-                        <th>&nbsp;</th>
-                        <th>&nbsp;</th>
-                        <th>From</th>
-                        <th>Subject</th>
-                        <th>Received</th>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th>@Localizer["From"]</th>
+                        <th>@Localizer["Subject"]</th>
+                        <th>@Localizer["Received"]</th>
                     </Header>
                     <Row>
-                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" /></td>
-                        <td><ActionDialog Header="Delete Notification" Message="@("Are You Sure You Wish To Delete This Notification?")" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" /></td>
-                        <td>@(context.FromUser == null ? "System" : context.FromUser.DisplayName)</td>
+                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
+                        <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
+                        <td>@context.FromDisplayName</td>
                         <td>@context.Subject</td>
-                        <td>@context.CreatedOn</td>
+                        <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
                     </Row>
                     <Detail>
                         <td colspan="2"></td>
-                        <td colspan="3">@(context.Body.Length > 100 ? context.Body.Substring(0, 100) : context.Body)</td>
+                        <td colspan="3">
+                            @{
+                                        string input = "___";
+                                        if (context.Body.Contains(input))
+                                        {
+                                            context.Body = context.Body.Split(input)[0];
+                                            context.Body = context.Body.Replace("\n", "");
+                                            context.Body = context.Body.Replace("\r", "");
+                                        } }
+                            @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
+                        </td>
                     </Detail>
                 </Pager>
             }
@@ -136,40 +184,59 @@ else
                     <Header>
                         <th>&nbsp;</th>
                         <th>&nbsp;</th>
-                        <th>To</th>
-                        <th>Subject</th>
-                        <th>Sent</th>
+                        <th>@Localizer["To"]</th>
+                        <th>@Localizer["Subject"]</th>
+                        <th>@Localizer["Sent"]</th>
                     </Header>
                     <Row>
-                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" /></td>
-                        <td><ActionDialog Header="Delete Notification" Message="@("Are You Sure You Wish To Delete This Notification?")" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" /></td>
-                        <td>@(context.ToUser == null ? context.ToEmail : context.ToUser.DisplayName)</td>
+                        <td><ActionLink Action="View" Parameters="@($"id=" + context.NotificationId.ToString())" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="ViewNotification" /></td>
+                        <td><ActionDialog Header="Delete Notification" Message="Are You Sure You Wish To Delete This Notification?" Action="Delete" Security="SecurityAccessLevel.View" Class="btn btn-danger" OnClick="@(async () => await Delete(context))" EditMode="false" ResourceKey="DeleteNotification" /></td>
+                        <td>@context.ToDisplayName</td>
                         <td>@context.Subject</td>
-                        <td>@context.CreatedOn</td>
+                        <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
                     </Row>
                     <Detail>
                         <td colspan="2"></td>
-                        <td colspan="3">@(context.Body.Length > 100 ? context.Body.Substring(0, 100) : context.Body)</td>
+                        <td colspan="3">
+                            @{
+                                        string input = "___";
+                                        if (context.Body.Contains(input))
+                                        {
+                                            context.Body = context.Body.Split(input)[0];
+                                            context.Body = context.Body.Replace("\n", "");
+                                            context.Body = context.Body.Replace("\r", "");
+                                        } }
+                            @(context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body)
+                        </td>
                     </Detail>
                 </Pager>
             }
+            <br />
+            <ActionDialog Header="Clear Notifications" Message="Are You Sure You Wish To Permanently Delete All Notifications ?" Action="Delete All Notifications" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllNotifications())" ResourceKey="DeleteAllNotifications" />
             <br /><hr />
-            <select class="form-control" @onchange="(e => FilterChanged(e))">
-                <option value="to">Inbox</option>
-                <option value="from">Sent Items</option>
+            <select class="form-select" @onchange="(e => FilterChanged(e))">
+                <option value="to">@Localizer["Inbox"]</option>
+                <option value="from">@Localizer["Items.Sent"]</option>
             </select>
         }
     </TabPanel>
 </TabStrip>
+<br /><br />
 
 @code {
     private string username = string.Empty;
-    private string password = string.Empty;
+    private string _password = string.Empty;
+    private string _passwordtype = "password";
+    private string _togglepassword = string.Empty;
     private string confirm = string.Empty;
+    private bool allowtwofactor = false;
+    private string twofactor = "False";
     private string email = string.Empty;
     private string displayname = string.Empty;
     private FileManager filemanager;
+    private int folderid = -1;
     private int photofileid = -1;
+    private File photo = null;
     private List<Profile> profiles;
     private Dictionary<string, string> settings;
     private string category = string.Empty;
@@ -178,19 +245,40 @@ else
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
-    protected override async Task OnInitializedAsync()
+    protected override async Task OnParametersSetAsync()
     {
         try
         {
+            _togglepassword = SharedLocalizer["ShowPassword"];
+
+            if (PageState.Site.Settings.ContainsKey("LoginOptions:TwoFactor") && !string.IsNullOrEmpty(PageState.Site.Settings["LoginOptions:TwoFactor"]))
+            {
+                allowtwofactor = (PageState.Site.Settings["LoginOptions:TwoFactor"] == "true");
+            }
+
             if (PageState.User != null)
             {
                 username = PageState.User.Username;
+                twofactor = PageState.User.TwoFactorRequired.ToString();
                 email = PageState.User.Email;
                 displayname = PageState.User.DisplayName;
 
+                // get user folder
+                var folder = await FolderService.GetFolderAsync(ModuleState.SiteId, PageState.User.FolderPath);
+                if (folder != null)
+                {
+                    folderid = folder.FolderId;
+                }
+
                 if (PageState.User.PhotoFileId != null)
                 {
                     photofileid = PageState.User.PhotoFileId.Value;
+                    photo = await FileService.GetFileAsync(photofileid);
+                }
+                else
+                {
+                    photofileid = -1;
+                    photo = null;
                 }
 
                 profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
@@ -200,13 +288,13 @@ else
             }
             else
             {
-                AddModuleMessage("Current User Is Not Logged In", MessageType.Warning);
+                AddModuleMessage(Localizer["Message.User.NoLogIn"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Loading User Profile {Error}", ex.Message);
-            AddModuleMessage("Error Loading User Profile", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Profile.Load"], MessageType.Error);
         }
     }
 
@@ -223,44 +311,76 @@ else
     {
         try
         {
-            if (username != string.Empty && email != string.Empty)
+            if (username != string.Empty && email != string.Empty && ValidateProfiles())
             {
-                if (password == confirm)
+                if (_password == confirm)
                 {
                     var user = PageState.User;
                     user.Username = username;
-                    user.Password = password;
+                    user.Password = _password;
+                    user.TwoFactorRequired = bool.Parse(twofactor);
                     user.Email = email;
                     user.DisplayName = (displayname == string.Empty ? username : displayname);
-                    user.PhotoFileId = null;
-                    photofileid = filemanager.GetFileId();
-
-                    if (photofileid != -1)
+                    user.PhotoFileId = filemanager.GetFileId();
+                    if (user.PhotoFileId == -1)
                     {
-                        user.PhotoFileId = photofileid;
+                        user.PhotoFileId = null;
+                    }
+                    if (user.PhotoFileId != null)
+                    {
+                        photofileid = user.PhotoFileId.Value;
+                        photo = await FileService.GetFileAsync(photofileid);
+                    }
+                    else
+                    {
+                        photofileid = -1;
+                        photo = null;
                     }
 
                     await UserService.UpdateUserAsync(user);
                     await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
                     await logger.LogInformation("User Profile Saved");
+
+                    AddModuleMessage(Localizer["Success.Profile.Update"], MessageType.Success);
+                    StateHasChanged();
                 }
                 else
                 {
-                    AddModuleMessage("Passwords Entered Do Not Match", MessageType.Warning);
+                    AddModuleMessage(Localizer["Message.Password.Invalid"], MessageType.Warning);
                 }
             }
             else
             {
-                AddModuleMessage("You Must Provide A Username and Email Address", MessageType.Warning);
+                AddModuleMessage(Localizer["Message.Required.ProfileInfo"], MessageType.Warning);
             }
         }
         catch (Exception ex)
         {
             await logger.LogError(ex, "Error Saving User Profile {Error}", ex.Message);
-            AddModuleMessage("Error Saving User Profile", MessageType.Error);
+            AddModuleMessage(Localizer["Error.Profile.Save"], MessageType.Error);
         }
     }
 
+    private bool ValidateProfiles()
+    {
+        bool valid = true;
+        foreach (Profile profile in profiles)
+        {
+            if (string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)) && !string.IsNullOrEmpty(profile.DefaultValue))
+            {
+                settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
+            }
+            if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+            {
+                if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+                {
+                    valid = false;
+                }
+            }
+        }
+        return valid;
+    }
+
     private void Cancel()
     {
         NavigationManager.NavigateTo(NavigateUrl(string.Empty));
@@ -305,4 +425,51 @@ else
         StateHasChanged();
     }
 
+    private async Task DeleteAllNotifications()
+    {
+        try
+        {
+            ModuleInstance.ShowProgressIndicator();
+            foreach(var Notification in notifications)
+            {
+                if (!Notification.IsDeleted)
+                {
+                    Notification.IsDeleted = true;
+                    await NotificationService.UpdateNotificationAsync(Notification);
+                }
+                else
+                {
+                    await NotificationService.DeleteNotificationAsync(Notification.NotificationId);
+                }
+                await logger.LogInformation("Notification Deleted {Notification}", Notification);
+            } 
+            await logger.LogInformation("Notifications Permanently Deleted");
+            await LoadNotificationsAsync();
+            ModuleInstance.HideProgressIndicator();
+
+            StateHasChanged();            
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Deleting Notifications {Error}", ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+            ModuleInstance.HideProgressIndicator();
+        }
+    
+    }
+
+    private void TogglePassword()
+	{
+		if (_passwordtype == "password")
+		{
+			_passwordtype = "text";
+			_togglepassword = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_passwordtype = "password";
+			_togglepassword = SharedLocalizer["ShowPassword"];
+		}
+	}
+
 }

Oqtane.Client/Modules/Admin/UserProfile/View.razor

@@ -1,162 +1,198 @@
-@namespace Oqtane.Modules.Admin.UserProfile
-@inherits ModuleBase
-@inject NavigationManager NavigationManager
-@inject IUserRoleService UserRoleService
-@inject INotificationService NotificationService
-
-@if (PageState.User != null)
-{
-    <table class="table table-borderless">
-        <tr>
-            <td>
-                <label  class="control-label">@title: </label>
-            </td>
-            <td>
-                <select class="form-control" readonly @bind="userid">
-                    <option value="-1">&lt;System&gt;</option>
-                    @if (userroles != null)
-                    {
-                        foreach (UserRole userrole in userroles)
-                        {
-                            <option value="@userrole.UserId">@userrole.User.DisplayName</option>
-                        }
-                    }
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <label  class="control-label">Subject: </label>
-            </td>
-            <td>
-                <input class="form-control" @bind="@subject" />
-            </td>
-        </tr>
-        @if (title == "From")
-        {
-            <tr>
-                <td>
-                    <label  class="control-label">Date: </label>
-                </td>
-                <td>
-                    <input class="form-control" @bind="@createdon" />
-                </td>
-            </tr>
-        }
-        <tr>
-            <td>
-                <label  class="control-label">Message: </label>
-            </td>
-            <td>
-                <textarea class="form-control" @bind="@body" rows="5" />
-            </td>
-        </tr>
-    </table>
-    @if (reply != string.Empty)
-    {
-        <button type="button" class="btn btn-primary" @onclick="Send">Send</button>
-    }
-    else
-    {
-        if (title == "From")
-        {
-            <button type="button" class="btn btn-primary" @onclick="Reply">Reply</button>
-        }
-    }
-    <NavLink class="btn btn-secondary" href="@NavigateUrl()">Cancel</NavLink>
-    <br />
-    <br />
-    <p>@reply</p>
-}
-
-@code {
-    private int notificationid;
-    private string title = string.Empty;
-    private List<UserRole> userroles;
-    private string userid = "-1";
-    private string subject = string.Empty;
-    private string createdon = string.Empty;
-    private string body = string.Empty;
-    private string reply = string.Empty;
-
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
-    public override string Title => "View Notification";
-
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            userroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
-            userroles = userroles.Where(item => item.Role.Name == Constants.RegisteredRole || item.Role.Name == Constants.HostRole)
-                .OrderBy(item => item.User.DisplayName).ToList();
-
-            notificationid = Int32.Parse(PageState.QueryString["id"]);
-            Notification notification = await NotificationService.GetNotificationAsync(notificationid);
-            if (notification != null)
-            {
-                if (notification.ToUserId == PageState.User.UserId)
-                {
-                    title = "From";
-                    if (notification.FromUserId != null)
-                    {
-                        userid = notification.FromUserId.ToString();
-                    }
-                }
-                else
-                {
-                    title = "To";
-                    if (notification.ToUserId != null)
-                    {
-                        userid = notification.ToUserId.ToString();
-                    }
-                }
-                
-                subject = notification.Subject;
-                createdon = notification.CreatedOn.ToString();
-                body = notification.Body;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
-            AddModuleMessage("Error Loading Users", MessageType.Error);
-        }
-    }
-
-    private void Reply()
-    {
-        title = "To";
-        subject = "RE: " + subject;
-        reply = body;
-        StateHasChanged();
-    }
-
-    private async Task Send()
-    {
-        var notification = new Notification();
-        notification.SiteId = PageState.Site.SiteId;
-        notification.FromUserId = PageState.User.UserId;
-        notification.ToUserId = int.Parse(userid);
-        notification.ToEmail = string.Empty;
-        notification.Subject = subject;
-        notification.Body = body;
-        notification.ParentId = notificationid;
-        notification.CreatedOn = DateTime.UtcNow;
-        notification.IsDelivered = false;
-        notification.DeliveredOn = null;
-
-        try
-        {
-            notification = await NotificationService.AddNotificationAsync(notification);
-
-            await logger.LogInformation("Notification Created {Notification}", notification);
-            NavigationManager.NavigateTo(NavigateUrl());
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Adding Notification {Notification} {Error}", notification, ex.Message);
-            AddModuleMessage("Error Adding Notification", MessageType.Error);
-        }
-    }
-
-}
+@namespace Oqtane.Modules.Admin.UserProfile
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUserService UserService
+@inject INotificationService NotificationService
+@inject IStringLocalizer<View> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (PageState.User != null)
+{
+    <div class="container">
+        <div class="row mb-1 align-items-center">
+            <label Class="col-sm-3">@Localizer["Title"] </label>
+            @if (title == "From")
+            {
+                <div class="col-sm-3">
+                    <input class="form-control" @bind="@username" readonly />
+                </div>
+            }
+            @if (title == "To")
+            {
+                <div class="col-sm-3">
+                    <input class="form-control" @bind="@username" />
+                </div>
+            }
+        </div>
+        <div class="row mb-1 align-items-center">
+            <label Class="col-sm-3">@Localizer["Subject"] </label>
+            @if (title == "From")
+            {
+                <div class="col-sm-3">
+                    <input class="form-control" @bind="@subject" readonly />
+                </div>
+            }
+            @if (title == "To")
+            {
+                <div class="col-sm-3">
+                    <input class="form-control" @bind="@subject" />
+                </div>
+            }
+        </div>
+    </div>
+    <div class="container">
+        @if (title == "From")
+        {
+            <div class="row mb-1 align-items-center">
+                <label class="col-sm-3">@Localizer["Date"] </label>
+                <div class="col-sm-9">
+                    <input class="form-control" @bind="@createdon" readonly />
+                </div>
+            </div>
+        }
+        @if (title == "From")
+        {
+                <div class="row mb-1 align-items-center">
+                    <label class="col-sm-3">@Localizer["Message"] </label>
+                    <div class="col-sm-9">
+                        <textarea class="form-control" @bind="@body" rows="5" readonly />
+                    </div>
+                </div>
+
+        }
+        @if (title == "To")
+        {
+
+                <div class="row mb-1 align-items-center">
+                    <label class="col-sm-3">@Localizer["Message"] </label>
+                    <div class="col-sm-9">
+                        <textarea class="form-control" @bind="@body" rows="5" readonly />
+                    </div>
+                </div>
+
+        }
+
+    </div>
+
+
+    @if (reply != string.Empty)
+    {
+        <button type="button" class="btn btn-primary" @onclick="Send">@SharedLocalizer["Send"]</button>
+    }
+    else
+    {
+        if (title == "From")
+        {
+            <button type="button" class="btn btn-primary" @onclick="Reply">@Localizer["Reply"]</button>
+        }
+    }
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+    <br />
+    <br />
+    @if (title == "To")
+    {
+        <div class="control-group">
+            <label class="control-label">@Localizer["OriginalMessage"] </label>
+            <textarea class="form-control" @bind="@reply" rows="5" readonly />
+        </div>
+    }
+}
+
+@code {
+    private int notificationid;
+    private string title = string.Empty;
+    private string username = "";
+    private string subject = string.Empty;
+    private string createdon = string.Empty;
+    private string body = string.Empty;
+    private string reply = string.Empty;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
+    public override string Title => "View Notification";
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            notificationid = Int32.Parse(PageState.QueryString["id"]);
+            Notification notification = await NotificationService.GetNotificationAsync(notificationid);
+            if (notification != null)
+            {
+                int userid = -1;
+                if (notification.ToUserId == PageState.User.UserId)
+                {
+                    title = "From";
+                    if (notification.FromUserId != null)
+                    {
+                        userid = notification.FromUserId.Value;
+                    }
+                }
+                else
+                {
+                    title = "To";
+                    if (notification.ToUserId != null)
+                    {
+                        userid = notification.ToUserId.Value;
+                    }
+                }
+                if (userid != -1)
+                {
+                    var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                    if (user != null)
+                    {
+                        username = user.Username;
+                    }
+                }
+                if (username == "")
+                {
+                    username = "System";
+                }
+                subject = notification.Subject;
+                createdon = notification.CreatedOn.ToString();
+                body = notification.Body;
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
+        }
+    }
+
+    private void Reply()
+    {
+        title = "To";
+        if (!subject.Contains("RE:"))
+        {
+            subject = "RE: " + subject;
+        }
+        reply = body;
+        body = "\n\n____________________________________________\nSent: " + createdon + "\nSubject: " + subject + "\n\n" + body;
+        StateHasChanged();
+    }
+
+    private async Task Send()
+    {
+        try
+        {
+            var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
+            if (user != null)
+            {
+                var notification = new Notification(PageState.Site.SiteId, PageState.User, user, subject, body, notificationid);
+                notification = await NotificationService.AddNotificationAsync(notification);
+                await logger.LogInformation("Notification Created {NotificationId}", notification.NotificationId);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.User.Invalid"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Adding Notification {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Notification.Add"], MessageType.Error);
+        }
+    }
+}
+