Merge pull request #3330 from sbwalker/dev

4.0.5 data provider packages

.gitattributes

@@ -0,0 +1,2 @@
+Oqtane.Server/wwwroot/Modules/Templates/External/Package/*.sh eol=lf
+Oqtane.Server/wwwroot/Themes/Templates/External/Package/*.sh eol=lf

.gitignore

@@ -10,6 +10,8 @@ msbuild.binlog
 *.zip
 
 *.idea
+_ReSharper.Caches
+.DS_Store
 
 Oqtane.Server/appsettings.json
 Oqtane.Server/Data

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2022 .NET Foundation
+Copyright (c) 2018-2023 .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,6 +1,8 @@
+@using Microsoft.AspNetCore.Http
 @inject IInstallationService InstallationService
 @inject IJSRuntime JSRuntime
 @inject SiteState SiteState
+@inject IServiceProvider ServiceProvider
 
 @if (_initialized)
 {
@@ -30,35 +32,47 @@
 }
 
 @code {
-	[Parameter]
-	public string AntiForgeryToken { get; set; }
+    [Parameter]
+    public string AntiForgeryToken { get; set; }
 
-	[Parameter]
-	public string Runtime { get; set; }
+    [Parameter]
+    public string Runtime { get; set; }
 
-	[Parameter]
-	public string RenderMode { get; set; }
+    [Parameter]
+    public string RenderMode { get; set; }
 
-	[Parameter]
-	public int VisitorId { get; set; }
+    [Parameter]
+    public int VisitorId { get; set; }
 
-	[Parameter]
-	public string RemoteIPAddress { get; set; }
+    [Parameter]
+    public string RemoteIPAddress { get; set; }
 
-	[Parameter]
-	public string AuthorizationToken { 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 bool _initialized = false;
+    private string _display = "display: none;";
+    private Installation _installation = new Installation { Success = false, Message = "" };
 
-	private PageState PageState { get; set; }
+    private PageState PageState { get; set; }
 
-	protected override async Task OnParametersSetAsync()
-	{
-		SiteState.RemoteIPAddress = RemoteIPAddress;
-		SiteState.AntiForgeryToken = AntiForgeryToken;
-		SiteState.AuthorizationToken = AuthorizationToken;
+    private IHttpContextAccessor accessor;
+
+    protected override async Task OnParametersSetAsync()
+    {
+        SiteState.RemoteIPAddress = RemoteIPAddress;
+        SiteState.AntiForgeryToken = AntiForgeryToken;
+        SiteState.AuthorizationToken = AuthorizationToken;
+
+        accessor = (IHttpContextAccessor)ServiceProvider.GetService(typeof(IHttpContextAccessor));
+        if (accessor != null)
+        {
+            SiteState.IsPrerendering = !accessor.HttpContext.Response.HasStarted;
+        }
+        else
+        {
+            SiteState.IsPrerendering = true;
+        }
 
         _installation = await InstallationService.IsInstalled();
         if (_installation.Alias != null)
@@ -72,6 +86,7 @@
     {
         if (firstRender)
         {
+            // prevents flash on initial page load
             _display = "";
             StateHasChanged();
         }

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -16,7 +16,7 @@ namespace Microsoft.Extensions.DependencyInjection
             return services;
         }
 
-        internal static IServiceCollection AddOqtaneScopedServices(this IServiceCollection services)
+        public static IServiceCollection AddOqtaneScopedServices(this IServiceCollection services)
         {
             services.AddScoped<SiteState>();
             services.AddScoped<IInstallationService, InstallationService>();

Oqtane.Client/Head.razor

@@ -0,0 +1,64 @@
+@using System.ComponentModel
+@using Oqtane.Shared
+@inject SiteState SiteState
+
+@if (!string.IsNullOrEmpty(_title))
+{
+    @((MarkupString)_title)
+}
+@if (!string.IsNullOrEmpty(_content))
+{
+    @((MarkupString)_content)
+}
+
+@code {
+    private string _title = "";
+    private string _content = "";
+
+    protected override void OnInitialized()
+    {
+        ((INotifyPropertyChanged)SiteState.Properties).PropertyChanged += PropertyChanged;
+    }
+
+    private void PropertyChanged(object sender, PropertyChangedEventArgs e)
+    {
+        switch (e.PropertyName)
+        {
+            case "PageTitle":
+                var title = "\n<title>" + SiteState.Properties.PageTitle + "</title>";
+                if (title != _title)
+                {
+                    _title = title;
+                    StateHasChanged();
+                }
+                break;
+            case "HeadContent":
+                var content = RemoveScripts(SiteState.Properties.HeadContent) + "\n";
+                if (content != _content)
+                {
+                    _content = content;
+                    StateHasChanged();
+                }
+                break;
+        }
+    }
+
+    private string RemoveScripts(string headcontent)
+    {
+        if (!string.IsNullOrEmpty(headcontent))
+        {
+            var index = headcontent.IndexOf("<script");
+            while (index >= 0)
+            {
+                headcontent = headcontent.Remove(index, headcontent.IndexOf("</script>") + 9 - index);
+                index = headcontent.IndexOf("<script");
+            }
+        }
+        return headcontent;
+    }
+
+    public void Dispose()
+    {
+        ((INotifyPropertyChanged)SiteState.Properties).PropertyChanged -= PropertyChanged;
+    }
+}

Oqtane.Client/IconResources.cs

@@ -0,0 +1,14 @@
+namespace Oqtane
+{
+    /// <summary>
+    /// Dummy class used to collect shared resource strings for this application
+    /// </summary>
+    /// <remarks>
+    /// This class is mostly used with IStringLocalizer and IHtmlLocalizer interfaces.
+    /// The class must reside at the project root.
+    /// </remarks>
+    public class IconResources
+    {
+
+    }
+}

Oqtane.Client/Installer/Controls/MySQLConfig.razor

@@ -1,5 +1,6 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="row mb-1 align-items-center">
     <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
@@ -28,7 +29,10 @@
 <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 class="input-group">
+            <input id="pwd" type="@_passwordType" class="form-control" @bind="@_pwd" autocomplete="new-password" />
+            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglePassword</button>
+        </div>
     </div>
 </div>
 
@@ -38,6 +42,13 @@
     private string _database = "Oqtane-" + DateTime.UtcNow.ToString("yyyyMMddHHmm");
     private string _uid = String.Empty;
     private string _pwd = String.Empty;
+    private string _passwordType = "password";
+    private string _togglePassword = string.Empty;
+
+    protected override void OnInitialized()
+	{
+        _togglePassword = SharedLocalizer["ShowPassword"];
+    }
 
     public string GetConnectionString()
     {
@@ -55,4 +66,18 @@
 
         return connectionString;
     }
+
+    private void TogglePassword()
+    {
+        if (_passwordType == "password")
+        {
+            _passwordType = "text";
+            _togglePassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _passwordType = "password";
+            _togglePassword = SharedLocalizer["ShowPassword"];
+        }
+    }
 }

Oqtane.Client/Installer/Controls/PostgreSQLConfig.razor

@@ -1,6 +1,7 @@
 @namespace Oqtane.Installer.Controls
 @implements Oqtane.Interfaces.IDatabaseConfigControl
 @inject IStringLocalizer<PostgreSQLConfig> 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" ResourceKey="Server">Server:</Label>
@@ -40,7 +41,10 @@
     <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 class="input-group">
+                <input id="pwd" type="@_passwordType" class="form-control" @bind="@_pwd" autocomplete="new-password" />
+                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglePassword</button>
+            </div>
         </div>
     </div>
 }
@@ -52,6 +56,13 @@
     private string _security = "integrated";
     private string _uid = String.Empty;
     private string _pwd = String.Empty;
+    private string _passwordType = "password";
+    private string _togglePassword = string.Empty;
+
+    protected override void OnInitialized()
+	{
+        _togglePassword = SharedLocalizer["ShowPassword"];
+    }
 
     public string GetConnectionString()
     {
@@ -80,4 +91,18 @@
 
         return connectionString;
     }
+
+    private void TogglePassword()
+    {
+        if (_passwordType == "password")
+        {
+            _passwordType = "text";
+            _togglePassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _passwordType = "password";
+            _togglePassword = SharedLocalizer["ShowPassword"];
+        }
+    }
 }

Oqtane.Client/Installer/Controls/SqlServerConfig.razor

@@ -4,7 +4,7 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <div class="row mb-1 align-items-center">
-    <Label Class="col-sm-3" For="server" HelpText="Enter the database server" ResourceKey="Server">Server:</Label>
+	<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>
@@ -35,7 +35,10 @@
     <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 class="input-group">
+                <input id="pwd" type="@_passwordType" class="form-control" @bind="@_pwd" autocomplete="new-password" />
+                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglePassword</button>
+            </div>
         </div>
     </div>
 }
@@ -51,7 +54,7 @@
 @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" ResourceKey="TrustServerCertificate">Certificate:</Label>
+		<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>
@@ -67,9 +70,16 @@
     private string _security = "integrated";
     private string _uid = String.Empty;
     private string _pwd = String.Empty;
+    private string _passwordType = "password";
+    private string _togglePassword = string.Empty;
     private string _encryption = "false";
     private string _trustservercertificate = "false";
 
+    protected override void OnInitialized()
+	{
+        _togglePassword = SharedLocalizer["ShowPassword"];
+    }
+
     public string GetConnectionString()
     {
         var connectionString = String.Empty;
@@ -92,4 +102,18 @@
 
         return connectionString;
     }
+
+    private void TogglePassword()
+    {
+        if (_passwordType == "password")
+        {
+            _passwordType = "text";
+            _togglePassword = SharedLocalizer["HidePassword"];
+        }
+        else
+        {
+            _passwordType = "password";
+            _togglePassword = SharedLocalizer["ShowPassword"];
+        }
+    }
 }

Oqtane.Client/Installer/Installer.razor

@@ -5,15 +5,17 @@
 @inject ISiteService SiteService
 @inject IUserService UserService
 @inject IDatabaseService DatabaseService
+@inject ISiteTemplateService SiteTemplateService
 @inject IJSRuntime JSRuntime
 @inject IStringLocalizer<Installer> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject SiteState SiteState
 
 <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 style="font-weight: bold">@SharedLocalizer["Version"] @Constants.Version (.NET 7)</div>
         </div>
     </div>
     <hr class="app-rule" />
@@ -26,21 +28,41 @@
                     <div class="col-sm-9">
                         @if (_databases != null)
                         {
-							<select id="databasetype" class="form-select custom-select" value="@_databaseName" @onchange="(e => DatabaseChanged(e))">
-                                @foreach (var database in _databases)
-                                {
-                                    <option value="@database.Name">@Localizer[@database.Name]</option>
-                                }
-							</select>
+							<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 (_databaseConfigType != null)
-                    {
-                        @DatabaseConfigComponent;
-                    }
-                }
+				@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">Settings:</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">
@@ -57,7 +79,7 @@
                     <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>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglePassword</button>
 						</div>
                     </div>
                 </div>
@@ -66,7 +88,7 @@
                     <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>
+                            <button type="button" class="btn btn-secondary" @onclick="@ToggleConfirmPassword" tabindex="-1">@_toggleConfirmPassword</button>
 						</div>
                     </div>
                 </div>
@@ -76,6 +98,20 @@
                         <input type="text" class="form-control" @bind="@_hostEmail" />
                     </div>
                 </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="template" HelpText="Select a site template" ResourceKey="Template">Template:</Label>
+                    <div class="col-sm-9">
+                        @if (_templates != null)
+                        {
+                            <select id="template" class="form-select" @bind="@_template" required>
+                                @foreach (var template in _templates)
+                                {
+                                    <option value="@template.TypeName">@template.Name</option>
+                                }
+                            </select>
+                        }
+                    </div>
+                </div>
             </div>
         </div>
     </div>
@@ -83,7 +119,13 @@
     <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>
+            @if (!string.IsNullOrEmpty(_message))
+            {
+                <div class="alert alert-danger alert-dismissible fade show mb-3" role="alert">
+                    @((MarkupString)_message)
+                    <button type="button" class="btn-close" aria-label="Close" @onclick="DismissModal"></button>
+                </div>
+            }
         </div>
         <div class="app-progress-indicator" style="@_loadingDisplay"></div>
     </div>
@@ -95,28 +137,36 @@
 </div>
 
 @code {
-	private List<Database> _databases;
-	private string _databaseName;
-	private Type _databaseConfigType;
-	private object _databaseConfig;
-	private RenderFragment DatabaseConfigComponent { get; set; }
+    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 _hostUsername = string.Empty;
+    private string _hostPassword = string.Empty;
+    private string _passwordType = "password";
     private string _confirmPasswordType = "password";
-	private string _togglePassword = string.Empty;
+    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 _confirmPassword = string.Empty;
+    private string _hostEmail = string.Empty;
+    private List<SiteTemplate> _templates;
+    private string _template = Constants.DefaultSiteTemplate;
+    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"];
+        // include CSS
+        var content = "<link rel=\"stylesheet\" href=\"https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/css/bootstrap.min.css\" integrity=\"sha512-t4GWSVZO1eC8BM339Xd7Uphw5s17a86tIZIj8qRxhnKub6WoyhnrxeCIMeAqBPgdZGlCcG2PrZjMc+Wr78+5Xg==\" crossorigin=\"anonymous\" type=\"text/css\"/>";
+        SiteState.AppendHeadContent(content);
+
+        _togglePassword = SharedLocalizer["ShowPassword"];
+		_toggleConfirmPassword = SharedLocalizer["ShowPassword"];
 
 		_databases = await DatabaseService.GetDatabasesAsync();
 		if (_databases.Exists(item => item.IsDefault))
@@ -128,14 +178,16 @@
 			_databaseName = "LocalDB";
 		}
 		LoadDatabaseConfigComponent();
-	}
+
+        _templates = await SiteTemplateService.GetSiteTemplatesAsync();
+    }
 
 	private void DatabaseChanged(ChangeEventArgs eventArgs)
 	{
 		try
 		{
 			_databaseName = (string)eventArgs.Value;
-
+			_showConnectionString = false;
 			LoadDatabaseConfigComponent();
 		}
 		catch
@@ -163,18 +215,25 @@
 	{
 		if (firstRender)
 		{
+            // include JavaScript
 			var interop = new Interop(JSRuntime);
-			await interop.IncludeLink("", "stylesheet", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css", "text/css", "sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==", "anonymous", "");
-			await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.bundle.min.js", "sha512-pax4MlgXjHEPfCwcJLQhigY7+N8rt6bVvWLFyUMuxShv170X53TRzGPmPkZmGBhk+jikR8WBM4yl7A9WMHHqvg==", "anonymous", "", "head");
+            await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.0/js/bootstrap.bundle.min.js", "sha512-VK2zcvntEufaimc+efOYi622VN5ZacdnufnmX7zIhCPmjhKnOi9ZDMtg1/ug5l183f19gG1/cBstPO4D8N/Img==", "anonymous", "", "head");
 		}
 	}
 
 	private async Task Install()
 	{
 		var connectionString = String.Empty;
-		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		if (_showConnectionString)
 		{
-			connectionString = databaseConfigControl.GetConnectionString();
+			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("@"))
@@ -200,7 +259,8 @@
 					TenantName = TenantNames.Master,
 					IsNewTenant = true,
 					SiteName = Constants.DefaultSite,
-					Register = _register
+					Register = _register,
+                    SiteTemplate = _template
 				};
 
 				var installation = await InstallationService.Install(config);
@@ -218,12 +278,12 @@
 			{
 				_message = Localizer["Message.Password.Invalid"];				
 			}
-        }
-        else
-        {
-            _message = Localizer["Message.Require.DbInfo"];
-        }
-    }
+		}
+		else
+		{
+			_message = Localizer["Message.Require.DbInfo"];
+		}
+	}
 
 	private void TogglePassword()
 	{
@@ -239,7 +299,7 @@
 		}
 	}
 
-    private void ToggleConfirmPassword()
+	private void ToggleConfirmPassword()
 	{
 		if (_confirmPasswordType == "password")
 		{
@@ -252,4 +312,19 @@
 			_toggleConfirmPassword = SharedLocalizer["ShowPassword"];
 		}
 	}
+
+	private void ToggleConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionString = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
+
+    private void DismissModal()
+    {
+        _message = "";
+        StateHasChanged();
+    }
 }

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

@@ -4,29 +4,35 @@
 @inject IUserService UserService
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<div class="row">
-    @foreach (var p in _pages)
-    {
-        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+@if (_pages != null)
+{
+    <div class="row">
+        @foreach (var p in _pages)
         {
-            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="@p.Icon" aria-hidden="true"></span></h2>@SharedLocalizer[p.Name]
-                </NavLink>
-            </div>
+            if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
+            {
+                string url = NavigateUrl(p.Path);
+                <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>
+            }
         }
-    }
-</div>
+    </div>
+}
 
 @code {
-    private List<Page> _pages;
+	private List<Page> _pages;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
-    protected override void OnInitialized()
-    {
-        var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
-        _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList();
+	protected override void OnInitialized()
+	{
+		var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
+		if (admin != null)
+		{
+			_pages = PageState.Pages.Where(item => item.ParentId == admin.PageId).ToList();
+		}
     }
 }

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

@@ -11,8 +11,7 @@
         Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-            string message = string.Format(Localizer["Error.Module.Load"], 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/Edit.razor

@@ -48,7 +48,7 @@
                 </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>
+                <Label Class="col-sm-3" For="imagesizes" HelpText="Enter a list of image sizes which can be generated dynamically from uploaded images (ie. 200x200,400x400). Use * to indicate the folder supports all image sizes." ResourceKey="ImageSizes">Image Sizes: </Label>
                 <div class="col-sm-9">
                     <input id="imagesizes" class="form-control" @bind="@_imagesizes" maxlength="512" />
                 </div>
@@ -62,8 +62,7 @@
             <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" />
-
+                    <PermissionGrid EntityName="@EntityNames.Folder" PermissionNames="@(PermissionNames.Browse + "," + PermissionNames.View + "," + PermissionNames.Edit)" PermissionList="@_permissions" @ref="_permissionGrid" />
                 </div>
             </div>
         </div>
@@ -99,7 +98,7 @@
     private string _imagesizes = string.Empty;
     private string _capacity = "0";
     private bool _isSystem;
-    private string _permissions = string.Empty;
+    private List<Permission> _permissions = null;
     private string _createdBy;
     private DateTime _createdOn;
     private string _modifiedBy;
@@ -111,7 +110,7 @@
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    public override string Title => "Folder Management";
+    public override string Title => "Folder Management"; 
 
     protected override async Task OnInitializedAsync()
     {
@@ -131,7 +130,7 @@
                     _imagesizes = folder.ImageSizes;
                     _capacity = folder.Capacity.ToString();
                     _isSystem = folder.IsSystem;
-                    _permissions = folder.Permissions;
+                    _permissions = folder.PermissionList;
                     _createdBy = folder.CreatedBy;
                     _createdOn = folder.CreatedOn;
                     _modifiedBy = folder.ModifiedBy;
@@ -196,7 +195,7 @@
                 folder.ImageSizes = _imagesizes;
                 folder.Capacity = int.Parse(_capacity);
                 folder.IsSystem = _isSystem;
-                folder.Permissions = _permissionGrid.GetPermissions();
+                folder.PermissionList = _permissionGrid.GetPermissionList();
 
                 if (_folderId != -1)
                 {

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

@@ -56,7 +56,7 @@
                         <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" />
+                        <input id="starting" type="time" class="form-control" placeholder="hh:mm" @bind="@_startTime" />
                     </div>
                 </div>
             </div>
@@ -69,7 +69,7 @@
                         <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" />
+                        <input id="ending" type="time" class="form-control" placeholder="hh:mm" @bind="@_endTime" />
                     </div>
                 </div>
             </div>
@@ -82,7 +82,7 @@
                         <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" />
+                        <input id="next" type="time" class="form-control" placeholder="hh:mm" @bind="@_nextTime" />
                     </div>
                 </div>
             </div>
@@ -97,22 +97,22 @@
 </form>
 
 @code {
-	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 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 DateTime? _startTime = null;
+    private DateTime? _endDate = null;
+    private DateTime? _endTime = null;
+    private string _retentionHistory = string.Empty;
+    private DateTime? _nextDate = null;
+    private DateTime? _nextTime = null;
+    private string createdby;
 	private DateTime createdon;
 	private string modifiedby;
 	private DateTime modifiedon;
@@ -132,23 +132,14 @@
 				_isEnabled = job.IsEnabled.ToString();
 				_interval = job.Interval.ToString();
 				_frequency = job.Frequency;
-				_startDate = job.StartDate;
-				if (job.StartDate != null && job.StartDate.Value.TimeOfDay.TotalSeconds != 0)
-				{
-					_startTime = job.StartDate.Value.ToString("HH:mm");
-				}
-				_endDate = job.EndDate;
-				if (job.EndDate != null && job.EndDate.Value.TimeOfDay.TotalSeconds != 0)
-				{
-					_endTime = job.EndDate.Value.ToString("HH:mm");
-				}
-				_retentionHistory = job.RetentionHistory.ToString();
-				_nextDate = job.NextExecution;
-				if (job.NextExecution != null && job.NextExecution.Value.TimeOfDay.TotalSeconds != 0)
-				{
-					_nextTime = job.NextExecution.Value.ToString("HH:mm");
-				}
-				createdby = job.CreatedBy;
+				_startDate = Utilities.UtcAsLocalDate(job.StartDate);
+                _startTime = Utilities.UtcAsLocalDateTime(job.StartDate);
+                _endDate = Utilities.UtcAsLocalDate(job.EndDate);
+                _endTime = Utilities.UtcAsLocalDateTime(job.EndDate);
+                _retentionHistory = job.RetentionHistory.ToString();
+                _nextDate = Utilities.UtcAsLocalDate(job.NextExecution);
+                _nextTime = Utilities.UtcAsLocalDateTime(job.NextExecution);
+                createdby = job.CreatedBy;
 				createdon = job.CreatedOn;
 				modifiedby = job.ModifiedBy;
 				modifiedon = job.ModifiedOn;
@@ -180,50 +171,27 @@
 			{
 				job.Interval = int.Parse(_interval);
 			}
-            job.StartDate = _startDate;
-            if (job.StartDate != null)
-            {
-                job.StartDate = job.StartDate.Value.Date;
-                if (!string.IsNullOrEmpty(_startTime))
-                {
-                    job.StartDate = DateTime.Parse(job.StartDate.Value.ToShortDateString() + " " + _startTime);
-                }
-            }
-            job.EndDate = _endDate;
-            if (job.EndDate != null)
-            {
-                job.EndDate = job.EndDate.Value.Date;
-                if (!string.IsNullOrEmpty(_endTime))
-                {
-                    job.EndDate = DateTime.Parse(job.EndDate.Value.ToShortDateString() + " " + _endTime);
-                }
-            }
-            job.RetentionHistory = int.Parse(_retentionHistory);
-            job.NextExecution = _nextDate;
-            if (job.NextExecution != null)
-            {
-                job.NextExecution = job.NextExecution.Value.Date;
-                if (!string.IsNullOrEmpty(_nextTime))
-                {
-                    job.NextExecution = DateTime.Parse(job.NextExecution.Value.ToShortDateString() + " " + _nextTime);
-                }
-            }
+			job.StartDate = Utilities.LocalDateAndTimeAsUtc(_startDate, _startTime);
+			job.EndDate = Utilities.LocalDateAndTimeAsUtc(_endDate, _endTime);
+			job.RetentionHistory = int.Parse(_retentionHistory);
+			job.NextExecution = Utilities.LocalDateAndTimeAsUtc(_nextDate, _nextTime);
+
+			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);
+		}
+	}
 
-            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

@@ -11,7 +11,7 @@
 else
 {
     <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>
+    <button type="button" class="btn btn-secondary" @onclick="(async () => await Refresh())">@Localizer["Refresh.Text"]</button>
     <br />
     <br />
 
@@ -33,7 +33,7 @@ else
             <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)
                 {
@@ -56,6 +56,10 @@ else
 	protected override async Task OnParametersSetAsync()
 	{
 		_jobs = await JobService.GetJobsAsync();
+		if (_jobs.Count == 0)
+		{
+			AddModuleMessage(string.Format(Localizer["Message.NoJobs"], NavigateUrl("admin/system")), MessageType.Warning);
+		}
 	}
 
 	private string DisplayStatus(bool isEnabled, bool isExecuting)

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

@@ -9,340 +9,120 @@
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_supportedCultures == null)
+@if (_cultures == 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</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>
+        <TabPanel Name="Manage" ResourceKey="Manage" Heading="Manage">
+            <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>
+								<option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+								@foreach (var culture in _cultures)
+                                {
+                                    <option value="@culture.Name">@(culture.DisplayName + " (" + culture.Name + ")")</option>
+                                }
+                            </select>
                         </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="Download" 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 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="@_default" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
                     </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>
-            }
+                <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="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
+        <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host" Heading="Upload">
             <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">Language: </Label>
+                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install." ResourceKey="LanguageUpload">Translation: </Label>
                     <div class="col-sm-9">
-                        <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
+                        <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" OnUpload="OnUpload" />
                     </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 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 = "";
+	private string _code = "-";
+	private string _default = "False";
+	private List<string> _languages;
+	private IEnumerable<Culture> _cultures;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	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();
+	protected override async Task OnParametersSetAsync()
+	{
+		var languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
+		_languages = 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();
+		await LoadCultures();
+	}
 
-        if (_supportedCultures.Count() == 1)
-        {
-            _message = Localizer["OnlyEnglish"];
-        }
-        else if (_availableCultures.Count() == 0)
-        {
-            _message = Localizer["AllLanguages"];
-        }
-    }
+	private async Task LoadCultures()
+	{
+		_cultures = await LocalizationService.GetCulturesAsync(false);
+		_cultures = _cultures.Where(c => !c.Name.Equals(Constants.DefaultCulture) && !_languages.Contains(c.Name));
+		_code = "-";
+	}
 
-    private async Task LoadTranslations()
-    {
-        _packages = await PackageService.GetPackagesAsync("translation", _search, _price, "");
-    }
+	private async Task SaveLanguage()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form) && _code != "-")
+		{
+			var language = new Language
+				{
+					SiteId = PageState.Page.SiteId,
+					Name = CultureInfo.GetCultureInfo(_code).DisplayName,
+					Code = _code,
+					IsDefault = (_default == null ? false : Boolean.Parse(_default))
+				};
 
-    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");
-        }
-    }
+			try
+			{
+				language = await LanguageService.AddLanguageAsync(language);
 
-    private async Task Search()
-    {
-        try
-        {
-            await LoadTranslations();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Search");
-        }
-    }
+				if (language.IsDefault)
+				{
+					await SetCultureAsync(language.Code);
+				}
 
-    private async Task Reset()
-    {
-        try
-        {
-            _search = "";
-            await LoadTranslations();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Reset");
-        }
-    }
+				await logger.LogInformation("Language Added {Language}", language);
 
-    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");
-        }
-    }
+				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 async Task SetCultureAsync(string culture)
     {
@@ -355,4 +135,9 @@ else
             NavigationManager.NavigateTo(NavigationManager.Uri, true);
         }
     }
+
+    private void OnUpload()
+    {
+        AddModuleMessage(string.Format(Localizer["Success.Language.Download"], NavigateUrl("admin/system")), MessageType.Success);
+    }
 }

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

@@ -20,52 +20,113 @@ else
             <th>@SharedLocalizer["Name"]</th>
             <th>@Localizer["Code"]</th>
             <th>@Localizer["Default"]</th>
-            <th style="width: 1px;">&nbsp;</th>
+			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+                <th style="width: 1px;">@Localizer["Translation"]</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><TriStateCheckBox Value="@(context.IsDefault)" Disabled="true"></TriStateCheckBox></td>
-            <td>
-                @if (UpgradeAvailable(context.Code))
-                {
-                    <button type="button" class="btn btn-success" @onclick=@(async () => await DownloadLanguage(context.Code))>@SharedLocalizer["Upgrade"]</button>
-                }
-            </td>
+			<td><TriStateCheckBox Value="@(context.IsDefault)" Disabled="true"></TriStateCheckBox></td>
+			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			{
+                <td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
+				<td>
+					@{
+						var translation = TranslationAvailable(context.Code, context.Version);
+					}
+					@if (translation != null)
+					{
+						if (string.IsNullOrEmpty(context.Version))
+						{
+							<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(context.Code, translation.Version))>@SharedLocalizer["Download"]</button>
+						}
+						else
+						{
+							if (Version.Parse(translation.Version).CompareTo(Version.Parse(context.Version)) > 0)
+							{
+								<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(context.Code, translation.Version))>@SharedLocalizer["Upgrade"]</button>
+							}
+						}
+					}
+				</td>
+			}
         </Row>
     </Pager>
 }
 
+@if (_package != null)
+{
+	<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;">
+							<h4 style="display: inline;"><a href="@_package.ProductUrl" target="_new">@_package.Name</a></h4><br />
+							@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@_package.OwnerUrl" target="new">@_package.Owner</a></strong><br />
+							@(_package.Description.Length > 400 ? (_package.Description.Substring(0, 400) + "...") : _package.Description)<br />
+							<strong>@(String.Format("{0:n0}", _package.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
+							@SharedLocalizer["Search.Released"]: <strong>@_package.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
+							@SharedLocalizer["Search.Version"]: <strong>@_package.Version</strong>
+							@((MarkupString)(!string.IsNullOrEmpty(_package.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(_package.PackageUrl).Host + "</strong>" : ""))
+							<br /><br />
+							@if (!string.IsNullOrEmpty(_package.License))
+							{
+								@((MarkupString)_package.License.Replace("\n", "<br />"))
+							}
+							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 List<Language> _languages;
     private List<Package> _packages;
+    private Package _package;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnParametersSetAsync()
     {
-        _languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId);
-
-        var cultures = await LocalizationService.GetCulturesAsync();
-        var culture = cultures.First(c => c.Name.Equals(Constants.DefaultCulture));
-
-        // Adds English as default language
-        _languages.Insert(0, new Language { Name = culture.DisplayName, Code = culture.Name, IsDefault = !_languages.Any(l => l.IsDefault) });
+        await GetLanguages();
 
         if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
-            _packages = await PackageService.GetPackagesAsync("translation");
+            _packages = await PackageService.GetPackagesAsync("translation");			
         }
     }
 
+    private async Task GetLanguages()
+    {
+        _languages = await LanguageService.GetLanguagesAsync(PageState.Site.SiteId, Constants.ClientId);
+    }
+
     private async Task DeleteLanguage(Language language)
     {
         try
         {
             await LanguageService.DeleteLanguageAsync(language.LanguageId);
             await logger.LogInformation("Language Deleted {Language}", language);
-
+            await GetLanguages();
             StateHasChanged();
         }
         catch (Exception ex)
@@ -76,37 +137,53 @@ else
         }
     }
 
-    private bool UpgradeAvailable(string code)
+    private Package TranslationAvailable(string code, string version)
     {
-        var upgradeavailable = false;
-        if (_packages != null)
-        {
-            var package = _packages.Where(item => item.PackageId == (Constants.PackageId + ".Client." + code)).FirstOrDefault();
-            if (package != null)
-            {
-                upgradeavailable = (Version.Parse(package.Version).CompareTo(Version.Parse(Constants.Version)) == 0);
-            }
-
-        }
-        return upgradeavailable;
+        return _packages?.FirstOrDefault(item => item.PackageId == (Constants.PackageId + "." + code));
     }
 
-    private async Task DownloadLanguage(string code)
+    private async Task GetPackage(string code, string version)
     {
         try
         {
-            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+            _package = await PackageService.GetPackageAsync(Constants.PackageId + "." + code, version, false);
+            if (_package != null)
             {
-                await PackageService.DownloadPackageAsync(Constants.PackageId + ".Client." + 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);
+                StateHasChanged();
+            }
+            else
+            {
+                await logger.LogError("Error Getting Package {PackageId} {Version}", Constants.PackageId + "." + code, Constants.Version);
+                AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
             }
         }
-        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);
-        }
-    }
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", Constants.PackageId + "." + code, Constants.Version);
+			AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+		}
+	}
+
+	private async Task DownloadPackage()
+	{
+		try
+		{
+			await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version);
+			await logger.LogInformation("Language Package {Name} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
+			AddModuleMessage(string.Format(Localizer["Success.Language.Download"], NavigateUrl("admin/system")), MessageType.Success);
+			_package = null;
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Downloading Translation {Name} {Version}", _package.PackageId, _package.Version);
+			AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error);
+		}
+	}
+
+	private void HideModal()
+	{
+		_package = null;
+		StateHasChanged();
+	}
 }

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

@@ -1,9 +1,10 @@
+@using System.Net
 @namespace Oqtane.Modules.Admin.Login
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
+@inject ISettingService SettingService
 @inject IServiceProvider ServiceProvider
-@inject SiteState SiteState
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -11,9 +12,6 @@
     <Authorizing>
         <text>...</text>
     </Authorizing>
-    <Authorized>
-		<div>@Localizer["Info.SignedIn"]</div>
-    </Authorized>
     <NotAuthorized>
 		@if (!twofactor)
 		{
@@ -34,7 +32,7 @@
 						<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>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 						</div>
 					</div>
 					<div class="form-group mt-2">
@@ -69,247 +67,264 @@
 </AuthorizeView>
 
 @code {
-	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;
+    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;
 
-	private string _returnUrl = string.Empty;
+    private string _returnUrl = string.Empty;
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
-	public override List<Resource> Resources => new List<Resource>()
+    public override List<Resource> Resources => new List<Resource>()
     {
         new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
     };
 
-	protected override async Task OnInitializedAsync()
-	{
-		try
-		{
-			_togglepassword = SharedLocalizer["ShowPassword"];
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            if (PageState.QueryString.ContainsKey("returnurl"))
+            {
+                _returnUrl = PageState.QueryString["returnurl"];
+            }
 
-			if (PageState.Site.Settings.ContainsKey("LoginOptions:AllowSiteLogin") && !string.IsNullOrEmpty(PageState.Site.Settings["LoginOptions:AllowSiteLogin"]))
-			{
-				_allowsitelogin = bool.Parse(PageState.Site.Settings["LoginOptions:AllowSiteLogin"]);
-			}
+            _allowexternallogin = (SettingService.GetSetting(PageState.Site.Settings, "ExternalLogin:ProviderType", "") != "") ? true : false;
+            _allowsitelogin = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AllowSiteLogin", "true"));
 
-			if (PageState.Site.Settings.ContainsKey("ExternalLogin:ProviderType") && !string.IsNullOrEmpty(PageState.Site.Settings["ExternalLogin:ProviderType"]))
-			{
-				_allowexternallogin = true;
-			}
+            if (_allowexternallogin && !_allowsitelogin)
+            {
+                // redirect to external login
+                NavigationManager.NavigateTo(Utilities.TenantUrl(PageState.Alias, "/pages/external?returnurl=" + _returnUrl), true);
+                return;
+            }
 
-			if (PageState.QueryString.ContainsKey("returnurl"))
-			{
-				_returnUrl = PageState.QueryString["returnurl"];
-			}
+            _togglepassword = SharedLocalizer["ShowPassword"];
 
-			if (PageState.QueryString.ContainsKey("name"))
-			{
-				_username = PageState.QueryString["name"];
-			}
+            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("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);
-		}
-	}
+                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();
-		}
-	}
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender && PageState.User == null && _allowsitelogin)
+        {
+            await username.FocusAsync();
+        }
 
-	private async Task Login()
-	{
-		try
-		{
-			validated = true;
-			var interop = new Interop(JSRuntime);
-			if (await interop.FormValid(login))
-			{
-				var user = new User { SiteId = PageState.Site.SiteId, Username = _username, Password = _password, LastIPAddress = SiteState.RemoteIPAddress};
+        // redirect logged in user to specified page
+        if (PageState.User != null)
+        {
+            NavigationManager.NavigateTo(PageState.ReturnUrl);
+        }
+    }
 
-				if (!twofactor)
-				{
-					user = await UserService.LoginUserAsync(user);
-				}
-				else
-				{
-					user = await UserService.VerifyTwoFactorAsync(user, _code);
-				}
+    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 (user.IsAuthenticated)
-				{
-					await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
+                if (!twofactor)
+                {
+                    user = await UserService.LoginUserAsync(user, hybrid, _remember);
+                }
+                else
+                {
+                    user = await UserService.VerifyTwoFactorAsync(user, _code);
+                }
 
-					// 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);
-		}
-	}
+                if (user.IsAuthenticated)
+                {
+                    await logger.LogInformation(LogFunction.Security, "Login Successful For Username {Username}", _username);
 
-	private void Cancel()
-	{
-		NavigationManager.NavigateTo(_returnUrl);
-	}
+                    if (hybrid)
+                    {
+                        // hybrid apps utilize an interactive login
+                        var authstateprovider = (IdentityAuthenticationStateProvider)ServiceProvider.GetService(typeof(IdentityAuthenticationStateProvider));
+                        authstateprovider.NotifyAuthenticationChanged();
+                        NavigationManager.NavigateTo(NavigateUrl(WebUtility.UrlDecode(_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 (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "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 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);
-			}
+    private void Cancel()
+    {
+        NavigationManager.NavigateTo(_returnUrl);
+    }
 
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Resetting Password {Error}", ex.Message);
-			AddModuleMessage(Localizer["Error.ResetPassword"], MessageType.Error);
-		}
-	}
+    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);
+            }
 
-	private void Reset()
-	{
-		twofactor = false;
-		_username = "";
-		_password = "";
-		ClearModuleMessage();
-		StateHasChanged();
-	}
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Resetting Password {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.ResetPassword"], MessageType.Error);
+        }
+    }
 
-	private async Task KeyPressed(KeyboardEventArgs e)
-	{
-		if (e.Code == "Enter" || e.Code == "NumpadEnter")
-		{
-			await Login();
-		}
-	}
+    private void Reset()
+    {
+        twofactor = false;
+        _username = "";
+        _password = "";
+        ClearModuleMessage();
+        StateHasChanged();
+    }
 
-	private void TogglePassword()
-	{
-		if (_passwordtype == "password")
-		{
-			_passwordtype = "text";
-			_togglepassword = SharedLocalizer["HidePassword"];
-		}
-		else
-		{
-			_passwordtype = "password";
-			_togglepassword = SharedLocalizer["ShowPassword"];
-		}
-	}
+    private async Task KeyPressed(KeyboardEventArgs e)
+    {
+        if (e.Code == "Enter" || e.Code == "NumpadEnter")
+        {
+            await Login();
+        }
+    }
 
-	private void ExternalLogin()
-	{
+    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);
-	}
+    }
 
 }

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

@@ -37,7 +37,7 @@
 			</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>
+			<Label Class="col-sm-3" For="category" HelpText="The fully qualified type type that was affected" ResourceKey="Category">Type Name: </Label>
 			<div class="col-sm-9">
 				<input id="category" class="form-control" @bind="@_category" readonly />
 			</div>
@@ -130,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)
             {
@@ -191,13 +192,6 @@
 
 	private string CloseUrl()
 	{
-		if (!PageState.QueryString.ContainsKey("level"))
-		{
-			return NavigateUrl();
-		}
-		else
-		{
-			return NavigateUrl(PageState.Page.Path, "level=" + PageState.QueryString["level"] + "&function=" + PageState.QueryString["function"] + "&rows=" + PageState.QueryString["rows"] + "&page=" + PageState.QueryString["page"]);
-		}
+		return (!string.IsNullOrEmpty(PageState.ReturnUrl)) ? PageState.ReturnUrl : NavigateUrl();
 	}
 }

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

@@ -63,7 +63,7 @@ else
 						<th>@Localizer["Function"]</th>
 					</Header>
 					<Row>
-						<td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString() + "&level=" + _level + "&function=" + _function + "&rows=" + _rows + "&page=" + _page.ToString())" ResourceKey="LogDetails" /></td>
+						<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>
@@ -99,29 +99,26 @@ else
 	private List<Log> _logs;
 	private string _retention = "";
 
+	public override string UrlParametersTemplate => "/{level}/{function}/{rows}/{page}";
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-	protected override async Task OnInitializedAsync()
+	protected override async Task OnParametersSetAsync()
 	{
 		try
 		{
-			if (PageState.QueryString.ContainsKey("id") && int.TryParse(PageState.QueryString["id"], out int id))
+			if (UrlParameters.ContainsKey("level"))
 			{
-				NavigationManager.NavigateTo(EditUrl(PageState.Page.Path, ModuleState.ModuleId, "Detail", $"id={id}"));
+				_level = UrlParameters["level"];
 			}
-			if (PageState.QueryString.ContainsKey("level"))
+			if (UrlParameters.ContainsKey("function"))
 			{
-				_level = PageState.QueryString["level"];
+				_function = UrlParameters["function"];
 			}
-			if (PageState.QueryString.ContainsKey("function"))
+			if (UrlParameters.ContainsKey("rows"))
 			{
-				_function = PageState.QueryString["function"];
+				_rows = UrlParameters["rows"];
 			}
-			if (PageState.QueryString.ContainsKey("rows"))
-			{
-				_rows = PageState.QueryString["rows"];
-			}
-			if (PageState.QueryString.ContainsKey("page") && int.TryParse(PageState.QueryString["page"], out int page))
+			if (UrlParameters.ContainsKey("page") && int.TryParse(UrlParameters["page"], out int page))
 			{
 				_page = page;
 			}
@@ -238,4 +235,15 @@ else
 		_page = page;	
 	}
 
+	protected override void OnAfterRender(bool firstRender)
+	{
+		if (firstRender)
+		{
+			// 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}"));
+			}
+		}
+	}
 }

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

@@ -1,203 +0,0 @@
-@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
-
-@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>
-}
-
-@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 = Constants.Version;
-	private string _minversion = "2.0.0";
-	private string _location = string.Empty;
-
-	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 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 ActivateModule()
-    {
-        try
-        {
-            if (!string.IsNullOrEmpty(_moduledefinitionname))
-            {
-                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 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,17 +0,0 @@
-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
-        {
-            Name = "Module Creator",
-            Description = "Enables software developers to quickly create modules by automating many of the initial module creation tasks",
-            Version = "1.0.0",
-            Categories = "Developer"
-        };
-    }
-}

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

@@ -8,70 +8,124 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <TabStrip>
-    <TabPanel Name="Download" ResourceKey="Download">
+    <TabPanel Name="Download" ResourceKey="Download" Heading="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 class="text-center">
+                <div class="form-check form-check-inline">
+                    <input id="free" class="form-check-input" type="radio" checked="@(_price == "free")" name="Price" @onchange="@(() => PriceChanged("free"))" />
+                    <label class="form-check-label" for="free">@SharedLocalizer["Free"]</label>
+                </div>
+                <div class="form-check form-check-inline">
+                    <input id="paid" class="form-check-input" type="radio" checked="@(_price == "paid")" name="Price" @onchange="@(() => PriceChanged("paid"))" />
+                    <label class="form-check-label" for="paid">@SharedLocalizer["Paid"]</label>
                 </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 class="row justify-content-center mb-3">
+            <div class="col">
+                <div class="input-group">
+                    <span class="input-group-text">@Localizer["Product"]</span>
+                    <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>
+                    <button type="button" class="btn btn-primary ms-2" @onclick="Refresh"><span class="@Icons.Reload" aria-hidden="true"></span></button>
                 </div>
-            }
-        }
+            </div>
+        </div>
+        <div class="row mb-3">
+            <div class="col">
+                @if (_initialized)
+                {
+                    <br />
+                    <div class="row mb-3">
+                        <div class="col-sm-4">
+                            <h3>@((_packages != null) ? _packages.Count : 0) @SharedLocalizer["Search.Results"]</h3>
+                        </div>
+                        <div class="col-sm-4">
+                            &nbsp;
+                        </div>
+                        <div class="col-sm-4">
+                            <select class="form-select" value="@_sort" @onchange="(e => SortChanged(e))">
+                                <option value="popularity">@SharedLocalizer["Search.Popularity"]</option>
+                                <option value="alphabetical">@SharedLocalizer["Search.Alphabetical"]</option>
+                                @if (_price == "free")
+                                {
+                                    <option value="downloads">@SharedLocalizer["Search.Downloads"]</option>
+                                }
+                                <option value="recent">@SharedLocalizer["Search.RecentlyReleased"]</option>
+                                @if (_price == "paid")
+                                {
+                                    <option value="price">@SharedLocalizer["Search.Price"]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    <Pager Format="Grid" Items="@_packages" DisplayPages="1" PageSize="9" Toolbar="Both" Class="container-fluid px-0" RowClass="row g-0" ColumnClass="col-lg-4 col-md-6"  CurrentPage="@_page.ToString()" OnPageChange="OnPageChange">
+                        <Row>
+                            <div class="m-2 p-2 d-flex justify-content-center">
+                                <div class="container-fluid px-0">
+                                    <div class="row g-0 mb-2">
+                                        <div class="col-4">
+                                            @if (context.LogoUrl != null)
+                                            {
+                                                <img src="@context.LogoUrl" class="img-fluid" alt="@context.Name" />
+                                            }
+                                            else
+                                            {
+                                                <img src="/package.png" class="img-fluid" alt="@context.Name" />
+                                            }
+                                        </div>
+                                        <div class="col-8 text-end">
+                                            <small>@SharedLocalizer["Search.Version"]:</small> <strong>@context.Version</strong>
+                                            <br /><small>@SharedLocalizer["Search.Released"]:</small> <strong>@context.ReleaseDate.ToString("MM/dd/yyyy")</strong>
+                                            @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                            {
+                                                <br /><small>@SharedLocalizer["Search.Source"]:</small> <strong>@(new Uri(context.PackageUrl).Host)</strong>
+                                            }
+                                            @if (context.Price == null)
+                                            {
+                                                <br /><small>@SharedLocalizer["Search.Downloads"]:</small> <strong>@(String.Format("{0:n0}", context.Downloads))</strong>
+                                            }
+                                            else
+                                            {
+                                                <br /><small>@SharedLocalizer["From"]:</small> <strong>@context.Price.Value.ToString("$#,##0.00")</strong>
+                                                @((MarkupString)(context.TrialPeriod > 0 ? " <strong>(" + context.TrialPeriod + " Day Trial)</strong>" : ""))
+                                            }
+                                        </div>
+                                    </div>
+                                    <div class="row g-0">
+                                        <div class="col">
+                                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_blank">@context.Name</a></h3><br />
+                                            <small>@SharedLocalizer["Search.By"]:</small> <strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+                                            @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+                                            <br />
+                                            @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                            {
+                                                <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                                            }
+                                            @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                                            {
+                                                <a class="btn btn-success ms-2" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@SharedLocalizer["Buy"]</a>
+                                            }
+                                            <br />
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </Row>
+                    </Pager>
+                }
+            </div>
+        </div>
+        <br />
+        <ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
     </TabPanel>
-    <TabPanel Name="Upload" ResourceKey="Upload">
+    <TabPanel Name="Upload" ResourceKey="Upload" Heading="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" />
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" OnUpload="OnUpload" />
                 </div>
             </div>
         </div>
@@ -91,9 +145,9 @@
                     <div class="modal-body">
                         <p style="height: 200px; overflow-y: scroll;">
                             <h3>@_productname</h3>
-                            @if (!string.IsNullOrEmpty(_license))
+                            @if (!string.IsNullOrEmpty(_packagelicense))
                             {
-                                @((MarkupString)_license)
+								@((MarkupString)_packagelicense)
                             }
                             else
                             {
@@ -111,149 +165,149 @@
     </div>
 }
 
-<button type="button" class="btn btn-success" @onclick="InstallModules">@SharedLocalizer["Install"]</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
-	private List<Package> _packages;
-	private string _price = "free";
-	private string _search = "";
-	private string _productname = "";
-	private string _license = "";
-	private string _packageid = "";
-	private string _version = "";
+    private bool _initialized = false;
+    private int _page = 1;
+    private List<Package> _packages;
+    private string _price = "free";
+    private string _sort = "popularity";
+    private string _search = "";
+    private string _productname = "";
+    private string _packageid = "";
+    private string _packagelicense = "";
+    private string _packageversion = "";
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+    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);
-		}
-	}
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            await LoadModuleDefinitions();
+            _initialized = true;
+        }
+        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, "");
+    private async Task LoadModuleDefinitions()
+    {
+        ShowProgressIndicator();
 
-		if (_packages != null)
-		{
-			foreach (Package package in _packages.ToArray())
-			{
-				if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
-				{
-					_packages.Remove(package);
-				}
-			}
-		}
-	}
+        var moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+        _packages = await PackageService.GetPackagesAsync("module", _search, _price, "", _sort);
 
-	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");
-		}
-	}
+        if (_packages != null)
+        {
+            foreach (Package package in _packages.ToArray())
+            {
+                if (moduledefinitions.Exists(item => item.PackageName == package.PackageId))
+                {
+                    _packages.Remove(package);
+                }
+            }
+        }
 
-	private async Task Search()
-	{
-		try
-		{
-			await LoadModuleDefinitions();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error On Search");
-		}
-	}
+        HideProgressIndicator();
+    }
 
-	private async Task Reset()
-	{
-		try
-		{
-			_search = "";
-			await LoadModuleDefinitions();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error On Reset");
-		}
-	}
+    private async void PriceChanged(string price)
+    {
+        _price = price;
+        _sort = "popularity";
+        await LoadModuleDefinitions();
+        StateHasChanged();
+    }
 
-	private void HideModal()
-	{
-		_productname = "";
-		_license = "";
-		StateHasChanged();
-	}
+    private async Task Search()
+    {
+        await LoadModuleDefinitions();
+    }
 
-	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 Reset()
+    {
+        _page = 1;
+        _search = "";
+        await LoadModuleDefinitions();
+    }
 
-	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.Module.Download"], MessageType.Success);
-			_productname = "";
-			_license = "";
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version);
-			AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
-		}
-	}
+    private async Task Refresh()
+    {
+        await LoadModuleDefinitions();
+    }
 
-	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 Module");
-		}
-	}
+    private void OnPageChange(int page)
+    {
+        _page = page;
+    }
+
+    private async void SortChanged(ChangeEventArgs e)
+    {
+        _sort = (string)e.Value;
+        await LoadModuleDefinitions();
+    }
+
+    private void HideModal()
+    {
+        _productname = "";
+        _packagelicense = "";
+        StateHasChanged();
+    }
+
+    private async Task GetPackage(string packageid, string version)
+    {
+        try
+        {
+            var package = await PackageService.GetPackageAsync(packageid, version, false);
+            if (package != null)
+            {
+                _productname = package.Name;
+                _packageid = package.PackageId;
+                if (!string.IsNullOrEmpty(package.License))
+                {
+                    _packagelicense = package.License.Replace("\n", "<br />");
+                }
+                _packageversion = package.Version;
+                StateHasChanged();
+            }
+            else
+            {
+                await logger.LogError("Error Getting Package {PackageId} {Version}", packageid, version);
+                AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error);
+            }
+        }
+        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);
+            await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _packageversion);
+            AddModuleMessage(string.Format(Localizer["Success.Module.Download"], NavigateUrl("admin/system")), 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 void OnUpload()
+    {
+        AddModuleMessage(string.Format(Localizer["Success.Module.Download"], NavigateUrl("admin/system")), MessageType.Success);
+    }
 }

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

@@ -89,7 +89,10 @@
 
     protected override void OnInitialized()
     {
-        AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
+        if (!NavigationManager.BaseUri.Contains("localhost:"))
+        {
+            AddModuleMessage(Localizer["Info.Module.Development"], MessageType.Info);
+        }
     }
 
     protected override async Task OnParametersSetAsync()
@@ -115,10 +118,18 @@
             {
                 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);
+                    if (IsValidXML(_description))
+                    {
+                        var template = _templates.FirstOrDefault(item => item.Name == _template);
+                        var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference, ModuleDefinitionName = template.Namespace };
+                        moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
+                        GetLocation();
+                        AddModuleMessage(string.Format(Localizer["Success.Module.Create"], NavigateUrl("admin/system")), MessageType.Success);
+                    }
+                    else
+                    {
+                        AddModuleMessage(Localizer["Message.Require.ValidDescription"], MessageType.Warning);
+                    }
                 }
                 else
                 {
@@ -139,7 +150,13 @@
     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_]*$");
+        return !string.IsNullOrEmpty(name) && name.ToLower() != "module" && !name.ToLower().Contains("oqtane") && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
+    }
+
+    private bool IsValidXML(string description)
+    {
+        // must contain letters, digits, or spaces
+        return Regex.IsMatch(description, "^[A-Za-z0-9 ]+$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)
@@ -160,8 +177,14 @@
         if (_owner != "" && _module != "" && _template != "-")
         {
             var template = _templates.FirstOrDefault(item => item.Name == _template);
-            _location = template.Location + _owner + "." + _module;
-
+            if (!string.IsNullOrEmpty(template.Namespace))
+            {
+                _location = template.Location + template.Namespace.Replace("[Owner]", _owner).Replace("[Module]", _module);
+            }
+            else
+            {
+                _location = template.Location + _owner + ".Module." + _module;
+            }
         }
         StateHasChanged();
     }

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

@@ -1,110 +1,241 @@
 @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" 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 />
+@if (_initialized)
+{
+	<TabStrip>
+        <TabPanel Name="Definition" ResourceKey="Definition" Heading="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 class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="isenabled" HelpText="Is module enabled for this site?" ResourceKey="IsEnabled">Enabled? </Label>
+                        <div class="col-sm-9">
+                            <select id="isenabled" class="form-select" @bind="@_isenabled" required>
+                                <option value="True">@SharedLocalizer["Yes"]</option>
+                                <option value="False">@SharedLocalizer["No"]</option>
+                            </select>
+                        </div>
                     </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 />
-                    </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 />
-                    </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 />
-                    </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 />
-                    </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 />
-                    </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>
-                    </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>
-    </TabPanel>
-    <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>
-    </TabPanel>
-</TabStrip>
-<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>
+			</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 />
+						</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 />
+						</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. This value must be specified within the module's IModule interface specification." ResourceKey="PackageName">Package Name: </Label>
+						<div class="col-sm-9">
+                            @if (!string.IsNullOrEmpty(_packagename))
+                            {
+                                <div class="input-group">
+                                    <input id="packagename" class="form-control" @bind="@_packagename" disabled />
+                                    @if (string.IsNullOrEmpty(_packageurl))
+                                    {
+                                        <button type="button" class="btn btn-secondary" @onclick="ValidatePackage">@Localizer["Validate"]</button>
+                                    }
+                                    else
+                                    {
+                                        <a href="@_packageurl" target="_blank" class="btn btn-primary">@SharedLocalizer["Download"]</a>
+                                    }
+                                </div>
+                            }
+                            else
+                            {
+                                <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 />
+						</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 />
+						</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 />
+						</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">
+                            @if (_license.StartsWith("http") || _license.StartsWith("/") || _license.StartsWith("~"))
+                            {
+                                <a href="@_license.Replace("~", PageState?.Alias.BaseUrl + "/Modules/" + Utilities.GetTypeName(_moduledefinitionname))" class="btn btn-info" style="text-decoration: none !important" target="_new">@Localizer["View License"]</a>
+                            }
+                            else
+                            {
+                                <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
+                            }
+						</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" ResourceKey="Permissions" Heading="Permissions">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<PermissionGrid EntityName="@EntityNames.ModuleDefinition" PermissionNames="@PermissionNames.Utilize" PermissionList="@_permissions" @ref="_permissionGrid" />
+				</div>
+			</div>
+			<br />
+			<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" Heading="Translations">
+			@if (_languages != null && _languages.Count > 0)
+			{
+				<Pager Items="@_languages">
+					<Header>
+					<th>@SharedLocalizer["Name"]</th>
+					<th>@Localizer["Code"]</th>
+					<th style="width: 1px;">@Localizer["Version"]</th>
+					<th style="width: 1px;">&nbsp;</th>
+					</Header>
+					<Row>
+						<td>@context.Name</td>
+						<td>@context.Code</td>
+						<td>@((string.IsNullOrEmpty(context.Version)) ? "---" : context.Version)</td>
+						<td>
+							@switch (TranslationAvailable(_packagename + "." + context.Code, context.Version))
+							{
+								case "install":
+									<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Download"]</button>
+									break;
+								case "upgrade":
+									<button type="button" class="btn btn-success" @onclick=@(async () => await GetPackage(_packagename + "." + context.Code))>@SharedLocalizer["Upgrade"]</button>
+									break;
+							}
+						</td>
+					</Row>
+				</Pager>
+			}
+			else
+			{
+				<br />
+				<div class="mx-auto text-center">
+					@if (string.IsNullOrEmpty(_packagename))
+					{
+						@Localizer["Search.PackageNameMissing"]
+					}
+					else
+					{
+						@Localizer["Search.NoResults"]
+					}
+				</div>
+				<br />
+			}
+		</TabPanel>
+	</TabStrip>
+
+	@if (_package != null)
+	{
+		<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;">
+								<h4 style="display: inline;"><a href="@_package.ProductUrl" target="_new">@_package.Name</a></h4><br />
+								@SharedLocalizer["Search.By"]:&nbsp;&nbsp;<strong><a href="@_package.OwnerUrl" target="new">@_package.Owner</a></strong><br />
+								@(_package.Description.Length > 400 ? (_package.Description.Substring(0, 400) + "...") : _package.Description)<br />
+								<strong>@(String.Format("{0:n0}", _package.Downloads))</strong> @SharedLocalizer["Search.Downloads"]&nbsp;&nbsp;|&nbsp;&nbsp;
+								@SharedLocalizer["Search.Released"]: <strong>@_package.ReleaseDate.ToString("MMM dd, yyyy")</strong>&nbsp;&nbsp;|&nbsp;&nbsp;
+								@SharedLocalizer["Search.Version"]: <strong>@_package.Version</strong>
+								@((MarkupString)(!string.IsNullOrEmpty(_package.PackageUrl) ? "&nbsp;&nbsp;|&nbsp;&nbsp;" + SharedLocalizer["Search.Source"] + ": <strong>" + new Uri(_package.PackageUrl).Host + "</strong>" : ""))
+								<br /><br />
+								@if (!string.IsNullOrEmpty(_package.License))
+								{
+									@((MarkupString)_package.License.Replace("\n", "<br />"))
+								}
+								else
+								{
+									@SharedLocalizer["License Not Specified"]
+								}
+							</p>
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-success" @onclick="DownloadTranslation">@SharedLocalizer["Accept"]</button>
+							<button type="button" class="btn btn-secondary" @onclick="HideModal">@SharedLocalizer["Cancel"]</button>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	}
+}
 
 @code {
+    private bool _initialized = false;
     private ElementReference form;
     private bool validated = false;
     private int _moduleDefinitionId;
     private string _name;
-    private string _version;
-    private string _categories;
-    private string _moduledefinitionname = "";
     private string _description = "";
+    private string _categories;
+    private string _isenabled;
+    private string _moduledefinitionname = "";
+    private string _version;
+    private string _packagename = "";
+    private string _packageurl = ""; 
     private string _owner = "";
     private string _url = "";
     private string _contact = "";
     private string _license = "";
-    private string _runtimes = "";
-    private string _permissions;
+    private List<Permission> _permissions = null;
     private string _createdby;
     private DateTime _createdon;
     private string _modifiedby;
@@ -114,6 +245,10 @@
     private PermissionGrid _permissionGrid;
 #pragma warning restore 649
 
+    private List<Package> _packages;
+    private List<Language> _languages;
+    private Package _package;
+
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
@@ -125,20 +260,38 @@
             if (moduleDefinition != null)
             {
                 _name = moduleDefinition.Name;
-                _version = moduleDefinition.Version;
-                _categories = moduleDefinition.Categories;
-                _moduledefinitionname = moduleDefinition.ModuleDefinitionName;
                 _description = moduleDefinition.Description;
+                _categories = moduleDefinition.Categories;
+                _isenabled = moduleDefinition.IsEnabled.ToString();
+                _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;
+                _permissions = moduleDefinition.PermissionList;
                 _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();
+                }
+
+                _initialized = true;
             }
         }
         catch (Exception ex)
@@ -156,23 +309,32 @@
         {
             try
             {
-                var moduledefinition = await ModuleDefinitionService.GetModuleDefinitionAsync(_moduleDefinitionId, ModuleState.SiteId);
-                if (moduledefinition.Name != _name)
+                var moduleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+                if (!moduleDefinitions.Any(item => item.Name.ToLower() == _name.ToLower() && item.ModuleDefinitionId != _moduleDefinitionId))
                 {
-                    moduledefinition.Name = _name;
+                    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.IsEnabled = (_isenabled == null ? true : bool.Parse(_isenabled));
+                    moduledefinition.PermissionList = _permissionGrid.GetPermissionList();
+                    await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition);
+                    await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition);
+                    NavigationManager.NavigateTo(NavigateUrl());
                 }
-                if (moduledefinition.Description != _description)
+                else
                 {
-                    moduledefinition.Description = _description;
+                    AddModuleMessage(Localizer["Message.DuplicateName"], MessageType.Warning);
                 }
-                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)
             {
@@ -185,4 +347,97 @@
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
+
+    private void HideModal()
+    {
+        _package = null;
+        StateHasChanged();
+    }
+
+    private string TranslationAvailable(string packagename, string version)
+    {
+        if (_packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null)
+            {
+                if (string.IsNullOrEmpty(version))
+                {
+                    return "install";
+                }
+                else
+                {
+                    if (Version.Parse(package.Version).CompareTo(Version.Parse(version)) > 0)
+                    {
+                        return "upgrade";
+                    }
+                }
+            }
+        }
+        return "";
+    }
+
+    private async Task GetPackage(string packagename)
+    {
+        var version = _packages.Where(item => item.PackageId == packagename).FirstOrDefault().Version;
+        try
+        {
+            _package = await PackageService.GetPackageAsync(packagename, version, false);
+            if (_package != null)
+            {
+                StateHasChanged();
+            }
+            else
+            {
+                await logger.LogError("Error Getting Package {PackageId} {Version}", packagename, version);
+                AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packagename, version);
+            AddModuleMessage(Localizer["Error.Translation.Download"], MessageType.Error);
+        }
+    }
+
+    private async Task DownloadTranslation()
+    {
+        try
+        {
+            await PackageService.DownloadPackageAsync(_package.PackageId, _package.Version);
+            await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _package.PackageId, _package.Version);
+            AddModuleMessage(string.Format(Localizer["Success.Translation.Download"], NavigateUrl("admin/system")), MessageType.Success);
+            _package = null;
+            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 ValidatePackage()
+    {
+        try
+        {
+            var package = await PackageService.GetPackageAsync(_packagename, _version, true);
+            if (package == null || string.IsNullOrEmpty(package.PackageUrl))
+            {
+                AddModuleMessage(Localizer["Message.Validate"], MessageType.Warning);
+            }
+            else
+            {
+                _packageurl = package.PackageUrl;
+                AddModuleMessage(Localizer["Message.Download"], MessageType.Info);
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packagename, _version);
+            AddModuleMessage(Localizer["Error.Validate"], MessageType.Error);
+        }
+    }
+
 }

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

@@ -37,20 +37,22 @@ else
 		</div>
 	</div>
 			
-	<Pager Items="@_moduleDefinitions.Where(item => item.Categories.Contains(_category))">
+	<Pager Items="@_moduleDefinitions">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
             <th>@SharedLocalizer["Version"]</th>
+            <th>@Localizer["Enabled"]</th>
             <th>@Localizer["InUse"]</th>
+            <th>@SharedLocalizer["Support"]</th>
             <th>@SharedLocalizer["Expires"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
         <Row>
             <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="@string.Format(Localizer["Confirm.Module.Delete", context.Name])" Action="Delete" Security="SecurityAccessLevel.Host" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" />
                 }
@@ -58,7 +60,17 @@ else
             <td>@context.Name</td>
             <td>@context.Version</td>
             <td>
-                @if(context.AssemblyName == "Oqtane.Client" || PageState.Modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
+               @if (context.IsEnabled)
+               {
+                   <span>@SharedLocalizer["Yes"]</span>
+               }
+               else
+               {
+                   <span>@SharedLocalizer["No"]</span>
+               }
+            </td>
+            <td>
+				@if (context.AssemblyName == Constants.ClientId || PageState.Modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
                 {
                     <span>@SharedLocalizer["Yes"]</span>
                 }
@@ -67,6 +79,9 @@ else
                     <span>@SharedLocalizer["No"]</span>
                 }
             </td>
+            <td>
+                @((MarkupString)SupportLink(context.PackageName, context.Version))
+            </td>
             <td>
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>
@@ -84,52 +99,76 @@ else
 }
 
 @code {
-	private List<ModuleDefinition> _moduleDefinitions;
-	private List<Package> _packages;
-	private List<string> _categories = new List<string>();
-	private string _category = "Common";
+    private List<ModuleDefinition> _allModuleDefinitions;
+    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 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);
-			}
-		}
-	}
+    protected override async Task OnParametersSetAsync()
+    {
+        try
+        {
+            _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+            _categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
+            await LoadModuleDefinitions();
+        }
+        catch (Exception ex)
+        {
+            if (_moduleDefinitions == null)
+            {
+                await logger.LogError(ex, "Error Loading Modules {Error}", ex.Message);
+                AddModuleMessage(Localizer["Error.Module.Load"], MessageType.Error);
+            }
+        }
+    }
 
-	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>";
-					}
-				}
+    private async Task LoadModuleDefinitions()
+    {
+        _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList();
+        _packages = await PackageService.GetPackageUpdatesAsync("module");
+    }
+
+    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)
+                {
+                    if (string.IsNullOrEmpty(package.PaymentUrl))
+                    {
+                        link = "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+                    }
+                    else
+                    {
+                        link = "<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</a>";
+                    }
+                }
 			}
 		}
 		return link;
 	}
 
+    private string SupportLink(string packagename, string version)
+    {
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null && !string.IsNullOrEmpty(package.SupportUrl))
+            {
+                link += "<a class=\"btn btn-info\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl.Replace("{Version}", version) + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
+            }
+        }
+        return link;
+    }
+
 	private string UpgradeAvailable(string packagename, string version)
 	{
 		if (!string.IsNullOrEmpty(packagename) && _packages != null)
@@ -147,9 +186,8 @@ else
 	{
 		try
 		{
-			await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
+			await PackageService.DownloadPackageAsync(packagename, version);
 			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)
@@ -174,9 +212,9 @@ else
 		}
 	}
 
-	private void CategoryChanged(ChangeEventArgs e)
+	private async Task CategoryChanged(ChangeEventArgs e)
 	{
 		_category = (string)e.Value;
-		StateHasChanged();
+        await LoadModuleDefinitions();
 	}
 }

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

@@ -19,15 +19,14 @@
 
 @code {
     private string _content = string.Empty;
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
     public override string Title => "Export Content";
 
-
     private async Task ExportModule()
     {
         try
         {
-            _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId);
+            _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId, PageState.Page.PageId);
             AddModuleMessage(Localizer["Success.Content.Export"], MessageType.Success);
         }
         catch (Exception ex)

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

@@ -25,7 +25,7 @@
     private ElementReference form;
     private bool validated = false;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
     public override string Title => "Import Content";
 
     private async Task ImportModule()
@@ -38,7 +38,7 @@
             {
                 try
                 {
-                    bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, _content);
+					bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, PageState.Page.PageId, _content);
                     if (success)
                     {
                         AddModuleMessage(Localizer["Success.Content.Import"], MessageType.Success);

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

@@ -14,10 +14,16 @@
             @if (_containers != null)
             {
                 <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <Label Class="col-sm-3" For="module" HelpText="The name of the module" ResourceKey="Module">Module: </Label>
+                        <div class="col-sm-9">
+                            <input id="module" type="text" class="form-control" @bind="@_module" disabled />
+                        </div>
+                    </div>
                     <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 />
+                            <input id="title" type="text" class="form-control" @bind="@_title" required />
                         </div>
                     </div>
                     <div class="row mb-1 align-items-center">
@@ -44,12 +50,20 @@
                         <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 (PageState.Page.UserId != null)
                                 {
-                                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+                                    <option value="@PageState.Page.PageId">@(PageState.Page.Name)</option>
+                                }
+                                else
+                                {
+                                    foreach (Page p in PageState.Pages)
                                     {
-                                        <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
+                                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, p.PermissionList))
+                                        {
+                                            <option value="@p.PageId">@(new string('-', p.Level * 2))@(p.Name)</option>
+                                        }
                                     }
+
                                 }
                             </select>
                         </div>
@@ -62,7 +76,7 @@
             {
                 <div class="container">
                     <div class="row mb-1 align-items-center">
-                        <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" Permissions="@_permissions" @ref="_permissionGrid" />
+                        <PermissionGrid EntityName="@EntityNames.Module" PermissionNames="@_permissionNames" PermissionList="@_permissions" @ref="_permissionGrid" />
                     </div>
                 </div>
 
@@ -90,74 +104,82 @@
 </form>
 
 @code {
-	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 ElementReference form;
+    private bool validated = false;
+    private List<ThemeControl> _containers = new List<ThemeControl>();
+    private string _module;
+    private string _title;
+    private string _containerType;
+    private string _allPages = "false";
+    private string _permissionNames = "";
+    private List<Permission> _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;
 
-	protected override async Task OnInitializedAsync()
-	{
-		_title = ModuleState.Title;
-		_themes = await ThemeService.GetThemesAsync();
-		_containers = ThemeService.GetContainerControls(_themes, PageState.Page.ThemeType);
+    protected override void OnInitialized()
+    {
+        _module = ModuleState.ModuleDefinition.Name;
+        _title = ModuleState.Title;
+        _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType);
 		_containerType = ModuleState.ContainerType;
 		_allPages = ModuleState.AllPages.ToString();
-		_permissions = ModuleState.Permissions;
-		_permissionNames = ModuleState.ModuleDefinition.PermissionNames;
+		_permissions = ModuleState.PermissionList;
 		_pageId = ModuleState.PageId.ToString();
 		createdby = ModuleState.CreatedBy;
 		createdon = ModuleState.CreatedOn;
 		modifiedby = ModuleState.ModifiedBy;
 		modifiedon = ModuleState.ModifiedOn;
 
-		if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType))
+		if (ModuleState.ModuleDefinition != null)
 		{
-		// module settings type explicitly declared in IModule interface
-			_moduleSettingsType = Type.GetType(ModuleState.ModuleDefinition.SettingsType);
+			_permissionNames = ModuleState.ModuleDefinition?.PermissionNames;
+
+			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
 		{
-		// 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();
-			};
+			AddModuleMessage(string.Format(Localizer["Error.Module.Load"], ModuleState.ModuleDefinitionName), MessageType.Error);
 		}
 
-		var theme = _themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
+        var theme = PageState.Site.Themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
 		if (theme != null && !string.IsNullOrEmpty(theme.ContainerSettingsType))
 		{
 			_containerSettingsType = Type.GetType(theme.ContainerSettingsType);
@@ -199,7 +221,7 @@
 				var module = ModuleState;
 				module.AllPages = bool.Parse(_allPages);
 				module.PageModuleId = ModuleState.PageModuleId;
-				module.Permissions = _permissionGrid.GetPermissions();
+				module.PermissionList = _permissionGrid.GetPermissionList();
 				await ModuleService.UpdateModuleAsync(module);
 
                 if (_moduleSettingsType != null)

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

@@ -3,15 +3,15 @@
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
 @inject IThemeService  ThemeService
+@inject ISystemService SystemService
 @inject IStringLocalizer<Add> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-
-<form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
-    <TabStrip Refresh="@_refresh">
-        <TabPanel Name="Settings" ResourceKey="Settings">
-            @if (_themeList != null)
-            {
+@if (_initialized)
+{
+    <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+        <TabStrip Refresh="@_refresh">
+            <TabPanel Name="Settings" ResourceKey="Settings" Heading="Settings">
                 <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>
@@ -19,42 +19,67 @@
                             <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 _pageList)
-                                {
-                                    <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 == ">"))
-                            {
-                                <select class="form-select" @bind="@_childid">
-                                    <option value="-1">&lt;@Localizer["Page.Select"]&gt;</option>
-                                    @foreach (Page page in _children)
+                    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+                    {
+                        <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" value="@_parentid" @onchange="(e => ParentChanged(e))" required>
+                                    <option value="-1">&lt;@Localizer["SiteRoot"]&gt;</option>
+                                    @foreach (Page page in PageState.Pages)
                                     {
-                                        <option value="@(page.PageId)">@(page.Name)</option>
+                                        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, page.PermissionList))
+                                        {
+                                            <option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
+                                        }
                                     }
                                 </select>
-                            }
+                            </div>
                         </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>
+                                    @if (_children != null && _children.Count > 0)
+                                    {
+                                        <option value="<<">@Localizer["AtBeginning"]</option>
+                                        <option value="<">@Localizer["Before"]</option>
+                                        <option value=">">@Localizer["After"]</option>
+                                    }
+                                    <option value=">>">@Localizer["AtEnd"]</option>
+                                </select>
+                                @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">"))
+                                {
+                                    <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>
+                                }
+                            </div>
+                        </div>
+                    }
+                    else
+                    {
+                        <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="@(_parent.PageId)">@(new string('-', _parent.Level * 2))@(_parent.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["AtEnd"]</option>
+                                </select>
+                            </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">
@@ -85,9 +110,27 @@
                             <input id="url" class="form-control" @bind="@_url" />
                         </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-8">
+                            <InputList Value="@_icon" ValueChanged="IconChanged" DataList="@_icons" ResourceKey="Icon" ResourceType="@_iconresources" />
+                        </div>
+                        <div class="col-sm-1">
+                            <i class="@_icon"></i>
+                        </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 Name="Appearance" ResourceKey="Appearance">
+                <Section Name="Appearance" ResourceKey="Appearance" Heading=@Localizer["Appearance.Name"]>
                     <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>
@@ -95,12 +138,6 @@
                                 <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">
@@ -116,7 +153,6 @@
                             <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="@container.TypeName">@container.Name</option>
@@ -124,92 +160,124 @@
                                 </select>
                             </div>
                         </div>
+                    </div>
+                </Section>
+                <Section Name="PageContent" ResourceKey="PageContent" Heading=@Localizer["PageContent.Heading"]>
+                    <div class="container">
                         <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>
+                            <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
                             <div class="col-sm-9">
-                                <input id="icon" class="form-control" @bind="@_icon" />
+                                <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
                             </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>
+                            <Label Class="col-sm-3" For="bodycontent" HelpText="Optionally enter content to be included in the page body (ie. script tags)" ResourceKey="BodyContent">Body Content: </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>
+                                <textarea id="bodycontent" class="form-control" @bind="@_bodycontent" rows="3"></textarea>
                             </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" />
-                </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>
+            <TabPanel Name="Permissions" ResourceKey="Permissions" Heading=@Localizer["Permissions.Heading"]>
+                <div class="container">
+                    <div class="row mb-1 align-items-center">
+                        <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
+                    </div>
+                </div>
+            </TabPanel>
+            @if (_themeSettingsType != null)
+            {
+                <TabPanel Name="ThemeSettings" Heading=@Localizer["Theme.Heading"] ResourceKey="ThemeSettings">
+                    @ThemeSettingsComponent
+                </TabPanel>
+            }
+        </TabStrip>
+        <br />
+        <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 {
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
-	private List<Theme> _themeList;
-	private List<ThemeControl> _themes = new List<ThemeControl>();
-	private List<ThemeControl> _containers = new List<ThemeControl>();
-	private List<Page> _pageList;
-	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;
+    private bool _initialized = false;
+    private ElementReference form;
+    private bool validated = false;
+    private List<ThemeControl> _themes = new List<ThemeControl>();
+    private List<ThemeControl> _containers = new List<ThemeControl>();
+    private int _pageId;
+    private string _name;
+    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 _path = string.Empty;
+    private string _url;
+    private string _ispersonalizable = "False";
+    private string _title;
+    private string _icon = string.Empty;
+    private string _themetype = string.Empty;
+    private string _containertype = string.Empty;
+    private string _headcontent;
+    private string _bodycontent;
+    private string _permissions = null;
+    private PermissionGrid _permissionGrid;
+    private Type _themeSettingsType;
+    private object _themeSettings;
+    private RenderFragment ThemeSettingsComponent { get; set; }
+    private bool _refresh = false;
+    protected Page _parent = null;
+    protected Dictionary<string, string> _icons;
+    private string _iconresources = "";
 
-	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;
-			_pageList = PageState.Pages;
-			_children = PageState.Pages.Where(item => item.ParentId == null).ToList();
-			_permissions = string.Empty;
-			ThemeSettings();
-		}
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            if (PageState.QueryString.ContainsKey("id"))
+            {
+                _pageId = Int32.Parse(PageState.QueryString["id"]);
+                _parent = await PageService.GetPageAsync(_pageId);
+                if (_parent != null)
+                {
+                    _parentid = _parent.PageId.ToString();
+                }
+            }
+            _icons = await SystemService.GetIconsAsync();
+            _iconresources = typeof(IconResources).FullName;
+
+            // if admin or user has edit access to parent page
+            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) || (_parent != null && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, _parent.PermissionList)))
+            {
+                _themetype = PageState.Site.DefaultThemeType;
+                _themes = ThemeService.GetThemeControls(PageState.Site.Themes);
+                _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+                _containertype = PageState.Site.DefaultContainerType;
+                _children = new List<Page>();
+                foreach (Page p in PageState.Pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
+                {
+                    if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
+                    {
+                        _children.Add(p);
+                    }
+                }
+                ThemeSettings();
+                _initialized = true;
+            }
+            else
+            {
+                await logger.LogWarning("Error Loading Page {ParentId}", _parentid);
+                AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
+            }
+        }
 		catch (Exception ex)
 		{
-			await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message);
-			AddModuleMessage(Localizer["Error.Page.Initialize"], MessageType.Error);
+			await logger.LogError(ex, "Error Loading Page {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
 		}
 	}
 
@@ -218,28 +286,15 @@
 		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();
+            _children = new List<Page>();
+            foreach (Page p in PageState.Pages.Where(item => (_parentid == "-1" && item.ParentId == null) || (item.ParentId == int.Parse(_parentid))))
+            {
+                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.PermissionList))
+                {
+                    _children.Add(p);
+                }
+            }
+            StateHasChanged();
 		}
 		catch (Exception ex)
 		{
@@ -248,27 +303,23 @@
 		}
 	}
 
-	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);
-		}
-	}
+    private void ThemeChanged(ChangeEventArgs e)
+    {
+        _themetype = (string)e.Value;
+        if (ThemeService.GetTheme(PageState.Site.Themes, _themetype)?.ThemeName != ThemeService.GetTheme(PageState.Site.Themes, PageState.Site.DefaultThemeType)?.ThemeName)
+        {
+            AddModuleMessage(Localizer["ThemeChanged.Message"], MessageType.Warning);
+            _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+            _containertype = _containers.First().TypeName;
+            ThemeSettings();
+            StateHasChanged();
+        }
+    }
 
 	private void ThemeSettings()
 	{
 		_themeSettingsType = null;
-		var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
+        var theme = PageState.Site.Themes.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
 		if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
 		{
 			_themeSettingsType = Type.GetType(theme.ThemeSettingsType);
@@ -294,12 +345,11 @@
 			Page page = null;
 			try
 			{
-				if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
+                if (!string.IsNullOrEmpty(_themetype) && !string.IsNullOrEmpty(_containertype))
 				{
 					page = new Page();
 					page.SiteId = PageState.Page.SiteId;
 					page.Name = _name;
-					page.Title = _title;
 
 					if (string.IsNullOrEmpty(_path))
 					{
@@ -307,6 +357,10 @@
 					}
 					if (_path.Contains("/"))
 					{
+						if (_path.EndsWith("/") && _path != "/")
+						{
+							_path = _path.Substring(0, _path.Length - 1);
+						}
 						_path = _path.Substring(_path.LastIndexOf("/") + 1);
 					}
 
@@ -329,15 +383,16 @@
 						}
 					}
 
-					if(PagePathIsDeleted(page.Path, page.SiteId, _pageList))
+					var _pages = await PageService.GetPagesAsync(PageState.Site.SiteId);
+					if (_pages.Any(item => item.Path == page.Path))
 					{
-						AddModuleMessage(string.Format(Localizer["Message.Page.Deleted"], _path), MessageType.Warning);
+						AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
 						return;
 					}
 
-					if (!PagePathIsUnique(page.Path, page.SiteId, _pageList))
+					if (page.ParentId == null && Constants.ReservedRoutes.Contains(page.Name.ToLower()))
 					{
-						AddModuleMessage(string.Format(Localizer["Message.Page.Exists"], _path), MessageType.Warning);
+						AddModuleMessage(string.Format(Localizer["Message.Page.Reserved"], page.Name), MessageType.Warning);
 						return;
 					}
 
@@ -362,34 +417,42 @@
 
 					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;
+                    page.Url = _url;
+                    page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
+                    page.UserId = null;
+
+                    // appearance
+                    page.Title = _title;
+                    page.Icon = (_icon == null ? string.Empty : _icon);
+					page.ThemeType = _themetype;
 					if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
 					{
 						page.ThemeType = string.Empty;
 					}
-					page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
+					page.DefaultContainerType = _containertype;
 					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 content
+                    page.HeadContent = _headcontent;
+                    page.BodyContent = _bodycontent;
+
+                    // permissions
+					page.PermissionList = _permissionGrid.GetPermissionList();
 
                     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"))
+                    if (!string.IsNullOrEmpty(PageState.ReturnUrl))
                     {
-                        NavigationManager.NavigateTo(NavigateUrl(PageState.Pages.First(item => item.PageId == int.Parse(PageState.QueryString["cp"])).Path));
+                        NavigationManager.NavigateTo(page.Path); // redirect to new page
                     }
                     else
                     {
-                        NavigationManager.NavigateTo(NavigateUrl(page.Path));
+                        NavigationManager.NavigateTo(NavigateUrl()); // redirect to page management
                     }
                 }
                 else
@@ -412,23 +475,17 @@
 
     private void Cancel()
     {
-        if (PageState.QueryString.ContainsKey("cp"))
+        if (!string.IsNullOrEmpty(PageState.ReturnUrl))
         {
-            NavigationManager.NavigateTo(NavigateUrl(PageState.Pages.First(item => item.PageId == int.Parse(PageState.QueryString["cp"])).Path));
+            NavigationManager.NavigateTo(PageState.ReturnUrl);
         }
         else
         {
             NavigationManager.NavigateTo(NavigateUrl());
         }
     }
-
-    private static bool PagePathIsUnique(string pagePath, int siteId, List<Page> existingPages)
+    private void IconChanged(string NewIcon)
     {
-        return !existingPages.Any(page => page.SiteId == siteId && page.Path == pagePath);
-    }
-
-    private static bool PagePathIsDeleted(string pagePath, int siteId, List<Page> existingPages)
-    {
-        return existingPages.Any(page => page.SiteId == siteId && page.Path == pagePath && page.IsDeleted == true);
+        _icon = NewIcon;
     }
 }

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

@@ -5,7 +5,7 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (PageState.Pages != null)
+@if (PageState.Pages != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
 {
     <ActionLink Action="Add" Text="Add Page" ResourceKey="AddPage" />
 

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

@@ -64,6 +64,12 @@
                 </select>
             </div>
         </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="validation" HelpText="Optionally provide a regular expression (RegExp) for validating the value entered" ResourceKey="Validation">Validation: </Label>
+            <div class="col-sm-9">
+                <input id="validation" class="form-control" @bind="@_validation" maxlength="200" />
+            </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">
@@ -97,6 +103,7 @@
     private string _maxlength = "0";
     private string _defaultvalue = string.Empty;
     private string _options = string.Empty;
+    private string _validation = string.Empty;
     private string _isrequired = "False";
     private string _isprivate = "False";
     private string createdby;
@@ -104,7 +111,7 @@
     private string modifiedby;
     private DateTime modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     public override string Actions => "Add,Edit";
 
@@ -126,6 +133,7 @@
                     _maxlength = profile.MaxLength.ToString();
                     _defaultvalue = profile.DefaultValue;
                     _options = profile.Options;
+                    _validation = profile.Validation;
                     _isrequired = profile.IsRequired.ToString();
                     _isprivate = profile.IsPrivate.ToString();
                     createdby = profile.CreatedBy;
@@ -169,6 +177,7 @@
                 profile.MaxLength = int.Parse(_maxlength);
                 profile.DefaultValue = _defaultvalue;
                 profile.Options = _options;
+                profile.Validation = _validation;
                 profile.IsRequired = (_isrequired == null ? false : Boolean.Parse(_isrequired));
                 profile.IsPrivate = (_isprivate == null ? false : Boolean.Parse(_isprivate));
                 if (_profileid != -1)

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

@@ -10,18 +10,24 @@
 }
 else
 {
-    <ActionLink Action="Add" Security="SecurityAccessLevel.Admin" Text="Add Profile" ResourceKey="AddProfile" />
+	<ActionLink Action="Add" Text="Add Profile" Security="SecurityAccessLevel.Edit" ResourceKey="AddProfile" />
 
     <Pager Items="@_profiles">
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
+            <th>@Localizer["Title"]</th>
+            <th>@Localizer["Category"]</th>
+            <th>@Localizer["Order"]</th>
         </Header>
         <Row>
-            <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><ActionLink Action="Edit" Parameters="@($"id=" + context.ProfileId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="EditProfile" /></td>
+			<td><ActionDialog Header="Delete Profile" Message="@string.Format(Localizer["Confirm.Profile.Delete"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteProfile(context.ProfileId))" ResourceKey="DeleteProfile" /></td>
             <td>@context.Name</td>
+            <td>@context.Title</td>
+            <td>@context.Category</td>
+            <td>@context.ViewOrder</td>
         </Row>
     </Pager>
 }
@@ -29,7 +35,7 @@ else
 @code {
     private List<Profile> _profiles;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
     protected override async Task OnParametersSetAsync()
     {

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

@@ -0,0 +1,20 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.Profiles
+{
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "Profiles",
+            Description = "Manage Profiles",
+            Categories = "Admin",
+            Version = Constants.Version,
+            PermissionNames = $"{PermissionNames.View},{PermissionNames.Edit}," +
+                $"{EntityNames.Profile}:{PermissionNames.Write}:{RoleNames.Admin}"
+        };
+    }
+}

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

@@ -7,76 +7,79 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Pages" ResourceKey="Pages">
-        @if (_pages == null)
-        {
-            <br />
-            <p>@Localizer["NoPage.Deleted"]</p>
-        }
-        else
-        {
-            <Pager Items="@_pages">
-                <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>
-            @if (_pages.Any())
-            {
-                <br /><ActionDialog Header="Delete All Pages" Message="Are You Sure You Wish To Permanently Delete All Pages?" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
-            }
-        }
-    </TabPanel>
-    <TabPanel Name="Modules" ResourceKey="Modules">
-        @if (_modules == null)
-        {
-            <br />
-            <p>@Localizer["NoModule.Deleted"]</p>
-        }
-        else
-        {
-            <Pager Items="@_modules">
-                <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>@PageState.Pages.Find(item => item.PageId == context.PageId).Name</td>
-                    <td>@context.Title</td>
-                    <td>@context.DeletedBy</td>
-                    <td>@context.DeletedOn</td>
-                </Row>
-            </Pager>
-            @if (_modules.Any())
-            {
-                <br /><ActionDialog Header="Delete All Modules" Message="Are You Sure You Wish To Permanently Delete All Modules?" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
-            }
-
-        }
-    </TabPanel>
-</TabStrip>
+@if (_pages == null || _modules == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+	<TabStrip>
+		<TabPanel Name="Pages" ResourceKey="Pages" Heading="Pages">
+			@if (!_pages.Where(item => item.IsDeleted).Any())
+			{
+				<br />
+				<p>@Localizer["NoPage.Deleted"]</p>
+			}
+			else
+			{
+          <Pager Items="@_pages.Where(item => item.IsDeleted)" CurrentPage="@_pagePage.ToString()" OnPageChange="OnPageChangePage">
+					<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">@Localizer["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" Heading="Modules">
+			@if (!_modules.Where(item => item.IsDeleted).Any())
+			{
+				<br />
+				<p>@Localizer["NoModule.Deleted"]</p>
+			}
+			else
+			{
+          <Pager Items="@_modules.Where(item => item.IsDeleted)" CurrentPage="@_pageModule.ToString()" OnPageChange="OnPageChangeModule">
+					<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;
+    private int _pagePage = 1;
+    private int _pageModule = 1;
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
     protected override async Task OnInitializedAsync()
@@ -95,10 +98,7 @@
     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)
@@ -140,7 +140,8 @@
     {
         try
         {
-            foreach (Page page in _pages)
+            ModuleInstance.ShowProgressIndicator();
+            foreach (Page page in _pages.Where(item => item.IsDeleted))
             {
                 await PageService.DeletePageAsync(page.PageId);
                 await logger.LogInformation("Page Permanently Deleted {Page}", page);
@@ -148,6 +149,7 @@
 
             await logger.LogInformation("Pages Permanently Deleted");
             await Load();
+            ModuleInstance.HideProgressIndicator();
             StateHasChanged();
             NavigationManager.NavigateTo(NavigateUrl());
         }
@@ -155,6 +157,7 @@
         {
             await logger.LogError(ex, "Error Permanently Deleting Pages {Error}", ex.Message);
             AddModuleMessage(ex.Message, MessageType.Error);
+            ModuleInstance.HideProgressIndicator();
         }
     }
 
@@ -181,14 +184,6 @@
         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();
@@ -204,26 +199,29 @@
     {
         try
         {
-            foreach (Module module in _modules)
+            ModuleInstance.ShowProgressIndicator();
+            foreach (Module module in _modules.Where(item => item.IsDeleted).ToList())
             {
                 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("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();
         }
     }
+    private void OnPageChangePage(int page)
+    {
+        _pagePage = page;
+    }
+    private void OnPageChangeModule(int page)
+    {
+        _pageModule = page;
+    }
 }

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

@@ -4,6 +4,7 @@
 @inject IUserService UserService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
+@inject ISettingService SettingService
 
 @if (PageState.Site.AllowRegistration)
 {
@@ -15,7 +16,7 @@
             <ModuleMessage Message="@Localizer["Info.Registration.Exists"]" Type="MessageType.Info" />
         </Authorized>
         <NotAuthorized>
-            <ModuleMessage Message="@Localizer["Info.Registration.InvalidEmail"]" Type="MessageType.Info" />
+            <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
             <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
                 <div class="container">
                     <div class="row mb-1 align-items-center">
@@ -29,7 +30,7 @@
                         <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>
+                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 							</div>
                         </div>
                     </div>
@@ -38,7 +39,7 @@
                         <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>
+                                <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 							</div>
                         </div>
                     </div>
@@ -68,21 +69,27 @@ else
 }
 
 @code {
-	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;
+    private string _passwordrequirements;
+    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()
+    protected override async Task OnInitializedAsync()
+    {
+        _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
+    }
+
+    protected override void OnParametersSet()
 	{
-		_togglepassword = SharedLocalizer["ShowPassword"];
+		_togglepassword = SharedLocalizer["ShowPassword"];     
 	}
 
     private async Task Register()

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

@@ -6,6 +6,7 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
+    <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
     <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>
@@ -18,7 +19,7 @@
             <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>
+                    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 				</div>
             </div>
         </div>
@@ -27,7 +28,7 @@
             <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>
+                    <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 				</div>
             </div>
         </div>
@@ -45,12 +46,14 @@
 	private string _passwordtype = "password";
 	private string _togglepassword = string.Empty;
 	private string _confirm = string.Empty;
+    private string _passwordrequirements;
 
 	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
 	protected override async Task OnInitializedAsync()
 	{
 		_togglepassword = SharedLocalizer["ShowPassword"];
+        _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
 
 		if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
         {

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

@@ -42,7 +42,7 @@
     private string _description = string.Empty;
     private string _isautoassigned = "False";
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     private async Task SaveRole()
     {

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

@@ -49,7 +49,7 @@
     private string _modifiedby;
     private DateTime _modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     protected override async Task OnInitializedAsync()
     {

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

@@ -10,7 +10,7 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Add Role" ResourceKey="AddRole" />
+	<ActionLink Action="Add" Text="Add Role" Security="SecurityAccessLevel.Edit" ResourceKey="AddRole" />
 
     <Pager Items="@_roles">
         <Header>
@@ -20,9 +20,9 @@ else
             <th>@SharedLocalizer["Name"]</th>
         </Header>
         <Row>
-            <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><ActionLink Action="Edit" Parameters="@($"id=" + context.RoleId.ToString())" Security="SecurityAccessLevel.Edit" Disabled="@(context.IsSystem)" ResourceKey="Edit" /></td>
+            <td><ActionDialog Header="Delete Role" Message="@string.Format(Localizer["Confirm.DeleteUser"], context.Name)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteRole(context))" Disabled="@(context.IsSystem)" ResourceKey="DeleteRole" /></td>
+			<td><ActionLink Action="Users" Parameters="@($"id=" + context.RoleId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="Users" /></td>
             <td>@context.Name</td>
         </Row>
     </Pager>
@@ -31,7 +31,7 @@ else
 @code {
     private List<Role> _roles;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
     protected override async Task OnParametersSetAsync()
     {

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

@@ -0,0 +1,21 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.Roles
+{
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "Roles",
+            Description = "Manage Roles",
+            Categories = "Admin",
+            Version = Constants.Version,
+            PermissionNames = $"{PermissionNames.View},{PermissionNames.Edit}," +
+                $"{EntityNames.Role}:{PermissionNames.Write}:{RoleNames.Admin}," +
+                $"{EntityNames.UserRole}:{PermissionNames.Write}:{RoleNames.Admin}"
+        };
+    }
+}

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

@@ -23,13 +23,7 @@ else
             <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>
+					<AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["User.Select"]" @ref="user" />
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
@@ -64,7 +58,7 @@ else
                             <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" />
+								<ActionDialog Header="Remove User" Message="@string.Format(Localizer["Confirm.User.DeleteRole"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || context.User.Username == UserNames.Host || context.User.UserId == PageState.User.UserId)" ResourceKey="DeleteUserRole" />
                             </td>
                         </Row>
                     </Pager>
@@ -75,81 +69,96 @@ else
 }
 
 @code {
-    private ElementReference form;
-    private bool validated = false;
+	private ElementReference form;
+	private bool validated = false;
 
-    private int roleid;
-    private string name = string.Empty;
-    private List<UserRole> users;
-    private int userid = -1;
-    private DateTime? effectivedate = null;
-    private DateTime? expirydate = null;
-    private List<UserRole> userroles;
+	private int roleid;
+	private string name = string.Empty;
+	private AutoComplete user;
+	private DateTime? effectivedate = null;
+	private DateTime? expirydate = null;
+	private List<UserRole> userroles;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            roleid = Int32.Parse(PageState.QueryString["id"]);
-            Role role = await RoleService.GetRoleAsync(roleid);
-            name = role.Name;
-            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(Localizer["Error.User.Load"], MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			roleid = Int32.Parse(PageState.QueryString["id"]);
+			Role role = await RoleService.GetRoleAsync(roleid);
+			name = role.Name;
+			await GetUserRoles();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Users {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
+		}
+	}
 
-    private async Task GetUserRoles()
-    {
-        try
-        {
-            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(Localizer["Error.User.LoadRole"], MessageType.Error);
-        }
-    }
+	private async Task<Dictionary<string, string>> GetUsers(string filter)
+	{
+		try
+		{
+			var users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+			return users.Where(item => item.User.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase))
+				.ToDictionary(item => item.UserId.ToString(), item => item.User.DisplayName);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Users {filter} {Error}", filter, ex.Message);
+			AddModuleMessage(Localizer["Error.User.Load"], MessageType.Error);
+		}
+		return new Dictionary<string, string>();
+	}
 
-    private async Task SaveUserRole()
-    {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
-        {
-            try
-            {
-                if (userid != -1)
-                {
-                    var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
-                    if (userrole != null)
-                    {
-                        userrole.EffectiveDate = effectivedate;
-                        userrole.ExpiryDate = expirydate;
-                        await UserRoleService.UpdateUserRoleAsync(userrole);
-                    }
-                    else
-                    {
-                        userrole = new UserRole();
-                        userrole.UserId = userid;
-                        userrole.RoleId = roleid;
-                        userrole.EffectiveDate = effectivedate;
-                        userrole.ExpiryDate = expirydate;
+	private async Task GetUserRoles()
+	{
+		try
+		{
+			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(Localizer["Error.User.LoadRole"], MessageType.Error);
+		}
+	}
 
-                        await UserRoleService.AddUserRoleAsync(userrole);
-                    }
+	private async Task SaveUserRole()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			try
+			{
+				if (!string.IsNullOrEmpty(user.Key) && int.TryParse(user.Key, out int userid))
+				{
+					var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
+					if (userrole != null)
+					{
+						userrole.EffectiveDate = effectivedate;
+						userrole.ExpiryDate = expirydate;
+						await UserRoleService.UpdateUserRoleAsync(userrole);
+					}
+					else
+					{
+						userrole = new UserRole();
+						userrole.UserId = userid;
+						userrole.RoleId = roleid;
+						userrole.EffectiveDate = effectivedate;
+						userrole.ExpiryDate = expirydate;
 
-                    await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
-                    AddModuleMessage(Localizer["Success.User.AssignedRole"], MessageType.Success);
-                    await GetUserRoles();
-                    StateHasChanged();
+						await UserRoleService.AddUserRoleAsync(userrole);
+					}
+
+					await logger.LogInformation("User Assigned To Role {UserRole}", userrole);
+					AddModuleMessage(Localizer["Success.User.AssignedRole"], MessageType.Success);
+					await GetUserRoles();
+					user.Clear();
+					StateHasChanged();
                 }
                 else
                 {

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

@@ -23,50 +23,16 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
+                <Label Class="col-sm-3" For="homepage" HelpText="Select the home page for the site (to be used if there is no page with a path of '/')" ResourceKey="HomePage">Home Page: </Label>
                 <div class="col-sm-9">
-                    <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label>
-                <div class="col-sm-9">
-                    <FileManager FileId="@_faviconfileid" Filter="ico" @ref="_faviconfilemanager" />
-                </div>
-            </div>
-            <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label>
-                <div class="col-sm-9">
-                    <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
-                        <option value="-">&lt;@Localizer["Theme.Select"]&gt;</option>
-                        @foreach (var theme in _themes)
+                    <select id="homepage" class="form-select" @bind="@_homepageid" required>
+                        <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
+                        @foreach (Page page in PageState.Pages)
                         {
-                            <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="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label>
-                <div class="col-sm-9">
-                    <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype" required>
-                        <option value="-">&lt;@Localizer["Container.Select"]&gt;</option>
-                        <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option>
-                        @foreach (var container in _containers)
-                        {
-                            <option value="@container.TypeName">@container.Name</option>
+							if (UserSecurity.ContainsRole(page.PermissionList, PermissionNames.View, RoleNames.Everyone))
+							{
+								<option value="@(page.PageId)">@(new string('-', page.Level * 2))@(page.Name)</option>
+							}
                         }
                     </select>
                 </div>
@@ -80,7 +46,95 @@
 					</select>
 				</div>
 			</div>
-		</div>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="sitemap" HelpText="The site map url for this site which can be submitted to search engines for indexing" ResourceKey="SiteMap">Site Map: </Label>
+				<div class="col-sm-9">
+                    <div class="input-group">
+                        <input id="sitemap" class="form-control" @bind="@_sitemap" disabled />
+                        <a href="@_sitemap" class="btn btn-secondary" target="_new">@Localizer["Browse"]</a>
+                    </div>
+                </div>
+			</div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="siteguid" HelpText="The Unique Identifier For The Site" ResourceKey="SiteGuid">ID: </Label>
+                <div class="col-sm-9">
+                    <input id="siteguid" class="form-control" @bind="@_siteguid" required disabled />
+                </div>
+            </div>
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="version" HelpText="The site version (for site content migrations)" ResourceKey="Version">Version: </Label>
+                <div class="col-sm-9">
+                    <input id="version" class="form-control" @bind="@_version" required disabled />
+                </div>
+            </div>
+        </div>
+        <br />
+        <Section Name="Appearance" Heading="Appearance" ResourceKey="Appearance">
+            <div class="container">
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
+                    <div class="col-sm-9">
+                        <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label>
+                    <div class="col-sm-9">
+                        <FileManager FileId="@_faviconfileid" Filter="ico,png,gif" @ref="_faviconfilemanager" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="defaultTheme" HelpText="Select the sites default theme" ResourceKey="DefaultTheme">Default Theme: </Label>
+                    <div class="col-sm-9">
+                        <select id="defaultTheme" class="form-select" value="@_themetype" @onchange="(e => ThemeChanged(e))" required>
+                            @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>
+                            @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="defaultAdminContainer" HelpText="Select the default admin container for the site" ResourceKey="DefaultAdminContainer">Default Admin Container: </Label>
+                    <div class="col-sm-9">
+                        <select id="defaultAdminContainer" class="form-select" @bind="@_admincontainertype" required>
+                            <option value="@Constants.DefaultAdminContainer">&lt;@Localizer["DefaultAdminContainer"]&gt;</option>
+                            @foreach (var container in _containers)
+                            {
+                                <option value="@container.TypeName">@container.Name</option>
+                            }
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </Section>
+        <Section Name="PageContent" Heading="Page Content" ResourceKey="PageContent">
+           <div class="container">
+               <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="headcontent" HelpText="Optionally enter content to be included in the page head (ie. meta, link, or script tags)" ResourceKey="HeadContent">Head Content: </Label>
+                    <div class="col-sm-9">
+                        <textarea id="headcontent" class="form-control" @bind="@_headcontent" rows="3"></textarea>
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="bodycontent" HelpText="Optionally enter content to be included in the page body (ie. script tags)" ResourceKey="BodyContent">Body Content: </Label>
+                    <div class="col-sm-9">
+                        <textarea id="bodycontent" class="form-control" @bind="@_bodycontent" rows="3"></textarea>
+                    </div>
+                </div>
+            </div>
+        </Section>
         <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings">
             <div class="container">
                 <div class="row mb-1 align-items-center">
@@ -103,16 +157,16 @@
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="enabledSSl" HelpText="Specify if SSL is required for your SMTP server" ResourceKey="UseSsl">SSL Enabled: </Label>
+                    <Label Class="col-sm-3" For="smtpssl" HelpText="Specify if SSL is required for your SMTP server" ResourceKey="UseSsl">SSL Enabled: </Label>
                     <div class="col-sm-9">
-                        <select id="enabledSSl" class="form-select" @bind="@_smtpssl" >
+                        <select id="smtpssl" class="form-select" @bind="@_smtpssl" >
                             <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="username" HelpText="Enter the username for your SMTP account" ResourceKey="SmptUsername">Username: </Label>
+                    <Label Class="col-sm-3" For="username" HelpText="Enter the username for your SMTP account" ResourceKey="SmtpUsername">Username: </Label>
                     <div class="col-sm-9">
                         <input id="username" class="form-control" @bind="@_smtpusername" />
                     </div>
@@ -122,15 +176,33 @@
                     <div class="col-sm-9">
 						<div class="input-group">
 							<input id="password" type="@_smtppasswordtype" class="form-control" @bind="@_smtppassword" />
-							<button type="button" class="btn btn-secondary" @onclick="@ToggleSMTPPassword">@_togglesmtppassword</button>
+                            <button type="button" class="btn btn-secondary" @onclick="@ToggleSMTPPassword" tabindex="-1">@_togglesmtppassword</button>
 						</div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="sender" HelpText="Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server." ResourceKey="SmptSender">Email Sender: </Label>
+                    <Label Class="col-sm-3" For="sender" HelpText="Enter the email which emails will be sent from. Please note that this email address may need to be authorized with the SMTP server." ResourceKey="SmtpSender">Email Sender: </Label>
                     <div class="col-sm-9">
                         <input id="sender" class="form-control" @bind="@_smtpsender" />
                     </div>
+                </div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="relay" HelpText="Only specify this option if you have properly configured an SMTP Relay Service to route your outgoing mail. This option will send notifications from the user's email rather than from the Email Sender specified above." ResourceKey="SmtpRelay">Relay Configured? </Label>
+					<div class="col-sm-9">
+						<select id="relay" class="form-select" @bind="@_smtprelay" 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="smtpenabled" HelpText="Specify if SMTP is enabled for this site" ResourceKey="SMTPEnabled">Enabled? </Label>
+                    <div class="col-sm-9">
+                        <select id="smtpenabled" class="form-select" @bind="@_smtpenabled">
+                            <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="retention" HelpText="Number of days of notifications to retain" ResourceKey="Retention">Retention (Days): </Label>
@@ -171,53 +243,53 @@
         {
 			<Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
 	            <div class="container">
-						<div class="row mb-1 align-items-center">
-							<Label Class="col-sm-3" For="aliases" HelpText="The list of aliases for this site" ResourceKey="Aliases">Aliases: </Label>
-							<div class="col-sm-9">
-								<button type="button" class="btn btn-primary" @onclick="AddAlias">@SharedLocalizer["Add"]</button>
-								<Pager Items="@_aliases">
-									<Header>
-										<th style="width: 1px;">&nbsp;</th>
-										<th style="width: 1px;">&nbsp;</th>
-										<th>@Localizer["AliasName"]</th>
-										<th>@Localizer["AliasDefault"]</th>
-									</Header>
-									<Row>
-										@if (context.AliasId != _aliasid)
-										{
-											<td>
-												@if (_aliasid == -1)
-												{
-													<button type="button" class="btn btn-primary" @onclick="@(() => EditAlias(context))">@SharedLocalizer["Edit"]</button>
-												}
-											</td>
-											<td>
-												@if (_aliasid == -1)
-												{
-													<ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteModule" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" />
-												}
-											</td>
-											<td>@context.Name</td>
-											<td>@context.IsDefault</td>
-										}
-										else
-										{
-											<td><button type="button" class="btn btn-success" @onclick="@(async () => await SaveAlias())">@SharedLocalizer["Save"]</button></td>
-											<td><button type="button" class="btn btn-secondary" @onclick="@(async () => await CancelAlias())">@SharedLocalizer["Cancel"]</button></td>
-											<td>
-												<input id="aliasname" class="form-control" @bind="@_aliasname" />
-											</td>
-											<td>
-												<select id="defaultaias" class="form-select" @bind="@_defaultalias" required>
-													<option value="True">@SharedLocalizer["Yes"]</option>
-													<option value="False">@SharedLocalizer["No"]</option>
-												</select>
-											</td>
-										}
-									</Row>
-								</Pager>
-							</div>
+					<div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="aliases" HelpText="The urls for the site. This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder)." ResourceKey="Aliases">Aliases: </Label>
+						<div class="col-sm-9">
+							<button type="button" class="btn btn-primary" @onclick="AddAlias">@SharedLocalizer["Add"]</button>
+							<Pager Items="@_aliases">
+								<Header>
+									<th style="width: 1px;">&nbsp;</th>
+									<th style="width: 1px;">&nbsp;</th>
+									<th>@Localizer["AliasName"]</th>
+									<th>@Localizer["AliasDefault"]</th>
+								</Header>
+								<Row>
+									@if (context.AliasId != _aliasid)
+									{
+										<td>
+											@if (_aliasid == -1)
+											{
+												<button type="button" class="btn btn-primary" @onclick="@(() => EditAlias(context))">@SharedLocalizer["Edit"]</button>
+											}
+										</td>
+										<td>
+											@if (_aliasid == -1)
+											{
+												<ActionDialog Action="Delete" OnClick="@(async () => await DeleteAlias(context))" ResourceKey="DeleteAlias" Class="btn btn-danger" Header="Delete Alias" Message="@string.Format(Localizer["Confirm.Alias.Delete", context.Name])" />
+											}
+										</td>
+										<td>@context.Name</td>
+										<td>@context.IsDefault</td>
+									}
+									else
+									{
+										<td><button type="button" class="btn btn-success" @onclick="@(async () => await SaveAlias())">@SharedLocalizer["Save"]</button></td>
+										<td><button type="button" class="btn btn-secondary" @onclick="@(async () => await CancelAlias())">@SharedLocalizer["Cancel"]</button></td>
+										<td>
+											<input id="aliasname" class="form-control" @bind="@_aliasname" />
+										</td>
+										<td>
+											<select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
+												<option value="True">@SharedLocalizer["Yes"]</option>
+												<option value="False">@SharedLocalizer["No"]</option>
+											</select>
+										</td>
+									}
+								</Row>
+							</Pager>
 						</div>
+					</div>
 				</div>
 			</Section>
             <Section Name="Hosting" Heading="Hosting Model" ResourceKey="Hosting">
@@ -228,6 +300,7 @@
                             <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>
@@ -242,16 +315,16 @@
                     </div>
                 </div>
             </Section>
-            <Section Name="TenantInformation" Heading="Tenant Information" ResourceKey="TenantInformation">
+            <Section Name="TenantInformation" Heading="Database" ResourceKey="TenantInformation">
                 <div class="container">
                     <div class="row mb-1 align-items-center">
-                        <Label Class="col-sm-3" For="tenant" HelpText="The tenant for the site" ResourceKey="Tenant">Tenant: </Label>
+						<Label Class="col-sm-3" For="tenant" HelpText="The name of the database used for the site" ResourceKey="Tenant">Database: </Label>
                         <div class="col-sm-9">
                             <input id="tenant" class="form-control" @bind="@_tenant" readonly />
                         </div>
                     </div>
                     <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>
+                        <Label Class="col-sm-3" For="database" HelpText="The type of database" ResourceKey="Database">Type: </Label>
                         <div class="col-sm-9">
                             <input id="database" class="form-control" @bind="@_database" readonly />
                         </div>
@@ -259,7 +332,7 @@
                     <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>
+							<input id="connectionstring" class="form-control" @bind="@_connectionstring" readonly />
                         </div>
                     </div>
                 </div>
@@ -275,211 +348,236 @@
 }
 
 @code {
-	private ElementReference form;
-	private bool validated = false;
-	private bool _initialized = false;
-	private List<Theme> _themeList;
-	private List<ThemeControl> _themes = new List<ThemeControl>();
-	private List<ThemeControl> _containers = new List<ThemeControl>();
-	private string _name = string.Empty;
-	private List<Alias> _aliases;
-	private int _aliasid = -1;
-	private string _aliasname;
-	private string _defaultalias;
-	private string _runtime = "";
-	private string _prerender = "";
-	private int _logofileid = -1;
-	private FileManager _logofilemanager;
-	private int _faviconfileid = -1;
-	private FileManager _faviconfilemanager;
-	private string _themetype = "-";
-	private string _containertype = "-";
-	private string _admincontainertype = "-";
-	private string _smtphost = string.Empty;
-	private string _smtpport = string.Empty;
-	private string _smtpssl = "False";
-	private string _smtpusername = string.Empty;
-	private string _smtppassword = string.Empty;
-	private string _smtppasswordtype = "password";
-	private string _togglesmtppassword = string.Empty;
-	private string _smtpsender = string.Empty;
-	private string _retention = string.Empty;
-	private string _pwaisenabled;
-	private int _pwaappiconfileid = -1;
-	private FileManager _pwaappiconfilemanager;
-	private int _pwasplashiconfileid = -1;
-	private FileManager _pwasplashiconfilemanager;
-	private string _tenant = string.Empty;
-	private string _database = string.Empty;
-	private string _connectionstring = string.Empty;
-	private string _createdby;
-	private DateTime _createdon;
-	private string _modifiedby;
-	private DateTime _modifiedon;
-	private string _deletedby;
-	private DateTime? _deletedon;
-	private string _isdeleted;
+    private ElementReference form;
+    private bool validated = false;
+    private bool _initialized = false;
+    private List<ThemeControl> _themes = new List<ThemeControl>();
+    private List<ThemeControl> _containers = new List<ThemeControl>();
+    private string _name = string.Empty;
+    private string _homepageid = "-";
+    private string _isdeleted;
+    private string _sitemap = "";
+    private string _siteguid = "";
+    private string _version = "";
+    private int _logofileid = -1;
+    private FileManager _logofilemanager;
+    private int _faviconfileid = -1;
+    private FileManager _faviconfilemanager;
+    private string _themetype = "";
+    private string _containertype = "";
+    private string _admincontainertype = "";
+    private string _headcontent = string.Empty;
+    private string _bodycontent = string.Empty;
+    private string _smtphost = string.Empty;
+    private string _smtpport = string.Empty;
+    private string _smtpssl = "False";
+    private string _smtpusername = string.Empty;
+    private string _smtppassword = string.Empty;
+    private string _smtppasswordtype = "password";
+    private string _togglesmtppassword = string.Empty;
+    private string _smtpsender = string.Empty;
+    private string _smtprelay = "False";
+    private string _smtpenabled = "True";
+    private string _retention = string.Empty;
+    private string _pwaisenabled;
+    private int _pwaappiconfileid = -1;
+    private FileManager _pwaappiconfilemanager;
+    private int _pwasplashiconfileid = -1;
+    private FileManager _pwasplashiconfilemanager;
+    private List<Alias> _aliases;
+    private int _aliasid = -1;
+    private string _aliasname;
+    private string _defaultalias;
+    private string _runtime = "";
+    private string _prerender = "";
+    private string _tenant = string.Empty;
+    private string _database = string.Empty;
+    private string _connectionstring = string.Empty;
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+    private string _deletedby;
+    private DateTime? _deletedon;
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-	protected override async Task OnInitializedAsync()
-	{
-		try
-		{
-			_themeList = await ThemeService.GetThemesAsync();
-			Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
-			if (site != null)
-			{
-				_name = site.Name;
-				_runtime = site.Runtime;
-				_prerender = site.RenderMode.Replace(_runtime, "");
-				_isdeleted = site.IsDeleted.ToString();
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            Site site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
+            if (site != null)
+            {
+                _name = site.Name;
+                if (site.HomePageId != null)
+                {
+                    _homepageid = site.HomePageId.Value.ToString();
+                }
+                _isdeleted = site.IsDeleted.ToString();
+                _sitemap = PageState.Alias.Protocol + PageState.Alias.Name + "/pages/sitemap.xml";
+                _siteguid = site.SiteGuid;
+                _version = site.Version;
 
-				await GetAliases();
+                // appearance
+                if (site.LogoFileId != null)
+                {
+                    _logofileid = site.LogoFileId.Value;
+                }
 
-				if (site.LogoFileId != null)
-				{
-					_logofileid = site.LogoFileId.Value;
-				}
+                if (site.FaviconFileId != null)
+                {
+                    _faviconfileid = site.FaviconFileId.Value;
+                }
+                _themes = ThemeService.GetThemeControls(PageState.Site.Themes);
+                _themetype = (!string.IsNullOrEmpty(site.DefaultThemeType)) ? site.DefaultThemeType : Constants.DefaultTheme;
+                _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+                _containertype = (!string.IsNullOrEmpty(site.DefaultContainerType)) ? site.DefaultContainerType : Constants.DefaultContainer;
+                _admincontainertype = (!string.IsNullOrEmpty(site.AdminContainerType)) ? site.AdminContainerType : Constants.DefaultAdminContainer;
 
-				if (site.FaviconFileId != null)
-				{
-					_faviconfileid = site.FaviconFileId.Value;
-				}
+                // page content
+                _headcontent = site.HeadContent;
+                _bodycontent = site.BodyContent;
 
-				_themes = ThemeService.GetThemeControls(_themeList);
-				_themetype = (!string.IsNullOrEmpty(site.DefaultThemeType)) ? site.DefaultThemeType : Constants.DefaultTheme;
-				_containers = ThemeService.GetContainerControls(_themeList, _themetype);
-				_containertype = (!string.IsNullOrEmpty(site.DefaultContainerType)) ? site.DefaultContainerType : Constants.DefaultContainer;
-				_admincontainertype = (!string.IsNullOrEmpty(site.AdminContainerType)) ? site.AdminContainerType : Constants.DefaultAdminContainer;
+                // PWA
+                _pwaisenabled = site.PwaIsEnabled.ToString();
+                if (site.PwaAppIconFileId != null)
+                {
+                    _pwaappiconfileid = site.PwaAppIconFileId.Value;
+                }
+                if (site.PwaSplashIconFileId != null)
+                {
+                    _pwasplashiconfileid = site.PwaSplashIconFileId.Value;
+                }
 
-				_pwaisenabled = site.PwaIsEnabled.ToString();
-				if (site.PwaAppIconFileId != null)
-				{
-					_pwaappiconfileid = site.PwaAppIconFileId.Value;
-				}
-				if (site.PwaSplashIconFileId != null)
-				{
-					_pwasplashiconfileid = site.PwaSplashIconFileId.Value;
-				}
+                // SMTP
+                var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
+                _smtphost = SettingService.GetSetting(settings, "SMTPHost", string.Empty);
+                _smtpport = SettingService.GetSetting(settings, "SMTPPort", string.Empty);
+                _smtpssl = SettingService.GetSetting(settings, "SMTPSSL", "False");
+                _smtpusername = SettingService.GetSetting(settings, "SMTPUsername", string.Empty);
+                _smtppassword = SettingService.GetSetting(settings, "SMTPPassword", string.Empty);
+                _togglesmtppassword = SharedLocalizer["ShowPassword"];
+                _smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
+                _smtprelay = SettingService.GetSetting(settings, "SMTPRelay", "False");
+                _smtpenabled = SettingService.GetSetting(settings, "SMTPEnabled", "True");
+                _retention = SettingService.GetSetting(settings, "NotificationRetention", "30");
 
-				var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-				_smtphost = SettingService.GetSetting(settings, "SMTPHost", string.Empty);
-				_smtpport = SettingService.GetSetting(settings, "SMTPPort", string.Empty);
-				_smtpssl = SettingService.GetSetting(settings, "SMTPSSL", "False");
-				_smtpusername = SettingService.GetSetting(settings, "SMTPUsername", string.Empty);
-				_smtppassword = SettingService.GetSetting(settings, "SMTPPassword", string.Empty);
-				_togglesmtppassword = SharedLocalizer["ShowPassword"];
-				_smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
-				_retention = SettingService.GetSetting(settings, "NotificationRetention", "30");
+                // aliases
+                await GetAliases();
 
-				if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-				{
-					var tenants = await TenantService.GetTenantsAsync();
-					var _databases = await DatabaseService.GetDatabasesAsync();
-					var tenant = tenants.Find(item => item.TenantId == site.TenantId);
-					if (tenant != null)
-					{
-						_tenant = tenant.Name;
-						_database = _databases.Find(item => item.DBType == tenant.DBType)?.Name;
-						_connectionstring = tenant.DBConnectionString;
-					}
-				}
+                // hosting model
+                _runtime = site.Runtime;
+                _prerender = site.RenderMode.Replace(_runtime, "");
 
-				_createdby = site.CreatedBy;
-				_createdon = site.CreatedOn;
-				_modifiedby = site.ModifiedBy;
-				_modifiedon = site.ModifiedOn;
-				_deletedby = site.DeletedBy;
-				_deletedon = site.DeletedOn;
+                // database
+                if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                {
+                    var tenants = await TenantService.GetTenantsAsync();
+                    var _databases = await DatabaseService.GetDatabasesAsync();
+                    var tenant = tenants.Find(item => item.TenantId == site.TenantId);
+                    if (tenant != null)
+                    {
+                        _tenant = tenant.Name;
+                        _database = _databases.Find(item => item.DBType == tenant.DBType)?.Name;
+                        _connectionstring = tenant.DBConnectionString;
+                    }
+                }
 
-				_initialized = true;
-			}
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Loading Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-			AddModuleMessage(ex.Message, MessageType.Error);
-		}
-	}
+                // audit
+                _createdby = site.CreatedBy;
+                _createdon = site.CreatedOn;
+                _modifiedby = site.ModifiedBy;
+                _modifiedon = site.ModifiedOn;
+                _deletedby = site.DeletedBy;
+                _deletedon = site.DeletedOn;
 
-	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 = Constants.DefaultAdminContainer;
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
-			AddModuleMessage(Localizer["Error.Theme.LoadPane"], MessageType.Error);
-		}
-	}
+                _initialized = true;
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
 
-	private async Task SaveSite()
-	{
-		validated = true;
-		var interop = new Interop(JSRuntime);
-		if (await interop.FormValid(form))
-		{
-			try
-			{
-				if (_name != string.Empty && _themetype != "-" && _containertype != "-")
-				{
-					var site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
-					if (site != null)
-					{
-						bool refresh = false;
-						bool reload = false;
+    private async void ThemeChanged(ChangeEventArgs e)
+    {
+        try
+        {
+            _themetype = (string)e.Value;
+            _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+            _containertype = _containers.First().TypeName;
+            _admincontainertype = Constants.DefaultAdminContainer;
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Containers For Theme {ThemeType} {Error}", _themetype, ex.Message);
+            AddModuleMessage(Localizer["Error.Theme.LoadPane"], MessageType.Error);
+        }
+    }
 
-						site.Name = _name;
-						if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-						{
-							if (site.Runtime != _runtime || site.RenderMode != _runtime + _prerender)
-							{
-								site.Runtime = _runtime;
-								site.RenderMode = _runtime + _prerender;
-								reload = true; // needs to be reloaded on server
-							}
-						}
-						site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
+    private async Task SaveSite()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            try
+            {
+                if (_name != string.Empty && _themetype != "-" && _containertype != "-")
+                {
+                    var site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
+                    if (site != null)
+                    {
+                        bool refresh = false;
+                        bool reload = false;
 
-						site.LogoFileId = null;
-						var logofileid = _logofilemanager.GetFileId();
-						if (logofileid != -1)
-						{
-							site.LogoFileId = logofileid;
-						}
-						int? faviconFieldId = _faviconfilemanager.GetFileId();
-						if (faviconFieldId == -1) faviconFieldId = null;
-						if (site.FaviconFileId != faviconFieldId)
-						{
-							site.FaviconFileId = faviconFieldId;
-							reload = true; // needs to be reloaded on server
-						}
-						if (site.DefaultThemeType != _themetype)
-						{
-							site.DefaultThemeType = _themetype;
-							refresh = true; // needs to be refreshed on client
-						}
-						if (site.DefaultContainerType != _containertype)
-						{
-							site.DefaultContainerType = _containertype;
-							refresh = true; // needs to be refreshed on client
-						}
-						site.AdminContainerType = _admincontainertype;
+                        site.Name = _name;
+                        site.HomePageId = (_homepageid != "-" ? int.Parse(_homepageid) : null);
+                        site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
 
+                        // appearance
+                        site.LogoFileId = null;
+                        var logofileid = _logofilemanager.GetFileId();
+                        if (logofileid != -1)
+                        {
+                            site.LogoFileId = logofileid;
+                        }
+                        int? faviconFieldId = _faviconfilemanager.GetFileId();
+                        if (faviconFieldId == -1) faviconFieldId = null;
+                        if (site.FaviconFileId != faviconFieldId)
+                        {
+                            site.FaviconFileId = faviconFieldId;
+                            reload = true; // needs to be reloaded on server
+                        }
+                        if (site.DefaultThemeType != _themetype)
+                        {
+                            site.DefaultThemeType = _themetype;
+                            refresh = true; // needs to be refreshed on client
+                        }
+                        if (site.DefaultContainerType != _containertype)
+                        {
+                            site.DefaultContainerType = _containertype;
+                            refresh = true; // needs to be refreshed on client
+                        }
+                        site.AdminContainerType = _admincontainertype;
+
+                        // page content
+                        if (site.HeadContent != _headcontent)
+                        {
+                            site.HeadContent = _headcontent;
+                            reload = true;
+                        }
+                        if (site.BodyContent != _bodycontent)
+                        {
+                            site.BodyContent = _bodycontent;
+                            reload = true;
+                        }
+
+                        // PWA
 						if (site.PwaIsEnabled.ToString() != _pwaisenabled)
 						{
 							site.PwaIsEnabled = Boolean.Parse(_pwaisenabled);
@@ -500,16 +598,31 @@
 							reload = true; // needs to be reloaded on server
 						}
 
+                        // hosting model
+                        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+                        {
+                            if (site.Runtime != _runtime || site.RenderMode != _runtime + _prerender)
+                            {
+                                site.Runtime = _runtime;
+                                site.RenderMode = _runtime + _prerender;
+                                reload = true; // needs to be reloaded on server
+                            }
+                        }
+
 						site = await SiteService.UpdateSiteAsync(site);
 
+                        // SMTP
 						var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-						settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
+                        settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
 						settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
 						settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
 						settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
 						settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
 						settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
-						settings = SettingService.SetSetting(settings, "NotificationRetention", _retention, true);
+						settings = SettingService.SetSetting(settings, "SMTPRelay", _smtprelay, true);
+                        settings = SettingService.SetSetting(settings, "SMTPEnabled", _smtpenabled, true);
+                        settings = SettingService.SetSetting(settings, "SiteGuid", _siteguid, true);
+                        settings = SettingService.SetSetting(settings, "NotificationRetention", _retention, true);
 						await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
 						await logger.LogInformation("Site Settings Saved {Site}", site);
@@ -521,8 +634,8 @@
 						else
 						{
 							AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
-							await interop.ScrollTo(0, 0, "smooth");
-						}
+                            await ScrollToPageTop();
+                        }
 					}
 				}
 				else
@@ -557,8 +670,8 @@
 					await AliasService.DeleteAliasAsync(alias.AliasId);
 				}
 
-				aliases = await AliasService.GetAliasesAsync();
-				NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliases.First().Name, true);
+				var redirect = aliases.First(item => item.SiteId != PageState.Site.SiteId || item.TenantId != PageState.Site.TenantId);
+				NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + redirect.Name, true);
 			}
 			else
 			{
@@ -579,20 +692,19 @@
 			try
 			{
 				var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-				SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
-				SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
-				SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
-				SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
-				SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
-				SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
+				settings = SettingService.SetSetting(settings, "SMTPHost", _smtphost, true);
+				settings = SettingService.SetSetting(settings, "SMTPPort", _smtpport, true);
+				settings = SettingService.SetSetting(settings, "SMTPSSL", _smtpssl, true);
+				settings = SettingService.SetSetting(settings, "SMTPUsername", _smtpusername, true);
+				settings = SettingService.SetSetting(settings, "SMTPPassword", _smtppassword, true);
+				settings = SettingService.SetSetting(settings, "SMTPSender", _smtpsender, true);
 				await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
 				await logger.LogInformation("Site SMTP Settings Saved");
 
 				await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
 				AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
-				var interop = new Interop(JSRuntime);
-				await interop.ScrollTo(0, 0, "smooth");
-			}
+                await ScrollToPageTop();
+            }
 			catch (Exception ex)
 			{
 				await logger.LogError(ex, "Error Testing SMTP Configuration");

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

@@ -29,7 +29,7 @@ else
                 </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). If a site has multiple aliases they can be separated by commas." ResourceKey="Aliases">Aliases: </Label>
+                <Label Class="col-sm-3" For="alias" HelpText="The urls for the site (comman delimited). This can include domain names (ie. domain.com), subdomains (ie. sub.domain.com) or virtual folders (ie. domain.com/folder)." ResourceKey="Aliases">Urls: </Label>
                 <div class="col-sm-9">
                     <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
                 </div>
@@ -89,7 +89,8 @@ else
                     <select id="runtime" class="form-select" @bind="@_runtime" required>
                         <option value="Server">@SharedLocalizer["BlazorServer"]</option>
                         <option value="WebAssembly">@SharedLocalizer["BlazorWebAssembly"]</option>
-                    </select>
+						<option value="Hybrid">@SharedLocalizer["BlazorHybrid"]</option>
+					</select>
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
@@ -102,7 +103,7 @@ else
                 </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>
+                <Label Class="col-sm-3" For="tenant" HelpText="Select the database for the site" ResourceKey="Tenant">Database: </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>
@@ -120,26 +121,51 @@ else
                     <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>
+                    <Label Class="col-sm-3" For="name" HelpText="Enter the name for the database" ResourceKey="TenantName">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>
+                    <Label Class="col-sm-3" For="databaseType" HelpText="Select the database type" ResourceKey="DatabaseType">Type: </Label>
                     <div class="col-sm-9">
-                        <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>
-                    </div>
+                        @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 (_databaseConfigType != null)
-                {
-                    @DatabaseConfigComponent;
-                }
+				@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">Settings:</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">
@@ -169,6 +195,8 @@ else
 	private Type _databaseConfigType;
 	private object _databaseConfig;
 	private RenderFragment DatabaseConfigComponent { get; set; }
+	private bool _showConnectionString = false;
+	private string _connectionString = string.Empty;
 
 	private List<Theme> _themeList;
 	private List<ThemeControl> _themes = new List<ThemeControl>();
@@ -218,7 +246,7 @@ else
 		try
 		{
 			_databaseName = (string)eventArgs.Value;
-
+			_showConnectionString = false;
 			LoadDatabaseConfigComponent();
 		}
 		catch
@@ -260,12 +288,13 @@ else
 			if (_themetype != "-")
 			{
 				_containers = ThemeService.GetContainerControls(_themeList, _themetype);
-			}
+                _containertype = _containers.First().TypeName;
+            }
 			else
 			{
 				_containers = new List<ThemeControl>();
-			}
-			_containertype = "-";
+                _containertype = "-";
+            }
 			_admincontainertype = "";
 			StateHasChanged();
 		}
@@ -287,7 +316,7 @@ else
 				_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))
+				foreach (string name in _urls.Split(',', StringSplitOptions.RemoveEmptyEntries))
 				{
 					if (aliases.Exists(item => item.Name == name))
 					{
@@ -301,7 +330,7 @@ else
 
 					if (_tenantid == "+")
 					{
-						if (!string.IsNullOrEmpty(_tenantName) && _tenants.FirstOrDefault(item => item.Name == _tenantName) == null)
+						if (!string.IsNullOrEmpty(_tenantName) && !_tenants.Exists(item => item.Name == _tenantName))
 						{
 							// validate host credentials
 							var user = new User();
@@ -309,15 +338,22 @@ else
 							user.Username = _hostusername;
 							user.Password = _hostpassword;
 							user.LastIPAddress = PageState.RemoteIPAddress;
-							user = await UserService.LoginUserAsync(user);
+							user = await UserService.LoginUserAsync(user, false, false);
                             if (user.IsAuthenticated)
                             {
-                                var connectionString = String.Empty;
-                                if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
-                                {
-                                    connectionString = databaseConfigControl.GetConnectionString();
-                                }
-                                var database = _databases.SingleOrDefault(d => d.Name == _databaseName);
+								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 != "")
                                 {
@@ -398,4 +434,13 @@ else
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
+
+	private void ToggleConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionString = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
 }

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

@@ -8,7 +8,7 @@
 
 @if (_sites == null)
 {
-    <p><em>Loading...</em></p>
+    <p><em>@SharedLocalizer["Loading"]</em></p>
 }
 else
 {
@@ -18,7 +18,7 @@ else
         <Header>
             <th style="width: 1px;">&nbsp;</th>
             <th style="width: 1px;">&nbsp;</th>
-            <th>@SharedLocalizer["Name"]</th>
+            <th>@Localizer["AliasName"]</th>
         </Header>
         <Row>
             <td><button type="button" class="btn btn-primary" @onclick="@(async () => Edit(context.Name))">@SharedLocalizer["Edit"]</button></td>

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

@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Sql
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
+@inject ISystemService SystemService
 @inject ITenantService TenantService
 @inject IDatabaseService DatabaseService
 @inject ISqlService SqlService
@@ -14,125 +15,307 @@
 else
 {
     <div class="container">
+		<div class="row mb-1 align-items-center">
+			<Label Class="col-sm-3" For="connection" HelpText="Select a database connection (from appsettings.json)" ResourceKey="Connection">Connection: </Label>
+			<div class="col-sm-9">
+				<select id="tenant" class="form-select" value="@_connection" @onchange="(e => ConnectionChanged(e))">
+					<option value="-">&lt;@Localizer["Connection.Select"]&gt;</option>
+					<option value="+">&lt;@Localizer["Connection.Add"]&gt;</option>
+					@foreach (var connection in _connections)
+					{
+						<option value="@connection.Key">@connection.Key</option>
+					}
+				</select>
+			</div>
+		</div>
+		@if (_connection == "+")
+		{
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="name" HelpText="Enter the name of the connection" ResourceKey="Name">Name: </Label>
+				<div class="col-sm-9">
+					<input id="name" class="form-control" @bind="@_name" 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" ResourceKey="DatabaseType">Type: </Label>
+				<div class="col-sm-9">
+					@if (_databases != null)
+					{
+						<div class="input-group">
+							<select id="databasetype" class="form-select" value="@_databasetype" @onchange="(e => DatabaseTypeChanged(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="ShowConnectionString">@Localizer["EnterConnectionString"]</button>
+							}
+							else
+							{
+								<button type="button" class="btn btn-secondary" @onclick="ShowConnectionString">@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">Settings:</Label>
+					<div class="col-sm-9">
+						<textarea id="connectionstring" class="form-control" @bind="@_connectionstring" rows="3"></textarea>
+					</div>
+				</div>
+			}
+			<br />
+			<button type="button" class="btn btn-success" @onclick="Add">@Localizer["Add"]</button>
+		}
+		else
+		{
+			@if (_connection != "-")
+			{
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="databasetype" HelpText="The database type" ResourceKey="DatabaseType">Type: </Label>
+					<div class="col-sm-9">
+						@if (_databases != null)
+						{
+							<select id="databasetype" class="form-select" @bind="@_databasetype" required>
+								<option value="-">&lt;@Localizer["Type.Select"]&gt;</option>
+								@foreach (var database in _databases)
+								{
+									<option value="@database.Name">@Localizer[@database.Name]</option>
+								}
+							</select>
+						}
+					</div>
+				</div>
+				@if (!string.IsNullOrEmpty(_tenant))
+				{
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="tenant" HelpText="The database using this connection" ResourceKey="Tenant">Database: </Label>
+						<div class="col-sm-9">
+							<input id="tenant" class="form-control" @bind="@_tenant" readonly />
+						</div>
+					</div>
+				}
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="connectionstring" HelpText="The connection string" ResourceKey="ConnectionString">Settings: </Label>
+					<div class="col-sm-9">
+						<div class="input-group">
+							<input id="connectionstring" type="@_connectionstringtype" class="form-control" @bind="@_connectionstring" readonly />
+							<button type="button" class="btn btn-secondary" @onclick="@ToggleConnectionString">@_connectionstringtoggle</button>
+						</div>
+					</div>
+				</div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="sqlQuery" HelpText="Enter a valid SQL query for the database" ResourceKey="SqlQuery">SQL Query: </Label>
+					<div class="col-sm-9">
+						<textarea id="sqlQuery" class="form-control" @bind="@_sql" rows="3"></textarea>
+					</div>
+				</div>
+				<br />
+				<button type="button" class="btn btn-success" @onclick="Execute">@Localizer["Execute"]</button>
+				<br />
+				<br />
+				@if (_results != null)
+				{
+					@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 />
 
-        <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>
-            </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)
-    {
-        @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 />
-    }
+					<br />
+				}
+			}
+		}
+	</div>
 }
 
 @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 List<Dictionary<string, string>> _results;
+	private string _connection = "-";
+	private Dictionary<string, object> _connections;
+	private List<Tenant> _tenants;
+	private List<Database> _databases;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	private string _name = string.Empty;
+	private string _databasetype = string.Empty;
+	private Type _databaseConfigType;
+	private object _databaseConfig;
+	private RenderFragment DatabaseConfigComponent { get; set; }
+	private bool _showConnectionString = false;
+	private string _tenant = string.Empty;
+	private string _connectionstring = string.Empty;
+	private string _connectionstringtype = "password";
+	private string _connectionstringtoggle = string.Empty;
+	private string _sql = string.Empty;
+	private List<Dictionary<string, string>> _results;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _tenants = await TenantService.GetTenantsAsync();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Tenants {Error}", ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
-        }
-    }
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    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);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_connections = await SystemService.GetSystemInfoAsync("connectionstrings");
+			_tenants = await TenantService.GetTenantsAsync();
+			_databases = await DatabaseService.GetDatabasesAsync();
+			_connectionstringtoggle = SharedLocalizer["ShowPassword"];
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Tenants {Error}", ex.Message);
+			AddModuleMessage(ex.Message, MessageType.Error);
+		}
+	}
 
-    private async Task Execute()
-    {
-        try
-        {
-            if (_tenantid != "-1" && !string.IsNullOrEmpty(_sql))
-            {
-                var sqlquery = new SqlQuery { TenantId = int.Parse(_tenantid), Query = _sql };
+	private async void ConnectionChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_connection = (string)e.Value;
+			if (_connection != "-" && _connection != "+")
+			{
+				_connectionstring = _connections[_connection].ToString();
+				_tenant = "";
+				_databasetype = "-";
+				var tenant = _tenants.FirstOrDefault(item => item.DBConnectionString == _connection);
+				if (tenant != null)
+				{
+					_tenant = tenant.Name;
+					_databasetype = _databases.FirstOrDefault(item => item.DBType == tenant.DBType).Name;
+				}
+			}
+			else
+			{
+				if (_databases.Exists(item => item.IsDefault))
+				{
+					_databasetype = _databases.Find(item => item.IsDefault).Name;
+				}
+				else
+				{
+					_databasetype = "LocalDB";
+				}
+				_showConnectionString = false;
+				LoadDatabaseConfigComponent();
+			}
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Connection {Connection} {Error}", _connection, ex.Message);
+			AddModuleMessage(ex.Message, MessageType.Error);
+		}
+	}
+
+	private void DatabaseTypeChanged(ChangeEventArgs eventArgs)
+	{
+		try
+		{
+			_databasetype = (string)eventArgs.Value;
+			_showConnectionString = false;
+			LoadDatabaseConfigComponent();
+		}
+		catch
+		{
+			AddModuleMessage(Localizer["Error.Database.LoadConfig"], MessageType.Error);
+		}
+	}
+
+	private void LoadDatabaseConfigComponent()
+	{
+		var database = _databases.SingleOrDefault(d => d.Name == _databasetype);
+		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();
+			};
+		}
+	}
+
+	private void ShowConnectionString()
+	{
+		if (_databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			_connectionstring = databaseConfigControl.GetConnectionString();
+		}
+		_showConnectionString = !_showConnectionString;
+	}
+
+	private async Task Add()
+	{
+		var connectionstring = _connectionstring;
+		if (!_showConnectionString && _databaseConfig is IDatabaseConfigControl databaseConfigControl)
+		{
+			connectionstring = databaseConfigControl.GetConnectionString();
+		}
+		if (!string.IsNullOrEmpty(_name) && !string.IsNullOrEmpty(connectionstring))
+		{
+			var settings = new Dictionary<string, object>();
+			settings.Add($"{SettingKeys.ConnectionStringsSection}:{_name}", connectionstring);
+			await SystemService.UpdateSystemInfoAsync(settings);
+			_connections = await SystemService.GetSystemInfoAsync("connectionstrings");
+			_connection = "-";
+			AddModuleMessage(Localizer["Message.Connection.Added"], MessageType.Success);
+		}
+		else
+		{
+			AddModuleMessage(Localizer["Message.Required.Connection"], MessageType.Warning);
+		}
+	}
+
+	private void ToggleConnectionString()
+	{
+		if (_connectionstringtype == "password")
+		{
+			_connectionstringtype = "text";
+			_connectionstringtoggle = SharedLocalizer["HidePassword"];
+		}
+		else
+		{
+			_connectionstringtype = "password";
+			_connectionstringtoggle = SharedLocalizer["ShowPassword"];
+		}
+	}
+
+	private async Task Execute()
+	{
+		try
+		{
+			if (_databasetype != "-" && !string.IsNullOrEmpty(_sql))
+			{
+				var dbtype = _databases.FirstOrDefault(item => item.Name == _databasetype).DBType;
+				var sqlquery = new SqlQuery { DBConnectionString = _connection, DBType = dbtype, Query = _sql };
                 sqlquery = await SqlService.ExecuteQueryAsync(sqlquery);
                 _results = sqlquery.Results;
                 AddModuleMessage(Localizer["Success.QueryExecuted"], MessageType.Success);

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

@@ -38,7 +38,13 @@
                     <input id="ipaddress" class="form-control" @bind="@_ipaddress" readonly />
                 </div>
             </div>
-            <div class="row mb-1 align-items-center">
+			<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 />
@@ -127,12 +133,9 @@
                 </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>
+                <Label Class="col-sm-3" For="packageregistryurl" HelpText="Specify The Package Manager Service For Installing Modules, Themes, And Translations. If This Field Is Blank It Means The Package Manager Service Is Disabled For This Installation." ResourceKey="PackageManager">Package Manager: </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>
+                    <input id="packageregistryurl" class="form-control" @bind="@_packageregistryurl" />
                 </div>
             </div>
         </div>
@@ -141,6 +144,18 @@
         <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>
+    <TabPanel Name="Log" Heading="Log" ResourceKey="Log">
+        <div class="container">
+            <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="log" HelpText="System log information for current day" ResourceKey="Log">Log: </Label>
+                <div class="col-sm-9">
+                    <textarea id="log" class="form-control" rows="10" @bind="@_log" readonly />
+                </div>
+            </div>
+		</div>
+		<br /><br />
+		<button type="button" class="btn btn-danger" @onclick="ClearLog">@Localizer["Clear"]</button>
+	</TabPanel>
 </TabStrip>
 <br /><br />
 
@@ -152,6 +167,7 @@
 	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;
@@ -163,19 +179,22 @@
 	private string _logginglevel = string.Empty;
 	private string _notificationlevel = string.Empty;
 	private string _swagger = string.Empty;
-	private string _packageservice = string.Empty;
+    private string _packageregistryurl = string.Empty;
+
+	private string _log = string.Empty;
 
 	protected override async Task OnInitializedAsync()
 	{
 		_version = Constants.Version;
 
-		Dictionary<string, object> systeminfo = await SystemService.GetSystemInfoAsync("environment");
+		var 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";
@@ -183,37 +202,60 @@
 			_workingset = (Convert.ToInt64(systeminfo["WorkingSet"].ToString()) / 1000000).ToString() + " MB";
 		}
 
-		systeminfo = await SystemService.GetSystemInfoAsync();
+		systeminfo = await SystemService.GetSystemInfoAsync("configuration");
 		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();
+			_detailederrors = systeminfo["DetailedErrors"].ToString();
+			_logginglevel = systeminfo["Logging:LogLevel:Default"].ToString();
+			_notificationlevel = systeminfo["Logging:LogLevel:Notify"].ToString();
+			_swagger = systeminfo["UseSwagger"].ToString();
+            _packageregistryurl = systeminfo["PackageRegistryUrl"].ToString();
+		}
+
+		systeminfo = await SystemService.GetSystemInfoAsync("log");
+		if (systeminfo != null)
+		{
+			_log = systeminfo["Log"].ToString();
 		}
 	}
 
-    private async Task SaveConfig()
-    {
-        try
-        {
-            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 SaveConfig()
+	{
+		try
+		{
+			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("PackageRegistryUrl", _packageregistryurl);
+			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 ClearLog()
+	{
+		try
+		{
+			var settings = new Dictionary<string, object>();
+			settings.Add("clearlog", "true");
+			await SystemService.UpdateSystemInfoAsync(settings);
+			_log = string.Empty;
+			AddModuleMessage(Localizer["Success.ClearLog"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Clearing Log");
+			AddModuleMessage(Localizer["Error.ClearLog"], MessageType.Error);
+		}
+	}
 
     private async Task RestartApplication()
     {

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

@@ -10,68 +10,122 @@
 <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 class="text-center">
+                <div class="form-check form-check-inline">
+                    <input id="free" class="form-check-input" type="radio" checked="@(_price == "free")" name="Price" @onchange="@(() => PriceChanged("free"))" />
+                    <label class="form-check-label" for="free">@SharedLocalizer["Free"]</label>
+                </div>
+                <div class="form-check form-check-inline">
+                    <input id="paid" class="form-check-input" type="radio" checked="@(_price == "paid")" name="Price" @onchange="@(() => PriceChanged("paid"))" />
+                    <label class="form-check-label" for="paid">@SharedLocalizer["Paid"]</label>
                 </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 class="row justify-content-center mb-3">
+            <div class="col">
+                <div class="input-group">
+                    <span class="input-group-text">@Localizer["Product"]</span>
+                    <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>
+                    <button type="button" class="btn btn-primary ms-2" @onclick="Refresh"><span class="@Icons.Reload" aria-hidden="true"></span></button>
                 </div>
-            }
-        }
+            </div>
+        </div>
+        <div class="row mb-3">
+            <div class="col">
+                @if (_initialized)
+                {
+                    <br />
+                    <div class="row mb-3">
+                        <div class="col-sm-4">
+                            <h3>@((_packages != null) ? _packages.Count : 0) @SharedLocalizer["Search.Results"]</h3>
+                        </div>
+                        <div class="col-sm-4">
+                            &nbsp;
+                        </div>
+                        <div class="col-sm-4">
+                            <select class="form-select" value="@_sort" @onchange="(e => SortChanged(e))">
+                                <option value="popularity">@SharedLocalizer["Search.Popularity"]</option>
+                                <option value="alphabetical">@SharedLocalizer["Search.Alphabetical"]</option>
+                                @if (_price == "free")
+                                {
+                                    <option value="downloads">@SharedLocalizer["Search.Downloads"]</option>
+                                }
+                                <option value="recent">@SharedLocalizer["Search.RecentlyReleased"]</option>
+                                @if (_price == "paid")
+                                {
+                                    <option value="price">@SharedLocalizer["Search.Price"]</option>
+                                }
+                            </select>
+                        </div>
+                    </div>
+                    <Pager Format="Grid" Items="@_packages" DisplayPages="1" PageSize="9" Toolbar="Both" Class="container-fluid px-0" RowClass="row g-0" ColumnClass="col-lg-4 col-md-6">
+                        <Row>
+                            <div class="m-2 p-2 d-flex justify-content-center">
+                                <div class="container-fluid px-0">
+                                    <div class="row g-0 mb-2">
+                                        <div class="col-4">
+                                            @if (context.LogoUrl != null)
+                                            {
+                                                <img src="@context.LogoUrl" class="img-fluid" alt="@context.Name" />
+                                            }
+                                            else
+                                            {
+                                                <img src="/package.png" class="img-fluid" alt="@context.Name" />
+                                            }
+                                        </div>
+                                        <div class="col-8 text-end">
+                                            <small>@SharedLocalizer["Search.Version"]:</small> <strong>@context.Version</strong>
+                                            <br /><small>@SharedLocalizer["Search.Released"]:</small> <strong>@context.ReleaseDate.ToString("MM/dd/yyyy")</strong>
+                                            @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                            {
+                                                <br /><small>@SharedLocalizer["Search.Source"]:</small> <strong>@(new Uri(context.PackageUrl).Host)</strong>
+                                            }
+                                            @if (context.Price == null)
+                                            {
+                                                <br /><small>@SharedLocalizer["Search.Downloads"]:</small> <strong>@(String.Format("{0:n0}", context.Downloads))</strong>
+                                            }
+                                            else
+                                            {
+                                                <br /><small>@SharedLocalizer["From"]:</small> <strong>@context.Price.Value.ToString("$#,##0.00")</strong>
+                                                @((MarkupString)(context.TrialPeriod > 0 ? " <strong>(" + context.TrialPeriod + " Day Trial)</strong>" : ""))
+                                            }
+                                        </div>
+                                    </div>
+                                    <div class="row g-0">
+                                        <div class="col">
+                                            <h3 style="display: inline;"><a href="@context.ProductUrl" target="_blank">@context.Name</a></h3><br />
+                                            <small>@SharedLocalizer["Search.By"]:</small> <strong><a href="@context.OwnerUrl" target="new">@context.Owner</a></strong><br />
+                                            @(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)<br />
+                                            <br />
+                                            @if (!string.IsNullOrEmpty(context.PackageUrl))
+                                            {
+                                                <button type="button" class="btn btn-primary" @onclick=@(async () => await GetPackage(context.PackageId, context.Version))>@SharedLocalizer["Download"]</button>
+                                            }
+                                            @if (context.Price != null && !string.IsNullOrEmpty(context.PaymentUrl))
+                                            {
+                                                <a class="btn btn-success ms-2" style="text-decoration: none !important" href="@context.PaymentUrl" target="_new">@SharedLocalizer["Buy"]</a>
+                                            }
+                                            <br />
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </Row>
+                    </Pager>
+                }
+            </div>
+        </div>
+        <br />
+        <ModuleMessage Type="MessageType.Info" Message="@SharedLocalizer["Oqtane.Marketplace"]" />
     </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 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" />
+                    <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" OnUpload="OnUpload" />
                 </div>
             </div>
         </div>
@@ -111,12 +165,14 @@
     </div>
 }
 
-<button type="button" class="btn btn-success" @onclick="InstallThemes">@SharedLocalizer["Install"]</button>
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
+    private bool _initialized = false;
+    private int _page = 1;
     private List<Package> _packages;
     private string _price = "free";
+    private string _sort = "popularity";
     private string _search = "";
     private string _productname = "";
     private string _license = "";
@@ -130,6 +186,7 @@
         try
         {
             await LoadThemes();
+            _initialized = true;
         }
         catch (Exception ex)
         {
@@ -140,8 +197,10 @@
 
     private async Task LoadThemes()
     {
+        ShowProgressIndicator();
+ 
         var themes = await ThemeService.GetThemesAsync();
-        _packages = await PackageService.GetPackagesAsync("theme", _search, _price, "");
+        _packages = await PackageService.GetPackagesAsync("theme", _search, _price, "", _sort);
 
         if (_packages != null)
         {
@@ -153,46 +212,44 @@
                 }
             }
         }
+
+        HideProgressIndicator();
     }
 
-    private async void PriceChanged(ChangeEventArgs e)
+    private async void PriceChanged(string price)
     {
-        try
-        {
-            _price = (string)e.Value;
-            _search = "";
-            await LoadThemes();
-            StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On PriceChanged");
-        }
+        _price = price;
+        _sort = "popularity";
+        await LoadThemes();
+        StateHasChanged();
     }
 
     private async Task Search()
     {
-        try
-        {
-            await LoadThemes();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Search");
-        }
+        await LoadThemes();
     }
 
     private async Task Reset()
     {
-        try
-        {
-            _search = "";
-            await LoadThemes();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error On Reset");
-        }
+        _page = 1;
+        _search = "";
+        await LoadThemes();
+    }
+
+    private async Task Refresh()
+    {
+        await LoadThemes();
+    }
+
+    private void OnPageChange(int page)
+    {
+        _page = page;
+    }
+
+    private async void SortChanged(ChangeEventArgs e)
+    {
+        _sort = (string)e.Value;
+        await LoadThemes();
     }
 
     private void HideModal()
@@ -206,7 +263,7 @@
     {
         try
         {
-            var package = await PackageService.GetPackageAsync(packageid, version);
+            var package = await PackageService.GetPackageAsync(packageid, version, false);
             if (package != null)
             {
                 _productname = package.Name;
@@ -216,8 +273,13 @@
                 }
                 _packageid = package.PackageId;
                 _version = package.Version;
+                StateHasChanged();
+            }
+            else
+            {
+                await logger.LogError("Error Getting Package {PackageId} {Version}", packageid, version);
+                AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error);
             }
-            StateHasChanged();
         }
         catch (Exception ex)
         {
@@ -230,9 +292,9 @@
     {
         try
         {
-            await PackageService.DownloadPackageAsync(_packageid, _version, Constants.PackagesFolder);
+            await PackageService.DownloadPackageAsync(_packageid, _version);
             await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version);
-            AddModuleMessage(Localizer["Success.Theme.Download"], MessageType.Success);
+			AddModuleMessage(string.Format(Localizer["Success.Theme.Download"], NavigateUrl("admin/system")), MessageType.Success);
             _productname = "";
             _license = "";
             StateHasChanged();
@@ -244,16 +306,8 @@
         }
     }
 
-    private async Task InstallThemes()
+    private void OnUpload()
     {
-        try
-        {
-            await ThemeService.InstallThemesAsync();
-            AddModuleMessage(string.Format(Localizer["Success.Theme.Install"], NavigateUrl("admin/system")), MessageType.Success);
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Installing Theme");
-        }
+        AddModuleMessage(string.Format(Localizer["Success.Theme.Download"], NavigateUrl("admin/system")), MessageType.Success);
     }
 }

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

@@ -80,7 +80,10 @@
 
     protected override void OnInitialized()
     {
-        AddModuleMessage(Localizer["Info.Theme.CreatorIntent"], MessageType.Info);
+        if (!NavigationManager.BaseUri.Contains("localhost:"))
+        {
+            AddModuleMessage(Localizer["Info.Theme.CreatorIntent"], MessageType.Info);
+        }
     }
 	
 	protected override async Task OnParametersSetAsync()
@@ -102,7 +105,8 @@
         {
             if (IsValid(_owner) && IsValid(_theme) && _owner != _theme && _template != "-")
             {
-                var theme = new Theme { Owner = _owner, Name = _theme, Template = _template, Version = _reference };
+                var template = _templates.FirstOrDefault(item => item.Name == _template);
+                var theme = new Theme { Owner = _owner, Name = _theme, Template = _template, Version = _reference, ThemeName = template.Namespace };
                 theme = await ThemeService.CreateThemeAsync(theme);
                 GetLocation();
                 AddModuleMessage(string.Format(Localizer["Success.Theme.Create"], NavigateUrl("admin/system")), MessageType.Success);
@@ -121,7 +125,7 @@
     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_]*$");
+		return !string.IsNullOrEmpty(name) && name.ToLower() != "theme" && !name.ToLower().Contains("oqtane") && Regex.IsMatch(name, "^[A-Za-z_][A-Za-z0-9_]*$");
     }
 
     private void TemplateChanged(ChangeEventArgs e)
@@ -142,8 +146,14 @@
         if (_owner != "" && _theme != "" && _template != "-")
         {
             var template = _templates.FirstOrDefault(item => item.Name == _template);
-            _location = template.Location + _owner + "." + _theme;
-
+            if (!string.IsNullOrEmpty(template.Namespace))
+            {
+                _location = template.Location + template.Namespace.Replace("[Owner]", _owner).Replace("[Theme]", _theme);
+            }
+            else
+            {
+                _location = template.Location + _owner + ".Theme." + _theme;
+            }
         }
         StateHasChanged();
     }

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

@@ -0,0 +1,211 @@
+@namespace Oqtane.Modules.Admin.Themes
+@using System.Net
+@inherits ModuleBase
+@inject IThemeService ThemeService
+@inject IPackageService PackageService
+@inject NavigationManager NavigationManager
+@inject IStringLocalizer<Edit> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_initialized)
+{
+    <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" />
+                </div>
+            </div>
+             <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="isenabled" HelpText="Is theme enabled for this site?" ResourceKey="IsEnabled">Enabled? </Label>
+                <div class="col-sm-9">
+                    <select id="isenabled" class="form-select" @bind="@_isenabled" required>
+                        <option value="True">@SharedLocalizer["Yes"]</option>
+                        <option value="False">@SharedLocalizer["No"]</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </form>
+    <Section Name="Information" ResourceKey="Information" Heading="Information">
+        <div class="container">
+             <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 theme was installed. This value must be specified within the theme's ITheme interface specification." ResourceKey="PackageName">Package Name: </Label>
+		        <div class="col-sm-9">
+                    @if (!string.IsNullOrEmpty(_packagename))
+                    {
+                        <div class="input-group">
+                            <input id="packagename" class="form-control" @bind="@_packagename" disabled />
+                            @if (string.IsNullOrEmpty(_packageurl))
+                            {
+                                <button type="button" class="btn btn-secondary" @onclick="ValidatePackage">@Localizer["Validate"]</button>
+                            }
+                            else
+                            {
+                                <a href="@_packageurl" target="_blank" class="btn btn-primary">@SharedLocalizer["Download"]</a>
+                            }
+                        </div>
+                    }
+                    else
+                    {
+                        <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">
+                    @if (_license.StartsWith("http") || _license.StartsWith("/") || _license.StartsWith("~"))
+                    {
+                        <a href="@_license.Replace("~", PageState?.Alias.BaseUrl + "/Themes/" + Utilities.GetTypeName(_themeName))" class="btn btn-info" style="text-decoration: none !important" target="_new">@Localizer["View License"]</a>
+                    }
+                    else
+                    {
+                        <textarea id="license" class="form-control" @bind="@_license" rows="5" disabled></textarea>
+                    }
+                </div>
+            </div>
+        </div>
+    </Section>
+    <br />
+    <button type="button" class="btn btn-success" @onclick="SaveTheme">@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>
+}
+
+@code {
+    private bool _initialized = false;
+    private ElementReference form;
+    private bool validated = false;
+    private int _themeId;
+    private string _themeName = "";
+    private string _isenabled;
+    private string _name;
+    private string _version;
+    private string _packagename = "";
+    private string _packageurl = "";
+    private string _owner = "";
+    private string _url = "";
+    private string _contact = "";
+    private string _license = "";
+    private string _createdby;
+    private DateTime _createdon;
+    private string _modifiedby;
+    private DateTime _modifiedon;
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+
+    protected override async Task OnInitializedAsync()
+    {
+        try
+        {
+            _themeId = Int32.Parse(PageState.QueryString["id"]);
+            var theme = await ThemeService.GetThemeAsync(_themeId, ModuleState.SiteId);
+            if (theme != null)
+            {
+                _name = theme.Name;
+                _isenabled =theme.IsEnabled.ToString();
+                _version = theme.Version;
+                _packagename = theme.PackageName;
+                _owner = theme.Owner;
+                _url = theme.Url;
+                _contact = theme.Contact;
+                _license = theme.License;
+                _createdby = theme.CreatedBy;
+                _createdon = theme.CreatedOn;
+                _modifiedby = theme.ModifiedBy;
+                _modifiedon = theme.ModifiedOn;
+
+                _initialized = true;
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Theme {ThemeName} {Error}", _themeName, ex.Message);
+            AddModuleMessage(Localizer["Error.Theme.Loading"], MessageType.Error);
+        }
+    }
+
+    private async Task SaveTheme()
+    {
+        validated = true;
+        var interop = new Interop(JSRuntime);
+        if (await interop.FormValid(form))
+        {
+            try
+            {
+                var theme = await ThemeService.GetThemeAsync(_themeId, ModuleState.SiteId);
+                theme.Name = _name;
+                theme.IsEnabled = (_isenabled == null ? true : bool.Parse(_isenabled));
+                await ThemeService.UpdateThemeAsync(theme);
+                await logger.LogInformation("Theme Saved {Theme}", theme);
+                NavigationManager.NavigateTo(NavigateUrl());
+            }
+            catch (Exception ex)
+            {
+                await logger.LogError(ex, "Error Saving Theme {ThemeId} {Error}", _themeId, ex.Message);
+                AddModuleMessage(Localizer["Error.Module.Save"], MessageType.Error);
+            }
+        }
+        else
+        {
+            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+        }
+    }
+
+    private async Task ValidatePackage()
+    {
+        try
+        {
+            var package = await PackageService.GetPackageAsync(_packagename, _version, true);
+            if (package == null || string.IsNullOrEmpty(package.PackageUrl))
+            {
+                AddModuleMessage(Localizer["Message.Validate"], MessageType.Warning);
+            }
+            else
+            {
+                _packageurl = package.PackageUrl;
+                AddModuleMessage(Localizer["Message.Download"], MessageType.Info);
+            }
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packagename, _version);
+            AddModuleMessage(Localizer["Error.Validate"], MessageType.Error);
+        }
+    }
+}

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

@@ -13,7 +13,7 @@
 }
 else
 {
-    <ActionLink Action="Add" Text="Install Theme" />
+    <ActionLink Action="Add" Text="Install Theme" ResourceKey="InstallTheme" />
     @((MarkupString)"&nbsp;")
     <ActionLink Action="Create" Text="Create Theme" ResourceKey="CreateTheme" Class="btn btn-secondary" />
 
@@ -23,19 +23,34 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
             <th>@SharedLocalizer["Version"]</th>
+            <th>@Localizer["Enabled"]</th>
+            <th>@SharedLocalizer["Support"]</th>
             <th>@SharedLocalizer["Expires"]</th>
             <th>&nbsp;</th>
         </Header>
         <Row>
-            <td><ActionLink Action="View" Parameters="@($"name=" + WebUtility.UrlEncode(context.ThemeName))" ResourceKey="ViewTheme" /></td>
+            <td><ActionLink Action="Edit" Parameters="@($"id=" + context.ThemeId.ToString())" ResourceKey="EditTheme" /></td>
             <td>
-                @if (context.AssemblyName != "Oqtane.Client")
+				@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 (context.IsEnabled)
+                {
+                    <span>@SharedLocalizer["Yes"]</span>
+                }
+                else
+                {
+                    <span>@SharedLocalizer["No"]</span>
+                }
+            </td>
+            <td>
+                @((MarkupString)SupportLink(context.PackageName, context.Version))
+            </td>
             <td>
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>
@@ -64,7 +79,7 @@ else
         try
         {
             _themes = await ThemeService.GetThemesAsync();
-            _packages = await PackageService.GetPackagesAsync("theme");
+            _packages = await PackageService.GetPackageUpdatesAsync("theme");
         }
         catch (Exception ex)
         {
@@ -85,11 +100,14 @@ else
             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))
+                { 
+                    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>";
+                        link = "<span>" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</span>";
+                    }
+                    else
+                    {
+                        link = "<a class=\"btn btn-primary\" style=\"text-decoration: none !important\" href=\"" + package.PaymentUrl + "\" target=\"_new\">" + package.ExpiryDate.Value.Date.ToString("MMM dd, yyyy") + "</a>";
                     }
                 }
             }
@@ -97,6 +115,20 @@ else
         return link;
     }
 
+    private string SupportLink(string packagename, string version)
+    {
+        string link = "";
+        if (!string.IsNullOrEmpty(packagename) && _packages != null)
+        {
+            var package = _packages.Where(item => item.PackageId == packagename).FirstOrDefault();
+            if (package != null && !string.IsNullOrEmpty(package.SupportUrl))
+            {
+                link += "<a class=\"btn btn-info\" style=\"text-decoration: none !important\" href=\"" + package.SupportUrl.Replace("{Version}", version) + "\" target=\"_new\">" + SharedLocalizer["Help"] + "</a>";
+            }
+        }
+        return link;
+    }
+
 	private string UpgradeAvailable(string packagename, string version)
 	{
 		if (!string.IsNullOrEmpty(packagename) && _packages != null)
@@ -114,9 +146,8 @@ else
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packagename, version, Constants.PackagesFolder);
+            await PackageService.DownloadPackageAsync(packagename, version);
             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)

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

@@ -1,89 +0,0 @@
-@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="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 _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;
-                _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

@@ -7,34 +7,38 @@
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-<TabStrip>
-    <TabPanel Name="Download" ResourceKey="Download">
-        @if (_package != null && _upgradeavailable)
-        {
-            <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" 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" />
+@if (_initialized)
+{
+    <TabStrip>
+        <TabPanel Name="Download" ResourceKey="Download">
+            @if (_package != null && _upgradeavailable)
+            {
+                <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=@Localizer["Message.Text"]></ModuleMessage>
+            }
+        </TabPanel>
+        <TabPanel Name="Upload" ResourceKey="Upload">
+            <ModuleMessage Type="MessageType.Info" Message=@Localizer["MessageUpgrade.Text"]></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>
-        </div>
-        <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
-    </TabPanel>
-</TabStrip>
+            <button type="button" class="btn btn-success" @onclick="Upgrade">@SharedLocalizer["Upgrade"]</button>
+        </TabPanel>
+    </TabStrip>
+}
 
 @code {
+    private bool _initialized = false;
     private Package _package;
     private bool _upgradeavailable = false;
 
@@ -44,18 +48,26 @@
     {
         try
         {
-            List<Package> packages = await PackageService.GetPackagesAsync("framework", "", "", "");
-            if (packages != null)
+            if (NavigationManager.BaseUri.Contains("localhost:"))
             {
-                _package = packages.Where(item => item.PackageId.StartsWith(Constants.PackageId)).FirstOrDefault();
-                if (_package != null)
+                AddModuleMessage(Localizer["Localhost.Text"], MessageType.Info);
+            }
+            else
+            {
+                List<Package> packages = await PackageService.GetPackagesAsync("framework", "", "", "");
+                if (packages != null)
                 {
-                    _upgradeavailable = (Version.Parse(_package.Version).CompareTo(Version.Parse(Constants.Version)) > 0);
-                }
-                else
-                {
-                    _package = new Package { Name = Constants.PackageId, Version = Constants.Version };
+                    _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 };
+                    }
                 }
+                _initialized = true;
             }
         }
         catch
@@ -85,8 +97,8 @@
     {
         try
         {
-            await PackageService.DownloadPackageAsync(packageid, version, Constants.PackagesFolder);
-            await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version, Constants.PackagesFolder);
+            await PackageService.DownloadPackageAsync(packageid, version);
+            await PackageService.DownloadPackageAsync(Constants.UpdaterPackageId, version);
             AddModuleMessage(Localizer["Success.Framework.Download"], MessageType.Success);
         }
         catch (Exception ex)

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

@@ -1,4 +1,5 @@
 @namespace Oqtane.Modules.Admin.UserProfile
+@using System.Text.RegularExpressions;
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
@@ -22,6 +23,7 @@ else
     <TabPanel Name="Identity" ResourceKey="Identity">
         @if (profiles != null && settings != null)
         {
+            <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
             <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>
@@ -34,7 +36,7 @@ else
 					<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>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>
@@ -43,7 +45,7 @@ else
                     <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>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>
@@ -143,6 +145,11 @@ else
     <TabPanel Name="Notifications" ResourceKey="Notifications">
         @if (notifications != null)
         {
+            <select class="form-select" @onchange="(e => FilterChanged(e))">
+                <option value="to">@Localizer["Inbox"]</option>
+                <option value="from">@Localizer["Items.Sent"]</option>
+            </select>
+            <br />
             <ActionLink Action="Add" Text="Send Notification" Security="SecurityAccessLevel.View" EditMode="false" ResourceKey="SendNotification" />
             <br /><br />
             @if (filter == "to")
@@ -158,22 +165,41 @@ else
                     <Row>
                         <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>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
+                        
+                        @if (context.IsRead)
+                        {
+                            <td>@context.FromDisplayName</td>
+                            <td>@context.Subject</td>
+                            <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
+                        } 
+                        else 
+                        {
+                            <td><b>@context.FromDisplayName</b></td>
+                            <td><b>@context.Subject</b></td>
+                            <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
+                        }
                     </Row>
                     <Detail>
                         <td colspan="2"></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)
+                                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", "");
+                                }
+                                notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                            }
+                            @if (context.IsRead)
+                            {
+                                @notificationSummary
+                            }
+                            else
+                            {
+                                <b>@notificationSummary</b>
+                            }
                         </td>
                     </Detail>
                 </Pager>
@@ -191,43 +217,62 @@ else
                     <Row>
                         <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>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
+
+                        @if (context.IsRead)
+                        {
+                            <td>@context.ToDisplayName</td>
+                            <td>@context.Subject</td>
+                            <td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</td>
+                        } 
+                        else
+                        {
+                            <td><b>@context.ToDisplayName</b></td>
+                            <td><b>@context.Subject</b></td>
+                            <td><b>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", @context.CreatedOn)</b></td>
+                        }
+
                     </Row>
                     <Detail>
                         <td colspan="2"></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)
+                                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", "");
+                                }
+                                notificationSummary = context.Body.Length > 100 ? (context.Body.Substring(0, 97) + "...") : context.Body;
+                            }
+                            @if (context.IsRead)
+                            {
+                                @notificationSummary
+                            }
+                            else 
+                            {
+                                <b>@notificationSummary</b>
+                            } 
                         </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-select" @onchange="(e => FilterChanged(e))">
-                <option value="to">@Localizer["Inbox"]</option>
-                <option value="from">@Localizer["Items.Sent"]</option>
-            </select>
+            @if (notifications.Any())
+            {
+                <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" />
+            }
         }
     </TabPanel>
 </TabStrip>
 <br /><br />
 
 @code {
+    private string _passwordrequirements;
     private string username = string.Empty;
     private string _password = string.Empty;
-	private string _passwordtype = "password";
-	private string _togglepassword = string.Empty;
+    private string _passwordtype = "password";
+    private string _togglepassword = string.Empty;
     private string confirm = string.Empty;
     private bool allowtwofactor = false;
     private string twofactor = "False";
@@ -242,6 +287,7 @@ else
     private string category = string.Empty;
     private string filter = "to";
     private List<Notification> notifications;
+    private string notificationSummary = string.Empty;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
@@ -249,12 +295,11 @@ else
     {
         try
         {
+            _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
+
             _togglepassword = SharedLocalizer["ShowPassword"];
 
-            if (PageState.Site.Settings.ContainsKey("LoginOptions:TwoFactor") && !string.IsNullOrEmpty(PageState.Site.Settings["LoginOptions:TwoFactor"]))
-            {
-                allowtwofactor = (PageState.Site.Settings["LoginOptions:TwoFactor"] == "true");
-            }
+            allowtwofactor = (SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:TwoFactor", "false") == "true");
 
             if (PageState.User != null)
             {
@@ -305,7 +350,14 @@ else
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
-        => SettingService.GetSetting(settings, SettingName, DefaultValue);
+    {
+        string value = SettingService.GetSetting(settings, SettingName, DefaultValue);
+        if (value.Contains("]"))
+        {
+            value = value.Substring(value.IndexOf("]") + 1);
+        }
+        return value;
+    }
 
     private async Task Save()
     {
@@ -337,12 +389,19 @@ else
                         photo = null;
                     }
 
-                    await UserService.UpdateUserAsync(user);
-                    await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
-                    await logger.LogInformation("User Profile Saved");
+                    user = await UserService.UpdateUserAsync(user);
+                    if (user != null)
+                    {
+                        await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
+                        await logger.LogInformation("User Profile Saved");
 
-                    AddModuleMessage(Localizer["Success.Profile.Update"], MessageType.Success);
-                    StateHasChanged();
+                        AddModuleMessage(Localizer["Success.Profile.Update"], MessageType.Success);
+                        StateHasChanged();
+                    }
+                    else
+                    {
+                        AddModuleMessage(Localizer["Message.Password.Complexity"], MessageType.Error);						
+                    }
                 }
                 else
                 {
@@ -353,6 +412,8 @@ else
             {
                 AddModuleMessage(Localizer["Message.Required.ProfileInfo"], MessageType.Warning);
             }
+
+            await ScrollToPageTop();
         }
         catch (Exception ex)
         {
@@ -372,10 +433,15 @@ else
             }
             if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
-                if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+                if (valid == true && profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
                 {
                     valid = false;
                 }
+                if (valid == true && !string.IsNullOrEmpty(profile.Validation))
+                {
+                    Regex regex = new Regex(profile.Validation);
+                    valid = regex.Match(SettingService.GetSetting(settings, profile.Name, string.Empty)).Success;
+                }
             }
         }
         return valid;
@@ -429,6 +495,7 @@ else
     {
         try
         {
+            ModuleInstance.ShowProgressIndicator();
             foreach(var Notification in notifications)
             {
                 if (!Notification.IsDeleted)
@@ -444,12 +511,15 @@ else
             } 
             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();
         }
     
     }

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

@@ -55,7 +55,7 @@
                 <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 />
+                        <textarea id="txtFrom" class="form-control" @bind="@body" rows="5" readonly />
                     </div>
                 </div>
 
@@ -66,7 +66,7 @@
                 <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 />
+                    <textarea id="txtTo" class="form-control" @bind="@body" rows="5" />
                     </div>
                 </div>
 
@@ -93,7 +93,7 @@
     {
         <div class="control-group">
             <label class="control-label">@Localizer["OriginalMessage"] </label>
-            <textarea class="form-control" @bind="@reply" rows="5" readonly />
+            <textarea id="txtReply" class="form-control" @bind="@reply" rows="5" readonly />
         </div>
     }
 }
@@ -118,6 +118,9 @@
             Notification notification = await NotificationService.GetNotificationAsync(notificationid);
             if (notification != null)
             {
+                notification.IsRead = true;
+                notification = await NotificationService.UpdateNotificationAsync(notification);
+
                 int userid = -1;
                 if (notification.ToUserId == PageState.User.UserId)
                 {

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

@@ -1,4 +1,5 @@
 @namespace Oqtane.Modules.Admin.Users
+@using System.Text.RegularExpressions;
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
@@ -11,11 +12,12 @@
     <TabPanel Name="Identity" ResourceKey="Identity">
         @if (profiles != null)
         {
+            <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
             <div class="container">
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="username" HelpText="A unique username for a user. 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" />
+                        <input id="username" class="form-control" @bind="@_username" />
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
@@ -23,7 +25,7 @@
 					<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>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>
@@ -31,25 +33,33 @@
                     <Label Class="col-sm-3" For="confirm" HelpText="Please enter the password again to confirm it matches with the value 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>
+							<input id="confirm" type="@_passwordtype" class="form-control" @bind="@_confirm" autocomplete="new-password" required />
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="email" HelpText="The email address where the user will receive notifications" ResourceKey="Email"></Label>
                     <div class="col-sm-9">
-                        <input id="email" class="form-control" @bind="@email" />
+                        <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="The full name of the user" ResourceKey="DisplayName"></Label>
                     <div class="col-sm-9">
-                        <input id="displayname" class="form-control" @bind="@displayname" />
+                        <input id="displayname" class="form-control" @bind="@_displayname" />
+                    </div>
+                </div>
+                <div class="row mb-1 align-items-center">
+                    <Label Class="col-sm-3" For="notify" HelpText="Indicate if new users should receive an email notification" ResourceKey="Notify">Notify? </Label>
+                    <div class="col-sm-9">
+                        <select id="notify" class="form-select" @bind="@_notify" required>
+                            <option value="True">@SharedLocalizer["Yes"]</option>
+                            <option value="False">@SharedLocalizer["No"]</option>
+                        </select>
                     </div>
                 </div>
             </div>
-
         }
     </TabPanel>
     <TabPanel Name="Profile" ResourceKey="Profile">
@@ -93,23 +103,26 @@
 <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 
 @code {
-    private string username = string.Empty;
+    private string _passwordrequirements;
+    private string _username = string.Empty;
     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;
+    private string _passwordtype = "password";
+    private string _togglepassword = string.Empty;
+    private string _confirm = string.Empty;
+    private string _email = string.Empty;
+    private string _displayname = string.Empty;
+    private string _notify = "True";
     private List<Profile> profiles;
     private Dictionary<string, string> settings;
     private string category = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     protected override async Task OnInitializedAsync()
     {
         try
         {
+            _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
             _togglepassword = SharedLocalizer["ShowPassword"];
             profiles = await ProfileService.GetProfilesAsync(ModuleState.SiteId);
             settings = new Dictionary<string, string>();
@@ -122,44 +135,44 @@
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
-        => SettingService.GetSetting(settings, SettingName, DefaultValue);
+    {
+        string value = SettingService.GetSetting(settings, SettingName, DefaultValue);
+        if (value.Contains("]"))
+        {
+            value = value.Substring(value.IndexOf("]") + 1);
+        }
+        return value;
+    }
 
     private async Task SaveUser()
     {
         try
         {
-            if (username != string.Empty && _password != string.Empty && confirm != string.Empty && email != string.Empty && ValidateProfiles())
+            if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty && _email != string.Empty && ValidateProfiles())
             {
-                if (_password == confirm)
+                if (_password == _confirm)
                 {
-                    var user = await UserService.GetUserAsync(username, PageState.Site.SiteId);
-                    if (user == null)
+                    var user = new User();
+                    user.SiteId = PageState.Site.SiteId;
+                    user.Username = _username;
+                    user.Password = _password;
+                    user.Email = _email;
+                    user.DisplayName = string.IsNullOrWhiteSpace(_displayname) ? _username : _displayname;
+                    user.PhotoFileId = null;
+                    user.SuppressNotification = !bool.Parse(_notify);
+
+                    user = await UserService.AddUserAsync(user);
+
+                    if (user != null)
                     {
-                        user = new User();
-                        user.SiteId = PageState.Site.SiteId;
-                        user.Username = username;
-                        user.Password = _password;
-                        user.Email = email;
-                        user.DisplayName = string.IsNullOrWhiteSpace(displayname) ? username : displayname;
-                        user.PhotoFileId = null;
-
-                        user = await UserService.AddUserAsync(user);
-
-                        if (user != null)
-                        {
-                            await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
-                            await logger.LogInformation("User Created {User}", user);
-                            NavigationManager.NavigateTo(NavigateUrl());
-                        }
-                        else
-                        {
-                            await logger.LogError("Error Adding User {Username} {Email}", username, email);
-                            AddModuleMessage(Localizer["Error.User.AddCheckPass"], MessageType.Error);
-                        }
+                        await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
+                        await logger.LogInformation("User Created {User}", user);
+                        NavigationManager.NavigateTo(NavigateUrl());
                     }
                     else
                     {
-                        AddModuleMessage(Localizer["Message.Username.Exists"], MessageType.Warning);
+                        await logger.LogError("Error Adding User {Username} {Email}", _username, _email);
+                        AddModuleMessage(Localizer["Error.User.AddCheckPass"], MessageType.Error);
                     }
                 }
                 else
@@ -174,7 +187,7 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", username, email, ex.Message);
+            await logger.LogError(ex, "Error Adding User {Username} {Email} {Error}", _username, _email, ex.Message);
             AddModuleMessage(Localizer["Error.User.Add"], MessageType.Error);
         }
     }
@@ -188,9 +201,17 @@
             {
                 settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
             }
-            if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+            if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
-                valid = false;
+                if (valid == true && profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+                {
+                    valid = false;
+                }
+                if (valid == true && !string.IsNullOrEmpty(profile.Validation))
+                {
+                    Regex regex = new Regex(profile.Validation);
+                    valid = regex.Match(SettingService.GetSetting(settings, profile.Name, string.Empty)).Success;
+                }
             }
         }
         return valid;

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

@@ -1,4 +1,5 @@
 @namespace Oqtane.Modules.Admin.Users
+@using System.Text.RegularExpressions;
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IUserService UserService
@@ -20,6 +21,7 @@ else
     <TabPanel Name="Identity" ResourceKey="Identity">
         @if (profiles != null)
         {
+            <ModuleMessage Message="@_passwordrequirements" Type="MessageType.Info" />
             <div class="container">
                 <div class="row mb-1 align-items-center">
                     <Label Class="col-sm-3" For="username" HelpText="The unique username for a user. Note that this field can not be modified." ResourceKey="Username"></Label>
@@ -32,7 +34,7 @@ else
 					<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>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>
@@ -41,7 +43,7 @@ else
                     <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>
+                            <button type="button" class="btn btn-secondary" @onclick="@TogglePassword" tabindex="-1">@_togglepassword</button>
 					    </div>
                     </div>
                 </div>
@@ -148,64 +150,66 @@ else
 <AuditInfo CreatedBy="@createdby" CreatedOn="@createdon" ModifiedBy="@modifiedby" ModifiedOn="@modifiedon" DeletedBy="@deletedby" DeletedOn="@deletedon"></AuditInfo>
 
 @code {
-	private int userid;
-	private string username = string.Empty;
-	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;
-	private FileManager filemanager;
-	private int photofileid = -1;
-	private File photo = null;
-	private string isdeleted;
-	private string lastlogin;
-	private string lastipaddress;
+    private string _passwordrequirements;
+    private int userid;
+    private string username = string.Empty;
+    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;
+    private FileManager filemanager;
+    private int photofileid = -1;
+    private File photo = null;
+    private string isdeleted;
+    private string lastlogin;
+    private string lastipaddress;
 
-	private List<Profile> profiles;
-	private Dictionary<string, string> settings;
-	private string category = string.Empty;
+    private List<Profile> profiles;
+    private Dictionary<string, string> settings;
+    private string category = string.Empty;
 
-	private string createdby;
-	private DateTime createdon;
-	private string modifiedby;
-	private DateTime modifiedon;
-	private string deletedby;
-	private DateTime? deletedon;
+    private string createdby;
+    private DateTime createdon;
+    private string modifiedby;
+    private DateTime modifiedon;
+    private string deletedby;
+    private DateTime? deletedon;
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
-	protected override async Task OnParametersSetAsync()
-	{
-		try
-		{
-			if (PageState.QueryString.ContainsKey("id"))
-			{
-				_togglepassword = SharedLocalizer["ShowPassword"];
-				profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
-				userid = Int32.Parse(PageState.QueryString["id"]);
-				var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
-				if (user != null)
-				{
-					username = user.Username;
-					email = user.Email;
-					displayname = user.DisplayName;
-					if (user.PhotoFileId != null)
-					{
-						photofileid = user.PhotoFileId.Value;
-						photo = await FileService.GetFileAsync(photofileid);
-					}
-					else
-					{
-						photofileid = -1;
-						photo = null;
-					}
+    protected override async Task OnParametersSetAsync()
+    {
+        try
+        {
+            if (PageState.QueryString.ContainsKey("id"))
+            {
+                _passwordrequirements = await UserService.GetPasswordRequirementsAsync(PageState.Site.SiteId);
+                _togglepassword = SharedLocalizer["ShowPassword"];
+                profiles = await ProfileService.GetProfilesAsync(PageState.Site.SiteId);
+                userid = Int32.Parse(PageState.QueryString["id"]);
+                var user = await UserService.GetUserAsync(userid, PageState.Site.SiteId);
+                if (user != null)
+                {
+                    username = user.Username;
+                    email = user.Email;
+                    displayname = user.DisplayName;
+                    if (user.PhotoFileId != null)
+                    {
+                        photofileid = user.PhotoFileId.Value;
+                        photo = await FileService.GetFileAsync(photofileid);
+                    }
+                    else
+                    {
+                        photofileid = -1;
+                        photo = null;
+                    }
                     isdeleted = user.IsDeleted.ToString();
-					lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn);
-					lastipaddress = user.LastIPAddress;
+                    lastlogin = string.Format("{0:MMM dd yyyy HH:mm:ss}", user.LastLoginOn);
+                    lastipaddress = user.LastIPAddress;
 
-					settings = await SettingService.GetUserSettingsAsync(user.UserId);
+                    settings = await SettingService.GetUserSettingsAsync(user.UserId);
                     createdby = user.CreatedBy;
                     createdon = user.CreatedOn;
                     modifiedby = user.ModifiedBy;
@@ -223,7 +227,14 @@ else
     }
 
     private string GetProfileValue(string SettingName, string DefaultValue)
-        => SettingService.GetSetting(settings, SettingName, DefaultValue);
+    {
+        string value = SettingService.GetSetting(settings, SettingName, DefaultValue);
+        if (value.Contains("]"))
+        {
+            value = value.Substring(value.IndexOf("]") + 1);
+        }
+        return value;
+    }
 
     private async Task SaveUser()
     {
@@ -249,10 +260,16 @@ else
                     user.IsDeleted = (isdeleted == null ? true : Boolean.Parse(isdeleted));
 
                     user = await UserService.UpdateUserAsync(user);
-                    await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
-                    await logger.LogInformation("User Saved {User}", user);
-
-                    NavigationManager.NavigateTo(NavigateUrl());
+                    if (user != null)
+                    {
+                        await SettingService.UpdateUserSettingsAsync(settings, user.UserId);
+                        await logger.LogInformation("User Saved {User}", user);
+                        NavigationManager.NavigateTo(NavigateUrl());
+                    }
+                    else
+                    {
+                        AddModuleMessage(Localizer["Message.Password.Complexity"], MessageType.Error);
+                    }
                 }
                 else
                 {
@@ -280,9 +297,17 @@ else
             {
                 settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
             }
-            if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+            if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
             {
-                valid = false;
+                if (valid == true && profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
+                {
+                    valid = false;
+                }
+                if (valid == true && !string.IsNullOrEmpty(profile.Validation))
+                {
+                    Regex regex = new Regex(profile.Validation);
+                    valid = regex.Match(SettingService.GetSetting(settings, profile.Name, string.Empty)).Success;
+                }
             }
         }
         return valid;

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

@@ -6,7 +6,6 @@
 @inject ISiteService SiteService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
-@inject SiteState SiteState
 
 @if (users == null)
 {
@@ -21,8 +20,9 @@ else
 			<div class="container">
 				<div class="row mb-1 align-items-center">
 					<div class="col-sm-4">
-						<ActionLink Action="Add" Text="Add User" ResourceKey="AddUser" />
-					</div>
+						<ActionLink Action="Add" Text="Add User" Security="SecurityAccessLevel.Edit" ResourceKey="AddUser" />&nbsp;
+                        <ActionLink Text="Import Users" Class="btn btn-secondary" Action="Users" Security="SecurityAccessLevel.Admin" ResourceKey="ImportUsers"/>                    
+                    </div>
 					<div class="col-sm-4">
 						<input class="form-control" @bind="@_search" />
 					</div>
@@ -36,27 +36,29 @@ else
 					<th style="width: 1px;">&nbsp;</th>
 					<th style="width: 1px;">&nbsp;</th>
 					<th style="width: 1px;">&nbsp;</th>
-					<th>@SharedLocalizer["Username"]</th>
-					<th>@SharedLocalizer["Name"]</th>
-					<th>@Localizer["LastLoginOn"]</th>
+                    <th class="app-sort-th link-primary text-decoration-underline" @onclick="@(() => SortTable("Username"))">@Localizer["Username"]<i class="@(SetSortIcon("Username"))"></i></th>
+                    <th class="app-sort-th link-primary text-decoration-underline" @onclick="@(() => SortTable("DisplayName"))">@Localizer["Name"]<i class="@(SetSortIcon("DisplayName"))"></i></th>
+                    <th class="app-sort-th link-primary text-decoration-underline" @onclick="@(() => SortTable("Email"))">@Localizer["Email"]<i class="@(SetSortIcon("Email"))"></i></th>
+                    <th class="app-sort-th link-primary text-decoration-underline" @onclick="@(() => SortTable("LastLoginOn"))">@Localizer["LastLoginOn"]<i class="@(SetSortIcon("LastLoginOn"))"></i></th>
 				</Header>
 				<Row>
 					<td>
-						<ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="EditUser" />
+						<ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="EditUser" />
 					</td>
 					<td>
-						<ActionDialog Header="Delete User" Message="@string.Format(Localizer["Confirm.User.Delete"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUser(context))" Disabled="@(context.UserId == PageState.User.UserId)" ResourceKey="DeleteUser" />
+						<ActionDialog Header="Delete User" Message="@string.Format(Localizer["Confirm.User.Delete"], context.User.DisplayName)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteUser(context))" Disabled="@(context.UserId == PageState.User.UserId)" ResourceKey="DeleteUser" />
 					</td>
 					<td>
-						<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
+						<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" Security="SecurityAccessLevel.Edit" ResourceKey="Roles" />
 					</td>
 					<td>@context.User.Username</td>
-					<td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.Email, @context.User.DisplayName))</td>
-					<td>@string.Format("{0:dd-MMM-yyyy HH:mm:ss}", context.User.LastLoginOn)</td>
+					<td>@context.User.DisplayName</td>
+					<td>@((MarkupString)string.Format("<a href=\"mailto:{0}\">{1}</a>", @context.User.Email, @context.User.Email))</td>
+					<td>@((context.User.LastLoginOn != DateTime.MinValue) ? string.Format("{0:dd-MMM-yyyy HH:mm:ss}", context.User.LastLoginOn) : "")</td>
 				</Row>
 			</Pager>
-	</TabPanel>
-        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+        </TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings" Security="SecurityAccessLevel.Admin">
 			<div class="container">
 				<Section Name="User" Heading="User Settings" ResourceKey="UserSettings">
 					<div class="row mb-1 align-items-center">
@@ -287,6 +289,21 @@ else
 									<input id="emailclaimtype" class="form-control" @bind="@_emailclaimtype" />
 								</div>
 							</div>
+							@if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
+							{
+								<div class="row mb-1 align-items-center">
+									<Label Class="col-sm-3" For="roleclaimtype" HelpText="The name of the role claim provided by the provider" ResourceKey="RoleClaimType">Role Claim:</Label>
+									<div class="col-sm-9">
+										<input id="roleclaimtype" class="form-control" @bind="@_roleclaimtype" />
+									</div>
+								</div>
+								<div class="row mb-1 align-items-center">
+									<Label Class="col-sm-3" For="profileclaimtypes" HelpText="A comma delimited list of user profile claims provided by the provider, as well as mappings to your user profile definition. For example if the provider includes a 'given_name' claim and you have a 'FirstName' user profile definition you should specify 'given_name:FirstName'." ResourceKey="ProfileClaimTypes">User Profile Claims:</Label>
+									<div class="col-sm-9">
+										<input id="profileclaimtypes" class="form-control" @bind="@_profileclaimtypes" />
+									</div>
+								</div>
+							}
 							<div class="row mb-1 align-items-center">
 								<Label Class="col-sm-3" For="domainfilter" HelpText="Provide any email domain filter criteria (separated by commas). Domains to exclude should be prefixed with an exclamation point (!). For example 'microsoft.com,!hotmail.com' would include microsoft.com email addresses but not hotmail.com email addresses." ResourceKey="DomainFilter">Domain Filter:</Label>
 								<div class="col-sm-9">
@@ -346,121 +363,129 @@ else
 			</div>
 			<br />
 			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
-		</TabPanel>
+        </TabPanel>
 	</TabStrip>
 }
 
 @code {
-	private List<UserRole> allusers;
-	private List<UserRole> users;
-	private string _search = "";
+    private List<UserRole> allusers;
+    private List<UserRole> users;
+    private string _search = "";
 
-	private string _allowregistration;
-	private string _allowsitelogin;
-	private string _twofactor;
-	private string _cookiename;
+    private string _allowregistration;
+    private string _allowsitelogin;
+    private string _twofactor;
+    private string _cookiename;
 
-	private string _minimumlength;
-	private string _uniquecharacters;
-	private string _requiredigit;
-	private string _requireupper;
-	private string _requirelower;
-	private string _requirepunctuation;
-	private string _maximumfailures;
-	private string _lockoutduration;
+    private string _minimumlength;
+    private string _uniquecharacters;
+    private string _requiredigit;
+    private string _requireupper;
+    private string _requirelower;
+    private string _requirepunctuation;
+    private string _maximumfailures;
+    private string _lockoutduration;
 
-	private string _providertype;
-	private string _providername;
-	private string _authority;
-	private string _metadataurl;
-	private string _authorizationurl;
-	private string _tokenurl;
-	private string _userinfourl;
-	private string _clientid;
-	private string _clientsecret;
-	private string _clientsecrettype = "password";
-	private string _toggleclientsecret = string.Empty;
-	private string _scopes;
-	private string _parameters;
-	private string _pkce;
-	private string _redirecturl;
-	private string _identifierclaimtype;
-	private string _emailclaimtype;
-	private string _domainfilter;
-	private string _createusers;
+    private string _providertype;
+    private string _providername;
+    private string _authority;
+    private string _metadataurl;
+    private string _authorizationurl;
+    private string _tokenurl;
+    private string _userinfourl;
+    private string _clientid;
+    private string _clientsecret;
+    private string _clientsecrettype = "password";
+    private string _toggleclientsecret = string.Empty;
+    private string _scopes;
+    private string _parameters;
+    private string _pkce;
+    private string _redirecturl;
+    private string _identifierclaimtype;
+    private string _emailclaimtype;
+    private string _roleclaimtype;
+    private string _profileclaimtypes;
+    private string _domainfilter;
+    private string _createusers;
 
-	private string _secret;
-	private string _secrettype = "password";
-	private string _togglesecret = string.Empty;
-	private string _issuer;
-	private string _audience;
-	private string _lifetime;
-	private string _token;
+    private string _secret;
+    private string _secrettype = "password";
+    private string _togglesecret = string.Empty;
+    private string _issuer;
+    private string _audience;
+    private string _lifetime;
+    private string _token;
 
-	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+    private bool isSortedAscending;
+    private string activeSortColumn;
 
-	protected override async Task OnInitializedAsync()
-	{
-		await LoadUserSettingsAsync();
-		await LoadUsersAsync(true);
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
 
-		var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-		_allowregistration = PageState.Site.AllowRegistration.ToString();
-		_allowsitelogin = SettingService.GetSetting(settings, "LoginOptions:AllowSiteLogin", "true");
+    protected override async Task OnInitializedAsync()
+    {
+        await LoadUserSettingsAsync();
+        await LoadUsersAsync(true);
 
-		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-		{
-			_twofactor = SettingService.GetSetting(settings, "LoginOptions:TwoFactor", "false");
-			_cookiename = SettingService.GetSetting(settings, "LoginOptions:CookieName", ".AspNetCore.Identity.Application");
+        var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+        _allowregistration = PageState.Site.AllowRegistration.ToString();
+        _allowsitelogin = SettingService.GetSetting(settings, "LoginOptions:AllowSiteLogin", "true");
 
-			_minimumlength = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredLength", "6");
-			_uniquecharacters = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", "1");
-			_requiredigit = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireDigit", "true");
-			_requireupper = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireUppercase", "true");
-			_requirelower = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireLowercase", "true");
-			_requirepunctuation = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireNonAlphanumeric", "true");
+        if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        {
+            _twofactor = SettingService.GetSetting(settings, "LoginOptions:TwoFactor", "false");
+            _cookiename = SettingService.GetSetting(settings, "LoginOptions:CookieName", ".AspNetCore.Identity.Application");
 
-			_maximumfailures = SettingService.GetSetting(settings, "IdentityOptions:Lockout:MaxFailedAccessAttempts", "5");
-			_lockoutduration = TimeSpan.Parse(SettingService.GetSetting(settings, "IdentityOptions:Lockout:DefaultLockoutTimeSpan", "00:05:00")).TotalMinutes.ToString();
+            _minimumlength = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredLength", "6");
+            _uniquecharacters = SettingService.GetSetting(settings, "IdentityOptions:Password:RequiredUniqueChars", "1");
+            _requiredigit = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireDigit", "true");
+            _requireupper = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireUppercase", "true");
+            _requirelower = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireLowercase", "true");
+            _requirepunctuation = SettingService.GetSetting(settings, "IdentityOptions:Password:RequireNonAlphanumeric", "true");
 
-			_providertype = SettingService.GetSetting(settings, "ExternalLogin:ProviderType", "");
-			_providername = SettingService.GetSetting(settings, "ExternalLogin:ProviderName", "");
-			_authority = SettingService.GetSetting(settings, "ExternalLogin:Authority", "");
-			_metadataurl = SettingService.GetSetting(settings, "ExternalLogin:MetadataUrl", "");
-			_authorizationurl = SettingService.GetSetting(settings, "ExternalLogin:AuthorizationUrl", "");
-			_tokenurl = SettingService.GetSetting(settings, "ExternalLogin:TokenUrl", "");
-			_userinfourl = SettingService.GetSetting(settings, "ExternalLogin:UserInfoUrl", "");
-			_clientid = SettingService.GetSetting(settings, "ExternalLogin:ClientId", "");
-			_clientsecret = SettingService.GetSetting(settings, "ExternalLogin:ClientSecret", "");
-			_toggleclientsecret = SharedLocalizer["ShowPassword"];
-			_scopes = SettingService.GetSetting(settings, "ExternalLogin:Scopes", "");
-			_parameters = SettingService.GetSetting(settings, "ExternalLogin:Parameters", "");
-			_pkce = SettingService.GetSetting(settings, "ExternalLogin:PKCE", "false");
-			_redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
-			_identifierclaimtype = SettingService.GetSetting(settings, "ExternalLogin:IdentifierClaimType", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier");
-			_emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress");
-			_domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
-			_createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
+            _maximumfailures = SettingService.GetSetting(settings, "IdentityOptions:Lockout:MaxFailedAccessAttempts", "5");
+            _lockoutduration = TimeSpan.Parse(SettingService.GetSetting(settings, "IdentityOptions:Lockout:DefaultLockoutTimeSpan", "00:05:00")).TotalMinutes.ToString();
 
-			_secret = SettingService.GetSetting(settings, "JwtOptions:Secret", "");
-			_togglesecret = SharedLocalizer["ShowPassword"];
-			_issuer = SettingService.GetSetting(settings, "JwtOptions:Issuer", PageState.Uri.Scheme + "://" + PageState.Alias.Name);
-			_audience = SettingService.GetSetting(settings, "JwtOptions:Audience", "");
-			_lifetime = SettingService.GetSetting(settings, "JwtOptions:Lifetime", "20");		}
-	}
+            _providertype = SettingService.GetSetting(settings, "ExternalLogin:ProviderType", "");
+            _providername = SettingService.GetSetting(settings, "ExternalLogin:ProviderName", "");
+            _authority = SettingService.GetSetting(settings, "ExternalLogin:Authority", "");
+            _metadataurl = SettingService.GetSetting(settings, "ExternalLogin:MetadataUrl", "");
+            _authorizationurl = SettingService.GetSetting(settings, "ExternalLogin:AuthorizationUrl", "");
+            _tokenurl = SettingService.GetSetting(settings, "ExternalLogin:TokenUrl", "");
+            _userinfourl = SettingService.GetSetting(settings, "ExternalLogin:UserInfoUrl", "");
+            _clientid = SettingService.GetSetting(settings, "ExternalLogin:ClientId", "");
+            _clientsecret = SettingService.GetSetting(settings, "ExternalLogin:ClientSecret", "");
+            _toggleclientsecret = SharedLocalizer["ShowPassword"];
+            _scopes = SettingService.GetSetting(settings, "ExternalLogin:Scopes", "");
+            _parameters = SettingService.GetSetting(settings, "ExternalLogin:Parameters", "");
+            _pkce = SettingService.GetSetting(settings, "ExternalLogin:PKCE", "false");
+            _redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
+            _identifierclaimtype = SettingService.GetSetting(settings, "ExternalLogin:IdentifierClaimType", "sub");
+            _emailclaimtype = SettingService.GetSetting(settings, "ExternalLogin:EmailClaimType", "email");
+            _roleclaimtype = SettingService.GetSetting(settings, "ExternalLogin:RoleClaimType", "");
+            _profileclaimtypes = SettingService.GetSetting(settings, "ExternalLogin:ProfileClaimTypes", "");
+            _domainfilter = SettingService.GetSetting(settings, "ExternalLogin:DomainFilter", "");
+            _createusers = SettingService.GetSetting(settings, "ExternalLogin:CreateUsers", "true");
 
-	private async Task LoadUsersAsync(bool load)
-	{
-		if (load)
-		{
-			allusers = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
-			if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-			{
-				var hosts = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Host);
-				allusers.AddRange(hosts);
-				allusers = allusers.OrderBy(u => u.User.DisplayName).ToList();
-			}			
-		}
+            _secret = SettingService.GetSetting(settings, "JwtOptions:Secret", "");
+            _togglesecret = SharedLocalizer["ShowPassword"];
+            _issuer = SettingService.GetSetting(settings, "JwtOptions:Issuer", PageState.Uri.Scheme + "://" + PageState.Alias.Name);
+            _audience = SettingService.GetSetting(settings, "JwtOptions:Audience", "");
+            _lifetime = SettingService.GetSetting(settings, "JwtOptions:Lifetime", "20");
+        }
+    }
+
+    private async Task LoadUsersAsync(bool load)
+    {
+        if (load)
+        {
+            allusers = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+            {
+                var hosts = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Host);
+                allusers.AddRange(hosts);
+                allusers = allusers.OrderBy(u => u.User.DisplayName).ToList();
+            }           
+        }
 
 		users = allusers;
 		if (!string.IsNullOrEmpty(_search))
@@ -512,7 +537,7 @@ else
 	private async Task UpdateUserSettingsAsync()
 	{
 		Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
-		SettingService.SetSetting(settings, settingSearch, _search);
+		settings = SettingService.SetSetting(settings, settingSearch, _search);
 		await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
 	}
 
@@ -556,6 +581,8 @@ else
 				settings = SettingService.SetSetting(settings, "ExternalLogin:PKCE", _pkce, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:IdentifierClaimType", _identifierclaimtype, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:EmailClaimType", _emailclaimtype, true);
+				settings = SettingService.SetSetting(settings, "ExternalLogin:RoleClaimType", _roleclaimtype, true);
+				settings = SettingService.SetSetting(settings, "ExternalLogin:ProfileClaimTypes", _profileclaimtypes, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:DomainFilter", _domainfilter, true);
 				settings = SettingService.SetSetting(settings, "ExternalLogin:CreateUsers", _createusers, true);
 
@@ -591,14 +618,10 @@ else
 			if (_providertype == AuthenticationProviderTypes.OpenIDConnect)
 			{
 				_scopes = "openid,profile,email";
-				_identifierclaimtype = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier";
-				_emailclaimtype = "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress";
 			}
 			else
 			{
 				_scopes = "";
-				_identifierclaimtype = "sub";
-				_emailclaimtype = "email";
 			}			
 		}
 		_redirecturl = PageState.Uri.Scheme + "://" + PageState.Alias.Name + "/signin-" + _providertype;
@@ -637,4 +660,43 @@ else
 			_togglesecret = SharedLocalizer["ShowPassword"];
 		}
 	}
+
+    private void SortTable(string columnName)
+    {
+        if (columnName != activeSortColumn)
+        {
+            users = users.OrderBy(x => x.User.GetType().GetProperty(columnName)?.GetValue(x.User)).ToList();
+            isSortedAscending = true;
+            activeSortColumn = columnName;
+        }
+        else
+        {
+            if (isSortedAscending)
+            {
+                users = users.OrderByDescending(x => x.User.GetType().GetProperty(columnName)?.GetValue(x.User)).ToList();
+            }
+            else
+            {
+                users = users.OrderBy(x => x.User.GetType().GetProperty(columnName)?.GetValue(x.User)).ToList();
+            }
+
+            isSortedAscending = !isSortedAscending;
+        }
+    }
+
+    private string SetSortIcon(string columnName)
+    {
+        if (activeSortColumn != columnName)
+        {
+            return "app-fas pe-3 ";
+        }
+        if (isSortedAscending)
+        {
+            return "app-fas oi oi-sort-ascending";
+        }
+        else
+        {
+            return "app-fas oi oi-sort-descending";
+        }
+    }
 }

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

@@ -0,0 +1,21 @@
+using Oqtane.Documentation;
+using Oqtane.Models;
+using Oqtane.Shared;
+
+namespace Oqtane.Modules.Admin.Users
+{
+    [PrivateApi("Mark this as private, since it's not very useful in the public docs")]
+    public class ModuleInfo : IModule
+    {
+        public ModuleDefinition ModuleDefinition => new ModuleDefinition
+        {
+            Name = "Users",
+            Description = "Manage Users",
+            Categories = "Admin",
+            Version = Constants.Version,
+            PermissionNames = $"{PermissionNames.View},{PermissionNames.Edit}," +
+                $"{EntityNames.User}:{PermissionNames.Write}:{RoleNames.Admin}," +
+                $"{EntityNames.UserRole}:{PermissionNames.Write}:{RoleNames.Admin}"
+        };
+    }
+}

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

@@ -34,13 +34,13 @@ else
         <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 id="effectiveDate" class="form-control" @bind="@effectivedate" />
+                <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 id="expiryDate" class="form-control" @bind="@expirydate" />
+                <input type="date" id="expiryDate" class="form-control" @bind="@expirydate" />
             </div>
         </div>
 
@@ -63,7 +63,7 @@ else
                 <td>@context.EffectiveDate</td>
                 <td>@context.ExpiryDate</td>
                 <td>
-                    <ActionDialog Header="Remove Role" Message="@string.Format(Localizer["Confirm.User.RemoveRole"], context.Role.Name)" Action="Delete" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || (context.Role.Name == RoleNames.Host && userid == PageState.User.UserId))" ResourceKey="DeleteUserRole" />
+                    <ActionDialog Header="Remove Role" Message="@string.Format(Localizer["Confirm.User.RemoveRole"], context.Role.Name)" Action="Delete" Security="SecurityAccessLevel.Edit" Class="btn btn-danger" OnClick="@(async () => await DeleteUserRole(context.UserRoleId))" Disabled="@(context.Role.IsAutoAssigned || (context.Role.Name == RoleNames.Host && userid == PageState.User.UserId))" ResourceKey="DeleteUserRole" />
                 </td>
             </Row>
         </Pager>
@@ -75,11 +75,11 @@ else
     private string name = string.Empty;
     private List<Role> roles;
     private int roleid = -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;
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
 
     protected override async Task OnInitializedAsync()
     {
@@ -130,23 +130,8 @@ else
                 var userrole = userroles.Where(item => item.UserId == userid && item.RoleId == roleid).FirstOrDefault();
                 if (userrole != null)
                 {
-                    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);
-                    }
+                    userrole.EffectiveDate = effectivedate;
+                    userrole.ExpiryDate = expirydate;
                     await UserRoleService.UpdateUserRoleAsync(userrole);
                 }
                 else
@@ -154,25 +139,8 @@ 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);
-                    }
-
+                    userrole.EffectiveDate = effectivedate;
+                    userrole.ExpiryDate = expirydate;
                     await UserRoleService.AddUserRoleAsync(userrole);
                 }
 

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

@@ -0,0 +1,69 @@
+@namespace Oqtane.Modules.Admin.Users
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IUserService UserService
+@inject IStringLocalizer<Users> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="importfile" HelpText="Upload or select a tab delimited text file containing user information. The file must be in the Template format specified (Roles can be specified as a comma delimited list)." ResourceKey="ImportFile">Import File:</Label>
+        <div class="col-sm-9">
+            <FileManager Id="importfile" @ref="_filemanager" Filter="txt" />
+        </div>
+    </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="notify" HelpText="Indicate if new users should receive an email notification" ResourceKey="Notify">Notify? </Label>
+        <div class="col-sm-9">
+            <select id="notify" class="form-select" @bind="@_notify" required>
+                <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="ImportUsers">@Localizer["Import"]</button>&nbsp;
+<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>&nbsp;
+<a class="btn btn-info" href="/users.txt" target="_new">@Localizer["Template"]</a>
+
+@code {
+    private FileManager _filemanager;
+
+    public override string Title => "Import Users";
+
+    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+    private string _notify = "True";
+
+    private async Task ImportUsers()
+    {
+        try
+        {
+            var fileid = _filemanager.GetFileId();
+            if (fileid != -1)
+            {
+                ShowProgressIndicator();
+                var results = await UserService.ImportUsersAsync(PageState.Site.SiteId, fileid, bool.Parse(_notify));
+                if (bool.Parse(results["Success"]))
+                {
+                    AddModuleMessage(string.Format(Localizer["Message.Import.Success"], results["Users"]), MessageType.Success);
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.Import.Failure"], MessageType.Error);
+                }
+                HideProgressIndicator();
+            }
+            else
+            {
+                AddModuleMessage(Localizer["Message.Import.Validation"], MessageType.Warning);
+            }
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Importing Users {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Import"], MessageType.Error);
+        }
+    }
+}

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

@@ -128,13 +128,6 @@
 
 	private string CloseUrl()
 	{
-		if (!PageState.QueryString.ContainsKey("type"))
-		{
-			return NavigateUrl();
-		}
-		else
-		{
-			return NavigateUrl(PageState.Page.Path, "type=" + PageState.QueryString["type"] + "&days=" + PageState.QueryString["days"] + "&page=" + PageState.QueryString["page"]);
-		}
+		return (!string.IsNullOrEmpty(PageState.ReturnUrl)) ? PageState.ReturnUrl : NavigateUrl();
 	}
 }

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

@@ -43,7 +43,7 @@ else
 					<th>@Localizer["Created"]</th>
 				</Header>
 				<Row>
-					<td><ActionLink Action="Detail" Parameters="@($"id=" + context.VisitorId.ToString() + "&type=" + _type.ToString() + "&days=" + _days.ToString() + "&page=" + _page.ToString())" ResourceKey="Details" /></td>
+					<td><ActionLink Action="Detail" Parameters="@($"id={context.VisitorId}")" ReturnUrl="@(NavigateUrl(PageState.Page.Path, $"type={_type}&days={_days}&page={_page}"))" ResourceKey="Details" /></td>
 					<td>@context.IPAddress</td>
 					<td>
 						@if (context.UserId != null)

Oqtane.Client/Modules/Controls/ActionDialog.razor

@@ -1,5 +1,7 @@
 @namespace Oqtane.Modules.Controls
+@using System.Text.Json
 @inherits LocalizableComponent
+@inject IStringLocalizer<SharedResources> SharedLocalizer
 
 @if (_visible)
 {
@@ -19,7 +21,7 @@
                         {
                             <button type="button" class="@Class" @onclick="Confirm">@((MarkupString)_iconSpan) @Text</button>
                         }
-                        <button type="button" class="btn btn-secondary" @onclick="DisplayModal">@Localize("Cancel")</button>
+                        <button type="button" class="btn btn-secondary" @onclick="DisplayModal">@SharedLocalizer["Cancel"]</button>
                     </div>
                 </div>
             </div>
@@ -40,7 +42,7 @@
 
 @code {
     private bool _visible = false;
-	private string _permissions = string.Empty;
+	private List<Permission> _permissions;
     private bool _editmode = false;
     private bool _authorized = false;
     private string _iconSpan = string.Empty;
@@ -61,7 +63,10 @@
     public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
 
 	[Parameter]
-	public string Permissions { get; set; } // optional - can be used to specify a permission string
+	public string Permissions { get; set; } // deprecated - use PermissionList instead
+
+	[Parameter]
+	public List<Permission> PermissionList { get; set; } // optional - can be used to specify permissions
 
     [Parameter]
     public string Class { get; set; } // optional
@@ -78,7 +83,15 @@
     [Parameter]
     public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
 
-    protected override void OnParametersSet()
+	protected override void OnInitialized()
+	{
+		if (!string.IsNullOrEmpty(Permissions))
+		{
+			PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);
+		}
+	}
+	
+	protected override void OnParametersSet()
     {
         base.OnParametersSet();
 
@@ -109,7 +122,7 @@
         Header = Localize(nameof(Header), Header);
         Message = Localize(nameof(Message), Message);
 
-		_permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions;
+		_permissions = (PermissionList == null) ? ModuleState.PermissionList : PermissionList;
         _authorized = IsAuthorized();
     }
 

Oqtane.Client/Modules/Controls/ActionLink.razor

@@ -1,4 +1,6 @@
 @namespace Oqtane.Modules.Controls
+@using System.Net
+@using System.Text.Json
 @inherits LocalizableComponent
 @inject IUserService UserService
 
@@ -22,103 +24,140 @@
 }
 
 @code {
-	private string _text = string.Empty;
-	private string _parameters = string.Empty;
-	private string _url = string.Empty;
-	private string _permissions = string.Empty;
-	private bool _editmode = false;
-	private bool _authorized = false;
-	private string _classname = "btn btn-primary";
-	private string _style = string.Empty;
-	private string _iconSpan = string.Empty;
+    private string _text = string.Empty;
+    private int _moduleId = -1;
+    private string _path = string.Empty;
+    private string _parameters = string.Empty;
+    private string _url = string.Empty;
+    private List<Permission> _permissions;
+    private bool _editmode = false;
+    private bool _authorized = false;
+    private string _classname = "btn btn-primary";
+    private string _style = string.Empty;
+    private string _iconSpan = string.Empty;
 
-	[Parameter]
-	public string Action { get; set; } // required
+    [Parameter]
+    public string Action { get; set; } // required
 
-	[Parameter]
-	public string Text { get; set; } // optional - defaults to Action if not specified
+    [Parameter]
+    public string Text { get; set; } // optional - defaults to Action if not specified
 
-	[Parameter]
-	public string Parameters { get; set; } // optional - querystring parameters should be in the form of "id=x&name=y"
+    [Parameter]
+    public int ModuleId { get; set; } = -1; // optional - allows the link to target a specific moduleid
 
-	[Parameter]
-	public int ModuleId { get; set; } = -1; // optional - allows the link to target a specific moduleid
+    [Parameter]
+    public string Path { get; set; } = null; // optional - allows the link to target a specific page
 
-	[Parameter]
-	public Action OnClick { get; set; } = null; // optional - executes a method in the calling component
+    [Parameter]
+    public string Parameters { get; set; } // optional - querystring parameters should be in the form of "id=x&name=y"
 
-	[Parameter]
-	public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
+    [Parameter]
+    public Action OnClick { get; set; } = null; // optional - executes a method in the calling component
 
-	[Parameter]
-	public string Permissions { get; set; } // optional - can be used to specify a permission string
+    [Parameter]
+    public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
 
-	[Parameter]
-	public bool Disabled { get; set; } // optional
+    [Parameter]
+    public string Permissions { get; set; } // deprecated - use PermissionList instead
 
-	[Parameter]
-	public string EditMode { get; set; } // optional - specifies if an authorized user must be in edit mode to see the action - default is false.
+    [Parameter]
+    public List<Permission> PermissionList { get; set; } // optional - can be used to specify permissions
 
-	[Parameter]
-	public string Class { get; set; } // optional - defaults to primary if not specified
+    [Parameter]
+    public bool Disabled { get; set; } // optional
 
-	[Parameter]
-	public string Style { get; set; } // optional
+    [Parameter]
+    public string EditMode { get; set; } // optional - specifies if an authorized user must be in edit mode to see the action - default is false.
 
-	[Parameter]
-	public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
+    [Parameter]
+    public string Class { get; set; } // optional - defaults to primary if not specified
 
-	[Parameter]
-	public bool IconOnly { get; set; } // optional - specifies only icon in link
+    [Parameter]
+    public string Style { get; set; } // optional
 
-	protected override void OnParametersSet()
-	{
-		base.OnParametersSet();
+    [Parameter]
+    public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
 
-		_text = Action;
-		if (!string.IsNullOrEmpty(Text))
+    [Parameter]
+    public bool IconOnly { get; set; } // optional - specifies only icon in link
+
+    [Parameter]
+    public string ReturnUrl { get; set; } // optional - used to set a url to redirect to
+
+
+    protected override void OnInitialized()
+    {
+        if (!string.IsNullOrEmpty(Permissions))
+        {
+            PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);
+        }
+    }
+
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
+
+        _text = Action;
+        if (!string.IsNullOrEmpty(Text))
+        {
+            _text = Text;
+        }
+
+        if (IconOnly && !string.IsNullOrEmpty(IconName))
+        {
+            _text = string.Empty;
+        }
+
+        _moduleId = ModuleState.ModuleId;
+        if (ModuleId != -1)
+        {
+            _moduleId = ModuleId;
+        }
+
+        _path = PageState.Page.Path;
+        if (Path != null)
+        {
+            _path = Path;
+        }
+
+        if (!string.IsNullOrEmpty(Parameters))
+        {
+            _parameters = Parameters;
+        }
+
+        if (!string.IsNullOrEmpty(Class))
+        {
+            _classname = Class;
+        }
+
+        if (!string.IsNullOrEmpty(Style))
+        {
+            _style = Style;
+        }
+
+        if (!string.IsNullOrEmpty(EditMode))
+        {
+            _editmode = bool.Parse(EditMode);
+        }
+
+        if (!string.IsNullOrEmpty(IconName))
+        {
+            if (!IconName.Contains(" "))
+            {
+                IconName = "oi oi-" + IconName;
+            }
+            _iconSpan = $"<span class=\"{IconName}\"></span>{(IconOnly ? "" : "&nbsp")}";
+        }
+
+		_permissions = (PermissionList == null) ? ModuleState.PermissionList : PermissionList;
+		_text = Localize(nameof(Text), _text);
+
+		_url = EditUrl(_path, _moduleId, Action, _parameters);
+		if (!string.IsNullOrEmpty(ReturnUrl))
 		{
-			_text = Text;
+			_url += ((_url.Contains("?")) ? "&" : "?") + $"returnurl={WebUtility.UrlEncode(ReturnUrl)}";
 		}
-
-		if (IconOnly && !string.IsNullOrEmpty(IconName))
-		{
-			_text = string.Empty;
-		}
-
-		if (!string.IsNullOrEmpty(Parameters))
-		{
-			_parameters = Parameters;
-		}
-
-		if (!string.IsNullOrEmpty(Class))
-		{
-			_classname = Class;
-		}
-
-		if (!string.IsNullOrEmpty(Style))
-		{
-			_style = Style;
-		}
-
-		if (!string.IsNullOrEmpty(EditMode))
-		{
-			_editmode = bool.Parse(EditMode);
-		}
-
-		if (!string.IsNullOrEmpty(IconName))
-		{
-			if (!IconName.Contains(" "))
-			{
-				IconName = "oi oi-" + IconName;
-			}
-			_iconSpan = $"<span class=\"{IconName}\"></span>{(IconOnly ? "" : "&nbsp")}";
-		}
-
-		_permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions;
-		_text = Localize(nameof(Text), _text);		
-        _url = (ModuleId == -1) ? EditUrl(Action, _parameters) : EditUrl(ModuleId, Action, _parameters);
-        _authorized = IsAuthorized();
+		_authorized = IsAuthorized();
     }
 
     private bool IsAuthorized()

Oqtane.Client/Modules/Controls/AuditInfo.razor

@@ -64,12 +64,12 @@
 
             if (!String.IsNullOrEmpty(ModifiedBy))
             {
-                _text += $" {Localizer["by"]} <b>{ModifiedBy}</b>";
+                _text += $" {Localizer["By"]} <b>{ModifiedBy}</b>";
             }
 
             if (ModifiedOn != null)
             {
-                _text += $" {Localizer["on"]} <b>{ModifiedOn.Value.ToString(DateTimeFormat)}</b>";
+                _text += $" {Localizer["On"]} <b>{ModifiedOn.Value.ToString(DateTimeFormat)}</b>";
             }
 
             _text += "</p>";

Oqtane.Client/Modules/Controls/AutoComplete.razor

@@ -0,0 +1,174 @@
+@namespace Oqtane.Modules.Controls
+@inherits LocalizableComponent
+
+<div class="app-autocomplete">
+    <input class="form-control" value="@Value" @oninput="OnInput" @onkeyup="OnKeyUp" placeholder="@Placeholder" autocomplete="off" @attributes="InputAttributes" />
+	@if (_results != null)
+	{
+		<select class="form-select" style="position: relative;" value="@Value" size="@Rows" @onkeyup="OnKeyUp" @onchange="(e => OnChange(e))">
+			@if (_results.Any())
+			{
+				@foreach (var result in _results)
+				{
+					if (result.Value == Value)
+					{
+						<option selected>@result.Value</option>
+					}
+					else
+					{
+						<option>@result.Value</option>
+					}
+				}
+			}
+			else
+			{
+				<option disabled>No Results</option>
+			}
+		</select>
+	}
+</div>
+
+@code {
+    Dictionary<string, string> _results;
+    Dictionary<string, object> InputAttributes { get; set; } = new();
+
+    [Parameter]
+    public Func<string, Task<Dictionary<string, string>>> OnSearch { get; set; } // required - an async delegate method which accepts a filter string parameter and returns a dictionary
+
+    [Parameter]
+    public int Characters { get; set; } = 3; // optional - number of characters before search is initiated
+
+    [Parameter]
+    public int Rows { get; set; } = 3; // optional - number of result rows to display
+
+    [Parameter]
+    public string Placeholder { get; set; } // optional - placeholder input text
+
+    [Parameter]
+    public string Value { get; set; } // value of item selected
+
+    [Parameter]
+    public string Key { get; set; } // key of item selected
+
+    [Parameter]
+    public bool Required { get; set; } // optional - if the item is required
+
+    protected override void OnParametersSet()
+    {
+        if (Required)
+        {
+            if (!InputAttributes.ContainsKey(nameof(Required)))
+            {
+                InputAttributes.Add(nameof(Required), true);
+            }
+        }
+        else
+        {
+            if (InputAttributes.ContainsKey(nameof(Required)))
+            {
+                InputAttributes.Remove(nameof(Required));
+            }
+        }
+    }
+    private async Task OnInput(ChangeEventArgs e)
+	{
+		Value = e.Value?.ToString();
+		if (Value?.Length >= Characters)
+		{
+			_results = await OnSearch?.Invoke(Value);
+		}
+		else
+		{
+			_results = null;
+		}
+		SetKey();
+	}
+
+	private async Task OnKeyUp(KeyboardEventArgs e)
+	{
+		var index = -1;
+		switch (e.Key)
+		{
+			case "ArrowDown":
+				if (_results == null)
+				{
+					if (Value?.Length >= Characters)
+					{
+						_results = await OnSearch?.Invoke(Value);
+					}
+				}
+				else
+				{
+					index = GetIndex();
+					if (index < _results.Count - 1)
+					{
+						Value = _results.ElementAt(index + 1).Value;
+						Key = _results.ElementAt(index + 1).Key;
+					}
+				}
+				break;
+			case "ArrowUp":
+				index = GetIndex();
+				if (index > 0)
+				{
+					Value = _results.ElementAt(index - 1).Value;
+					Key = _results.ElementAt(index - 1).Key;
+				}
+				break;
+			case "ArrowRight":
+			case "Tab":
+				_results = null;
+				break;
+			case "Enter": // note within a form the enter key submits the entire form
+			case "NumpadEnter":
+				_results = null;
+				break;
+			case "Escape":
+				Value = "";
+				_results = null;
+				break;
+		}
+	}
+
+	private void OnChange(ChangeEventArgs e)
+	{
+		Value = (string)e.Value;
+		SetKey();
+		_results = null;
+	}
+
+	private int GetIndex()
+	{
+		if (_results != null)
+		{
+			for (int index = 0; index < _results.Count; index++)
+			{
+				if (_results.ElementAt(index).Value == Value)
+				{
+					return index;
+				}
+			}
+		}
+		return -1;
+	}
+
+	private void SetKey()
+	{
+		var index = GetIndex();
+		if (index != -1)
+		{
+			Key = _results.ElementAt(index).Key;
+		}
+		else
+		{
+			Key = "";
+		}
+	}
+
+	public void Clear()
+	{
+		Value = "";
+		Key = "";
+		_results = null;
+	}
+}

Oqtane.Client/Modules/Controls/FileManager.razor

@@ -1,11 +1,12 @@
 @namespace Oqtane.Modules.Controls
+@using System.Threading
 @inherits ModuleControlBase
 @inject IFolderService FolderService
 @inject IFileService FileService
 @inject IStringLocalizer<FileManager> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-@if (_folders != null)
+@if (_initialized)
 {
     <div id="@Id" class="container-fluid px-0">
         <div class="row">
@@ -53,17 +54,27 @@
                                 }
                             </div>
                             <div class="col mt-2 text-end">
-                                <button type="button" class="btn btn-success" @onclick="UploadFile">@SharedLocalizer["Upload"]</button>
-                                @if (ShowFiles && GetFileId() != -1)
+                                <button type="button" class="btn btn-success" @onclick="UploadFiles">@SharedLocalizer["Upload"]</button>
+                                @if (GetFileId() != -1)
                                 {
                                     <button type="button" class="btn btn-danger mx-1" @onclick="DeleteFile">@SharedLocalizer["Delete"]</button>
                                 }
                             </div>
                         </div>
-                        <div class="row">
-                            <div class="col mt-1"><span id="@_progressinfoid" style="display: none;"></span></div>
-                            <div class="col text-center mt-1"><progress id="@_progressbarid" class="mt-1" style="display: none;"></progress></div>
-                        </div>
+                        @if (ShowProgress)
+                        {
+                            <div class="row">
+                                <div class="col mt-1"><span id="@_progressinfoid" style="display: none;"></span></div>
+                                <div class="col mt-1"><progress id="@_progressbarid" class="mt-1" style="display: none;"></progress></div>
+                            </div>
+                        }
+                        else
+                        {
+                            if (_uploading)
+                            {
+                                <div class="app-progress-indicator"></div>
+                            }
+                        }
                     }
                 </div>
             </div>
@@ -86,296 +97,373 @@
 }
 
 @code {
-	private string _id;
-	private List<Folder> _folders;
-	private List<File> _files = new List<File>();
-	private string _fileinputid = string.Empty;
-	private string _progressinfoid = string.Empty;
-	private string _progressbarid = string.Empty;
-	private string _filter = "*";
-	private bool _haseditpermission = false;
-	private string _image = string.Empty;
-	private File _file = null;
-	private string _guid;
-	private string _message = string.Empty;
-	private MessageType _messagetype;
+    private bool _initialized = false;
+    private List<Folder> _folders;
+    private List<File> _files = new List<File>();
+    private string _fileinputid = string.Empty;
+    private string _progressinfoid = string.Empty;
+    private string _progressbarid = string.Empty;
+    private string _filter = "*";
+    private bool _haseditpermission = false;
+    private string _image = string.Empty;
+    private File _file = null;
+    private string _guid;
+    private string _message = string.Empty;
+    private MessageType _messagetype;
+    private bool _uploading = false;
 
-	[Parameter]
-	public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
+    [Parameter]
+    public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
 
-	[Parameter]
-	public int FolderId { get; set; } = -1; // optional - for setting a specific default folder by folderid 
+    [Parameter]
+    public int FolderId { get; set; } = -1; // optional - for setting a specific default folder by folderid 
 
-	[Parameter]
-	public string Folder { get; set; } = ""; // optional - for setting a specific default folder by folder path 
+    [Parameter]
+    public string Folder { get; set; } = ""; // optional - for setting a specific default folder by folder path 
 
-	[Parameter]
-	public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
+    [Parameter]
+    public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
 
-	[Parameter]
-	public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
+    [Parameter]
+    public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
 
-	[Parameter]
-	public bool ShowFiles { get; set; } = true; // optional - for indicating whether a list of files should be displayed - default is true
+    [Parameter]
+    public bool ShowFiles { get; set; } = true; // optional - for indicating whether a list of files should be displayed - default is true
 
-	[Parameter]
-	public bool ShowUpload { get; set; } = true; // optional - for indicating whether a Upload controls should be displayed - default is true
+    [Parameter]
+    public bool ShowUpload { get; set; } = true; // optional - for indicating whether a Upload controls should be displayed - default is true
 
-	[Parameter]
-	public bool ShowFolders { get; set; } = true; // optional - for indicating whether a list of folders should be displayed - default is true
+    [Parameter]
+    public bool ShowFolders { get; set; } = true; // optional - for indicating whether a list of folders should be displayed - default is true
 
-	[Parameter]
-	public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
+    [Parameter]
+    public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
 
-	[Parameter]
-	public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false
+    [Parameter]
+    public bool ShowProgress { get; set; } = true; // optional - for indicating whether progress info should be displayed during upload - default is true
 
-	[Parameter]
-	public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
+    [Parameter]
+    public bool ShowSuccess { get; set; } = false; // optional - for indicating whether a success message should be displayed upon successful upload - default is false
 
-	[Parameter]
-	public EventCallback<int> OnUpload { get; set; } // optional - executes a method in the calling component when a file is uploaded
+    [Parameter]
+    public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
 
-	[Parameter]
-	public EventCallback<int> OnSelect { get; set; } // optional - executes a method in the calling component when a file is selected
+    [Parameter]
+    public EventCallback<int> OnUpload { get; set; } // optional - executes a method in the calling component when a file is uploaded
 
-	[Parameter]
-	public EventCallback<int> OnDelete { get; set; } // optional - executes a method in the calling component when a file is deleted
+    [Parameter]
+    public EventCallback<int> OnSelect { get; set; } // optional - executes a method in the calling component when a file is selected
 
-	protected override async Task OnInitializedAsync()
-	{
-		if (!string.IsNullOrEmpty(Id))
-		{
-			_id = Id;
-		}
+    [Parameter]
+    public EventCallback<int> OnDelete { get; set; } // optional - executes a method in the calling component when a file is deleted
 
-		// packages folder is a framework folder for uploading installable nuget packages
-		if (Folder == Constants.PackagesFolder)
-		{
-			ShowFiles = false;
-			ShowFolders = false;
-			Filter = "nupkg";
-			ShowSuccess = true;
-		}
+    protected override void OnInitialized()
+    {
+        // create unique id for component
+        _guid = Guid.NewGuid().ToString("N");
+        _fileinputid = "FileInput_" + _guid;
+        _progressinfoid = "ProgressInfo_" + _guid;
+        _progressbarid = "ProgressBar_" + _guid;
+    }
 
-		if (!ShowFiles)
-		{
-			ShowImage = false;
-		}
+    protected override async Task OnParametersSetAsync()
+    {
+        // packages folder is a framework folder for uploading installable nuget packages
+        if (Folder == Constants.PackagesFolder)
+        {
+            ShowFiles = false;
+            ShowFolders = false;
+            Filter = "nupkg";
+            ShowSuccess = true;
+        }
 
-		_folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
+        if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
+        {
+            Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
+            if (folder != null)
+            {
+                FolderId = folder.FolderId;
+            }
+            else
+            {
+                FolderId = -1;
+                _message = "Folder Path " + Folder + "Does Not Exist";
+                _messagetype = MessageType.Error;
+            }
+        }
 
-		if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
-		{
-			Folder folder = await FolderService.GetFolderAsync(ModuleState.SiteId, Folder);
-			if (folder != null)
-			{
-				FolderId = folder.FolderId;
-			}
-			else
-			{
-				FolderId = -1;
-				_message = "Folder Path " + Folder + "Does Not Exist";
-				_messagetype = MessageType.Error;
-			}
-		}
+        if (ShowFolders)
+        {
+            _folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
+        }
+        else
+        {
+            if (FolderId != -1)
+            {
+                var folder = await FolderService.GetFolderAsync(FolderId);
+                if (folder != null)
+                {
+                    _folders = new List<Folder> { folder };
+                }
+            }
+        }
 
-		if (FileId != -1)
-		{
-			File file = await FileService.GetFileAsync(FileId);
-			if (file != null)
-			{
-				FolderId = file.FolderId;
-				await OnSelect.InvokeAsync(FileId);
-			}
-			else
-			{
-				FileId = -1; // file does not exist
-				_message = "FileId " + FileId.ToString() + "Does Not Exist";
-				_messagetype = MessageType.Error;
-			}
-		}
+        if (FileId != -1)
+        {
+            File file = await FileService.GetFileAsync(FileId);
+            if (file != null)
+            {
+                FolderId = file.FolderId;
+            }
+            else
+            {
+                FileId = -1; // file does not exist
+                _message = "FileId " + FileId.ToString() + "Does Not Exist";
+                _messagetype = MessageType.Error;
+            }
+        }
 
-		await SetImage();
+        await SetImage();
 
-		if (!string.IsNullOrEmpty(Filter))
-		{
-			_filter = "." + Filter.Replace(",", ",.");
-		}
+        if (!string.IsNullOrEmpty(Filter))
+        {
+            _filter = "." + Filter.Replace(",", ",.");
+        }
 
-		await GetFiles();
+        await GetFiles();
 
-		// create unique id for component
-		_guid = Guid.NewGuid().ToString("N");
-		_fileinputid = _guid + "FileInput";
-		_progressinfoid = _guid + "ProgressInfo";
-		_progressbarid = _guid + "ProgressBar";
-	}
+        _initialized = true;
+    }
 
-	private async Task GetFiles()
-	{
-		_haseditpermission = false;
-		if (Folder == Constants.PackagesFolder)
-		{
-			_haseditpermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
-			_files = new List<File>();
-		}
-		else
-		{
-			Folder folder = _folders.FirstOrDefault(item => item.FolderId == FolderId);
-			if (folder != null)
-			{
-				_haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.Permissions);
-				_files = await FileService.GetFilesAsync(FolderId);
-			}
-			else
-			{
-				_haseditpermission = false;
-				_files = new List<File>();
-			}
-		}
-		if (_filter != "*")
-		{
-			List<File> filtered = new List<File>();
-			foreach (File file in _files)
-			{
-				if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
-				{
-					filtered.Add(file);
-				}
-			}
-			_files = filtered;
-		}
-	}
+    private async Task GetFiles()
+    {
+        _haseditpermission = false;
+        if (Folder == Constants.PackagesFolder)
+        {
+            _haseditpermission = UserSecurity.IsAuthorized(PageState.User, RoleNames.Host);
+            _files = new List<File>();
+        }
+        else
+        {
+            Folder folder = _folders.FirstOrDefault(item => item.FolderId == FolderId);
+            if (folder != null)
+            {
+                _haseditpermission = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, folder.PermissionList);
+                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Browse, folder.PermissionList))
+                {
+                    _files = await FileService.GetFilesAsync(FolderId);
+                }
+                else
+                {
+                    _files = new List<File>();
+                }
+            }
+            else
+            {
+                _haseditpermission = false;
+                _files = new List<File>();
+            }
+            if (_filter != "*")
+            {
+                List<File> filtered = new List<File>();
+                foreach (File file in _files)
+                {
+                    if (_filter.ToUpper().IndexOf("." + file.Extension.ToUpper()) != -1)
+                    {
+                        filtered.Add(file);
+                    }
+                }
+                _files = filtered;
+            }
+        }
+    }
 
-	private async Task FolderChanged(ChangeEventArgs e)
-	{
-		_message = string.Empty;
-		try
-		{
-			FolderId = int.Parse((string)e.Value);
-			await GetFiles();
-			FileId = -1;
-			_file = null;
-			_image = string.Empty;
-			StateHasChanged();
-		}
-		catch (Exception ex)
-		{
-			await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
-			_message = Localizer["Error.File.Load"];
-			_messagetype = MessageType.Error;
-		}
-	}
+    private async Task FolderChanged(ChangeEventArgs e)
+    {
+        _message = string.Empty;
+        try
+        {
+            FolderId = int.Parse((string)e.Value);
+            await GetFiles();
+            FileId = -1;
+            _file = null;
+            _image = string.Empty;
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Loading Files {Error}", ex.Message);
+            _message = Localizer["Error.File.Load"];
+            _messagetype = MessageType.Error;
+        }
+    }
 
-	private async Task FileChanged(ChangeEventArgs e)
-	{
-		_message = string.Empty;
-		FileId = int.Parse((string)e.Value);
-		if (FileId != -1)
-		{
-			await OnSelect.InvokeAsync(FileId);
-		}
+    private async Task FileChanged(ChangeEventArgs e)
+    {
+        _message = string.Empty;
+        FileId = int.Parse((string)e.Value);
+        await SetImage();
+        await OnSelect.InvokeAsync(FileId);
+        StateHasChanged();
 
-		await SetImage();
-		StateHasChanged();
-	}
+    }
 
-	private async Task SetImage()
-	{
-		_image = string.Empty;
-		_file = null;
-		if (FileId != -1)
-		{
-			_file = await FileService.GetFileAsync(FileId);
-			if (_file != null && ShowImage && _file.ImageHeight != 0 && _file.ImageWidth != 0)
-			{
-				var maxwidth = 200;
-				var maxheight = 200;
+    private async Task SetImage()
+    {
+        _image = string.Empty;
+        _file = null;
+        if (FileId != -1)
+        {
+            _file = await FileService.GetFileAsync(FileId);
+            if (_file != null && ShowImage && _file.ImageHeight != 0 && _file.ImageWidth != 0)
+            {
+                var maxwidth = 200;
+                var maxheight = 200;
 
-				var ratioX = (double)maxwidth / (double)_file.ImageWidth;
-				var ratioY = (double)maxheight / (double)_file.ImageHeight;
-				var ratio = ratioX < ratioY ? ratioX : ratioY;
+                var ratioX = (double)maxwidth / (double)_file.ImageWidth;
+                var ratioY = (double)maxheight / (double)_file.ImageHeight;
+                var ratio = ratioX < ratioY ? ratioX : ratioY;
 
-				_image = "<img src=\"" + _file.Url + "\" alt=\"" + _file.Name +
-							"\" width=\"" + Convert.ToInt32(_file.ImageWidth * ratio).ToString() +
-							"\" height=\"" + Convert.ToInt32(_file.ImageHeight * ratio).ToString() + "\" />";
-			}
-		}
-	}
+                _image = "<img src=\"" + _file.Url + "\" alt=\"" + _file.Name +
+                            "\" width=\"" + Convert.ToInt32(_file.ImageWidth * ratio).ToString() +
+                            "\" height=\"" + Convert.ToInt32(_file.ImageHeight * ratio).ToString() + "\" />";
+            }
+        }
+    }
 
-	private async Task UploadFile()
-	{
-		_message = string.Empty;
-		var interop = new Interop(JSRuntime);
-		var upload = await interop.GetFiles(_fileinputid);
-		if (upload.Length > 0)
-		{
-			string restricted = "";
-			foreach (var file in upload)
-			{
-				var extension = (file.LastIndexOf(".") != -1) ? file.Substring(file.LastIndexOf(".") + 1) : "";
-				if (!Constants.UploadableFiles.Split(',').Contains(extension.ToLower()))
-				{
-					restricted += (restricted == "" ? "" : ",") + extension;
-				}
-			}
-			if (restricted == "")
-			{
-				try
-				{
-					string result;
-					if (Folder == Constants.PackagesFolder)
-					{
-						result = await FileService.UploadFilesAsync(Folder, upload, _guid);
-					}
-					else
-					{
-						result = await FileService.UploadFilesAsync(FolderId, upload, _guid);
-					}
+    private async Task UploadFiles()
+    {
+        _message = string.Empty;
+        var interop = new Interop(JSRuntime);
+        var uploads = await interop.GetFiles(_fileinputid);
+        if (uploads.Length > 0)
+        {
+            string restricted = "";
+            foreach (var upload in uploads)
+            {
+                var filename = upload.Split(':')[0];
+                var extension = (filename.LastIndexOf(".") != -1) ? filename.Substring(filename.LastIndexOf(".") + 1) : "";
+                if (!Constants.UploadableFiles.Split(',').Contains(extension.ToLower()))
+                {
+                    restricted += (restricted == "" ? "" : ",") + extension;
+                }
+            }
+            if (restricted == "")
+            {
+                if (!ShowProgress)
+                {
+                    _uploading = true;
+                    StateHasChanged();
+                }
 
-					if (result == string.Empty)
-					{
-						await logger.LogInformation("File Upload Succeeded {Files}", upload);
-						if (ShowSuccess)
-						{
-							_message = Localizer["Success.File.Upload"];
-							_messagetype = MessageType.Success;
-						}
+                try
+                {
+                    // upload the files
+                    var posturl = Utilities.TenantUrl(PageState.Alias, "/api/file/upload");
+                    var folder = (Folder == Constants.PackagesFolder) ? Folder : FolderId.ToString();
+                    await interop.UploadFiles(posturl, folder, _guid, SiteState.AntiForgeryToken);
 
-						// set FileId to first file in upload collection
-						await GetFiles();
-						var file = _files.Where(item => item.Name == upload[0]).FirstOrDefault();
-						if (file != null)
-						{
-							FileId = file.FileId;
-							await SetImage();
-							await OnUpload.InvokeAsync(FileId);
-						}
-						StateHasChanged();
-					}
-					else
-					{
-						await logger.LogError("File Upload Failed For {Files}", result.Replace(",", ", "));
+                    // uploading is asynchronous so we need to poll to determine if uploads are completed
+                    var success = true;
+                    int upload = 0;
+                    while (upload < uploads.Length && success)
+                    {
+                        success = false;
+                        var filename = uploads[upload].Split(':')[0];
+                        var size = Int64.Parse(uploads[upload].Split(':')[1]);
+                        var maxattempts = (int)Math.Ceiling(size / 500000.0) + 1; // 30 MB takes 1 minute at 5 Mbps
 
-						_message = Localizer["Error.File.Upload"];
-						_messagetype = MessageType.Error;
-					}
-				}
-				catch (Exception ex)
-				{
-					await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
+                        int attempts = 0;
+                        while (attempts < maxattempts && !success)
+                        {
+                            attempts += 1;
+                            Thread.Sleep(1000);
 
-					_message = Localizer["Error.File.Upload"];
-					_messagetype = MessageType.Error;
-				}
-			}
-			else
-			{
-				_message = string.Format(Localizer["Message.File.Restricted"], restricted);
-				_messagetype = MessageType.Warning;
-			}
-		}
+                            if (Folder == Constants.PackagesFolder)
+                            {
+                                var files = await FileService.GetFilesAsync(folder);
+                                if (files != null && files.Any(item => item.Name == filename))
+                                {
+                                    success = true;
+                                }
+                            }
+                            else
+                            {
+                                var file = await FileService.GetFileAsync(int.Parse(folder), filename);
+                                if (file != null)
+                                {
+                                    success = true;
+                                }
+                            }
+                        }
+                        if (success)
+                        {
+                            upload++;
+                        }
+                    }
+
+                    // reset progress indicators
+                    if (ShowProgress)
+                    {
+                        await interop.SetElementAttribute(_progressinfoid, "style", "display: none;");
+                        await interop.SetElementAttribute(_progressbarid, "style", "display: none;");
+                    }
+                    else
+                    {
+                        _uploading = false;
+                        StateHasChanged();
+                    }
+
+                    if (success)
+                    {
+                        await logger.LogInformation("File Upload Succeeded {Files}", uploads);
+                        if (ShowSuccess)
+                        {
+                            _message = Localizer["Success.File.Upload"];
+                            _messagetype = MessageType.Success;
+                        }
+                    }
+                    else
+                    {
+                        await logger.LogInformation("File Upload Failed Or Is Still In Progress {Files}", uploads);
+                        _message = Localizer["Error.File.Upload"];
+                        _messagetype = MessageType.Error;
+                    }
+
+                    if (Folder == Constants.PackagesFolder)
+                    {
+                        await OnUpload.InvokeAsync(-1);
+                    }
+                    else
+                    {
+                        // set FileId to first file in upload collection
+                        var file = await FileService.GetFileAsync(int.Parse(folder), uploads[0].Split(":")[0]);
+                        if (file != null)
+                        {
+                            FileId = file.FileId;
+                            await SetImage();
+                            await OnSelect.InvokeAsync(FileId);
+                            await OnUpload.InvokeAsync(FileId);
+                        }
+                        await GetFiles();
+                        StateHasChanged();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    await logger.LogError(ex, "File Upload Failed {Error}", ex.Message);
+                    _message = Localizer["Error.File.Upload"];
+                    _messagetype = MessageType.Error;
+                    _uploading = false;
+                }
+
+            }
+            else
+            {
+                _message = string.Format(Localizer["Message.File.Restricted"], restricted);
+                _messagetype = MessageType.Warning;
+            }
+        }
         else
         {
             _message = Localizer["Message.File.NotSelected"];
@@ -392,26 +480,50 @@
             await logger.LogInformation("File Deleted {File}", FileId);
             await OnDelete.InvokeAsync(FileId);
 
-            _message = Localizer["Success.File.Delete"];
-            _messagetype = MessageType.Success;
+            if (ShowSuccess)
+            {
+                _message = Localizer["Success.File.Delete"];
+                _messagetype = MessageType.Success;
+            }
 
-            await GetFiles();
-            FileId = -1;
-            await SetImage();
+			await GetFiles();
+			FileId = -1;
+			await SetImage();
+            await OnSelect.InvokeAsync(FileId);
             StateHasChanged();
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting File {File} {Error}", FileId, ex.Message);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting File {File} {Error}", FileId, ex.Message);
 
-            _message = Localizer["Error.File.Delete"];
-            _messagetype = MessageType.Error;
-        }
-    }
+			_message = Localizer["Error.File.Delete"];
+			_messagetype = MessageType.Error;
+		}
+	}
 
-    public int GetFileId() => FileId;
+	public int GetFileId() => FileId;
 
-    public int GetFolderId() => FolderId;
+	public int GetFolderId() => FolderId;
 
-    public File GetFile() => _file;
+	public File GetFile() => _file;
+
+	public async Task Refresh()
+	{
+		await Refresh(-1);
+	}
+
+	public async Task Refresh(int fileId)
+	{
+		await GetFiles();
+		if (fileId != -1)
+		{
+			var file = _files.Where(item => item.FileId == fileId).FirstOrDefault();
+			if (file != null)
+			{
+				FileId = file.FileId;
+				await SetImage();
+			}
+		}
+		StateHasChanged();
+	}
 }

Oqtane.Client/Modules/Controls/InputList.razor

@@ -0,0 +1,50 @@
+@namespace Oqtane.Modules.Controls
+@inherits LocalizableComponent
+
+<input type="text" value="@Value" list="@_id" class="form-control" @onchange="(e => OnChange(e))" />
+<datalist id="@_id" value="@Value">
+    @foreach(var kvp in DataList)
+    {
+        if (!string.IsNullOrEmpty(kvp.Value))
+        {
+            <option value="@kvp.Key">@Localize(kvp.Value, kvp.Value)</option>
+        }
+        else
+        {
+            <option value="@kvp.Key">@Localize(kvp.Key, kvp.Key)</option>
+        }
+    }
+</datalist>
+
+@code {
+    private string _id;
+
+    [Parameter]
+    public string Value { get; set; }
+
+    [EditorRequired]
+    [Parameter]    
+    public Dictionary<string, string> DataList { get; set; }
+
+    [EditorRequired]
+    [Parameter]
+    public EventCallback<string> ValueChanged { get; set; }
+
+    protected override void OnInitialized()
+    {
+        // create unique id for component
+        _id = "DataList_" + Guid.NewGuid().ToString("N");
+    }
+
+    protected void OnChange(ChangeEventArgs e)
+    {
+        if (!string.IsNullOrEmpty(e.Value.ToString()))
+        {
+            Value = e.Value.ToString();
+            if (ValueChanged.HasDelegate)
+            {
+                ValueChanged.InvokeAsync(Value);
+            }
+        }
+    }
+}

Oqtane.Client/Modules/Controls/Pager.razor

@@ -8,16 +8,16 @@
     @if ((Toolbar == "Top" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
     {
         <ul class="pagination justify-content-center my-2">
-            <li class="page-item@((_page > 1) ? "" : " disabled")">
+            <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
             </li>
             @if (_pages > _displayPages && _displayPages > 1)
             {
-                <li class="page-item@((_page > _displayPages) ? "" : " disabled")">
+                <li class="page-item@((_page > _displayPages) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("back"))><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
                 </li>
             }
-            <li class="page-item@((_page > 1) ? "" : " disabled")">
+            <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></a>
             </li>
             @for (int i = _startPage; i <= _endPage; i++)
@@ -25,27 +25,27 @@
                 var pager = i;
                 if (pager == _page)
                 {
-                    <li class="page-item active">
+                    <li class="page-item app-pager-pointer active">
                         <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
                     </li>
                 }
                 else
                 {
-                    <li class="page-item">
+                    <li class="page-item app-pager-pointer">
                         <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
                     </li>
                 }
             }
-            <li class="page-item@((_page < _pages) ? "" : " disabled")">
+            <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
             </li>
             @if (_pages > _displayPages && _displayPages > 1)
             {
-                <li class="page-item@((_endPage < _pages) ? "" : " disabled")">
+                <li class="page-item@((_endPage < _pages) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
                 </li>
             }
-            <li class="page-item@((_page < _pages) ? "" : " disabled")">
+            <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
             </li>
             <li class="page-item disabled">
@@ -55,43 +55,46 @@
     }
     @if (Format == "Table" && Row != null)
     {
-		<div class="table-responsive">
-			<table class="@Class">
-				<thead>
-					<tr class="@RowClass">@Header</tr>
-				</thead>
-				<tbody>
-					@foreach (var item in ItemList)
-					{
-						<tr class="@RowClass">@Row(item)</tr>
-						@if (Detail != null)
-						{
-							<tr>@Detail(item)</tr>
-						}
-					}
-				</tbody>
-			</table>
-		</div>
+        <div class="table-responsive">
+            <table class="@Class">
+                <thead>
+                    <tr class="@RowClass">@Header</tr>
+                </thead>
+                <tbody>
+                    @foreach (var item in ItemList)
+                    {
+                        <tr class="@RowClass">@Row(item)</tr>
+                        @if (Detail != null)
+                        {
+                            <tr>@Detail(item)</tr>
+                        }
+                    }
+                </tbody>
+                <tfoot>
+                    <tr class="@RowClass">@Footer</tr>
+                </tfoot>
+            </table>
+        </div>
     }
     @if (Format == "Grid" && Row != null)
     {
         int count = 0;
-		int rows = 0;
-		int cols = 0;
-		if (ItemList != null)
+        int rows = 0;
+        int cols = 0;
+        if (ItemList != null)
         {
-			if (_columns == 0)
-			{
-				count = ItemList.Count();
-				rows = 1;
-				cols = count;
-			}
-			else
-			{
-				count = (int)Math.Ceiling(ItemList.Count() / (decimal)_columns) * _columns;
-				rows = count / _columns;
-				cols = _columns;
-			}
+            if (_columns == 0)
+            {
+                count = ItemList.Count();
+                rows = 1;
+                cols = count;
+            }
+            else
+            {
+                count = (int)Math.Ceiling(ItemList.Count() / (decimal)_columns) * _columns;
+                rows = count / _columns;
+                cols = _columns;
+            }
         }
         <div class="@Class">
             @for (int row = 0; row < rows; row++)
@@ -113,19 +116,19 @@
             }
         </div>
     }
-    @if ((Toolbar == "Bottom"  || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
+    @if ((Toolbar == "Bottom" || Toolbar == "Both") && _pages > 0 && Items.Count() > _maxItems)
     {
         <ul class="pagination justify-content-center my-2">
-            <li class="page-item@((_page > 1) ? "" : " disabled")">
+            <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(1))><span class="oi oi-media-step-backward" title="start" aria-hidden="true"></span></a>
             </li>
             @if (_pages > _displayPages && _displayPages > 1)
-             {
-                <li class="page-item@((_page > _displayPages) ? "" : " disabled")">
+            {
+                <li class="page-item@((_page > _displayPages) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("back"))><span class="oi oi-media-skip-backward" title="skip back" aria-hidden="true"></span></a>
                 </li>
             }
-            <li class="page-item@((_page > 1) ? "" : " disabled")">
+            <li class="page-item@((_page > 1) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("previous"))><span class="oi oi-chevron-left" title="previous" aria-hidden="true"></span></a>
             </li>
             @for (int i = _startPage; i <= _endPage; i++)
@@ -133,97 +136,100 @@
                 var pager = i;
                 if (pager == _page)
                 {
-                    <li class="page-item active">
+                    <li class="page-item app-pager-pointer active">
                         <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
                     </li>
                 }
                 else
                 {
-                    <li class="page-item">
+                    <li class="page-item app-pager-pointer">
                         <a class="page-link" @onclick=@(async () => UpdateList(pager))>@pager</a>
                     </li>
                 }
             }
-            <li class="page-item@((_page < _pages) ? "" : " disabled")">
+            <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => NavigateToPage("next"))><span class="oi oi-chevron-right" title="next" aria-hidden="true"></span></a>
             </li>
             @if (_pages > _displayPages && _displayPages > 1)
             {
-                <li class="page-item@((_endPage < _pages) ? "" : " disabled")">
+                <li class="page-item@((_endPage < _pages) ? " app-pager-pointer" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
                 </li>
             }
-            <li class="page-item@((_page < _pages) ? "" : " disabled")">
+            <li class="page-item@((_page < _pages) ? " app-pager-pointer" : " disabled")">
                 <a class="page-link" @onclick=@(async () => UpdateList(_pages))><span class="oi oi-media-step-forward" title="end" aria-hidden="true"></span></a>
             </li>
             <li class="page-item disabled">
-               <a class="page-link" style="white-space: nowrap;">@Localizer["PageOfPages", _page, _pages]</a>
+                <a class="page-link" style="white-space: nowrap;">@Localizer["PageOfPages", _page, _pages]</a>
             </li>
         </ul>
     }
 }
 
 @code {
-	private IStringLocalizer Localizer;
-	private int _pages = 0;
-	private int _page = 1;
-	private int _maxItems = 10;
-	private int _displayPages = 5;
-	private int _startPage = 0;
-	private int _endPage = 0;
-	private int _columns = 0;
+    private IStringLocalizer Localizer;
+    private int _pages = 0;
+    private int _page = 1;
+    private int _maxItems = 10;
+    private int _displayPages = 5;
+    private int _startPage = 0;
+    private int _endPage = 0;
+    private int _columns = 0;
 
-	[Parameter]
-	public string Format { get; set; } // Table or Grid
+    [Parameter]
+    public string Format { get; set; } // Table or Grid
 
-	[Parameter]
-	public string Toolbar { get; set; } // Top, Bottom or Both
+    [Parameter]
+    public string Toolbar { get; set; } // Top, Bottom or Both
 
-	[Parameter]
-	public RenderFragment Header { get; set; } = null; // only applicable to Table layouts
+    [Parameter]
+    public RenderFragment Header { get; set; } = null; // only applicable to Table layouts
 
-	[Parameter]
-	public RenderFragment<TableItem> Row { get; set; } = null; // required
+    [Parameter]
+    public RenderFragment<TableItem> Row { get; set; } = null; // required
 
-	[Parameter]
-	public RenderFragment<TableItem> Detail { get; set; } = null; // only applicable to Table layouts
+    [Parameter]
+    public RenderFragment Footer { get; set; } = null; // only applicable to Table layouts
 
-	[Parameter]
-	public IEnumerable<TableItem> Items { get; set; } // the IEnumerable data source
+    [Parameter]
+    public RenderFragment<TableItem> Detail { get; set; } = null; // only applicable to Table layouts
 
-	[Parameter]
-	public string PageSize { get; set; } // number of items to display on a page
+    [Parameter]
+    public IEnumerable<TableItem> Items { get; set; } // the IEnumerable data source
 
-	[Parameter]
-	public string Columns { get; set; } // only applicable to Grid layouts - default is zero indicating use responsive behavior
+    [Parameter]
+    public string PageSize { get; set; } // number of items to display on a page
 
-	[Parameter]
-	public string CurrentPage { get; set; } // sets the initial page to display
+    [Parameter]
+    public string Columns { get; set; } // only applicable to Grid layouts - default is zero indicating use responsive behavior
 
-	[Parameter]
-	public string DisplayPages { get; set; } // maximum number of page numbers to display for user selection
+    [Parameter]
+    public string CurrentPage { get; set; } // sets the initial page to display
 
-	[Parameter]
-	public string Class { get; set; } // class for the containing element - ie. <table> for Table or <div> for Grid
+    [Parameter]
+    public string DisplayPages { get; set; } // maximum number of page numbers to display for user selection
 
-	[Parameter]
-	public string RowClass { get; set; } // class for row element - ie. <tr> for Table or <div> for Grid
+    [Parameter]
+    public string Class { get; set; } // class for the containing element - ie. <table> for Table or <div> for Grid
 
-	[Parameter]
-	public string ColumnClass { get; set; } // class for column element - only applicable to Grid format
+    [Parameter]
+    public string RowClass { get; set; } // class for row element - ie. <tr> for Table or <div> for Grid
 
-	[Parameter]
-	public Action<int> OnPageChange { get; set; } // a method to be executed in the calling component when the page changes
+    [Parameter]
+    public string ColumnClass { get; set; } // class for column element - only applicable to Grid format
 
-	private IEnumerable<TableItem> ItemList { get; set; }
+    [Parameter]
+    public Action<int> OnPageChange { get; set; } // a method to be executed in the calling component when the page changes
 
-	protected override void OnInitialized()
-	{
-		Localizer = LocalizerFactory.Create(GetType().FullName);
-	}
+    private IEnumerable<TableItem> ItemList { get; set; }
 
-	protected override void OnParametersSet()
-	{
+    protected override void OnInitialized()
+    {
+        Localizer = LocalizerFactory.Create(GetType().FullName);
+    }
+
+    protected override void OnParametersSet()
+    {
         if (string.IsNullOrEmpty(Format))
         {
             Format = "Table";
@@ -256,8 +262,8 @@
             {
                 RowClass = "row";
             }
-        }	
-		
+        }
+
         if (string.IsNullOrEmpty(ColumnClass))
         {
             if (Format == "Table")
@@ -268,9 +274,9 @@
             {
                 ColumnClass = "col";
             }
-        }	
-		
-		if (!string.IsNullOrEmpty(PageSize))
+        }
+
+        if (!string.IsNullOrEmpty(PageSize))
         {
             _maxItems = int.Parse(PageSize);
         }
@@ -293,6 +299,7 @@
         {
             _page = 1;
         }
+        if (_page < 1) _page = 1;
 
         _startPage = 0;
         _endPage = 0;
@@ -304,7 +311,6 @@
             {
                 _page = _pages;
             }
-            ItemList = Items.Skip((_page - 1) * _maxItems).Take(_maxItems);
             SetPagerSize();
         }
     }
@@ -317,13 +323,13 @@
         {
             _endPage = _pages;
         }
-        OnPageChange?.Invoke(_page);
-        StateHasChanged();
-    }
+		ItemList = Items.Skip((_page - 1) * _maxItems).Take(_maxItems);
+		StateHasChanged();
+		OnPageChange?.Invoke(_page);
+	}
 
     public void UpdateList(int page)
     {
-        ItemList = Items.Skip((page - 1) * _maxItems).Take(_maxItems);
         _page = page;
         SetPagerSize();
     }

Oqtane.Client/Modules/Controls/PermissionGrid.razor

@@ -1,7 +1,9 @@
 @namespace Oqtane.Modules.Controls
+@using System.Text.Json
 @inherits ModuleControlBase
 @inject IRoleService RoleService
 @inject IUserService UserService
+@inject IUserRoleService UserRoleService
 @inject IStringLocalizer<PermissionGrid> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -14,20 +16,19 @@
                 <tbody>
                     <tr>
                         <th scope="col">@Localizer["Role"]</th>
-                        @foreach (PermissionString permission in _permissions)
+                        @foreach (var permissionname in _permissionnames)
                         {
-                            <th style="text-align: center; width: 1px;">@Localizer[permission.PermissionName]</th>
-                        }
+							<th style="text-align: center; width: 1px;">@((MarkupString)DisplayPermissionName(permissionname).Replace(" ", "<br />"))</th>
+						}
                     </tr>
                     @foreach (Role role in _roles)
                     {
                         <tr>
                             <td>@role.Name</td>
-                            @foreach (PermissionString permission in _permissions)
+                            @foreach (var permissionname in _permissionnames)
                             {
-                                var p = permission;
                                 <td style="text-align: center;">
-                                    <TriStateCheckBox Value=@GetPermissionValue(p.Permissions, role.Name) Disabled=@GetPermissionDisabled(role.Name) OnChange="@(e => PermissionChanged(e, p.PermissionName, role.Name))" />
+									<TriStateCheckBox Value=@GetPermissionValue(permissionname, role.Name, -1) Disabled="@GetPermissionDisabled(permissionname, role.Name)" OnChange="@(e => PermissionChanged(e, permissionname, role.Name, -1))" />
                                 </td>
                             }
                         </tr>
@@ -49,23 +50,21 @@
                     <thead>
                         <tr>
                             <th scope="col">@Localizer["User"]</th>
-                            @foreach (PermissionString permission in _permissions)
-                            {
-                                <th style="text-align: center; width: 1px;">@Localizer[permission.PermissionName]</th>
-                            }
-                        </tr>
+								@foreach (var permissionname in _permissionnames)
+								{
+									<th style="text-align: center; width: 1px;">@((MarkupString)DisplayPermissionName(permissionname).Replace(" ", "<br />"))</th>
+								}
+							</tr>
                     </thead>
                     <tbody>
                         @foreach (User user in _users)
                         {
-                            string userid = "[" + user.UserId.ToString() + "]";
                             <tr>
                                 <td>@user.DisplayName</td>
-                                @foreach (PermissionString permission in _permissions)
+                                @foreach (var permissionname in _permissionnames)
                                 {
-                                    var p = permission;
                                     <td style="text-align: center; width: 1px;">
-                                        <TriStateCheckBox Value=@GetPermissionValue(p.Permissions, userid) Disabled=false OnChange="@(e => PermissionChanged(e, p.PermissionName, userid))" />
+										<TriStateCheckBox Value=@GetPermissionValue(permissionname, "", user.UserId) Disabled="@GetPermissionDisabled(permissionname, "")" OnChange="@(e => PermissionChanged(e, permissionname, "", user.UserId))" />
                                     </td>
                                 }
                             </tr>
@@ -77,34 +76,27 @@
         </div>
     </div>
     <div class="row">
-        <div class="col">
-            <table class="table table-borderless">
-                <tbody>
-                    <tr>
-                        <td class="input-group">
-                            <input type="text" name="Username" class="form-control" placeholder="@Localizer["Username.Enter"]" @bind="@_username" />
-                            <button type="button" class="btn btn-primary" @onclick="AddUser">@SharedLocalizer["Add"]</button>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-            <br />
+        <div class="col-11">
+			<AutoComplete OnSearch="GetUsers" Placeholder="@Localizer["Username.Enter"]" @ref="_user" />
+		</div>
+		<div class="col-1">
+			<button type="button" class="btn btn-primary" @onclick="AddUser">@SharedLocalizer["Add"]</button>
         </div>
     </div>
     <div class="row">
         <div class="col">
-            <ModuleMessage Type="MessageType.Error" Message="@_message" />
+            <ModuleMessage Type="MessageType.Warning" Message="@_message" />
         </div>
     </div>
 </div>
 }
 
 @code {
-	private string _permissionnames = string.Empty;
+	private List<string> _permissionnames;
+	private List<Permission> _permissions;
 	private List<Role> _roles;
-	private List<PermissionString> _permissions;
 	private List<User> _users = new List<User>();
-	private string _username = string.Empty;
+	private AutoComplete _user;
 	private string _message = string.Empty;
 
 	[Parameter]
@@ -114,17 +106,16 @@
 	public string PermissionNames { get; set; }
 
 	[Parameter]
-	public string Permissions { get; set; }
+	public string Permissions { get; set; } // deprecated - use PermissionList instead
+
+	[Parameter]
+	public List<Permission> PermissionList { get; set; }
 
 	protected override async Task OnInitializedAsync()
 	{
-		if (string.IsNullOrEmpty(PermissionNames))
+		if (!string.IsNullOrEmpty(Permissions))
 		{
-			_permissionnames = Shared.PermissionNames.View + "," + Shared.PermissionNames.Edit;
-		}
-		else
-		{
-			_permissionnames = PermissionNames;
+			PermissionList = JsonSerializer.Deserialize<List<Permission>>(Permissions);			
 		}
 
 		_roles = await RoleService.GetRolesAsync(ModuleState.SiteId, true);
@@ -133,140 +124,212 @@
 			_roles.RemoveAll(item => item.Name == RoleNames.Host);
 		}
 
-		_permissions = new List<PermissionString>();
-
-		foreach (string permissionname in _permissionnames.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
+		// get permission names
+		if (string.IsNullOrEmpty(PermissionNames))
 		{
-			// initialize with admin role
-			_permissions.Add(new PermissionString { PermissionName = permissionname, Permissions = RoleNames.Admin });
+			_permissionnames = new List<string>();
+			_permissionnames.Add(Shared.PermissionNames.View);
+			_permissionnames.Add(Shared.PermissionNames.Edit);
+		}
+		else
+		{
+			_permissionnames = PermissionNames.Split(',', StringSplitOptions.RemoveEmptyEntries).ToList();
 		}
 
-		if (!string.IsNullOrEmpty(Permissions))
+		// initialize permissions
+		_permissions = new List<Permission>();
+		if (PermissionList != null && PermissionList.Any())
 		{
-			// populate permissions
-			foreach (PermissionString permissionstring in UserSecurity.GetPermissionStrings(Permissions))
+			foreach (var permission in PermissionList)
 			{
-				if (_permissions.Find(item => item.PermissionName == permissionstring.PermissionName) != null)
+				_permissions.Add(permission);
+				if (permission.UserId != null)
 				{
-					_permissions[_permissions.FindIndex(item => item.PermissionName == permissionstring.PermissionName)].Permissions = permissionstring.Permissions;
-				}
-
-				if (permissionstring.Permissions.Contains("["))
-				{
-					foreach (string user in permissionstring.Permissions.Split(new char[] { '[' }, StringSplitOptions.RemoveEmptyEntries))
+					if (!_users.Any(item => item.UserId == permission.UserId.Value))
 					{
-						if (user.Contains("]"))
-						{
-							var userid = int.Parse(user.Substring(0, user.IndexOf("]")));
-							if (_users.Where(item => item.UserId == userid).FirstOrDefault() == null)
-							{
-								_users.Add(await UserService.GetUserAsync(userid, ModuleState.SiteId));
-							}
-						}
+						_users.Add(await UserService.GetUserAsync(permission.UserId.Value, ModuleState.SiteId));
 					}
 				}
 			}
 		}
+		else
+		{
+			foreach (string permissionname in _permissionnames)
+			{
+				// permission names can be in the form of "EntityName:PermissionName:Roles"
+				if (permissionname.Contains(":"))
+				{
+					var segments = permissionname.Split(':');
+					if (segments.Length == 3)
+					{
+						foreach (var role in segments[2].Split(';'))
+						{
+							_permissions.Add(new Permission(ModuleState.SiteId, segments[0], segments[1], role, null, true));
+						}
+						// ensure admin access
+						if (!_permissions.Any(item => item.EntityName == segments[0] && item.PermissionName == segments[1] && item.RoleName == RoleNames.Admin))
+						{
+							_permissions.Add(new Permission(ModuleState.SiteId, segments[0], segments[1], RoleNames.Admin, null, true));
+						}
+					}
+				}
+				else
+				{
+					_permissions.Add(new Permission(ModuleState.SiteId, EntityName, permissionname, RoleNames.Admin, null, true));
+				}
+			}
+		}
 	}
 
-	private bool? GetPermissionValue(string permissions, string securityKey)
+	private string GetPermissionName(string permissionName)
 	{
-		if ((";" + permissions + ";").Contains(";" + "!" + securityKey + ";"))
+		return (permissionName.Contains(":")) ? permissionName.Split(':')[1] : permissionName;
+	}
+
+	private string GetEntityName(string permissionName)
+	{
+		return (permissionName.Contains(":")) ? permissionName.Split(':')[0] : EntityName;
+	}
+
+	private string DisplayPermissionName(string permissionName)
+	{
+		var name = Localizer[GetPermissionName(permissionName)].ToString();
+		name += " " + Localizer[GetEntityName(permissionName)].ToString();
+		return name;
+	}
+
+	private bool? GetPermissionValue(string permissionName, string roleName, int userId)
+	{
+		bool? isauthorized = null;
+		if (roleName != "")
 		{
-			return false; // deny permission
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.RoleName == roleName);
+			if (permission != null)
+			{
+				isauthorized = permission.IsAuthorized;
+			}
 		}
 		else
 		{
-			if ((";" + permissions + ";").Contains(";" + securityKey + ";"))
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.UserId == userId);
+			if (permission != null)
 			{
-				return true; // grant permission
+				isauthorized = permission.IsAuthorized;
+			}			
+		}
+		return isauthorized;
+	}
+
+	private bool GetPermissionDisabled(string permissionName, string roleName)
+	{
+		if (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			return true;
+		}
+		else
+		{
+			if (GetEntityName(permissionName) != EntityName && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+			{
+				return true;
 			}
 			else
 			{
-				return null; // not specified
+				return false;
 			}
 		}
 	}
 
-	private bool GetPermissionDisabled(string roleName)
-		=> (roleName == RoleNames.Admin && !UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) ? true : false;
+	private void PermissionChanged(bool? value, string permissionName, string roleName, int userId)
+	{
+		if (roleName != "")
+		{
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.RoleName == roleName);
+			if (permission != null)
+			{
+				_permissions.Remove(permission);
+			}
+			if (value != null)
+			{
+				_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), roleName, null, value.Value));
+			}
+		}
+		else
+		{
+			var permission = _permissions.FirstOrDefault(item => item.EntityName == GetEntityName(permissionName) && item.PermissionName == GetPermissionName(permissionName) && item.UserId == userId);
+			if (permission != null)
+			{
+				_permissions.Remove(permission);
+			}
+			if (value != null)
+			{
+				_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionName), GetPermissionName(permissionName), null, userId, value.Value));
+			}
+		}
+	}
+
+	private async Task<Dictionary<string, string>> GetUsers(string filter)
+	{
+		var users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId, RoleNames.Registered);
+		return users.Where(item => item.User.DisplayName.Contains(filter, StringComparison.OrdinalIgnoreCase))
+			.ToDictionary(item => item.UserId.ToString(), item => item.User.DisplayName);
+	}
 
 	private async Task AddUser()
 	{
-		if (_users.Where(item => item.Username == _username).FirstOrDefault() == null)
+		if (!string.IsNullOrEmpty(_user.Key))
 		{
-			try
+			var user = await UserService.GetUserAsync(int.Parse(_user.Key), ModuleState.SiteId);
+			if (user != null && !_users.Any(item => item.UserId == user.UserId))
 			{
-				var user = await UserService.GetUserAsync(_username, ModuleState.SiteId);
-				if (user != null)
-				{
-					_users.Add(user);
-				}
-			}
-			catch
-			{
-				_message = Localizer["Message.Username.DontExist"];
+				_users.Add(user);
 			}
 		}
-
-		_username = string.Empty;
-	}
-
-	private void PermissionChanged(bool? value, string permissionName, string securityId)
-	{
-		var selected = value;
-		var permission = _permissions.Find(item => item.PermissionName == permissionName);
-		if (permission != null)
+		else
 		{
-			var ids = permission.Permissions.Split(';').ToList();
-
-			ids.Remove(securityId); // remove grant permission
-			ids.Remove("!" + securityId); // remove deny permission
-
-			switch (selected)
-			{
-				case true:
-					ids.Add(securityId); // add grant permission
-					break;
-				case false:
-					ids.Add("!" + securityId); // add deny permission
-					break;
-				case null:
-					break; // permission not specified
-			}
-
-			_permissions[_permissions.FindIndex(item => item.PermissionName == permissionName)].Permissions = string.Join(";", ids.ToArray());
+			_message = Localizer["Message.Username.DontExist"];
 		}
+		_user.Clear();
 	}
 
 	public string GetPermissions()
 	{
 		ValidatePermissions();
-		return UserSecurity.SetPermissionStrings(_permissions);
+		return JsonSerializer.Serialize(_permissions);
+	}
+
+	public List<Permission> GetPermissionList()
+	{
+		ValidatePermissions();
+		return _permissions;
 	}
 
 	private void ValidatePermissions()
 	{
-		PermissionString permission;
-		for (int i = 0; i < _permissions.Count; i++)
+		// remove deny all users, unauthenticated, and registered users
+		var permissions = _permissions.Where(item => !item.IsAuthorized && 
+			(item.RoleName == RoleNames.Everyone || item.RoleName == RoleNames.Unauthenticated || item.RoleName == RoleNames.Registered)).ToList();
+		foreach (var permission in permissions)
 		{
-			permission = _permissions[i];
-			List<string> ids = permission.Permissions.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
-			ids.Remove("!" + RoleNames.Everyone); // remove deny all users
-			ids.Remove("!" + RoleNames.Unauthenticated); // remove deny unauthenticated
-			ids.Remove("!" + RoleNames.Registered); // remove deny registered users
-			if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+			_permissions.Remove(permission);
+		}
+		if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+		{
+			// remove deny administrators and host users
+			permissions = _permissions.Where(item => !item.IsAuthorized &&
+				(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)).ToList();
+			foreach (var permission in permissions)
 			{
-				ids.Remove("!" + RoleNames.Admin); // remove deny administrators
-				ids.Remove("!" + RoleNames.Host); // remove deny host users
-				if (!ids.Contains(RoleNames.Host) && !ids.Contains(RoleNames.Admin))
+				_permissions.Remove(permission);
+			}
+			foreach (var permissionname in _permissionnames)
+			{
+				// add administrators role if neither host or administrator is assigned
+				if (!_permissions.Any(item => item.EntityName == GetEntityName(permissionname) && item.PermissionName == GetPermissionName(permissionname) &&
+					(item.RoleName == RoleNames.Admin || item.RoleName == RoleNames.Host)))
 				{
-					// add administrators role if host user role is not assigned
-					ids.Add(RoleNames.Admin);				
+					_permissions.Add(new Permission(ModuleState.SiteId, GetEntityName(permissionname), GetPermissionName(permissionname), RoleNames.Admin, null, true));
 				}
 			}
-			permission.Permissions = string.Join(";", ids.ToArray());
-            _permissions[i] = permission;
-        }
+		}
     }
 }

Oqtane.Client/Modules/Controls/RichTextEditor.razor

@@ -5,79 +5,100 @@
 <div class="row" style="margin-bottom: 50px;">
     <div class="col">
         <TabStrip>
-            <TabPanel Name="Rich" Heading="Rich Text Editor">
-                @if (AllowFileManagement)
-                {
-                    @if (_filemanagervisible)
-                    {
-                        <FileManager @ref="_fileManager" Filter="@Constants.ImageFiles" />
-                        <ModuleMessage Message="@_message" Type="MessageType.Warning"></ModuleMessage>
-                        <br />
-                    }
-                    <div class="d-flex justify-content-center mb-2">
-                        <button type="button" class="btn btn-secondary" @onclick="RefreshRichText">@Localizer["SynchronizeContent"]</button>&nbsp;&nbsp;
-                        <button type="button" class="btn btn-primary" @onclick="InsertImage">@Localizer["InsertImage"]</button>
-                        @if (_filemanagervisible)
-                        {
-                            @((MarkupString)"&nbsp;&nbsp;")
-                            <button type="button" class="btn btn-secondary" @onclick="CloseFileManager">@Localizer["Close"]</button>
-                        }
-                    </div>
-                }
-                <div class="row">
-                    <div class="col">
-                        <div @ref="@_toolBar">
-                            @if (ToolbarContent != null)
-                            {
-                                @ToolbarContent
-                            }
-                            else
-                            {
-                                <select class="ql-header">
-                                    <option selected=""></option>
-                                    <option value="1"></option>
-                                    <option value="2"></option>
-                                    <option value="3"></option>
-                                    <option value="4"></option>
-                                    <option value="5"></option>
-                                </select>
-                                <span class="ql-formats">
-                                    <button class="ql-bold"></button>
-                                    <button class="ql-italic"></button>
-                                    <button class="ql-underline"></button>
-                                    <button class="ql-strike"></button>
-                                </span>
-                                <span class="ql-formats">
-                                    <select class="ql-color"></select>
-                                    <select class="ql-background"></select>
-                                </span>
-                                <span class="ql-formats">
-                                    <button class="ql-list" value="ordered"></button>
-                                    <button class="ql-list" value="bullet"></button>
-                                </span>
-                                <span class="ql-formats">
-                                    <button class="ql-link"></button>
-                                </span>
-                            }
-                        </div>
-                        <div @ref="@_editorElement">
-                        </div>
-                    </div>
-                </div>
-            </TabPanel>
-            <TabPanel Name="Raw" Heading="Raw HTML Editor" ResourceKey="HtmlEditor">
-                <div class="d-flex justify-content-center mb-2">
-                    <button type="button" class="btn btn-secondary" @onclick="RefreshRawHtml">@Localizer["SynchronizeContent"]</button>
-                </div>
-                @if (ReadOnly)
-                {
-                    <textarea class="form-control" placeholder="@Placeholder" @bind="@_rawhtml" rows="10" readonly></textarea>
-                }
-                else
-                {
-                    <textarea class="form-control" placeholder="@Placeholder" @bind="@_rawhtml" rows="10"></textarea>
-                }
-            </TabPanel>
+            <TabPanel Name="Rich" Heading="Rich Text Editor" ResourceKey="RichTextEditor">
+				@if (_richfilemanager)
+				{
+					<FileManager @ref="_fileManager" Filter="@Constants.ImageFiles" />
+					<ModuleMessage Message="@_message" Type="MessageType.Warning"></ModuleMessage>
+					<br />
+				}
+				<div class="d-flex justify-content-center mb-2">
+					@if (AllowRawHtml)
+					{
+						<button type="button" class="btn btn-secondary" @onclick="RefreshRichText">@Localizer["SynchronizeContent"]</button>@((MarkupString)"&nbsp;&nbsp;")
+					}
+					@if (AllowFileManagement)
+					{
+						<button type="button" class="btn btn-primary" @onclick="InsertRichImage">@Localizer["InsertImage"]</button>
+					}
+					@if (_richfilemanager)
+					{
+						@((MarkupString)"&nbsp;&nbsp;")
+						<button type="button" class="btn btn-secondary" @onclick="CloseRichFileManager">@Localizer["Close"]</button>
+					}
+				</div>
+				<div class="row">
+					<div class="col">
+						<div @ref="@_toolBar">
+							@if (ToolbarContent != null)
+							{
+								@ToolbarContent
+							}
+							else
+							{
+								<select class="ql-header">
+									<option selected=""></option>
+									<option value="1"></option>
+									<option value="2"></option>
+									<option value="3"></option>
+									<option value="4"></option>
+									<option value="5"></option>
+								</select>
+								<span class="ql-formats">
+									<button class="ql-bold"></button>
+									<button class="ql-italic"></button>
+									<button class="ql-underline"></button>
+									<button class="ql-strike"></button>
+								</span>
+								<span class="ql-formats">
+									<select class="ql-color"></select>
+									<select class="ql-background"></select>
+								</span>
+								<span class="ql-formats">
+									<button class="ql-list" value="ordered"></button>
+									<button class="ql-list" value="bullet"></button>
+								</span>
+								<span class="ql-formats">
+									<button class="ql-link"></button>
+								</span>
+							}
+						</div>
+						<div @ref="@_editorElement">
+						</div>
+					</div>
+				</div>
+			</TabPanel>
+			@if (AllowRawHtml)
+			{
+				<TabPanel Name="Raw" Heading="Raw HTML Editor" ResourceKey="HtmlEditor">
+					@if (_rawfilemanager)
+					{
+						<FileManager @ref="_fileManager" Filter="@Constants.ImageFiles" />
+						<ModuleMessage Message="@_message" Type="MessageType.Warning"></ModuleMessage>
+						<br />
+					}
+					<div class="d-flex justify-content-center mb-2">
+						<button type="button" class="btn btn-secondary" @onclick="RefreshRawHtml">@Localizer["SynchronizeContent"]</button>&nbsp;&nbsp;
+						@if (AllowFileManagement)
+						{
+							<button type="button" class="btn btn-primary" @onclick="InsertRawImage">@Localizer["InsertImage"]</button>
+						}
+						@if (_rawfilemanager)
+						{
+							@((MarkupString)"&nbsp;&nbsp;")
+							<button type="button" class="btn btn-secondary" @onclick="CloseRawFileManager">@Localizer["Close"]</button>
+						}
+					</div>
+					@if (ReadOnly)
+					{
+						<textarea id="rawhtmleditor" class="form-control" placeholder="@Placeholder" @bind="@_rawhtml" rows="10" readonly></textarea>
+					}
+					else
+					{
+						<textarea id="rawhtmleditor" class="form-control" placeholder="@Placeholder" @bind="@_rawhtml" rows="10"></textarea>
+					}
+				</TabPanel>
+			}
         </TabStrip>
     </div>
 </div>
@@ -85,10 +106,11 @@
 @code {
 	private ElementReference _editorElement;
 	private ElementReference _toolBar;
-	private bool _filemanagervisible = false;
+	private bool _richfilemanager = false;
 	private FileManager _fileManager;
 	private string _richhtml = string.Empty;
 	private string _originalrichhtml = string.Empty;
+	private bool _rawfilemanager = false;
 	private string _rawhtml = string.Empty;
 	private string _originalrawhtml = string.Empty;
 	private string _message = string.Empty;
@@ -102,6 +124,12 @@
 	[Parameter]
 	public string Placeholder { get; set; } = "Enter Your Content...";
 
+	[Parameter]
+	public bool AllowFileManagement { get; set; } = true;
+
+	[Parameter]
+	public bool AllowRawHtml { get; set; } = true;  
+	
 	// parameters only applicable to rich text editor
 	[Parameter]
 	public RenderFragment ToolbarContent { get; set; }
@@ -112,9 +140,6 @@
 	[Parameter]
 	public string DebugLevel { get; set; } = "info";
 
-	[Parameter]
-	public bool AllowFileManagement { get; set; } = true;
-
 	public override List<Resource> Resources => new List<Resource>()
     {
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill.min.js" },
@@ -152,9 +177,16 @@
 		}
 	}
 
-	public void CloseFileManager()
+	public void CloseRichFileManager()
 	{
-		_filemanagervisible = false;
+		_richfilemanager = false;
+		_message = string.Empty;
+		StateHasChanged();
+	}
+
+	public void CloseRawFileManager()
+	{
+		_rawfilemanager = false;
 		_message = string.Empty;
 		StateHasChanged();
 	}
@@ -194,29 +226,55 @@
 				return _originalrawhtml;
 			}
 		}
-    }
+	}
 
-    public async Task InsertImage()
-    {
-        _message = string.Empty;
-        if (_filemanagervisible)
-        {
-            var file = _fileManager.GetFile();
-            if (file != null)
-            {
-                var interop = new RichTextEditorInterop(JSRuntime);
-                await interop.InsertImage(_editorElement, file.Url, file.Name);
-                _filemanagervisible = false;
-            }
-            else
-            {
-                _message = Localizer["Message.Require.Image"];
-            }
-        }
-        else
-        {
-            _filemanagervisible = true;
-        }
-        StateHasChanged();
-    }
+	public async Task InsertRichImage()
+	{
+		_message = string.Empty;
+		if (_richfilemanager)
+		{
+			var file = _fileManager.GetFile();
+			if (file != null)
+			{
+				var interop = new RichTextEditorInterop(JSRuntime);
+				await interop.InsertImage(_editorElement, file.Url, ((!string.IsNullOrEmpty(file.Description)) ? file.Description : file.Name));
+				_richfilemanager = false;
+			}
+			else
+			{
+				_message = Localizer["Message.Require.Image"];
+			}
+		}
+		else
+		{
+			_richfilemanager = true;
+		}
+		StateHasChanged();
+	}
+
+	public async Task InsertRawImage()
+	{
+		_message = string.Empty;
+		if (_rawfilemanager)
+		{
+			var file = _fileManager.GetFile();
+			if (file != null)
+			{
+				var interop = new Interop(JSRuntime);
+				int pos = await interop.GetCaretPosition("rawhtmleditor");
+				var image = "<img src=\"" + file.Url + "\" alt=\"" + ((!string.IsNullOrEmpty(file.Description)) ? file.Description : file.Name) + "\" class=\"img-fluid\">";
+				_rawhtml = _rawhtml.Substring(0, pos) + image + _rawhtml.Substring(pos);
+				_rawfilemanager = false;
+			}
+			else
+			{
+				_message = Localizer["Message.Require.Image"];
+			}
+		}
+		else
+		{
+			_rawfilemanager = true;
+		}
+		StateHasChanged();
+	}
 }

Oqtane.Client/Modules/Controls/Section.razor

@@ -17,7 +17,10 @@
     <hr class="app-rule" />
 </div>
 <div class="collapse @_show" id="@Name">
-    @ChildContent
+    @if (ChildContent != null)
+    {
+        @ChildContent
+    }
 </div>
 
 @code {
@@ -26,7 +29,7 @@
     private string _show = string.Empty;
 
     [Parameter]
-    public RenderFragment ChildContent { get; set; }
+    public RenderFragment ChildContent { get; set; } = null;
 
     [Parameter]
     public string Name { get; set; } // required - the name of the section
@@ -37,19 +40,12 @@
     [Parameter]
     public string Expanded { get; set; } // optional - will default to false if not provided
 
-    protected override void OnInitialized()
-    {
-        _heading = (!string.IsNullOrEmpty(Heading)) ? Heading : Name;
-        _expanded = (!string.IsNullOrEmpty(Expanded)) ? Expanded : "false";
-        if (_expanded == "true") { _show = "show"; }
-    }
-
     protected override void OnParametersSet()
     {
-        base.OnParametersSet();
+        base.OnParametersSet(); // must be included to call method in LocalizableComponent
 
-        _heading = !string.IsNullOrEmpty(Heading)
-            ? Localize(nameof(Heading), Heading)
-            : Localize(nameof(Name), Name);
+        _heading = !string.IsNullOrEmpty(Heading) ? Localize(nameof(Heading), Heading) : Localize(nameof(Name), Name);
+        _expanded = (!string.IsNullOrEmpty(Expanded)) ? Expanded.ToLower() : "false";
+        if (_expanded == "true") { _show = "show"; }
     }
 }

Oqtane.Client/Modules/Controls/TabPanel.razor

@@ -3,13 +3,13 @@
 
 @if (Name == Parent.ActiveTab)
 {
-    <div id="@Name" class="tab-pane fade show active" role="tabpanel">
+    <div id="@(Parent.Id + Name)" class="tab-pane fade show active" role="tabpanel">
         @ChildContent
     </div>
 }
 else
 {
-    <div id="@Name" class="tab-pane fade" role="tabpanel">
+	<div id="@(Parent.Id + Name)" class="tab-pane fade" role="tabpanel">
         @ChildContent
     </div>
 }

Oqtane.Client/Modules/Controls/TabStrip.razor

@@ -8,15 +8,15 @@
                 @foreach (TabPanel tabPanel in _tabPanels)
                 {
                     <li class="nav-item" @key="tabPanel.Name">
-                        @if (tabPanel.Name == ActiveTab)
+                        @if (tabPanel.Name.ToLower() == ActiveTab.ToLower())
                         {
-                            <a class="nav-link active" data-bs-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
+                            <a class="nav-link active" data-bs-toggle="tab" href="#@(Id + tabPanel.Name)" role="tab" @onclick:preventDefault="true">
                                 @tabPanel.DisplayHeading()
                             </a>
                         }
                         else
                         {
-                            <a class="nav-link" data-bs-toggle="tab" href="#@tabPanel.Name" role="tab" @onclick:preventDefault="true">
+							<a class="nav-link" data-bs-toggle="tab" href="#@(Id + tabPanel.Name)" role="tab" @onclick:preventDefault="true">
                                 @tabPanel.DisplayHeading()
                             </a>
                         }
@@ -32,18 +32,31 @@
 </CascadingValue>
 
 @code {
-    private List<TabPanel> _tabPanels;
+	private List<TabPanel> _tabPanels;
+	private string _tabpanelid = string.Empty;
 
-    [Parameter]
-    public RenderFragment ChildContent { get; set; } // contains the TabPanels
+	[Parameter]
+	public RenderFragment ChildContent { get; set; } // contains the TabPanels
 
-    [Parameter]
-    public string ActiveTab { get; set; } // optional - defaults to first TabPanel if not specified. Can also be set using a "tab=" querystring parameter.
+	[Parameter]
+	public string ActiveTab { get; set; } // optional - defaults to first TabPanel if not specified. Can also be set using a "tab=" querystring parameter.
 
-    [Parameter]
-    public bool Refresh { get; set; } // optional - used in scenarios where TabPanels are added/removed dynamically within a parent form. ActiveTab may need to be reset as well when this property is used.
+	[Parameter]
+	public bool Refresh { get; set; } // optional - used in scenarios where TabPanels are added/removed dynamically within a parent form. ActiveTab may need to be reset as well when this property is used.
 
-    protected override void OnParametersSet()
+	[Parameter]
+	public string Id { get; set; } // optional - used to uniquely identify an instance of a tab strip component (will be set automatically if no value provided)
+
+	protected override void OnInitialized()
+	{
+		if (string.IsNullOrEmpty(Id))
+		{
+			// create unique id for component
+			Id = "TabStrip_" + Guid.NewGuid().ToString("N") + "_" ;
+		}
+	}
+	
+	protected override void OnParametersSet()
     {
         if (PageState.QueryString.ContainsKey("tab"))
         {
@@ -80,10 +93,10 @@
                 authorized = true;
                 break;
             case SecurityAccessLevel.View:
-                authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, ModuleState.Permissions);
+                authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, ModuleState.PermissionList);
                 break;
             case SecurityAccessLevel.Edit:
-                authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions);
+                authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.PermissionList);
                 break;
             case SecurityAccessLevel.Admin:
                 authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);

Oqtane.Client/Modules/HtmlText/Edit.razor

@@ -13,7 +13,7 @@
     <TabPanel Name="Edit" Heading="Edit" ResourceKey="Edit">
 		@if (_content != null)
 		{
-			<RichTextEditor Content="@_content" AllowFileManagement="@_allowfilemanagement" @ref="@RichTextEditorHtml"></RichTextEditor>
+			<RichTextEditor Content="@_content" AllowFileManagement="@_allowfilemanagement" AllowRawHtml="@_allowrawhtml" @ref="@RichTextEditorHtml"></RichTextEditor>
 			<br />
 			<button type="button" class="btn btn-success" @onclick="SaveContent">@SharedLocalizer["Save"]</button>
 			<NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
@@ -53,13 +53,13 @@
 
 	public override List<Resource> Resources => new List<Resource>()
 	{
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.bubble.css" },
         new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill.snow.css" }
     };
 
 	private RichTextEditor RichTextEditorHtml;
 	private bool _allowfilemanagement;
+	private bool _allowrawhtml;
 	private string _content = null;
 	private string _createdby;
 	private DateTime _createdon;
@@ -73,6 +73,7 @@
 		try
 		{
 			_allowfilemanagement = bool.Parse(SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true"));
+			_allowrawhtml = bool.Parse(SettingService.GetSetting(ModuleState.Settings, "AllowRawHtml", "true"));
 			await LoadContent();
 		}
 		catch (Exception ex)

Oqtane.Client/Modules/HtmlText/Index.razor

@@ -15,11 +15,6 @@
 }
 
 @code {
-	public override List<Resource> Resources => new List<Resource>()
-    {
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
-    };
-
 	private string content = "";
 
 	protected override async Task OnParametersSetAsync()

Oqtane.Client/Modules/HtmlText/ModuleInfo.cs

@@ -1,5 +1,7 @@
+using System.Collections.Generic;
 using Oqtane.Documentation;
 using Oqtane.Models;
+using Oqtane.Shared;
 
 namespace Oqtane.Modules.HtmlText
 {
@@ -13,7 +15,11 @@ namespace Oqtane.Modules.HtmlText
             Version = "1.0.1",
             ServerManagerType = "Oqtane.Modules.HtmlText.Manager.HtmlTextManager, Oqtane.Server",
             ReleaseVersions = "1.0.0,1.0.1",
-            SettingsType = "Oqtane.Modules.HtmlText.Settings, Oqtane.Client"
+            SettingsType = "Oqtane.Modules.HtmlText.Settings, Oqtane.Client",
+            Resources = new List<Resource>()
+            {
+                new Resource { ResourceType = ResourceType.Stylesheet, Url = "~/Module.css" }
+            }
         };
     }
 }

Oqtane.Client/Modules/HtmlText/Settings.razor

@@ -15,18 +15,29 @@
             </select>
         </div>
     </div>
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="files" ResourceKey="AllowRawHtml" ResourceType="@resourceType" HelpText="Specify If Editors Can Enter Raw HTML">Allow Raw HTML: </Label>
+        <div class="col-sm-9">
+            <select id="files" class="form-select" @bind="@_allowrawhtml">
+                <option value="true">@SharedLocalizer["Yes"]</option>
+                <option value="false">@SharedLocalizer["No"]</option>
+            </select>
+        </div>
+    </div>
 </div>
 
 @code {		
 	private string resourceType = "Oqtane.Modules.HtmlText.Settings, Oqtane.Client"; // for localization
     private string _allowfilemanagement;
+	private string _allowrawhtml;
 
     protected override void OnInitialized()
     {
         try
         {
-            _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
-        }
+			_allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
+			_allowrawhtml = SettingService.GetSetting(ModuleState.Settings, "AllowRawHtml", "true");
+		}
         catch (Exception ex)
         {
             ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
@@ -39,7 +50,8 @@
         {
 			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
             settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
-            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+			settings = SettingService.SetSetting(settings, "AllowRawHtml", _allowrawhtml);
+			await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
         }
         catch (Exception ex)
         {

Oqtane.Client/Modules/ModuleBase.cs

@@ -9,12 +9,15 @@ using Oqtane.UI;
 using System.Collections.Generic;
 using Microsoft.JSInterop;
 using System.Linq;
+using System.Dynamic;
 
 namespace Oqtane.Modules
 {
     public abstract class ModuleBase : ComponentBase, IModuleControl
     {
         private Logger _logger;
+        private string _urlparametersstate;
+        private Dictionary<string, string> _urlparameters;
 
         protected Logger logger => _logger ?? (_logger = new Logger(this));
 
@@ -24,6 +27,9 @@ namespace Oqtane.Modules
         [Inject]
         protected IJSRuntime JSRuntime { get; set; }
 
+        [Inject]
+        protected SiteState SiteState { get; set; }
+
         [CascadingParameter]
         protected PageState PageState { get; set; }
 
@@ -44,22 +50,63 @@ namespace Oqtane.Modules
 
         public virtual List<Resource> Resources { get; set; }
 
+        // url parameters
+        public virtual string UrlParametersTemplate { get; set; }
+
+        public Dictionary<string, string> UrlParameters {
+            get
+            {
+                if (_urlparametersstate == null || _urlparametersstate != PageState.UrlParameters)
+                {
+                    _urlparametersstate = PageState.UrlParameters;
+                    _urlparameters = GetUrlParameters(UrlParametersTemplate);
+                }
+                return _urlparameters;
+            }
+        }
+
         // base lifecycle method for handling JSInterop script registration
 
         protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             if (firstRender)
             {
-                if (Resources != null && Resources.Exists(item => item.ResourceType == ResourceType.Script))
+                List<Resource> resources = null;
+                var type = GetType();
+                if (type.BaseType == typeof(ModuleBase))
                 {
-                    var scripts = new List<object>();
-                    foreach (Resource resource in Resources.Where(item => item.ResourceType == ResourceType.Script))
+                    if (PageState.Page.Resources != null)
                     {
-                        scripts.Add(new { href = resource.Url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module });
+                        resources = PageState.Page.Resources.Where(item => item.ResourceType == ResourceType.Script && item.Level != ResourceLevel.Site && item.Namespace == type.Namespace).ToList();
+                    }
+                }
+                else // modulecontrolbase
+                {
+                    if (Resources != null)
+                    {
+                        resources = Resources.Where(item => item.ResourceType == ResourceType.Script).ToList();
+                    }
+                }
+                if (resources != null &&resources.Any())
+                {
+                    var interop = new Interop(JSRuntime);
+                    var scripts = new List<object>();
+                    var inline = 0;
+                    foreach (Resource resource in resources)
+                    {
+                        if (!string.IsNullOrEmpty(resource.Url))
+                        {
+                            var url = (resource.Url.Contains("://")) ? resource.Url : PageState.Alias.BaseUrl + resource.Url;
+                            scripts.Add(new { href = url, bundle = resource.Bundle ?? "", integrity = resource.Integrity ?? "", crossorigin = resource.CrossOrigin ?? "", es6module = resource.ES6Module, location = resource.Location.ToString().ToLower() });
+                        }
+                        else
+                        {
+                            inline += 1;
+                            await interop.IncludeScript(GetType().Namespace.ToLower() + inline.ToString(), "", "", "", resource.Content, resource.Location.ToString().ToLower());
+                        }
                     }
                     if (scripts.Any())
                     {
-                        var interop = new Interop(JSRuntime);
                         await interop.IncludeScripts(scripts.ToArray());
                     }
                 }
@@ -70,10 +117,11 @@ namespace Oqtane.Modules
 
         public string ModulePath()
         {
-            return "Modules/" + GetType().Namespace + "/";
+            return PageState?.Alias.BaseUrl + "/Modules/" + GetType().Namespace + "/";
         }
 
         // url methods
+
         public string NavigateUrl()
         {
             return NavigateUrl(PageState.Page.Path);
@@ -124,14 +172,23 @@ namespace Oqtane.Modules
             return Utilities.EditUrl(PageState.Alias.Path, path, moduleid, action, parameters);
         }
 
-        public string ContentUrl(int fileid)
+        public string FileUrl(string folderpath, string filename)
         {
-            return ContentUrl(fileid, false);
+            return FileUrl(folderpath, filename, false);
         }
 
-        public string ContentUrl(int fileid, bool asAttachment)
+        public string FileUrl(string folderpath, string filename, bool download)
         {
-            return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
+            return Utilities.FileUrl(PageState.Alias, folderpath, filename, download);
+        }
+        public string FileUrl(int fileid)
+        {
+            return FileUrl(fileid, false);
+        }
+
+        public string FileUrl(int fileid, bool download)
+        {
+            return Utilities.FileUrl(PageState.Alias, fileid, download);
         }
 
         public string ImageUrl(int fileid, int width, int height)
@@ -149,15 +206,21 @@ namespace Oqtane.Modules
             return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, position, background, rotate, recreate);
         }
 
-        public virtual Dictionary<string, string> GetUrlParameters(string parametersTemplate = "")
+        public string AddUrlParameters(params object[] parameters)
+        {
+            return Utilities.AddUrlParameters(parameters);
+        }
+
+        // template is in the form of a standard route template ie. "/{id}/{name}" and produces dictionary of key/value pairs
+        // if url parameters belong to a specific module you should embed a unique key into the route (ie. /!/blog/1) and validate the url parameter key in the module
+        public virtual Dictionary<string, string> GetUrlParameters(string template = "")
         {
             var urlParameters = new Dictionary<string, string>();
-            string[] templateSegments;
-            var parameters = PageState.UrlParameters.Split('/', StringSplitOptions.RemoveEmptyEntries);
-            var parameterId = 0;
+            var parameters = _urlparametersstate.Split('/', StringSplitOptions.RemoveEmptyEntries);
 
-            if (string.IsNullOrEmpty(parametersTemplate))
+            if (string.IsNullOrEmpty(template))
             {
+                // no template will populate dictionary with generic "parameter#" keys
                 for (int i = 0; i < parameters.Length; i++)
                 {
                     urlParameters.TryAdd("parameter" + i, parameters[i]);
@@ -165,39 +228,37 @@ namespace Oqtane.Modules
             }
             else
             {
-                templateSegments = parametersTemplate.Split('/', StringSplitOptions.RemoveEmptyEntries);
+                var segments = template.Split('/', StringSplitOptions.RemoveEmptyEntries);
+                string key;
 
-                if (parameters.Length == templateSegments.Length)
+                for (int i = 0; i < parameters.Length; i++)
                 {
-                    for (int i = 0; i < parameters.Length; i++)
+                    if (i < segments.Length)
                     {
-                        if (parameters.Length > i)
+                        key = segments[i];
+                        if (key.StartsWith("{") && key.EndsWith("}"))
                         {
-                            if (templateSegments[i] == parameters[i])
-                            {
-                                urlParameters.TryAdd("parameter" + parameterId, parameters[i]);
-                                parameterId++;
-                            }
-                            else if (templateSegments[i].StartsWith("{") && templateSegments[i].EndsWith("}"))
-                            {
-                                var key = templateSegments[i].Replace("{", "");
-                                key = key.Replace("}", "");
-                                urlParameters.TryAdd(key, parameters[i]);
-                            }
-                            else
-                            {
-                                i = parameters.Length;
-                                urlParameters.Clear();
-                            }
+                            // dynamic segment
+                            key = key.Substring(1, key.Length - 2);
+                        }
+                        else
+                        {
+                            // static segments use generic "parameter#" keys
+                            key = "parameter" + i.ToString();
                         }
                     }
+                    else // unspecified segments use generic "parameter#" keys
+                    {
+                        key = "parameter" + i.ToString();
+                    }
+                    urlParameters.TryAdd(key, parameters[i]);
                 }
             }
 
             return urlParameters;
         }
 
-        // user feedback methods
+        // UI methods
         public void AddModuleMessage(string message, MessageType type)
         {
             ModuleInstance.AddModuleMessage(message, type);
@@ -218,6 +279,49 @@ namespace Oqtane.Modules
             ModuleInstance.HideProgressIndicator();
         }
 
+        public void SetModuleTitle(string title)
+        {
+            dynamic obj = new ExpandoObject();
+            obj.PageModuleId = ModuleState.PageModuleId;
+            obj.Title = title;
+            SiteState.Properties.ModuleTitle = obj;
+        }
+
+        public void SetModuleVisibility(bool visible)
+        {
+            dynamic obj = new ExpandoObject();
+            obj.PageModuleId = ModuleState.PageModuleId;
+            obj.Visible = visible;
+            SiteState.Properties.ModuleVisibility = obj;
+        }
+
+        public void SetPageTitle(string title)
+        {
+            SiteState.Properties.PageTitle = title;
+        }
+
+        // note - only supports links and meta tags - not scripts
+        public void AddHeadContent(string content)
+        {
+            SiteState.AppendHeadContent(content);
+        }
+
+        public void AddScript(Resource resource)
+        {
+            resource.ResourceType = ResourceType.Script;
+            if (Resources == null) Resources = new List<Resource>();
+            if (!Resources.Any(item => (!string.IsNullOrEmpty(resource.Url) && item.Url == resource.Url) || (!string.IsNullOrEmpty(resource.Content) && item.Content == resource.Content)))
+            {
+                Resources.Add(resource);
+            }
+        }
+
+        public async Task ScrollToPageTop()
+        {
+            var interop = new Interop(JSRuntime);
+            await interop.ScrollTo(0, 0, "smooth");
+        }
+
         // logging methods
         public async Task Log(Alias alias, LogLevel level, string function, Exception exception, string message, params object[] args)
         {
@@ -255,15 +359,10 @@ namespace Oqtane.Modules
         {
             int pageId = ModuleState.PageId;
             int moduleId = ModuleState.ModuleId;
-            int? userId = null;
-            if (PageState.User != null)
-            {
-                userId = PageState.User.UserId;
-            }
             string category = GetType().AssemblyQualifiedName;
             string feature = Utilities.GetTypeNameLastSegment(category, 1);
 
-            await LoggingService.Log(alias, pageId, moduleId, userId, category, feature, function, level, exception, message, args);
+            await LoggingService.Log(alias, pageId, moduleId, PageState.User?.UserId, category, feature, function, level, exception, message, args);
         }
 
         public class Logger
@@ -365,5 +464,17 @@ namespace Oqtane.Modules
                 await _moduleBase.Log(null, LogLevel.Critical, "", exception, message, args);
             }
         }
+
+        [Obsolete("ContentUrl(int fileId) is deprecated. Use FileUrl(int fileId) instead.", false)]
+        public string ContentUrl(int fileid)
+        {
+            return ContentUrl(fileid, false);
+        }
+
+        [Obsolete("ContentUrl(int fileId, bool asAttachment) is deprecated. Use FileUrl(int fileId, bool download) instead.", false)]
+        public string ContentUrl(int fileid, bool asAttachment)
+        {
+            return Utilities.FileUrl(PageState.Alias, fileid, asAttachment);
+        }
     }
 }

Oqtane.Client/Oqtane.Client.csproj

@@ -1,19 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.1.3</Version>
+    <Version>4.0.5</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
-    <Description>Modular Application Framework for Blazor</Description>
+    <Description>CMS and Application Framework for Blazor and .NET MAUI</Description>
     <Copyright>.NET Foundation</Copyright>
     <PackageProjectUrl>https://www.oqtane.org</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/oqtane/oqtane.framework/blob/dev/LICENSE</PackageLicenseUrl>
-    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.1.3</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v4.0.5</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -22,26 +21,21 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.3" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.5" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="7.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
+    <PackageReference Include="System.Net.Http.Json" Version="7.0.1" />
     <PackageReference Include="Microsoft.AspNetCore.Localization" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.3" />
-    <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <TrimmerRootAssembly Include="System.Runtime" />
-    <TrimmerRootAssembly Include="System.Linq.Parallel" />
-    <TrimmerRootAssembly Include="System.Runtime.CompilerServices.VisualC" />
-  </ItemGroup>
-
   <PropertyGroup>
+    <PublishTrimmed>false</PublishTrimmed>
     <BlazorEnableCompression>false</BlazorEnableCompression>
   </PropertyGroup>
 

Oqtane.Client/Program.cs

@@ -1,21 +1,25 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Reflection;
 using System.Runtime.Loader;
+using System.Text.Json;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.JSInterop;
 using Oqtane.Documentation;
+using Oqtane.Models;
 using Oqtane.Modules;
 using Oqtane.Services;
-using Oqtane.Shared;
 using Oqtane.UI;
 
 namespace Oqtane.Client
@@ -33,7 +37,7 @@ namespace Oqtane.Client
 
             builder.Services.AddOptions();
 
-            // Register localization services
+            // register localization services
             builder.Services.AddLocalization(options => options.ResourcesPath = "Resources");
 
             // register auth services
@@ -42,7 +46,9 @@ namespace Oqtane.Client
             // register scoped core services
             builder.Services.AddOqtaneScopedServices();
 
-            await LoadClientAssemblies(httpClient);
+            var serviceProvider = builder.Services.BuildServiceProvider();
+
+            await LoadClientAssemblies(httpClient, serviceProvider);
 
             var assemblies = AppDomain.CurrentDomain.GetOqtaneAssemblies();
             foreach (var assembly in assemblies)
@@ -58,33 +64,114 @@ namespace Oqtane.Client
 
             await SetCultureFromLocalizationCookie(host.Services);
 
-            ServiceActivator.Configure(host.Services);
-
             await host.RunAsync();
         }
 
-        private static async Task LoadClientAssemblies(HttpClient http)
+        private static async Task LoadClientAssemblies(HttpClient http, IServiceProvider serviceProvider)
         {
-            // get list of loaded assemblies on the client
-            var assemblies = AppDomain.CurrentDomain.GetAssemblies().Select(a => a.GetName().Name).ToList();
+            // get alias
+            var navigationManager = serviceProvider.GetRequiredService<NavigationManager>();
+            var urlpath = GetUrlPath(navigationManager.Uri);
+            var json = await http.GetStringAsync($"api/Installation/installed/?path={WebUtility.UrlEncode(urlpath)}");
+            var installation = JsonSerializer.Deserialize<Installation>(json, new JsonSerializerOptions(JsonSerializerDefaults.Web));
+            urlpath = installation.Alias.Path;
+            urlpath = (!string.IsNullOrEmpty(urlpath)) ? urlpath + "/" : urlpath;
 
-            // get assemblies from server and load into client app domain
-            var zip = await http.GetByteArrayAsync($"/api/Installation/load");
+            var dlls = new Dictionary<string, byte[]>();
+            var pdbs = new Dictionary<string, byte[]>();
+            var list = new List<string>();
 
-            // asemblies and debug symbols are packaged in a zip file
-            using (ZipArchive archive = new ZipArchive(new MemoryStream(zip)))
+            var jsRuntime = serviceProvider.GetRequiredService<IJSRuntime>();
+            var interop = new Interop(jsRuntime);
+            var files = await interop.GetIndexedDBKeys(".dll");
+
+            if (files.Count() != 0)
             {
-                var dlls = new Dictionary<string, byte[]>();
-                var pdbs = new Dictionary<string, byte[]>();
+                // get list of assemblies from server
+                json = await http.GetStringAsync($"{urlpath}api/Installation/list");
+                var assemblies = JsonSerializer.Deserialize<List<string>>(json);
 
-                foreach (ZipArchiveEntry entry in archive.Entries)
+                // determine which assemblies need to be downloaded
+                foreach (var assembly in assemblies)
                 {
-                    if (!assemblies.Contains(Path.GetFileNameWithoutExtension(entry.FullName)))
+                    var file = files.FirstOrDefault(item => item.Contains(assembly));
+                    if (file == null)
+                    {
+                        list.Add(assembly);
+                    }
+                    else
+                    {
+                        // check if newer version available
+                        if (GetFileDate(assembly) > GetFileDate(file))
+                        {
+                            list.Add(assembly);
+                        }
+                    }
+                }
+
+                // get assemblies already downloaded
+                foreach (var file in files)
+                {
+                    if (assemblies.Contains(file) && !list.Contains(file))
+                    {
+                        try
+                        {
+                            dlls.Add(file, await interop.GetIndexedDBItem<byte[]>(file));
+                            var pdb = file.Replace(".dll", ".pdb");
+                            if (files.Contains(pdb))
+                            {
+                                pdbs.Add(pdb, await interop.GetIndexedDBItem<byte[]>(pdb));
+                            }
+                        }
+                        catch
+                        {
+                            // ignore
+                        }
+                    }
+                    else // file is deprecated
+                    {
+                        try
+                        {
+                            await interop.RemoveIndexedDBItem(file);
+                            await interop.RemoveIndexedDBItem(file.Replace(".dll", ".pdb"));
+                        }
+                        catch
+                        {
+                            // ignore
+                        }
+                    }
+                }
+            }
+            else
+            {
+                list.Add("*");
+            }
+
+            if (list.Count != 0)
+            {
+                // get assemblies from server and load into client app domain
+                var zip = await http.GetByteArrayAsync($"{urlpath}api/Installation/load?list=" + string.Join(",", list));
+
+                // asemblies and debug symbols are packaged in a zip file
+                using (ZipArchive archive = new ZipArchive(new MemoryStream(zip)))
+                {
+                    foreach (ZipArchiveEntry entry in archive.Entries)
                     {
                         using (var memoryStream = new MemoryStream())
                         {
                             entry.Open().CopyTo(memoryStream);
                             byte[] file = memoryStream.ToArray();
+
+                            // save assembly to indexeddb
+                            try
+                            {
+                                await interop.SetIndexedDBItem(entry.FullName, file);
+                            }
+                            catch
+                            {
+                                // ignore
+                            }
+
                             switch (Path.GetExtension(entry.FullName))
                             {
                                 case ".dll":
@@ -97,40 +184,62 @@ namespace Oqtane.Client
                         }
                     }
                 }
+            }
 
-                foreach (var item in dlls)
+            // load assemblies into app domain
+            foreach (var item in dlls)
+            {
+                if (pdbs.ContainsKey(item.Key.Replace(".dll", ".pdb")))
                 {
-                    if (pdbs.ContainsKey(item.Key))
-                    {
-                        AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(item.Value), new MemoryStream(pdbs[item.Key]));
-                    }
-                    else
-                    {
-                        AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(item.Value));
-                    }
+                    AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(item.Value), new MemoryStream(pdbs[item.Key.Replace(".dll", ".pdb")]));
+                }
+                else
+                {
+                    AssemblyLoadContext.Default.LoadFromStream(new MemoryStream(item.Value));
                 }
             }
         }
 
+        private static DateTime GetFileDate(string filepath)
+        {
+            var segments = filepath.Split('.');
+            return DateTime.ParseExact(segments[segments.Length - 2], "yyyyMMddHHmmss", CultureInfo.InvariantCulture);
+        }
+
         private static void RegisterModuleServices(Assembly assembly, IServiceCollection services)
         {
-            var implementationTypes = assembly.GetInterfaces<IService>();
-            foreach (var implementationType in implementationTypes)
+            // dynamically register module scoped services
+            try
             {
-                if (implementationType.AssemblyQualifiedName != null)
+                var implementationTypes = assembly.GetInterfaces<IService>();
+                foreach (var implementationType in implementationTypes)
                 {
-                    var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
-                    services.AddScoped(serviceType ?? implementationType, implementationType);
+                    if (implementationType.AssemblyQualifiedName != null)
+                    {
+                        var serviceType = Type.GetType(implementationType.AssemblyQualifiedName.Replace(implementationType.Name, $"I{implementationType.Name}"));
+                        services.AddScoped(serviceType ?? implementationType, implementationType);
+                    }
                 }
             }
+            catch
+            {
+                // could not interrogate assembly - likely missing dependencies
+            }
         }
 
         private static void RegisterClientStartups(Assembly assembly, IServiceCollection services)
         {
-            var startUps = assembly.GetInstances<IClientStartup>();
-            foreach (var startup in startUps)
+            try
             {
-                startup.ConfigureServices(services);
+                var startUps = assembly.GetInstances<IClientStartup>();
+                foreach (var startup in startUps)
+                {
+                    startup.ConfigureServices(services);
+                }
+            }
+            catch
+            {
+                // could not interrogate assembly - likely missing dependencies
             }
         }
 
@@ -141,7 +250,7 @@ namespace Oqtane.Client
             var localizationCookie = await interop.GetCookie(CookieRequestCultureProvider.DefaultCookieName);
             var culture = CookieRequestCultureProvider.ParseCookieValue(localizationCookie)?.UICultures?[0].Value;
             var localizationService = serviceProvider.GetRequiredService<ILocalizationService>();
-            var cultures = await localizationService.GetCulturesAsync();
+            var cultures = await localizationService.GetCulturesAsync(false);
 
             if (culture == null || !cultures.Any(c => c.Name.Equals(culture, StringComparison.OrdinalIgnoreCase)))
             {
@@ -157,5 +266,10 @@ namespace Oqtane.Client
             CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
             CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
         }
+
+        private static string GetUrlPath(string url)
+        {
+            return new Uri(url).AbsolutePath.Substring(1);
+        }
     }
 }

Oqtane.Client/Resources/IconResources.resx

@@ -0,0 +1,789 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Icon.AccountLogin" xml:space="preserve">
+    <value>Account Login</value>
+  </data>
+  <data name="Icon.AccountLogout" xml:space="preserve">
+    <value>Account Logout</value>
+  </data>
+  <data name="Icon.ActionRedo" xml:space="preserve">
+    <value>Action Redo</value>
+  </data>
+  <data name="Icon.ActionUndo" xml:space="preserve">
+    <value>Action Undo</value>
+  </data>
+  <data name="Icon.AlignCenter" xml:space="preserve">
+    <value>Align Center</value>
+  </data>
+  <data name="Icon.AlignLeft" xml:space="preserve">
+    <value>Align Left</value>
+  </data>
+  <data name="Icon.AlignRight" xml:space="preserve">
+    <value>Align Right</value>
+  </data>
+  <data name="Icon.Aperture" xml:space="preserve">
+    <value>Aperture</value>
+  </data>
+  <data name="Icon.ArrowBottom" xml:space="preserve">
+    <value>Arrow Bottom</value>
+  </data>
+  <data name="Icon.ArrowCircleBottom" xml:space="preserve">
+    <value>Arrow Circle Bottom</value>
+  </data>
+  <data name="Icon.ArrowCircleLeft" xml:space="preserve">
+    <value>Arrow Circle Left</value>
+  </data>
+  <data name="Icon.ArrowCircleRight" xml:space="preserve">
+    <value>Arrow Circle Right</value>
+  </data>
+  <data name="Icon.ArrowCircleTop" xml:space="preserve">
+    <value>Arrow Circle Top</value>
+  </data>
+  <data name="Icon.ArrowLeft" xml:space="preserve">
+    <value>Arrow Left</value>
+  </data>
+  <data name="Icon.ArrowRight" xml:space="preserve">
+    <value>Arrow Right</value>
+  </data>
+  <data name="Icon.ArrowThickBottom" xml:space="preserve">
+    <value>Arrow Thick Bottom</value>
+  </data>
+  <data name="Icon.ArrowThickLeft" xml:space="preserve">
+    <value>Arrow Thick Left</value>
+  </data>
+  <data name="Icon.ArrowThickRight" xml:space="preserve">
+    <value>Arrow Thick Right</value>
+  </data>
+  <data name="Icon.ArrowThickTop" xml:space="preserve">
+    <value>Arrow Thick Top</value>
+  </data>
+  <data name="Icon.ArrowTop" xml:space="preserve">
+    <value>Arrow Top</value>
+  </data>
+  <data name="Icon.AudioSpectrum" xml:space="preserve">
+    <value>Audio Spectrum</value>
+  </data>
+  <data name="Icon.Audio" xml:space="preserve">
+    <value>Audio</value>
+  </data>
+  <data name="Icon.Badge" xml:space="preserve">
+    <value>Badge</value>
+  </data>
+  <data name="Icon.Ban" xml:space="preserve">
+    <value>Ban</value>
+  </data>
+  <data name="Icon.BarChart" xml:space="preserve">
+    <value>Bar Chart</value>
+  </data>
+  <data name="Icon.Basket" xml:space="preserve">
+    <value>Basket</value>
+  </data>
+  <data name="Icon.BatteryEmpty" xml:space="preserve">
+    <value>Battery Empty</value>
+  </data>
+  <data name="Icon.BatteryFull" xml:space="preserve">
+    <value>Battery Full</value>
+  </data>
+  <data name="Icon.Beaker" xml:space="preserve">
+    <value>Beaker</value>
+  </data>
+  <data name="Icon.Bell" xml:space="preserve">
+    <value>Bell</value>
+  </data>
+  <data name="Icon.Bluetooth" xml:space="preserve">
+    <value>Bluetooth</value>
+  </data>
+  <data name="Icon.Bold" xml:space="preserve">
+    <value>Bold</value>
+  </data>
+  <data name="Icon.Bolt" xml:space="preserve">
+    <value>Bolt</value>
+  </data>
+  <data name="Icon.Book" xml:space="preserve">
+    <value>Book</value>
+  </data>
+  <data name="Icon.Bookmark" xml:space="preserve">
+    <value>Bookmark</value>
+  </data>
+  <data name="Icon.Box" xml:space="preserve">
+    <value>Box</value>
+  </data>
+  <data name="Icon.Briefcase" xml:space="preserve">
+    <value>Briefcase</value>
+  </data>
+  <data name="Icon.BritishPound" xml:space="preserve">
+    <value>British Pound</value>
+  </data>
+  <data name="Icon.Browser" xml:space="preserve">
+    <value>Browser</value>
+  </data>
+  <data name="Icon.Brush" xml:space="preserve">
+    <value>Brush</value>
+  </data>
+  <data name="Icon.Bug" xml:space="preserve">
+    <value>Bug</value>
+  </data>
+  <data name="Icon.Bullhorn" xml:space="preserve">
+    <value>Bullhorn</value>
+  </data>
+  <data name="Icon.Calculator" xml:space="preserve">
+    <value>Calculator</value>
+  </data>
+  <data name="Icon.Calendar" xml:space="preserve">
+    <value>Calendar</value>
+  </data>
+  <data name="Icon.CameraSlr" xml:space="preserve">
+    <value>Camera Slr</value>
+  </data>
+  <data name="Icon.CaretBottom" xml:space="preserve">
+    <value>Caret Bottom</value>
+  </data>
+  <data name="Icon.CaretLeft" xml:space="preserve">
+    <value>Caret Left</value>
+  </data>
+  <data name="Icon.CaretRight" xml:space="preserve">
+    <value>Caret Right</value>
+  </data>
+  <data name="Icon.CaretTop" xml:space="preserve">
+    <value>Caret Top</value>
+  </data>
+  <data name="Icon.Cart" xml:space="preserve">
+    <value>Cart</value>
+  </data>
+  <data name="Icon.Chat" xml:space="preserve">
+    <value>Chat</value>
+  </data>
+  <data name="Icon.Check" xml:space="preserve">
+    <value>Check</value>
+  </data>
+  <data name="Icon.ChevronBottom" xml:space="preserve">
+    <value>Chevron Bottom</value>
+  </data>
+  <data name="Icon.ChevronLeft" xml:space="preserve">
+    <value>Chevron Left</value>
+  </data>
+  <data name="Icon.ChevronRight" xml:space="preserve">
+    <value>Chevron Right</value>
+  </data>
+  <data name="Icon.ChevronTop" xml:space="preserve">
+    <value>Chevron Top</value>
+  </data>
+  <data name="Icon.CircleCheck" xml:space="preserve">
+    <value>Circle Check</value>
+  </data>
+  <data name="Icon.CircleX" xml:space="preserve">
+    <value>Circle X</value>
+  </data>
+  <data name="Icon.Clipboard" xml:space="preserve">
+    <value>Clipboard</value>
+  </data>
+  <data name="Icon.Clock" xml:space="preserve">
+    <value>Clock</value>
+  </data>
+  <data name="Icon.CloudDownload" xml:space="preserve">
+    <value>Cloud Download</value>
+  </data>
+  <data name="Icon.CloudUpload" xml:space="preserve">
+    <value>Cloud Upload</value>
+  </data>
+  <data name="Icon.Cloud" xml:space="preserve">
+    <value>Cloud</value>
+  </data>
+  <data name="Icon.Cloudy" xml:space="preserve">
+    <value>Cloudy</value>
+  </data>
+  <data name="Icon.Code" xml:space="preserve">
+    <value>Code</value>
+  </data>
+  <data name="Icon.Cog" xml:space="preserve">
+    <value>Cog</value>
+  </data>
+  <data name="Icon.CollapseDown" xml:space="preserve">
+    <value>Collapse Down</value>
+  </data>
+  <data name="Icon.CollapseLeft" xml:space="preserve">
+    <value>Collapse Left</value>
+  </data>
+  <data name="Icon.CollapseRight" xml:space="preserve">
+    <value>Collapse Right</value>
+  </data>
+  <data name="Icon.CollapseUp" xml:space="preserve">
+    <value>Collapse Up</value>
+  </data>
+  <data name="Icon.Command" xml:space="preserve">
+    <value>Command</value>
+  </data>
+  <data name="Icon.CommentSquare" xml:space="preserve">
+    <value>Comment Square</value>
+  </data>
+  <data name="Icon.Compass" xml:space="preserve">
+    <value>Compass</value>
+  </data>
+  <data name="Icon.Contrast" xml:space="preserve">
+    <value>Contrast</value>
+  </data>
+  <data name="Icon.Copywriting" xml:space="preserve">
+    <value>Copywriting</value>
+  </data>
+  <data name="Icon.CreditCard" xml:space="preserve">
+    <value>Credit Card</value>
+  </data>
+  <data name="Icon.Crop" xml:space="preserve">
+    <value>Crop</value>
+  </data>
+  <data name="Icon.Dashboard" xml:space="preserve">
+    <value>Dashboard</value>
+  </data>
+  <data name="Icon.DataTransferDownload" xml:space="preserve">
+    <value>Data Transfer Download</value>
+  </data>
+  <data name="Icon.DataTransferUpload" xml:space="preserve">
+    <value>Data Transfer Upload</value>
+  </data>
+  <data name="Icon.Delete" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Icon.Dial" xml:space="preserve">
+    <value>Dial</value>
+  </data>
+  <data name="Icon.Document" xml:space="preserve">
+    <value>Document</value>
+  </data>
+  <data name="Icon.Dollar" xml:space="preserve">
+    <value>Dollar</value>
+  </data>
+  <data name="Icon.DoubleQuoteSansLeft" xml:space="preserve">
+    <value>Double Quote Sans Left</value>
+  </data>
+  <data name="Icon.DoubleQuoteSansRight" xml:space="preserve">
+    <value>Double Quote Sans Right</value>
+  </data>
+  <data name="Icon.DoubleQuoteSerifLeft" xml:space="preserve">
+    <value>Double Quote Serif Left</value>
+  </data>
+  <data name="Icon.DoubleQuoteSerifRight" xml:space="preserve">
+    <value>Double Quote Serif Right</value>
+  </data>
+  <data name="Icon.Droplet" xml:space="preserve">
+    <value>Droplet</value>
+  </data>
+  <data name="Icon.Eject" xml:space="preserve">
+    <value>Eject</value>
+  </data>
+  <data name="Icon.Elevator" xml:space="preserve">
+    <value>Elevator</value>
+  </data>
+  <data name="Icon.Ellipses" xml:space="preserve">
+    <value>Ellipses</value>
+  </data>
+  <data name="Icon.EnvelopeClosed" xml:space="preserve">
+    <value>Envelope Closed</value>
+  </data>
+  <data name="Icon.EnvelopeOpen" xml:space="preserve">
+    <value>Envelope Open</value>
+  </data>
+  <data name="Icon.Euro" xml:space="preserve">
+    <value>Euro</value>
+  </data>
+  <data name="Icon.Excerpt" xml:space="preserve">
+    <value>Excerpt</value>
+  </data>
+  <data name="Icon.ExpandDown" xml:space="preserve">
+    <value>Expand Down</value>
+  </data>
+  <data name="Icon.ExpandLeft" xml:space="preserve">
+    <value>Expand Left</value>
+  </data>
+  <data name="Icon.ExpandRight" xml:space="preserve">
+    <value>Expand Right</value>
+  </data>
+  <data name="Icon.ExpandUp" xml:space="preserve">
+    <value>Expand Up</value>
+  </data>
+  <data name="Icon.ExternalLink" xml:space="preserve">
+    <value>External Link</value>
+  </data>
+  <data name="Icon.Eye" xml:space="preserve">
+    <value>Eye</value>
+  </data>
+  <data name="Icon.Eyedropper" xml:space="preserve">
+    <value>Eyedropper</value>
+  </data>
+  <data name="Icon.File" xml:space="preserve">
+    <value>File</value>
+  </data>
+  <data name="Icon.Fire" xml:space="preserve">
+    <value>Fire</value>
+  </data>
+  <data name="Icon.Flag" xml:space="preserve">
+    <value>Flag</value>
+  </data>
+  <data name="Icon.Flash" xml:space="preserve">
+    <value>Flash</value>
+  </data>
+  <data name="Icon.Folder" xml:space="preserve">
+    <value>Folder</value>
+  </data>
+  <data name="Icon.Fork" xml:space="preserve">
+    <value>Fork</value>
+  </data>
+  <data name="Icon.FullscreenEnter" xml:space="preserve">
+    <value>Fullscreen Enter</value>
+  </data>
+  <data name="Icon.FullscreenExit" xml:space="preserve">
+    <value>Fullscreen Exit</value>
+  </data>
+  <data name="Icon.Globe" xml:space="preserve">
+    <value>Globe</value>
+  </data>
+  <data name="Icon.Graph" xml:space="preserve">
+    <value>Graph</value>
+  </data>
+  <data name="Icon.GridFourUp" xml:space="preserve">
+    <value>Grid Four Up</value>
+  </data>
+  <data name="Icon.GridThreeUp" xml:space="preserve">
+    <value>Grid Three Up</value>
+  </data>
+  <data name="Icon.GridTwoUp" xml:space="preserve">
+    <value>Grid Two Up</value>
+  </data>
+  <data name="Icon.HardDrive" xml:space="preserve">
+    <value>Hard Drive</value>
+  </data>
+  <data name="Icon.Header" xml:space="preserve">
+    <value>Header</value>
+  </data>
+  <data name="Icon.Headphones" xml:space="preserve">
+    <value>Headphones</value>
+  </data>
+  <data name="Icon.Heart" xml:space="preserve">
+    <value>Heart</value>
+  </data>
+  <data name="Icon.Home" xml:space="preserve">
+    <value>Home</value>
+  </data>
+  <data name="Icon.Image" xml:space="preserve">
+    <value>Image</value>
+  </data>
+  <data name="Icon.Inbox" xml:space="preserve">
+    <value>Inbox</value>
+  </data>
+  <data name="Icon.Infinity" xml:space="preserve">
+    <value>Infinity</value>
+  </data>
+  <data name="Icon.Info" xml:space="preserve">
+    <value>Info</value>
+  </data>
+  <data name="Icon.Italic" xml:space="preserve">
+    <value>Italic</value>
+  </data>
+  <data name="Icon.JustifyCenter" xml:space="preserve">
+    <value>Justify Center</value>
+  </data>
+  <data name="Icon.JustifyLeft" xml:space="preserve">
+    <value>Justify Left</value>
+  </data>
+  <data name="Icon.JustifyRight" xml:space="preserve">
+    <value>Justify Right</value>
+  </data>
+  <data name="Icon.Key" xml:space="preserve">
+    <value>Key</value>
+  </data>
+  <data name="Icon.Laptop" xml:space="preserve">
+    <value>Laptop</value>
+  </data>
+  <data name="Icon.Layers" xml:space="preserve">
+    <value>Layers</value>
+  </data>
+  <data name="Icon.Lightbulb" xml:space="preserve">
+    <value>Lightbulb</value>
+  </data>
+  <data name="Icon.LinkBroken" xml:space="preserve">
+    <value>Link Broken</value>
+  </data>
+  <data name="Icon.LinkIntact" xml:space="preserve">
+    <value>Link Intact</value>
+  </data>
+  <data name="Icon.ListRich" xml:space="preserve">
+    <value>List Rich</value>
+  </data>
+  <data name="Icon.List" xml:space="preserve">
+    <value>List</value>
+  </data>
+  <data name="Icon.Location" xml:space="preserve">
+    <value>Location</value>
+  </data>
+  <data name="Icon.LockLocked" xml:space="preserve">
+    <value>Lock Locked</value>
+  </data>
+  <data name="Icon.LockUnlocked" xml:space="preserve">
+    <value>Lock Unlocked</value>
+  </data>
+  <data name="Icon.LoopCircular" xml:space="preserve">
+    <value>Loop Circular</value>
+  </data>
+  <data name="Icon.LoopSquare" xml:space="preserve">
+    <value>Loop Square</value>
+  </data>
+  <data name="Icon.Loop" xml:space="preserve">
+    <value>Loop</value>
+  </data>
+  <data name="Icon.MagnifyingGlass" xml:space="preserve">
+    <value>Magnifying Glass</value>
+  </data>
+  <data name="Icon.MapMarker" xml:space="preserve">
+    <value>Map Marker</value>
+  </data>
+  <data name="Icon.Map" xml:space="preserve">
+    <value>Map</value>
+  </data>
+  <data name="Icon.MediaPause" xml:space="preserve">
+    <value>Media Pause</value>
+  </data>
+  <data name="Icon.MediaPlay" xml:space="preserve">
+    <value>Media Play</value>
+  </data>
+  <data name="Icon.MediaRecord" xml:space="preserve">
+    <value>Media Record</value>
+  </data>
+  <data name="Icon.MediaSkipBackward" xml:space="preserve">
+    <value>Media Skip Backward</value>
+  </data>
+  <data name="Icon.MediaSkipForward" xml:space="preserve">
+    <value>Media Skip Forward</value>
+  </data>
+  <data name="Icon.MediaStepBackward" xml:space="preserve">
+    <value>Media Step Backward</value>
+  </data>
+  <data name="Icon.MediaStepForward" xml:space="preserve">
+    <value>Media Step Forward</value>
+  </data>
+  <data name="Icon.MediaStop" xml:space="preserve">
+    <value>Media Stop</value>
+  </data>
+  <data name="Icon.MedicalCross" xml:space="preserve">
+    <value>Medical Cross</value>
+  </data>
+  <data name="Icon.Menu" xml:space="preserve">
+    <value>Menu</value>
+  </data>
+  <data name="Icon.Microphone" xml:space="preserve">
+    <value>Microphone</value>
+  </data>
+  <data name="Icon.Minus" xml:space="preserve">
+    <value>Minus</value>
+  </data>
+  <data name="Icon.Monitor" xml:space="preserve">
+    <value>Monitor</value>
+  </data>
+  <data name="Icon.Moon" xml:space="preserve">
+    <value>Moon</value>
+  </data>
+  <data name="Icon.Move" xml:space="preserve">
+    <value>Move</value>
+  </data>
+  <data name="Icon.MusicalNote" xml:space="preserve">
+    <value>Musical Note</value>
+  </data>
+  <data name="Icon.Paperclip" xml:space="preserve">
+    <value>Paperclip</value>
+  </data>
+  <data name="Icon.Pencil" xml:space="preserve">
+    <value>Pencil</value>
+  </data>
+  <data name="Icon.People" xml:space="preserve">
+    <value>People</value>
+  </data>
+  <data name="Icon.Person" xml:space="preserve">
+    <value>Person</value>
+  </data>
+  <data name="Icon.Phone" xml:space="preserve">
+    <value>Phone</value>
+  </data>
+  <data name="Icon.PieChart" xml:space="preserve">
+    <value>Pie Chart</value>
+  </data>
+  <data name="Icon.Pin" xml:space="preserve">
+    <value>Pin</value>
+  </data>
+  <data name="Icon.PlayCircle" xml:space="preserve">
+    <value>Play Circle</value>
+  </data>
+  <data name="Icon.Plus" xml:space="preserve">
+    <value>Plus</value>
+  </data>
+  <data name="Icon.PowerStandby" xml:space="preserve">
+    <value>Power Standby</value>
+  </data>
+  <data name="Icon.Print" xml:space="preserve">
+    <value>Print</value>
+  </data>
+  <data name="Icon.Project" xml:space="preserve">
+    <value>Project</value>
+  </data>
+  <data name="Icon.Pulse" xml:space="preserve">
+    <value>Pulse</value>
+  </data>
+  <data name="Icon.PuzzlePiece" xml:space="preserve">
+    <value>Puzzle Piece</value>
+  </data>
+  <data name="Icon.QuestionMark" xml:space="preserve">
+    <value>Question Mark</value>
+  </data>
+  <data name="Icon.Rain" xml:space="preserve">
+    <value>Rain</value>
+  </data>
+  <data name="Icon.Random" xml:space="preserve">
+    <value>Random</value>
+  </data>
+  <data name="Icon.Reload" xml:space="preserve">
+    <value>Reload</value>
+  </data>
+  <data name="Icon.ResizeBoth" xml:space="preserve">
+    <value>Resize Both</value>
+  </data>
+  <data name="Icon.ResizeHeight" xml:space="preserve">
+    <value>Resize Height</value>
+  </data>
+  <data name="Icon.ResizeWidth" xml:space="preserve">
+    <value>Resize Width</value>
+  </data>
+  <data name="Icon.RssAlt" xml:space="preserve">
+    <value>Rss Alt</value>
+  </data>
+  <data name="Icon.Rss" xml:space="preserve">
+    <value>Rss</value>
+  </data>
+  <data name="Icon.Script" xml:space="preserve">
+    <value>Script</value>
+  </data>
+  <data name="Icon.ShareBoxed" xml:space="preserve">
+    <value>Share Boxed</value>
+  </data>
+  <data name="Icon.Share" xml:space="preserve">
+    <value>Share</value>
+  </data>
+  <data name="Icon.Shield" xml:space="preserve">
+    <value>Shield</value>
+  </data>
+  <data name="Icon.Signal" xml:space="preserve">
+    <value>Signal</value>
+  </data>
+  <data name="Icon.Signpost" xml:space="preserve">
+    <value>Signpost</value>
+  </data>
+  <data name="Icon.SortAscending" xml:space="preserve">
+    <value>Sort Ascending</value>
+  </data>
+  <data name="Icon.SortDescending" xml:space="preserve">
+    <value>Sort Descending</value>
+  </data>
+  <data name="Icon.Spreadsheet" xml:space="preserve">
+    <value>Spreadsheet</value>
+  </data>
+  <data name="Icon.Star" xml:space="preserve">
+    <value>Star</value>
+  </data>
+  <data name="Icon.Sun" xml:space="preserve">
+    <value>Sun</value>
+  </data>
+  <data name="Icon.Tablet" xml:space="preserve">
+    <value>Tablet</value>
+  </data>
+  <data name="Icon.Tag" xml:space="preserve">
+    <value>Tag</value>
+  </data>
+  <data name="Icon.Tags" xml:space="preserve">
+    <value>Tags</value>
+  </data>
+  <data name="Icon.Target" xml:space="preserve">
+    <value>Target</value>
+  </data>
+  <data name="Icon.Task" xml:space="preserve">
+    <value>Task</value>
+  </data>
+  <data name="Icon.Terminal" xml:space="preserve">
+    <value>Terminal</value>
+  </data>
+  <data name="Icon.Text" xml:space="preserve">
+    <value>Text</value>
+  </data>
+  <data name="Icon.ThumbDown" xml:space="preserve">
+    <value>Thumb Down</value>
+  </data>
+  <data name="Icon.ThumbUp" xml:space="preserve">
+    <value>Thumb Up</value>
+  </data>
+  <data name="Icon.Timer" xml:space="preserve">
+    <value>Timer</value>
+  </data>
+  <data name="Icon.Transfer" xml:space="preserve">
+    <value>Transfer</value>
+  </data>
+  <data name="Icon.Trash" xml:space="preserve">
+    <value>Trash</value>
+  </data>
+  <data name="Icon.Underline" xml:space="preserve">
+    <value>Underline</value>
+  </data>
+  <data name="Icon.VerticalAlignBottom" xml:space="preserve">
+    <value>Vertical Align Bottom</value>
+  </data>
+  <data name="Icon.VerticalAlignCenter" xml:space="preserve">
+    <value>Vertical Align Center</value>
+  </data>
+  <data name="Icon.VerticalAlignTop" xml:space="preserve">
+    <value>Vertical Align Top</value>
+  </data>
+  <data name="Icon.Video" xml:space="preserve">
+    <value>Video</value>
+  </data>
+  <data name="Icon.VolumeHigh" xml:space="preserve">
+    <value>Volume High</value>
+  </data>
+  <data name="Icon.VolumeLow" xml:space="preserve">
+    <value>Volume Low</value>
+  </data>
+  <data name="Icon.VolumeOff" xml:space="preserve">
+    <value>Volume Off</value>
+  </data>
+  <data name="Icon.Warning" xml:space="preserve">
+    <value>Warning</value>
+  </data>
+  <data name="Icon.Wifi" xml:space="preserve">
+    <value>Wifi</value>
+  </data>
+  <data name="Icon.Wrench" xml:space="preserve">
+    <value>Wrench</value>
+  </data>
+  <data name="Icon.X" xml:space="preserve">
+    <value>X</value>
+  </data>
+  <data name="Icon.Yen" xml:space="preserve">
+    <value>Yen</value>
+  </data>
+  <data name="Icon.ZoomIn" xml:space="preserve">
+    <value>Zoom In</value>
+  </data>
+  <data name="Icon.ZoomOut" xml:space="preserve">
+    <value>Zoom Out</value>
+  </data>
+</root>

Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx

@@ -121,7 +121,7 @@
     <value>Server:</value>
   </data>
   <data name="Server.HelpText" xml:space="preserve">
-    <value>Enter the database server</value>
+    <value>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) </value>
   </data>
   <data name="Database.Text" xml:space="preserve">
     <value>Database:</value>
@@ -133,7 +133,7 @@
     <value>Integrated Security:</value>
   </data>
   <data name="IntegratedSecurity.HelpText" xml:space="preserve">
-    <value>Select if you want integrated security or not</value>
+    <value>Select if you are using integrated security</value>
   </data>
   <data name="Uid.Text" xml:space="preserve">
     <value>User Id:</value>
@@ -163,7 +163,7 @@
     <value>Self Signed</value>
   </data>
   <data name="TrustServerCertificate.HelpText" xml:space="preserve">
-    <value>Specify the type of certificate you are using for encryption</value>
+    <value>Specify the type of certificate you are using for encryption. Verifiable is equivalent to False. Self Signed is equivalent to True.</value>
   </data>
   <data name="TrustServerCertificate.Text" xml:space="preserve">
     <value>Trust Server Certificate:</value>

Oqtane.Client/Resources/Installer/Installer.resx

@@ -124,7 +124,7 @@
     <value>Database:</value>
   </data>
   <data name="ApplicationAdmin" xml:space="preserve">
-    <value>Application Administrator</value>
+    <value>Application Administration</value>
   </data>
   <data name="InstallNow" xml:space="preserve">
     <value>Install Now</value>
@@ -135,10 +135,10 @@
   <data name="Message.Require.DbInfo" xml:space="preserve">
     <value>Please Enter All Required Fields. Ensure Passwords Match And Email Address Provided Is Valid.</value>
   </data>
-    <data name="Message.Password.Invalid" xml:space="preserve">
-    <value>The Password Provided Does Not Meet The Password Policy. Please Verify The Minimum Password Length And Complexity Requirements.</value>
+  <data name="Message.Password.Invalid" xml:space="preserve">
+    <value>The Password Provided Does Not Meet The Complexity Policy. Passwords Must Be At Least 6 Characters In Length And Contain Uppercase, Lowercase, Numeric, And Punctuation Characters.</value>
   </data>
-    <data name="Register" xml:space="preserve">
+  <data name="Register" xml:space="preserve">
     <value>Please Register Me For Major Product Updates And Security Bulletins</value>
   </data>
   <data name="Confirm.HelpText" xml:space="preserve">
@@ -168,4 +168,19 @@
   <data name="Username.Text" xml:space="preserve">
     <value>Username:</value>
   </data>
+  <data name="ConnectionString.HelpText" xml:space="preserve">
+    <value>Enter a complete connection string including all parameters and delimiters</value>
+  </data>
+  <data name="ConnectionString.Text" xml:space="preserve">
+    <value>Settings:</value>
+  </data>
+  <data name="EnterConnectionParameters" xml:space="preserve">
+    <value>Enter Connection Parameters</value>
+  </data>
+  <data name="EnterConnectionString" xml:space="preserve">
+    <value>Enter Connection String</value>
+  </data>
+  <data name="Template" xml:space="preserve">
+    <value>Select a site template</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Api/Edit.resx

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="EntityName.HelpText" xml:space="preserve">
+    <value>The Name Of The Entity</value>
+  </data>
+  <data name="EntityName.Text" xml:space="preserve">
+    <value>Entity:</value>
+  </data>
+</root>

Oqtane.Client/Resources/Modules/Admin/Api/Index.resx

@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Entity" xml:space="preserve">
+    <value>Entity</value>
+  </data>
+  <data name="Permissions" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+</root>

Oqtane.Client/Resources/Modules/Admin/Error/Index.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -118,6 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Error.Module.Load" xml:space="preserve">
-    <value>A Problem Was Encountered Loading Module {0}</value>
+    <value>A Problem Was Encountered Loading Module {0}. The Module Is Either Invalid Or Does Not Exist.</value>
   </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Files/Add.resx

@@ -162,4 +162,7 @@
   <data name="Name.Text" xml:space="preserve">
     <value>Name:</value>
   </data>
+  <data name="DownloadFiles.Heading" xml:space="preserve">
+    <value>Download Files</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Files/Details.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -150,4 +150,7 @@
   <data name="Description.Text" xml:space="preserve">
     <value>Description:</value>
   </data>
+  <data name="File Management" xml:space="preserve">
+    <value>File Management</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Files/Edit.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -178,9 +178,21 @@
     <value>Capacity:</value>
   </data>
   <data name="ImageSizes.HelpText" xml:space="preserve">
-    <value>Enter a list of image sizes which can be generated dynamically from uploaded images (ie. 200x200,x200,200x)</value>
+    <value>Enter a list of image sizes which can be generated dynamically from uploaded images (ie. 200x200,400x400). Use * to indicate the folder supports all image sizes.</value>
   </data>
   <data name="ImageSizes.Text" xml:space="preserve">
     <value>Image Sizes:</value>
   </data>
+  <data name="FolderManagement.Title" xml:space="preserve">
+    <value>Folder Management!</value>
+  </data>
+  <data name="Private" xml:space="preserve">
+    <value>Private</value>
+  </data>
+  <data name="Public" xml:space="preserve">
+    <value>Public</value>
+  </data>
+  <data name="Folder Management" xml:space="preserve">
+    <value>Folder Management</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Jobs/Index.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -192,4 +192,10 @@
   <data name="Once" xml:space="preserve">
     <value>Execute Once</value>
   </data>
+  <data name="Message.NoJobs" xml:space="preserve">
+    <value>Please Note That After An Initial Installation You Must &lt;a href={0}&gt;Restart&lt;/a&gt; The Application In Order To Activate The Default Scheduled Jobs.</value>
+  </data>
+  <data name="Refresh.Text" xml:space="preserve">
+    <value>Refresh</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Languages/Add.resx

@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="The Only Supported Culture That Has Been Defined Is English" xml:space="preserve">
-    <value>The Only Supported Culture That Has Been Defined Is English</value>
-  </data>
   <data name="Error.Language.Add" xml:space="preserve">
     <value>Error Adding Language</value>
   </data>
@@ -135,32 +132,14 @@
   <data name="IsDefault.Text" xml:space="preserve">
     <value>Default?</value>
   </data>
-  <data name="AllLanguages" xml:space="preserve">
-    <value>All The Installed Languages Have Been Added.</value>
-  </data>
-  <data name="Error.Language.Download" xml:space="preserve">
-    <value>Error Downloading Translation</value>
-  </data>
-  <data name="OnlyEnglish" xml:space="preserve">
-    <value>The Only Installed Language Is English</value>
-  </data>
   <data name="Success.Language.Download" xml:space="preserve">
-    <value>Translation Downloaded Successfully. Click Install To Complete Installation.</value>
-  </data>
-  <data name="Success.Language.Install" xml:space="preserve">
-    <value>Translations Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
-  </data>
-  <data name="Search.NoResults" xml:space="preserve">
-    <value>No Translations Match The Criteria Provided Or Package Service Is Disabled</value>
-  </data>
-  <data name="Download.Heading" xml:space="preserve">
-    <value>Download</value>
+    <value>Translation Package Saved Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; To Complete The Installation.</value>
   </data>
   <data name="LanguageUpload.HelpText" xml:space="preserve">
-    <value>Upload one or more translations. Once they are uploaded click Install to complete the installation.</value>
+    <value>Upload one or more translation packages.</value>
   </data>
   <data name="LanguageUpload.Text" xml:space="preserve">
-    <value>Upload Language</value>
+    <value>Translation</value>
   </data>
   <data name="Manage.Heading" xml:space="preserve">
     <value>Manage</value>

Oqtane.Client/Resources/Modules/Admin/Languages/Index.resx

@@ -132,16 +132,19 @@
   <data name="DeleteLanguage.Header" xml:space="preserve">
     <value>Delete Language</value>
   </data>
+  <data name="Success.Language.Download" xml:space="preserve">
+    <value>Translation Package Saved Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Complete The Installation.</value>
+  </data>
   <data name="Error.Language.Download" xml:space="preserve">
     <value>Error Downloading Translation</value>
   </data>
-  <data name="Success.Language.Install" xml:space="preserve">
-    <value>Translation Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
-  </data>
   <data name="Default" xml:space="preserve">
     <value>Default</value>
   </data>
   <data name="DeleteLanguage.Text" xml:space="preserve">
     <value>Delete</value>
   </data>
+  <data name="Translation" xml:space="preserve">
+    <value>Translation</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Logs/Detail.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -136,7 +136,7 @@
     <value>The function that was performed</value>
   </data>
   <data name="Category.HelpText" xml:space="preserve">
-    <value>The categories that were affected</value>
+    <value>The fully qualified type type that was affected</value>
   </data>
   <data name="Page.HelpText" xml:space="preserve">
     <value>The page that was affected</value>
@@ -178,7 +178,7 @@
     <value>Function: </value>
   </data>
   <data name="Category.Text" xml:space="preserve">
-    <value>Category: </value>
+    <value>Type Name: </value>
   </data>
   <data name="Page.Text" xml:space="preserve">
     <value>Page: </value>

Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Add.resx

@@ -123,25 +123,25 @@
   <data name="Error.Package.Load" xml:space="preserve">
     <value>Error Loading Packages</value>
   </data>
-  <data name="Success.Module.Install" xml:space="preserve">
-    <value>Module Installed Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Apply These Changes.</value>
-  </data>
   <data name="Success.Module.Download" xml:space="preserve">
-    <value>Module Downloaded Successfully. Click Install To Complete Installation.</value>
+    <value>Module Package Downloaded Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Complete The Installation.</value>
   </data>
   <data name="Error.Module.Download" xml:space="preserve">
     <value>Error Downloading Module</value>
   </data>
   <data name="Module.HelpText" xml:space="preserve">
-    <value>Upload one or more module packages. Once they are uploaded click Install to complete the installation.</value>
+    <value>Upload one or more module packages.</value>
   </data>
   <data name="Search.NoResults" xml:space="preserve">
     <value>No Modules Match The Criteria Provided Or Package Service Is Disabled</value>
   </data>
   <data name="Download.Heading" xml:space="preserve">
-    <value>Download</value>
+    <value>Marketplace</value>
   </data>
   <data name="Upload.Heading" xml:space="preserve">
     <value>Upload</value>
   </data>
+  <data name="Product" xml:space="preserve">
+    <value>Product</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Create.resx

@@ -132,6 +132,9 @@
   <data name="Message.Require.ValidName" xml:space="preserve">
     <value>You Must Provide A Valid Owner Name And Module Name ( ie. No Punctuation Or Spaces And The Values Cannot Be The Same ) And Choose A Template</value>
   </data>
+  <data name="Message.Require.ValidDescription" xml:space="preserve">
+    <value>You Must Provide A Valid Description (ie. No Punctuation)</value>
+  </data>
   <data name="OwnerName.HelpText" xml:space="preserve">
     <value>Enter the name of the organization who is developing this module. It should not contain spaces or punctuation.</value>
   </data>

Oqtane.Client/Resources/Modules/Admin/ModuleDefinitions/Edit.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -195,4 +195,49 @@
   <data name="Information.Text" xml:space="preserve">
     <value>Information</value>
   </data>
+  <data name="PackageName.HelpText" xml:space="preserve">
+    <value>The unique name of the package from which this module was installed. This value must be specified within the module's IModule interface specification.</value>
+  </data>
+  <data name="PackageName.Text" xml:space="preserve">
+    <value>Package Name:</value>
+  </data>
+  <data name="Error.Translation.Download" xml:space="preserve">
+    <value>Error Downloading Translation</value>
+  </data>
+  <data name="Search.PackageNameMissing" xml:space="preserve">
+    <value>A Package Name Was Not Provided For The Module</value>
+  </data>
+  <data name="Search.NoResults" xml:space="preserve">
+    <value>No Translations Exist For This Module Or Package Service Is Disabled</value>
+  </data>
+  <data name="Success.Translation.Download" xml:space="preserve">
+    <value>Translation Package Saved Successfully. You Must &lt;a href={0}&gt;Restart&lt;/a&gt; Your Application To Complete The Installation.</value>
+  </data>
+  <data name="Translations.Heading" xml:space="preserve">
+    <value>Translations</value>
+  </data>
+  <data name="Message.DuplicateName" xml:space="preserve">
+    <value>A Module With The Name Specified Already Exists</value>
+  </data>
+  <data name="IsEnabled.HelpText" xml:space="preserve">
+    <value>Is module enabled for this site?</value>
+  </data>
+  <data name="IsEnabled.Text" xml:space="preserve">
+    <value>Enabled?</value>
+  </data>
+  <data name="View License" xml:space="preserve">
+    <value>View License</value>
+  </data>
+  <data name="Error.Validate" xml:space="preserve">
+    <value>Error Validating Package</value>
+  </data>
+  <data name="Message.Download" xml:space="preserve">
+    <value>Package Version Has Been Verified. Please Select The Download Button To Obtain The Package.</value>
+  </data>
+  <data name="Message.Validate" xml:space="preserve">
+    <value>This Package Version Has Not Been Registered In The Oqtane Marketplace Or You Do Not Have The Right To Use It From This Installation</value>
+  </data>
+  <data name="Validate" xml:space="preserve">
+    <value>Validate</value>
+  </data>
 </root>