Update README.md

use PageState.Uri rather than creating a new Uri object

LICENSE

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

Oqtane.Client/App.razor

@@ -15,7 +15,7 @@
             <div style="@_display">
                 <CascadingAuthenticationState>
                     <CascadingValue Value="@PageState">
-                        <SiteRouter Runtime="@Runtime" RenderMode="@RenderMode" OnStateChange="@ChangeState" />
+                        <SiteRouter Runtime="@Runtime" RenderMode="@RenderMode" VisitorId="@VisitorId" OnStateChange="@ChangeState" />
                     </CascadingValue>
                 </CascadingAuthenticationState>
             </div>
@@ -30,25 +30,32 @@
 }
 
 @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; }
 
-    private bool _initialized = false;
-    private string _display = "display: none;";
-    private Installation _installation = new Installation { Success = false, Message = "" };
+	[Parameter]
+	public int VisitorId { get; set; }
 
-    private PageState PageState { get; set; }
+	[Parameter]
+	public string RemoteIPAddress { get; set; }
 
-    protected override async Task OnParametersSetAsync()
-    {
-        SiteState.AntiForgeryToken = AntiForgeryToken;
-        InstallationService.SetAntiForgeryTokenHeader(AntiForgeryToken);
+	private bool _initialized = false;
+	private string _display = "display: none;";
+	private Installation _installation = new Installation { Success = false, Message = "" };
+
+	private PageState PageState { get; set; }
+
+	protected override async Task OnParametersSetAsync()
+	{
+		SiteState.RemoteIPAddress = RemoteIPAddress;
+		SiteState.AntiForgeryToken = AntiForgeryToken;
+		InstallationService.SetAntiForgeryTokenHeader(AntiForgeryToken);
 
         _installation = await InstallationService.IsInstalled();
         if (_installation.Alias != null)

Oqtane.Client/Extensions/OqtaneServiceCollectionExtensions.cs

@@ -46,6 +46,8 @@ namespace Microsoft.Extensions.DependencyInjection
             services.AddScoped<ILocalizationService, LocalizationService>();
             services.AddScoped<ILanguageService, LanguageService>();
             services.AddScoped<IDatabaseService, DatabaseService>();
+            services.AddScoped<IUrlMappingService, UrlMappingService>();
+            services.AddScoped<IVisitorService, VisitorService>();
             services.AddScoped<ISyncService, SyncService>();
 
             return services;

Oqtane.Client/Installer/Installer.razor

@@ -158,8 +158,8 @@
         if (firstRender)
         {
             var interop = new Interop(JSRuntime);
-            await interop.IncludeLink("", "stylesheet", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.0.2/css/bootstrap.min.css", "text/css", "sha512-usVBAd66/NpVNfBge19gws2j6JZinnca12rAe2l+d+QkLU9fiG02O1X8Q6hepIpr/EYKZvKx/I9WsnujJuOmBA==", "anonymous", "");
-            await interop.IncludeScript("", "https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.0.2/js/bootstrap.min.js", "sha512-a6ctI6w1kg3J4dSjknHj3aWLEbjitAXAjLDRUxo2wyYmDFRcz2RJuQr5M3Kt8O/TtUSp8n2rAyaXYy1sjoKmrQ==", "anonymous", "", "head", "");
+            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", "");
         }
     }
 

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

@@ -27,6 +27,6 @@
     protected override void OnInitialized()
     {
         var admin = PageState.Pages.FirstOrDefault(item => item.Path == "admin");
-        _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId).ToList();
+        _pages = PageState.Pages.Where(item => item.ParentId == admin?.PageId && !item.IsDeleted).ToList();
     }
 }

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

@@ -36,7 +36,9 @@
                     <option value="m">@Localizer["Minute(s)"]</option>
                     <option value="H">@Localizer["Hour(s)"]</option>
                     <option value="d">@Localizer["Day(s)"]</option>
+                    <option value="w">@Localizer["Week(s)"]</option>
                     <option value="M">@Localizer["Month(s)"]</option>
+                    <option value="O">@Localizer["Once"]</option>
                 </select>
             </div>
         </div>
@@ -95,82 +97,89 @@
 </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 DateTime createdon;
-    private string modifiedby;
-    private DateTime modifiedon;
+	private ElementReference form;
+	private bool validated = false;
+	private int _jobId;
+	private string _name = string.Empty;
+	private string _jobType = string.Empty;
+	private string _isEnabled = "True";
+	private string _interval = string.Empty;
+	private string _frequency = string.Empty;
+	private DateTime? _startDate = null;
+	private string _startTime = string.Empty;
+	private DateTime? _endDate = null;
+	private string _endTime = string.Empty;
+	private string _retentionHistory = string.Empty;
+	private DateTime? _nextDate = null;
+	private string _nextTime = string.Empty;
+	private string createdby;
+	private DateTime createdon;
+	private string modifiedby;
+	private DateTime modifiedon;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _jobId = Int32.Parse(PageState.QueryString["id"]);
-            Job job = await JobService.GetJobAsync(_jobId);
-            if (job != null)
-            {
-                _name = job.Name;
-                _jobType = job.JobType;
-                _isEnabled = job.IsEnabled.ToString();
-                _interval = job.Interval.ToString();
-                _frequency = job.Frequency;
-                _startDate = job.StartDate;
-                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;
-                createdon = job.CreatedOn;
-                modifiedby = job.ModifiedBy;
-                modifiedon = job.ModifiedOn;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
-            AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
-        }
-    }
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_jobId = Int32.Parse(PageState.QueryString["id"]);
+			Job job = await JobService.GetJobAsync(_jobId);
+			if (job != null)
+			{
+				_name = job.Name;
+				_jobType = job.JobType;
+				_isEnabled = job.IsEnabled.ToString();
+				_interval = job.Interval.ToString();
+				_frequency = job.Frequency;
+				_startDate = job.StartDate;
+				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;
+				createdon = job.CreatedOn;
+				modifiedby = job.ModifiedBy;
+				modifiedon = job.ModifiedOn;
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Job {JobId} {Error}", _jobId, ex.Message);
+			AddModuleMessage(Localizer["Error.Job.Load"], MessageType.Error);
+		}
+	}
 
-    private async Task SaveJob()
-    {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
-        {
-            var job = await JobService.GetJobAsync(_jobId);
-            job.Name = _name;
-            job.JobType = _jobType;
-            job.IsEnabled = Boolean.Parse(_isEnabled);
-            job.Frequency = _frequency;
-            job.Interval = int.Parse(_interval);
+	private async Task SaveJob()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			var job = await JobService.GetJobAsync(_jobId);
+			job.Name = _name;
+			job.JobType = _jobType;
+			job.IsEnabled = Boolean.Parse(_isEnabled);
+			job.Frequency = _frequency;
+			if (job.Frequency == "O") // once
+			{
+				job.Interval = 1;
+			}
+			else
+			{
+				job.Interval = int.Parse(_interval);
+			}
             job.StartDate = _startDate;
             if (job.StartDate != null)
             {

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

@@ -36,75 +36,75 @@ else
             <td>@context.NextExecution</td>
             <td>
                 @if (context.IsStarted)
-                    {
+                {
                     <button type="button" class="btn btn-danger" @onclick="(async () => await StopJob(context.JobId))">@Localizer["Stop"]</button>
-                    }
-                    else
-                    {
+                }
+                else
+                {
                     <button type="button" class="btn btn-success" @onclick="(async () => await StartJob(context.JobId))">@Localizer["Start"]</button>
-                    }
+                }
             </td>
         </Row>
     </Pager>
 }
 
 @code {
-    private List<Job> _jobs;
+	private List<Job> _jobs;
 
-    public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
+	public override SecurityAccessLevel SecurityAccessLevel { get { return SecurityAccessLevel.Host; } }
 
-    protected override async Task OnParametersSetAsync()
-    {
-        _jobs = await JobService.GetJobsAsync();
-    }
+	protected override async Task OnParametersSetAsync()
+	{
+		_jobs = await JobService.GetJobsAsync();
+	}
 
-    private string DisplayStatus(bool isEnabled, bool isExecuting)
-    {
-        var status = string.Empty;
-        if (!isEnabled)
-        {
-            status = Localizer["Disabled"];
-        }
-        else
-        {
-            if (isExecuting)
-            {
-                status = Localizer["Executing"];
-            }
-            else
-            {
-                status = Localizer["Idle"];
-            }
-        }
+	private string DisplayStatus(bool isEnabled, bool isExecuting)
+	{
+		var status = string.Empty;
+		if (!isEnabled)
+		{
+			status = Localizer["Disabled"];
+		}
+		else
+		{
+			if (isExecuting)
+			{
+				status = Localizer["Executing"];
+			}
+			else
+			{
+				status = Localizer["Idle"];
+			}
+		}
 
-        return status;
-    }
+		return status;
+	}
 
 
-    private string DisplayFrequency(int interval, string frequency)
-    {
-        var result = $"{Localizer["Every"]} {interval.ToString()} ";
-        switch (frequency)
-        {
-            case "m":
-                result += Localizer["Minute"];
-                break;
-            case "H":
-                result += Localizer["Hour"];
-                break;
-            case "d":
-                result += Localizer["Day"];
-                break;
-            case "M":
-                result += Localizer["Month"];
-                break;
-        }
-
-        if (interval > 1)
-        {
-            result += Localizer["s"];
-        }
-
+	private string DisplayFrequency(int interval, string frequency)
+	{
+		var result = "";
+		switch (frequency)
+		{
+			case "m":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Minute"];
+				break;
+			case "H":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Hour"];
+				break;
+			case "d":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Day"];
+				break;
+			case "w":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Week"];
+				break;
+			case "M":
+				result = $"{Localizer["Every"]} {interval.ToString()} " + Localizer["Month"];
+				break;
+			case "O":
+				result = Localizer["Once"];
+				break;
+		}
         return result;
     }
 
@@ -114,6 +114,7 @@ else
         {
             await JobService.DeleteJobAsync(job.JobId);
             await logger.LogInformation("Job Deleted {Job}", job);
+			_jobs = await JobService.GetJobsAsync();
             StateHasChanged();
         }
         catch (Exception ex)
@@ -125,12 +126,36 @@ else
 
     private async Task StartJob(int jobId)
     {
-        await JobService.StartJobAsync(jobId);
+        try
+        {
+			await JobService.StartJobAsync(jobId);
+            await logger.LogInformation("Job Started {JobId}", jobId);
+            AddModuleMessage(Localizer["Message.Job.Start"], MessageType.Success);
+			_jobs = await JobService.GetJobsAsync();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Starting Job {JobId} {Error}", jobId, ex.Message);
+            AddModuleMessage(Localizer["Error.Job.Start"], MessageType.Error);
+        }
     }
 
     private async Task StopJob(int jobId)
     {
-        await JobService.StopJobAsync(jobId);
+        try
+        {
+			await JobService.StopJobAsync(jobId);
+            await logger.LogInformation("Job Stopped {JobId}", jobId);
+            AddModuleMessage(Localizer["Message.Job.Stop"], MessageType.Success);
+			_jobs = await JobService.GetJobsAsync();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Stopping Job {JobId} {Error}", jobId, ex.Message);
+            AddModuleMessage(Localizer["Error.Job.Stop"], MessageType.Error);
+        }
     }
 
     private async Task Refresh()

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

@@ -113,7 +113,7 @@ else
         <TabPanel Name="Upload" ResourceKey="Upload" Security="SecurityAccessLevel.Host">
             <div class="container">
                 <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" HelpText="Upload one or more translations. Once they are uploaded click Install to complete the installation." ResourceKey="Module">Language: </Label>
+                    <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>
                     <div class="col-sm-9">
                         <FileManager Folder="@Constants.PackagesFolder" UploadMultiple="true" />
                     </div>
@@ -350,7 +350,7 @@ else
             var localizationCookieValue = CookieRequestCultureProvider.MakeCookieValue(new RequestCulture(culture));
             await interop.SetCookie(CookieRequestCultureProvider.DefaultCookieName, localizationCookieValue, 360);
 
-            NavigationManager.NavigateTo(NavigationManager.Uri, forceLoad: true);
+            NavigationManager.NavigateTo(NavigationManager.Uri, true);
         }
     }
 }

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

@@ -177,17 +177,17 @@
             {
                 await UserService.ForgotPasswordAsync(user);
                 await logger.LogInformation(LogFunction.Security, "Password Reset Notification Sent For Username {Username}", _username);
-                _message = "Please Check The Email Address Associated To Your User Account For A Password Reset Notification";
+                _message = Localizer["Message.ForgotUser"];
             }
             else
             {
-                _message = "User Does Not Exist";
+                _message = Localizer["Message.UserDoesNotExist"];
                 _type = MessageType.Warning;
             }
         }
         else
         {
-            _message = "Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again";
+            _message = Localizer["Message.ForgotPassword"];
         }
 
         StateHasChanged();

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

@@ -10,100 +10,32 @@
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
     <div class="container">
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-        <div class="row mb-1 align-items-center">
-
-            <div class="col-sm-9">
-
-            </div>
-        </div>
-
-    </div>
        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
+            <Label Class="col-sm-3" For="dateTime" HelpText="The date and time of this log" ResourceKey="DateTime">Date/Time: </Label>
             <div class="col-sm-9">
                 <input id="dateTime" class="form-control" @bind="@_logDate" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
+            <Label Class="col-sm-3" For="level" HelpText="The level of this log" ResourceKey="Level">Level: </Label>
             <div class="col-sm-9">
                 <input id="level" class="form-control" @bind="@_level" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
+            <Label Class="col-sm-3" For="feature" HelpText="The feature that was affected" ResourceKey="Feature">Feature: </Label>
             <div class="col-sm-9">
                 <input id="feature" class="form-control" @bind="@_feature" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-                 <Label Class="col-sm-3" For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
+            <Label Class="col-sm-3" For="function" HelpText="The function that was performed" ResourceKey="Function">Function: </Label>
             <div class="col-sm-9">
                 <input id="function" class="form-control" @bind="@_function" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-               <Label Class="col-sm-3" For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
+            <Label Class="col-sm-3" For="category" HelpText="The categories that were affected" ResourceKey="Category">Category: </Label>
             <div class="col-sm-9">
                 <input id="category" class="form-control" @bind="@_category" readonly />
             </div>
@@ -111,7 +43,7 @@
         @if (_pageName != string.Empty)
         {
            <div class="row mb-1 align-items-center">
-                   <Label Class="col-sm-3" For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
+                <Label Class="col-sm-3" For="page" HelpText="The page that was affected" ResourceKey="Page">Page: </Label>
                 <div class="col-sm-9">
                     <input id="page" class="form-control" @bind="@_pageName" readonly />
                 </div>
@@ -120,7 +52,7 @@
         @if (_moduleTitle != string.Empty)
         {
            <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
+                <Label Class="col-sm-3" For="module" HelpText="The module that was affected" ResourceKey="Module">Module: </Label>
                 <div class="col-sm-9">
                     <input id="module" class="form-control" @bind="@_moduleTitle" readonly />
                 </div>
@@ -129,26 +61,26 @@
         @if (_username != string.Empty)
         {
            <div class="row mb-1 align-items-center">
-                   <Label Class="col-sm-3" For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
+                <Label Class="col-sm-3" For="user" HelpText="The user that caused this log" ResourceKey="User">User: </Label>
                  <div class="col-sm-9">
                     <input id="user" class="form-control" @bind="@_username" readonly />
                 </div>
            </div>
         }
        <div class="row mb-1 align-items-center">
-               <Label Class="col-sm-3" For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
+            <Label Class="col-sm-3" For="url" HelpText="The url the log comes from" ResourceKey="Url">Url: </Label>
             <div class="col-sm-9">
                 <input id="url" class="form-control" @bind="@_url" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-               <Label Class="col-sm-3" For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
+            <Label Class="col-sm-3" For="template" HelpText="What the log is about" ResourceKey="Template">Template: </Label>
             <div class="col-sm-9">
                 <input id="template" class="form-control" @bind="@_template" readonly />
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-                 <Label Class="col-sm-3" For="message" HelpText="The message that the system generated" ResourceKey="Message">Message: </Label>
+            <Label Class="col-sm-3" For="message" HelpText="The message that the system generated" ResourceKey="Message">Message: </Label>
             <div class="col-sm-9">
                 <textarea id="message" class="form-control" @bind="@_message" rows="5" readonly></textarea>
             </div>
@@ -156,24 +88,25 @@
         @if (!string.IsNullOrEmpty(_exception))
         {
            <div class="row mb-1 align-items-center">
-                    <Label Class="col-sm-3" For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
-               <div class="col-sm-9">
+                <Label Class="col-sm-3" For="exception" HelpText="The exceptions generated by the system" ResourceKey="Exception">Exception: </Label>
+				<div class="col-sm-9">
                     <textarea id="exception" class="form-control" @bind="@_exception" rows="5" readonly></textarea>
                 </div>
            </div>
         }
        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
+            <Label Class="col-sm-3" For="properties" HelpText="The properties that were affected" ResourceKey="Properties">Properties: </Label>
             <div class="col-sm-9">
                 <textarea id="properties" class="form-control" @bind="@_properties" rows="5" readonly></textarea>
             </div>
        </div>
        <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
-           <div class="col-sm-9">
+            <Label Class="col-sm-3" For="server" HelpText="The server that was affected" ResourceKey="Server">Server: </Label>
+			<div class="col-sm-9">
                 <input id="server" class="form-control" @bind="@_server" readonly />
             </div>
         </div>
+    </div>
 
     <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
 

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

@@ -1,6 +1,7 @@
 @namespace Oqtane.Modules.Admin.Logs
 @inherits ModuleBase
 @inject ILogService LogService
+@inject ISettingService SettingService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -10,66 +11,83 @@
 }
 else
 {
-    <div class="container g-0">
-        <div class="row mb-1 align-items-center">
-            <div class="col-sm-4">
-                <Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
-                <select id="level" class="form-select" @onchange="(e => LevelChanged(e))">
-                    <option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
-                    <option value="Trace">@Localizer["Trace"]</option>
-                    <option value="Debug">@Localizer["Debug"]</option>
-                    <option value="Information">@Localizer["Information"]</option>
-                    <option value="Warning">@Localizer["Warning"]</option>
-                    <option value="Error">@Localizer["Error"]</option>
-                    <option value="Critical">@Localizer["Critical"]</option>
-                </select>
-            </div>            
-            <div class="col-sm-4">
-                <Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
-                <select id="function" class="form-select" @onchange="(e => FunctionChanged(e))">
-                    <option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
-                    <option value="Create">@Localizer["Create"]</option>
-                    <option value="Read">@Localizer["Read"]</option>
-                    <option value="Update">@SharedLocalizer["Update"]</option>
-                    <option value="Delete">@SharedLocalizer["Delete"]</option>
-                    <option value="Security">@Localizer["Security"]</option>
-                    <option value="Other">@Localizer["Other"]</option>
-                </select>
-            </div>            
-            <div class="col-sm-4">
-                <Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br />
-                <select id="rows" class="form-select" @onchange="(e => RowsChanged(e))">
-                    <option value="10">10</option>
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                </select>
-            </div>
-        </div>
-    </div>
+    <TabStrip>
+        <TabPanel Name="Events" Heading="Events" ResourceKey="Events">
+			<div class="container g-0">
+				<div class="row mb-1 align-items-center">
+					<div class="col-sm-4">
+						<Label For="level" HelpText="Select the log level for event log items" ResourceKey="Level">Level: </Label><br /><br />
+						<select id="level" class="form-select" @onchange="(e => LevelChanged(e))">
+							<option value="-">&lt;@Localizer["AllLevels"]&gt;</option>
+							<option value="Trace">@Localizer["Trace"]</option>
+							<option value="Debug">@Localizer["Debug"]</option>
+							<option value="Information">@Localizer["Information"]</option>
+							<option value="Warning">@Localizer["Warning"]</option>
+							<option value="Error">@Localizer["Error"]</option>
+							<option value="Critical">@Localizer["Critical"]</option>
+						</select>
+					</div>            
+					<div class="col-sm-4">
+						<Label For="function" HelpText="Select the function for event log items" ResourceKey="Function">Function: </Label><br /><br />
+						<select id="function" class="form-select" @onchange="(e => FunctionChanged(e))">
+							<option value="-">&lt;@Localizer["AllFunctions"]&gt;</option>
+							<option value="Create">@Localizer["Create"]</option>
+							<option value="Read">@Localizer["Read"]</option>
+							<option value="Update">@SharedLocalizer["Update"]</option>
+							<option value="Delete">@SharedLocalizer["Delete"]</option>
+							<option value="Security">@Localizer["Security"]</option>
+							<option value="Other">@Localizer["Other"]</option>
+						</select>
+					</div>            
+					<div class="col-sm-4">
+						<Label For="rows" HelpText="Select the maximum number of event log items to review. Please note that if you choose more than 10 items the information will be split into pages." ResourceKey="Rows">Maximum Items: </Label><br /><br />
+						<select id="rows" class="form-select" @onchange="(e => RowsChanged(e))">
+							<option value="10">10</option>
+							<option value="50">50</option>
+							<option value="100">100</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<br />
 
-    @if (_logs.Any())
-    {
-        <Pager Items="@_logs">
-            <Header>
-            <th style="width: 1px;">&nbsp;</th>
-            <th>@Localizer["Date"]</th>
-            <th>@Localizer["Level"]</th>
-            <th>@Localizer["Feature"]</th>
-            <th>@Localizer["Function"]</th>
-            </Header>
-            <Row>
-                <td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>
-                <td class="@GetClass(context.Function)">@context.LogDate</td>
-                <td class="@GetClass(context.Function)">@context.Level</td>
-                <td class="@GetClass(context.Function)">@context.Feature</td>
-                <td class="@GetClass(context.Function)">@context.Function</td>
-            </Row>
-        </Pager>
-    }
-    else
-    {
-        <p><em>@Localizer["NoLogs"]</em></p>
-    }
+			@if (_logs.Any())
+			{
+				<Pager Items="@_logs">
+					<Header>
+						<th style="width: 1px;">&nbsp;</th>
+						<th>@Localizer["Date"]</th>
+						<th>@Localizer["Level"]</th>
+						<th>@Localizer["Feature"]</th>
+						<th>@Localizer["Function"]</th>
+					</Header>
+					<Row>
+						<td class="@GetClass(context.Function)"><ActionLink Action="Detail" Parameters="@($"id=" + context.LogId.ToString())" ResourceKey="LogDetails" /></td>
+						<td class="@GetClass(context.Function)">@context.LogDate</td>
+						<td class="@GetClass(context.Function)">@context.Level</td>
+						<td class="@GetClass(context.Function)">@context.Feature</td>
+						<td class="@GetClass(context.Function)">@context.Function</td>
+					</Row>
+				</Pager>
+			}
+			else
+			{
+				<p><em>@Localizer["NoLogs"]</em></p>
+			}
+		</TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="retention" HelpText="Number of days of events to retain" ResourceKey="Retention">Retention (Days): </Label>
+					<div class="col-sm-9">
+						<input id="retention" class="form-control" @bind="@_retention" />
+					</div>
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+		</TabPanel>
+	</TabStrip>
 }
 
 @code {
@@ -77,6 +95,7 @@ else
     private string _function = "-";
     private string _rows = "10";
     private List<Log> _logs;
+    private string _retention = "";
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
@@ -85,6 +104,7 @@ else
         try
         {
             await GetLogs();
+			_retention = SettingService.GetSetting(PageState.Site.Settings, "LogRetention", "30");
         }
         catch (Exception ex)
         {
@@ -170,4 +190,22 @@ else
         }
         return classname;
     }
+
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			settings = SettingService.SetSetting(settings, "LogRetention", _retention, true);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+
+			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
+		}
+	}
+
 }

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

@@ -128,7 +128,7 @@ else
                 var moduleDefinition = new ModuleDefinition { Owner = _owner, Name = _module, Description = _description, Template = _template, Version = _reference };
                 moduleDefinition = await ModuleDefinitionService.CreateModuleDefinitionAsync(moduleDefinition);
 
-                var settings = ModuleState.Settings;
+				var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
                 SettingService.SetSetting(settings, "ModuleDefinitionName", moduleDefinition.ModuleDefinitionName);
                 await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
 

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

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

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

@@ -22,6 +22,7 @@ else
             <th style="width: 1px;">&nbsp;</th>
             <th>@SharedLocalizer["Name"]</th>
             <th>@SharedLocalizer["Version"]</th>
+            <th>@Localizer["InUse"]</th>
             <th>@SharedLocalizer["Expires"]</th>
             <th style="width: 1px;">&nbsp;</th>
         </Header>
@@ -35,6 +36,16 @@ else
             </td>
             <td>@context.Name</td>
             <td>@context.Version</td>
+            <td>
+                @if(context.AssemblyName == "Oqtane.Client" || PageState.Modules.Where(m => m.ModuleDefinition.ModuleDefinitionId == context.ModuleDefinitionId).Count() > 0)
+                {
+                    <span>@SharedLocalizer["Yes"]</span>
+                }
+                else
+                {
+                    <span>@SharedLocalizer["No"]</span>
+                }
+            </td>
             <td>
                 @((MarkupString)PurchaseLink(context.PackageName))
             </td>

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

@@ -3,13 +3,14 @@
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject IPageService PageService
+@inject IPageModuleService PageModuleService
 @inject IThemeService  ThemeService
 @inject IStringLocalizer<Edit> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <TabStrip Refresh="@_refresh">
-        <TabPanel Name="Settings" ResourceKey="Settings">
+        <TabPanel Name="Settings" ResourceKey="Settings" Heading=@Localizer["Settings.Heading"]>
             @if (_themeList != null)
             {
                 <div class="container">
@@ -151,10 +152,27 @@
                 <div class="container">
                     <div class="row mb-1 align-items-center">
                         <PermissionGrid EntityName="@EntityNames.Page" Permissions="@_permissions" @ref="_permissionGrid" />
-
                     </div>
                 </div>
-
+            }
+        </TabPanel>
+        <TabPanel Name="PageModules" Heading="Modules" ResourceKey="PageModules">
+            @if(_pageModules != null)
+            {
+                <Pager Items="_pageModules">
+                    <Header>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th style="width: 1px;">&nbsp;</th>
+                        <th>@Localizer["ModuleTitle"]</th>
+                        <th>@Localizer["ModuleDefinition"]</th>
+                    </Header>
+                    <Row>
+                        <td><ActionLink Action="Settings" Text="Edit" ModuleId="@context.ModuleId" Security="SecurityAccessLevel.Edit" Permissions="@context.Permissions" ResourceKey="ModuleSettings" /></td>
+                        <td><ActionDialog Header="Delete Module" Message="Are You Sure You Wish To Delete This Module?" Action="Delete" Security="SecurityAccessLevel.Edit" Permissions="@context.Permissions" Class="btn btn-danger" OnClick="@(async () => await DeleteModule(context))" ResourceKey="DeleteModule" /></td>
+                        <td>@context.Title</td>
+                        <td>@context.ModuleDefinition?.Name</td>
+                    </Row>
+                </Pager>
             }
         </TabPanel>
         @if (_themeSettingsType != null)
@@ -170,114 +188,136 @@
 </form>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    private ElementReference form;
-    private bool validated = false;
-    private List<Theme> _themeList;
-    private List<ThemeControl> _themes = new List<ThemeControl>();
-    private List<ThemeControl> _containers = new List<ThemeControl>();
-    private List<Page> _pageList;
-    private int _pageId;
-    private string _name;
-    private string _title;
-    private string _path;
-    private string _currentparentid;
-    private string _parentid = "-1";
-    private string _insert = "=";
-    private List<Page> _children;
-    private int _childid = -1;
-    private string _isnavigation;
-    private string _isclickable;
-    private string _url;
-    private string _ispersonalizable;
-    private string _themetype;
-    private string _containertype = "-";
-    private string _icon;
-    private string _permissions = null;
-    private string _createdby;
-    private DateTime _createdon;
-    private string _modifiedby;
-    private DateTime _modifiedon;
-    private string _deletedby;
-    private DateTime? _deletedon;
-    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 List<Theme> _themeList;
+	private List<ThemeControl> _themes = new List<ThemeControl>();
+	private List<ThemeControl> _containers = new List<ThemeControl>();
+	private List<Page> _pageList;
+	private List<Module> _pageModules;
+	private int _pageId;
+	private string _name;
+	private string _title;
+	private string _path;
+	private string _currentparentid;
+	private string _parentid = "-1";
+	private string _insert = "=";
+	private List<Page> _children;
+	private int _childid = -1;
+	private string _isnavigation;
+	private string _isclickable;
+	private string _url;
+	private string _ispersonalizable;
+	private string _themetype;
+	private string _containertype = "-";
+	private string _icon;
+	private string _permissions = null;
+	private string _createdby;
+	private DateTime _createdon;
+	private string _modifiedby;
+	private DateTime _modifiedon;
+	private string _deletedby;
+	private DateTime? _deletedon;
+	private PermissionGrid _permissionGrid;
+	private Type _themeSettingsType;
+	private object _themeSettings;
+	private RenderFragment ThemeSettingsComponent { get; set; }
+	private bool _refresh = false;
+	protected Page page;
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            _pageList = PageState.Pages;
-            _children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_pageList = PageState.Pages;
+			_children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+			_themeList = await ThemeService.GetThemesAsync();
+			_themes = ThemeService.GetThemeControls(_themeList);
 
-            _themeList = await ThemeService.GetThemesAsync();
-            _themes = ThemeService.GetThemeControls(_themeList);
+			_pageId = Int32.Parse(PageState.QueryString["id"]);
+			page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
 
-            _pageId = Int32.Parse(PageState.QueryString["id"]);
-            var page = PageState.Pages.FirstOrDefault(item => item.PageId == _pageId);
-            if (page != null)
-            {
-                _name = page.Name;
-                _title = page.Title;
-                _path = page.Path;
+			if (page != null)
+			{
+				_name = page.Name;
+				_title = page.Title;
+				_path = page.Path;
+				_pageModules = PageState.Modules.Where(m => m.PageId == page.PageId && m.IsDeleted == false).ToList();
 
-                if (string.IsNullOrEmpty(_path))
-                {
-                    _path = "/";
-                }
-                else
-                {
-                    if (_path.Contains("/"))
-                    {
-                        _path = _path.Substring(_path.LastIndexOf("/") + 1);
-                    }
-                }
+				if (string.IsNullOrEmpty(_path))
+				{
+					_path = "/";
+				}
+				else
+				{
+					if (_path.Contains("/"))
+					{
+						_path = _path.Substring(_path.LastIndexOf("/") + 1);
+					}
+				}
 
-                if (page.ParentId == null)
-                {
-                    _parentid = "-1";
-                }
-                else
-                {
-                    _parentid = page.ParentId.ToString();
-                }
+				if (page.ParentId == null)
+				{
+					_parentid = "-1";
+				}
+				else
+				{
+					_parentid = page.ParentId.ToString();
+				}
 
-                _currentparentid = _parentid;
-                _isnavigation = page.IsNavigation.ToString();
-                _isclickable = page.IsClickable.ToString();
-                _url = page.Url;
-                _ispersonalizable = page.IsPersonalizable.ToString();
-                _themetype = page.ThemeType;
-                if (string.IsNullOrEmpty(_themetype))
-                {
-                    _themetype = PageState.Site.DefaultThemeType;
-                }
-                _containers = ThemeService.GetContainerControls(_themeList, _themetype);
-                _containertype = page.DefaultContainerType;
-                if (string.IsNullOrEmpty(_containertype))
-                {
-                    _containertype = PageState.Site.DefaultContainerType;
-                }
-                _icon = page.Icon;
-                _permissions = page.Permissions;
-                _createdby = page.CreatedBy;
-                _createdon = page.CreatedOn;
-                _modifiedby = page.ModifiedBy;
-                _modifiedon = page.ModifiedOn;
-                _deletedby = page.DeletedBy;
-                _deletedon = page.DeletedOn;
+				_currentparentid = _parentid;
+				_isnavigation = page.IsNavigation.ToString();
+				_isclickable = page.IsClickable.ToString();
+				_url = page.Url;
+				_ispersonalizable = page.IsPersonalizable.ToString();
+				_themetype = page.ThemeType;
+				if (string.IsNullOrEmpty(_themetype))
+				{
+					_themetype = PageState.Site.DefaultThemeType;
+				}
+				_containers = ThemeService.GetContainerControls(_themeList, _themetype);
+				_containertype = page.DefaultContainerType;
+				if (string.IsNullOrEmpty(_containertype))
+				{
+					_containertype = PageState.Site.DefaultContainerType;
+				}
+				_icon = page.Icon;
+				_permissions = page.Permissions;
+				_createdby = page.CreatedBy;
+				_createdon = page.CreatedOn;
+				_modifiedby = page.ModifiedBy;
+				_modifiedon = page.ModifiedOn;
+				_deletedby = page.DeletedBy;
+				_deletedon = page.DeletedOn;
 
-                ThemeSettings();
-            }
+				ThemeSettings();
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Page {PageId} {Error}", _pageId, ex.Message);
+			AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
+		}
+	}
+
+	private async Task DeleteModule(Module module)
+	{
+		try
+		{
+			PageModule pagemodule = await PageModuleService.GetPageModuleAsync(page.PageId, module.ModuleId);
+			pagemodule.IsDeleted = true;
+			await PageModuleService.UpdatePageModuleAsync(pagemodule);
+			await logger.LogInformation(LogFunction.Update,"Module Deleted {Title}", module.Title);
+			_pageModules.RemoveAll(item => item.PageModuleId == pagemodule.PageModuleId);
+			StateHasChanged();
+			NavigationManager.NavigateTo(NavigationManager.Uri + "&tab=PageModules");
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "Error Loading Page {PageId} {Error}", _pageId, ex.Message);
-            AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
+            await logger.LogError(ex, "Error Deleting Module {Title} {Error}", module.Title, ex.Message);
+            AddModuleMessage(Localizer["Error.Module.Delete"], MessageType.Error);
         }
     }
 

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

@@ -25,7 +25,7 @@
                     <th>@Localizer["DeletedOn"]</th>
                 </Header>
                 <Row>
-                    <td><button @onclick="@(() => RestorePage(context))" class="btn btn-info" title="Restore">Restore</button></td>
+                    <td><button type="button" @onclick="@(() => RestorePage(context))" class="btn btn-info" 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>
@@ -34,9 +34,7 @@
             </Pager>
             @if (_pages.Any())
             {
-                <div style="text-align:right;">
-                    <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" />
-                </div>
+                <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>
@@ -58,7 +56,7 @@
                     <th>@Localizer["DeletedOn"]</th>
                 </Header>
                 <Row>
-                    <td><button @onclick="@(() => RestoreModule(context))" class="btn btn-info" title="Restore">@Localizer["Restore"]</button></td>
+                    <td><button type="button" @onclick="@(() => RestoreModule(context))" class="btn btn-info" 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>
@@ -68,9 +66,7 @@
             </Pager>
             @if (_modules.Any())
             {
-                <div style="text-align:right;">
-                    <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" />
-                </div>
+                <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" />
             }
 
         }

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

@@ -7,41 +7,49 @@
 
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
-        <div class="form-group">
-            <label for="Username" class="control-label">@SharedLocalizer["Username"] </label>
-            <input type="text" class="form-control" placeholder="Username" @bind="@_username" readonly id="Username" />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="username" HelpText="Your username will be populated from the link you received in the password reset notification" ResourceKey="Username">Username: </Label>
+            <div class="col-sm-9">
+                <input id="username" type="text" class="form-control" @bind="@_username" readonly />
+            </div>
         </div>
-        <div class="form-group">
-            <label for="Password" class="control-label">@SharedLocalizer["Password"] </label>
-            <input type="password" class="form-control" placeholder="Password" @bind="@_password" id="Password" required />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="password" HelpText="The new password. It must satisfy complexity rules for the site." ResourceKey="Password">Password: </Label>
+            <div class="col-sm-9">
+                <input id="password" type="password" class="form-control" @bind="@_password" required />
+            </div>
         </div>
-        <div class="form-group">
-            <label for="Confirm" class="control-label">@Localizer["Password.Confirm"] </label>
-            <input type="password" class="form-control" placeholder="Password" @bind="@_confirm" id="Confirm" required />
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="confirm" HelpText="Enter the password again. It must exactly match the password entered above." ResourceKey="Confirm">Confirm: </Label>
+            <div class="col-sm-9">
+                <input id="confirm" type="password" class="form-control" @bind="@_confirm" required />
+            </div>
         </div>
-        <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button>
-        <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
     </div>
+    <br />
+    <button type="button" class="btn btn-primary" @onclick="Reset">@Localizer["Password.Reset"]</button>
+    <button type="button" class="btn btn-secondary" @onclick="Cancel">@SharedLocalizer["Cancel"]</button>
 </form>
 
 @code {
-    private ElementReference form;
-    private bool validated = false;
-    private string _username = string.Empty;
-    private string _password = string.Empty;
-    private string _confirm = string.Empty;
+	private ElementReference form;
+	private bool validated = false;
+	private string _username = string.Empty;
+	private string _password = string.Empty;
+	private string _confirm = string.Empty;
 
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous;
 
-    protected override void OnInitialized()
-    {
-        if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
+	protected override async Task OnInitializedAsync()
+	{
+		if (PageState.QueryString.ContainsKey("name") && PageState.QueryString.ContainsKey("token"))
         {
             _username = PageState.QueryString["name"];
         }
         else
         {
-            NavigationManager.NavigateTo(NavigateUrl(string.Empty));
+            await logger.LogError(LogFunction.Security, "Invalid Attempt To Access User Password Reset");
+            NavigationManager.NavigateTo(NavigateUrl("")); // home page
         }
     }
 

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

@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Admin.Site
 @inherits ModuleBase
+@using System.Text.RegularExpressions
 @inject NavigationManager NavigationManager
 @inject ISiteService SiteService
 @inject ITenantService TenantService
@@ -22,90 +23,64 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="alias" HelpText="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 should be separated by commas." ResourceKey="Aliases">Aliases: </Label>
+                <Label Class="col-sm-3" For="logo" HelpText="Specify a logo for the site" ResourceKey="Logo">Logo: </Label>
                 <div class="col-sm-9">
-                    @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                    {
-                        <textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
-                    }
-                    else
-                    {
-                        <textarea id="alias" class="form-control" @bind="@_urls" rows="3" readonly></textarea>
-                    }
+                    <FileManager FileId="@_logofileid" Filter="@Constants.ImageFiles" @ref="_logofilemanager" />
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="allowRegister" HelpText="Do you want the users to be able to register for an account on the site" ResourceKey="AllowRegistration">Allow User Registration? </Label>
+                <Label Class="col-sm-3" For="favicon" HelpText="Specify a Favicon" ResourceKey="FavoriteIcon">Favicon: </Label>
                 <div class="col-sm-9">
-                    <select id="allowRegister" class="form-select" @bind="@_allowregistration" required>
-                        <option value="True">@SharedLocalizer["Yes"]</option>
-                        <option value="False">@SharedLocalizer["No"]</option>
+                    <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)
+                        {
+                            <option value="@theme.TypeName">@theme.Name</option>
+                        }
                     </select>
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Is Deleted? </Label>
+                <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="isDeleted" class="form-select" @bind="@_isdeleted" required>
-                        <option value="True">@SharedLocalizer["Yes"]</option>
-                        <option value="False">@SharedLocalizer["No"]</option>
+                    <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>
-        <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" @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)
-                            {
-                                <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>
-                            }
-                        </select>
-                    </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>
+                        }
+                    </select>
                 </div>
             </div>
-        </Section>
+			<div class="row mb-1 align-items-center">
+				<Label Class="col-sm-3" For="isDeleted" HelpText="Is this site deleted?" ResourceKey="IsDeleted">Deleted? </Label>
+				<div class="col-sm-9">
+					<select id="isDeleted" class="form-select" @bind="@_isdeleted" required>
+						<option value="True">@SharedLocalizer["Yes"]</option>
+						<option value="False">@SharedLocalizer["No"]</option>
+					</select>
+				</div>
+			</div>
+		</div>
         <Section Name="SMTP" Heading="SMTP Settings" ResourceKey="SMTPSettings">
             <div class="container">
                 <div class="row mb-1 align-items-center">
@@ -183,8 +158,29 @@
                 </div>
             </div>
         </Section>
-        @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+        @if (_aliases != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
         {
+			<Section Name="Aliases" Heading="Aliases" ResourceKey="Aliases">
+                <div class="container">
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="alias" HelpText="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 should be separated by commas." ResourceKey="Aliases">Aliases: </Label>
+						<div class="col-sm-9">
+							<textarea id="alias" class="form-control" @bind="@_urls" rows="3" required></textarea>
+						</div>
+					</div>
+					<div class="row mb-1 align-items-center">
+						<Label Class="col-sm-3" For="defaultalias" HelpText="The default alias for the site. Requests for non-default aliases will be redirected to the default alias." ResourceKey="DefaultAlias">Default Alias: </Label>
+						<div class="col-sm-9">
+                            <select id="defaultalias" class="form-select" @bind="@_defaultalias" required>
+								@foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
+								{
+									<option value="@name">@name</option>
+								}
+                            </select>
+						</div>
+					</div>
+				</div>
+			</Section>
             <Section Name="Hosting" Heading="Hosting Model" ResourceKey="Hosting">
                 <div class="container">
                     <div class="row mb-1 align-items-center">
@@ -240,372 +236,401 @@
 }
 
 @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> _aliasList;
-    private string _urls = string.Empty;
-    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 _allowregistration;
-    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 _smtpsender = 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<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 string _defaultalias = string.Empty;
+	private string _urls = string.Empty;
+	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 _smtpsender = 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;
 
-    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, "");
-                _allowregistration = site.AllowRegistration.ToString();
-                _isdeleted = site.IsDeleted.ToString();
+	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();
 
-                if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                {
-                    _aliasList = await AliasService.GetAliasesAsync();
-                    foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
-                    {
-                        _urls += alias.Name + ",";
-                    }
-                    _urls = _urls.Substring(0, _urls.Length - 1);
+				if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+				{
+					await GetAliases();
+				}
 
-                }
+				if (site.LogoFileId != null)
+				{
+					_logofileid = site.LogoFileId.Value;
+				}
 
-                if (site.LogoFileId != null)
-                {
-                    _logofileid = site.LogoFileId.Value;
-                }
+				if (site.FaviconFileId != null)
+				{
+					_faviconfileid = site.FaviconFileId.Value;
+				}
 
-                if (site.FaviconFileId != null)
-                {
-                    _faviconfileid = site.FaviconFileId.Value;
-                }
+				_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;
 
-                _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;
+				_pwaisenabled = site.PwaIsEnabled.ToString();
+				if (site.PwaAppIconFileId != null)
+				{
+					_pwaappiconfileid = site.PwaAppIconFileId.Value;
+				}
+				if (site.PwaSplashIconFileId != null)
+				{
+					_pwasplashiconfileid = site.PwaSplashIconFileId.Value;
+				}
 
-                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);
-                _smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
+				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);
+				_smtpsender = SettingService.GetSetting(settings, "SMTPSender", string.Empty);
 
-                _pwaisenabled = site.PwaIsEnabled.ToString();
+				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;
+					}
+				}
 
-                if (site.PwaAppIconFileId != null)
-                {
-                    _pwaappiconfileid = site.PwaAppIconFileId.Value;
-                }
+				_createdby = site.CreatedBy;
+				_createdon = site.CreatedOn;
+				_modifiedby = site.ModifiedBy;
+				_modifiedon = site.ModifiedOn;
+				_deletedby = site.DeletedBy;
+				_deletedon = site.DeletedOn;
 
-                if (site.PwaSplashIconFileId != null)
-                {
-                    _pwasplashiconfileid = site.PwaSplashIconFileId.Value;
-                }
+				_initialized = true;
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+			AddModuleMessage(ex.Message, MessageType.Error);
+		}
+	}
 
-                _pwaisenabled = site.PwaIsEnabled.ToString();
-                if (site.PwaAppIconFileId != null)
-                {
-                    _pwaappiconfileid = site.PwaAppIconFileId.Value;
-                }
-                if (site.PwaSplashIconFileId != null)
-                {
-                    _pwasplashiconfileid = site.PwaSplashIconFileId.Value;
-                }
+	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);
+		}
+	}
 
-                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;
-                    }
-                }
+	private async Task SaveSite()
+	{
+		validated = true;
+		var interop = new Interop(JSRuntime);
+		if (await interop.FormValid(form))
+		{
+			try
+			{
+				if (_name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-")
+				{
+					var unique = true;
+					if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+					{
+						_urls = Regex.Replace(_urls, @"\r\n?|\n", ","); // convert line breaks to commas
+						var aliases = await AliasService.GetAliasesAsync();
+						foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(sValue => sValue.Trim()).ToArray())
+						{
+							var alias = aliases.Where(item => item.Name == name).FirstOrDefault();
+							if (alias != null && unique)
+							{
+								unique = (alias.TenantId == PageState.Site.TenantId && alias.SiteId == PageState.Site.SiteId);
+							}
+						}
+						if (unique && string.IsNullOrEmpty(_defaultalias)) unique = false;
+					}
 
-                _createdby = site.CreatedBy;
-                _createdon = site.CreatedOn;
-                _modifiedby = site.ModifiedBy;
-                _modifiedon = site.ModifiedOn;
-                _deletedby = site.DeletedBy;
-                _deletedon = site.DeletedOn;
+					if (unique)
+					{
+						var site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
+						if (site != null)
+						{
+							bool refresh = false;
+							bool reload = false;
 
-                _initialized = true;
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Loading Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-            AddModuleMessage(ex.Message, 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 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);
-        }
-    }
+							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;
 
-    private async Task SaveSite()
-    {
-        validated = true;
-        var interop = new Interop(JSRuntime);
-        if (await interop.FormValid(form))
-        {
-            try
-            {
-                if (_name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-")
-                {
-                    var unique = true;
-                    if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                    {
-                        foreach (string name in _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
-                        {
-                            if (_aliasList.Exists(item => item.Name == name && item.SiteId != PageState.Alias.SiteId && item.TenantId != PageState.Alias.TenantId))
-                            {
-                                unique = false;
-                            }
-                        }
-                    }
+							if (site.PwaIsEnabled.ToString() != _pwaisenabled)
+							{
+								site.PwaIsEnabled = Boolean.Parse(_pwaisenabled);
+								reload = true; // needs to be reloaded on server
+							}
+							int? pwaappiconfileid = _pwaappiconfilemanager.GetFileId();
+							if (pwaappiconfileid == -1) pwaappiconfileid = null;
+							if (site.PwaAppIconFileId != pwaappiconfileid)
+							{
+								site.PwaAppIconFileId = pwaappiconfileid;
+								reload = true; // needs to be reloaded on server
+							}
+							int? pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
+							if (pwasplashiconfileid == -1) pwasplashiconfileid = null;
+							if (site.PwaSplashIconFileId != pwasplashiconfileid)
+							{
+								site.PwaSplashIconFileId = pwasplashiconfileid;
+								reload = true; // needs to be reloaded on server
+							}
 
-                    if (unique)
-                    {
-                        var site = await SiteService.GetSiteAsync(PageState.Site.SiteId);
-                        if (site != null)
-                        {
-                            bool reload = false;
-                            bool refresh = (site.DefaultThemeType != _themetype || site.DefaultContainerType != _containertype);
+							site = await SiteService.UpdateSiteAsync(site);
 
-                            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;
-                                    refresh = true;
-                                    reload = true;
-                                }
-                            }
-                            site.AllowRegistration = (_allowregistration == null ? true : Boolean.Parse(_allowregistration));
-                            site.IsDeleted = (_isdeleted == null ? true : Boolean.Parse(_isdeleted));
+							var settings = await SettingService.GetSiteSettingsAsync(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);
+							await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
 
-                            site.LogoFileId = null;
-                            var logofileid = _logofilemanager.GetFileId();
-                            if (logofileid != -1)
-                            {
-                                site.LogoFileId = logofileid;
-                            }
-                            var faviconFieldId = _faviconfilemanager.GetFileId();
-                            if (faviconFieldId != -1)
-                            {
-                                site.FaviconFileId = faviconFieldId;
-                            }
-                            site.DefaultThemeType = _themetype;
-                            site.DefaultContainerType = _containertype;
-                            site.AdminContainerType = _admincontainertype;
+							if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
+							{
+								var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+									.Select(sValue => sValue.Trim()).ToArray();
+								foreach (Alias alias in _aliases)
+								{
+									if (!names.Contains(alias.Name.Trim()))
+									{
+										await AliasService.DeleteAliasAsync(alias.AliasId);
+									}
+								}
 
-                            site.PwaIsEnabled = (_pwaisenabled == null ? true : Boolean.Parse(_pwaisenabled));
-                            var pwaappiconfileid = _pwaappiconfilemanager.GetFileId();
-                            if (pwaappiconfileid != -1)
-                            {
-                                site.PwaAppIconFileId = pwaappiconfileid;
-                            }
-                            var pwasplashiconfileid = _pwasplashiconfilemanager.GetFileId();
-                            if (pwasplashiconfileid != -1)
-                            {
-                                site.PwaSplashIconFileId = pwasplashiconfileid;
-                            }
+								foreach (string name in names)
+								{
+									var alias = _aliases.Find(item => item.Name.Trim() == name);
+									if (alias == null)
+									{
+										alias = new Alias();
+										alias.Name = name;
+										alias.TenantId = site.TenantId;
+										alias.SiteId = site.SiteId;
+										alias.IsDefault = (name == _defaultalias);
+										await AliasService.AddAliasAsync(alias);
+									}
+									else
+									{
+										if (alias.Name != name || alias.IsDefault != (alias.Name.Trim() == _defaultalias))
+										{
+											alias.Name = name;
+											alias.IsDefault = (name == _defaultalias);
+											await AliasService.UpdateAliasAsync(alias);
+										}
+									}
+								}
+								await GetAliases();
+							}
 
-                            site = await SiteService.UpdateSiteAsync(site);
+							await logger.LogInformation("Site Settings Saved {Site}", site);
 
-                            var settings = await SettingService.GetSiteSettingsAsync(site.SiteId);
-                            SettingService.SetSetting(settings, "SMTPHost", _smtphost);
-                            SettingService.SetSetting(settings, "SMTPPort", _smtpport);
-                            SettingService.SetSetting(settings, "SMTPSSL", _smtpssl);
-                            SettingService.SetSetting(settings, "SMTPUsername", _smtpusername);
-                            SettingService.SetSetting(settings, "SMTPPassword", _smtppassword);
-                            SettingService.SetSetting(settings, "SMTPSender", _smtpsender);
-                            await SettingService.UpdateSiteSettingsAsync(settings, site.SiteId);
+							if (refresh || reload)
+							{
+								NavigationManager.NavigateTo(NavigateUrl(true), reload); // refresh/reload
+							}
+							else
+							{
+								AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
+								await interop.ScrollTo(0, 0, "smooth");
+							}
+						}
+					}
+					else // deuplicate alias or default alias not specified
+					{
+						AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
+					}
+				}
+				else
+				{
+					AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
+				}
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+				AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
+		}
+	}
 
-                            if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-                            {
-                                var names = _urls.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
-                                foreach (Alias alias in _aliasList.Where(item => item.SiteId == site.SiteId && item.TenantId == site.TenantId).ToList())
-                                {
-                                    if (!names.Contains(alias.Name))
-                                    {
-                                        await AliasService.DeleteAliasAsync(alias.AliasId);
-                                    }
-                                }
+	private async Task DeleteSite()
+	{
+		try
+		{
+			var sites = await SiteService.GetSitesAsync();
+			if (sites.Count > 1)
+			{
+				await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
+				await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
 
-                                foreach (string name in names)
-                                {
-                                    if (!_aliasList.Exists(item => item.Name == name))
-                                    {
-                                        Alias alias = new Alias();
-                                        alias.Name = name;
-                                        alias.TenantId = site.TenantId;
-                                        alias.SiteId = site.SiteId;
-                                        await AliasService.AddAliasAsync(alias);
-                                    }
-                                }
-                            }
+				var aliases = await AliasService.GetAliasesAsync();
+				foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
+				{
+					await AliasService.DeleteAliasAsync(a.AliasId);
+				}
 
-                            await logger.LogInformation("Site Settings Saved {Site}", site);
+				NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
+			AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
+		}
+	}
 
-                            if (refresh)
-                            {
-                                NavigationManager.NavigateTo(NavigateUrl(), reload); // refresh to show new theme or container
-                            }
-                            else
-                            {
-                                AddModuleMessage(Localizer["Success.Settings.SaveSite"], MessageType.Success);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        AddModuleMessage(Localizer["Message.Aliases.Taken"], MessageType.Warning);
-                    }
-                }
-                else
-                {
-                    AddModuleMessage(Localizer["Message.Required.SiteName"], MessageType.Warning);
-                }
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Saving Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-                AddModuleMessage(Localizer["Error.SaveSite"], MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
-        }
-    }
+	private async Task SendEmail()
+	{
+		if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
+		{
+			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);
+				await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+				await logger.LogInformation("Site SMTP Settings Saved");
 
-    private async Task DeleteSite()
-    {
-        try
-        {
-            var sites = await SiteService.GetSitesAsync();
-            if (sites.Count > 1)
-            {
-                await SiteService.DeleteSiteAsync(PageState.Site.SiteId);
-                await logger.LogInformation("Site Deleted {SiteId}", PageState.Site.SiteId);
+				await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User.DisplayName, PageState.User.Email, PageState.User.DisplayName, PageState.User.Email, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
+				AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
+			}
+			catch (Exception ex)
+			{
+				await logger.LogError(ex, "Error Testing SMTP Configuration");
+				AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
+			}
+		}
+		else
+		{
+			AddModuleMessage(Localizer["Message.required.Smtp"], MessageType.Warning);
+		}
+	}
 
-                var aliases = await AliasService.GetAliasesAsync();
-                foreach (Alias a in aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId))
-                {
-                    await AliasService.DeleteAliasAsync(a.AliasId);
-                }
-
-                NavigationManager.NavigateTo(NavigateUrl("admin/sites"));
-            }
-            else
-            {
-                AddModuleMessage(Localizer["Message.FailAuth.DeleteSite"], MessageType.Warning);
-            }
-        }
-        catch (Exception ex)
-        {
-            await logger.LogError(ex, "Error Deleting Site {SiteId} {Error}", PageState.Site.SiteId, ex.Message);
-            AddModuleMessage(Localizer["Error.DeleteSite"], MessageType.Error);
-        }
-    }
-
-    private async Task SendEmail()
-    {
-        if (_smtphost != "" && _smtpport != "" && _smtpsender != "")
-        {
-            try
-            {
-                var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
-                SettingService.SetSetting(settings, "SMTPHost", _smtphost);
-                SettingService.SetSetting(settings, "SMTPPort", _smtpport);
-                SettingService.SetSetting(settings, "SMTPSSL", _smtpssl);
-                SettingService.SetSetting(settings, "SMTPUsername", _smtpusername);
-                SettingService.SetSetting(settings, "SMTPPassword", _smtppassword);
-                SettingService.SetSetting(settings, "SMTPSender", _smtpsender);
-                await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
-                await logger.LogInformation("Site SMTP Settings Saved");
-
-                await NotificationService.AddNotificationAsync(new Notification(PageState.Site.SiteId, PageState.User.DisplayName, PageState.User.Email, PageState.User.DisplayName, PageState.User.Email, PageState.Site.Name + " SMTP Configuration Test", "SMTP Server Is Configured Correctly."));
-                AddModuleMessage(Localizer["Info.Smtp.SaveSettings"], MessageType.Info);
-            }
-            catch (Exception ex)
-            {
-                await logger.LogError(ex, "Error Testing SMTP Configuration");
-                AddModuleMessage(Localizer["Error.Smtp.TestConfig"], MessageType.Error);
-            }
-        }
-        else
-        {
-            AddModuleMessage(Localizer["Message.required.Smtp"], MessageType.Warning);
-        }
-    }
+	private async Task GetAliases()
+	{
+		_urls = string.Empty;
+		_defaultalias = string.Empty;
+		_aliases = await AliasService.GetAliasesAsync();
+		_aliases = _aliases.Where(item => item.SiteId == PageState.Site.SiteId && item.TenantId == PageState.Site.TenantId).OrderBy(item => item.AliasId).ToList();
+		foreach (Alias alias in _aliases)
+		{
+			_urls += (_urls == string.Empty) ? alias.Name.Trim() : ", " + alias.Name.Trim();
+			if (alias.IsDefault && string.IsNullOrEmpty(_defaultalias)) _defaultalias = alias.Name.Trim();
+		}
+		if (string.IsNullOrEmpty(_defaultalias)) _defaultalias = _aliases.First().Name.Trim();
+	}
 }

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

@@ -1,5 +1,6 @@
 @namespace Oqtane.Modules.Admin.Sites
 @using Oqtane.Interfaces
+@using System.Text.RegularExpressions
 @inherits ModuleBase
 @inject NavigationManager NavigationManager
 @inject ITenantService TenantService
@@ -282,6 +283,7 @@ else
         {
             if (_tenantid != "-" && _name != string.Empty && _urls != string.Empty && _themetype != "-" && _containertype != "-" && _sitetemplatetype != "-")
             {
+				_urls = Regex.Replace(_urls, @"\r\n?|\n", ",");
                 var duplicates = new List<string>();
                 var aliases = await AliasService.GetAliasesAsync();
                 foreach (string name in _urls.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
@@ -370,8 +372,7 @@ else
                         if (installation.Success)
                         {
                             var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
-                            var uri = new Uri(NavigationManager.Uri);
-                            NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true);
+                            NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliasname, true);
                         }
                         else
                         {

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

@@ -30,20 +30,16 @@ else
 
 @code {
     private List<Alias> _sites;
-    private string _scheme;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
     {
-        var uri = new Uri(NavigationManager.Uri);
-        _scheme = uri.Scheme + "://";
-
         var aliases = await AliasService.GetAliasesAsync();
         _sites = new List<Alias>();
         foreach (Alias alias in aliases)
         {
-            if (!_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
+            if (alias.IsDefault && !_sites.Exists(item => item.TenantId == alias.TenantId && item.SiteId == alias.SiteId))
             {
                 _sites.Add(alias);
             }
@@ -52,11 +48,11 @@ else
 
     private void Edit(string name)
     {
-        NavigationManager.NavigateTo(_scheme + name + "/admin/site/?reload");
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name + "/admin/site", true);
     }
 
     private void Browse(string name)
     {
-        NavigationManager.NavigateTo(_scheme + name + "/?reload");
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name, true);
     }
 }

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

@@ -57,22 +57,20 @@ else
     {
         @if (_results.Count > 0)
         {
-            <div class="table-responsive">
-                <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>
-            </div>
+            <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
         {

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

@@ -33,7 +33,7 @@
                 </div>
             </div>
             <div class="row mb-1 align-items-center">
-                <Label Class="col-sm-3" For="servertime" HelpText="Server Time" ResourceKey="ServerTime">Server Time: </Label>
+                <Label Class="col-sm-3" For="servertime" HelpText="Server Date/Time (in UTC)" ResourceKey="ServerTime">Server Date/Time: </Label>
                 <div class="col-sm-9">
                     <input id="servertime" class="form-control" @bind="@_servertime" readonly />
                 </div>
@@ -99,32 +99,32 @@
 </TabStrip>
 
 @code {
-    public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
-    private string _version = string.Empty;
-    private string _clrversion = string.Empty;
-    private string _osversion = string.Empty;
-    private string _serverpath = string.Empty;
-    private string _servertime = string.Empty;
-    private string _installationid = string.Empty;
+	private string _version = string.Empty;
+	private string _clrversion = string.Empty;
+	private string _osversion = string.Empty;
+	private string _serverpath = string.Empty;
+	private string _servertime = string.Empty;
+	private string _installationid = string.Empty;
 
-    private string _detailederrors = string.Empty;
-    private string _logginglevel = string.Empty;
-    private string _swagger = string.Empty;
-    private string _packageservice = string.Empty;
+	private string _detailederrors = string.Empty;
+	private string _logginglevel = string.Empty;
+	private string _swagger = string.Empty;
+	private string _packageservice = string.Empty;
 
-    protected override async Task OnInitializedAsync()
-    {
-        _version = Constants.Version;
+	protected override async Task OnInitializedAsync()
+	{
+		_version = Constants.Version;
 
-        Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
-        if (systeminfo != null)
-        {
-            _clrversion = systeminfo["clrversion"];
-            _osversion = systeminfo["osversion"];
-            _serverpath = systeminfo["serverpath"];
-            _servertime = systeminfo["servertime"];
-            _installationid = systeminfo["installationid"];
+		Dictionary<string, string> systeminfo = await SystemService.GetSystemInfoAsync();
+		if (systeminfo != null)
+		{
+			_clrversion = systeminfo["clrversion"];
+			_osversion = systeminfo["osversion"];
+			_serverpath = systeminfo["serverpath"];
+			_servertime = systeminfo["servertime"] + " UTC";
+			_installationid = systeminfo["installationid"];
 
             _detailederrors = systeminfo["detailederrors"];
             _logginglevel = systeminfo["logginglevel"];

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

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

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

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

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

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

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

@@ -12,7 +12,7 @@
 
 @if (PageState.User != null && photo != null)
 {
-    <img src="@ImageUrl(photofileid, 400, 400, "crop")" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
+    <img src="@ImageUrl(photofileid, 400, 400)" alt="@displayname" style="max-width: 400px" class="rounded-circle mx-auto d-block">
 }
 else
 {

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

@@ -3,6 +3,7 @@
 @inject IUserRoleService UserRoleService
 @inject IUserService UserService
 @inject ISettingService SettingService
+@inject ISiteService SiteService
 @inject IStringLocalizer<Index> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
@@ -14,45 +15,65 @@
 }
 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>
-            <div class="col-sm-4">
-                <input class="form-control" @bind="@_search" />
-            </div>
-            <div class="col-sm-4">
-                <button class="btn btn-secondary" @onclick="OnSearch">@SharedLocalizer["Search"]</button>
-            </div>
-        </div>
-    </div>
-    <Pager Items="@userroles">
-        <Header>
-        <th style="width: 1px;">&nbsp;</th>
-        <th style="width: 1px;">&nbsp;</th>
-        <th style="width: 1px;">&nbsp;</th>
-        <th>@SharedLocalizer["Name"]</th>
-        </Header>
-        <Row>
-            <td>
-                <ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" 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" />
-            </td>
-            <td>
-                <ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
-            </td>
-            <td>@context.User.DisplayName</td>
-        </Row>
-    </Pager>
+    <TabStrip>
+        <TabPanel Name="Users" Heading="Users" ResourceKey="Users">
+			<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>
+					<div class="col-sm-4">
+						<input class="form-control" @bind="@_search" />
+					</div>
+					<div class="col-sm-4">
+						<button type="button" class="btn btn-secondary" @onclick="OnSearch">@SharedLocalizer["Search"]</button>
+					</div>
+				</div>
+			</div>
+			<Pager Items="@userroles">
+				<Header>
+				<th style="width: 1px;">&nbsp;</th>
+				<th style="width: 1px;">&nbsp;</th>
+				<th style="width: 1px;">&nbsp;</th>
+				<th>@SharedLocalizer["Name"]</th>
+				</Header>
+				<Row>
+					<td>
+						<ActionLink Action="Edit" Parameters="@($"id=" + context.UserId.ToString())" 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" />
+					</td>
+					<td>
+						<ActionLink Action="Roles" Parameters="@($"id=" + context.UserId.ToString())" ResourceKey="Roles" />
+					</td>
+					<td>@context.User.DisplayName</td>
+				</Row>
+			</Pager>
+	</TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="allowregistration" HelpText="Do you want to allow visitors to be able to register for a user account on the site" ResourceKey="AllowRegistration">Allow User Registration? </Label>
+					<div class="col-sm-9">
+						<select id="allowregistration" class="form-select" @bind="@_allowregistration" 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="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+		</TabPanel>
+	</TabStrip>
 }
 
 @code {
     private List<UserRole> allroles;
     private List<UserRole> userroles;
     private string _search;
+	private string _allowregistration;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
@@ -61,13 +82,14 @@ else
         allroles = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
         await LoadSettingsAsync();
         userroles = Search(_search);
+		_allowregistration = PageState.Site.AllowRegistration.ToString();
     }
 
     private List<UserRole> Search(string search)
     {
         var results = allroles.Where(item => item.Role.Name == RoleNames.Registered || (item.Role.Name == RoleNames.Host && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)));
 
-        if (string.IsNullOrEmpty(_search))
+        if (!string.IsNullOrEmpty(_search))
         {
             results = results.Where(item =>
                 (
@@ -122,4 +144,20 @@ else
         await SettingService.UpdateUserSettingsAsync(settings, PageState.User.UserId);
     }
 
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var site = PageState.Site;
+			site.AllowRegistration = bool.Parse(_allowregistration);
+			await SiteService.UpdateSiteAsync(site);
+			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
+		}
+	}
+
 }

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

@@ -0,0 +1,123 @@
+@namespace Oqtane.Modules.Admin.Visitors
+@using System.Globalization
+@inherits ModuleBase
+@inject NavigationManager NavigationManager
+@inject IVisitorService VisitorService
+@inject IUserService UserService
+@inject IStringLocalizer<Detail> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+    <div class="container">
+       <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="ip" HelpText="The last recorded IP address for this visitor" ResourceKey="IP">IP Address: </Label>
+            <div class="col-sm-9">
+                <input id="ip" class="form-control" @bind="@_ip" readonly />
+            </div>
+       </div>
+       <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="language" HelpText="The last recorded language for this visitor" ResourceKey="Language">Language: </Label>
+            <div class="col-sm-9">
+                <input id="language" class="form-control" @bind="@_language" readonly />
+            </div>
+       </div>
+       <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="useragent" HelpText="The last recorded user agent for this visitor" ResourceKey="UserAgent">User Agent: </Label>
+            <div class="col-sm-9">
+                <input id="useragent" class="form-control" @bind="@_useragent" readonly />
+            </div>
+       </div>
+       <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="url" HelpText="The last recorded url for this visitor" ResourceKey="Url">Url: </Label>
+            <div class="col-sm-9">
+                <input id="url" class="form-control" @bind="@_url" readonly />
+            </div>
+       </div>
+       <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="referrer" HelpText="The last recorded referrer for this visitor" ResourceKey="Referrer">Referrer: </Label>
+            <div class="col-sm-9">
+                <input id="referrer" class="form-control" @bind="@_referrer" readonly />
+            </div>
+       </div>
+        @if (_user != string.Empty)
+        {
+           <div class="row mb-1 align-items-center">
+                <Label Class="col-sm-3" For="user" HelpText="The last recorded user associated with this visitor" ResourceKey="User">User: </Label>
+                <div class="col-sm-9">
+                    <input id="user" class="form-control" @bind="@_user" readonly />
+                </div>
+           </div>
+        }
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="visits" HelpText="The total number of visits by this visitor all time" ResourceKey="Visits">Visits: </Label>
+            <div class="col-sm-9">
+                <input id="visits" class="form-control" @bind="@_visits" readonly />
+            </div>
+        </div>
+        <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="visited" HelpText="The last recorded date/time when the visitor visited the site" ResourceKey="Visited">Visited: </Label>
+                <div class="col-sm-9">
+                <input id="visited" class="form-control" @bind="@_visited" readonly />
+            </div>
+        </div>
+       <div class="row mb-1 align-items-center">
+            <Label Class="col-sm-3" For="created" HelpText="The first recorded date/time when this visitor visited the site" ResourceKey="Created">Created: </Label>
+            <div class="col-sm-9">
+                <input id="created" class="form-control" @bind="@_created" readonly />
+            </div>
+       </div>
+	</div>
+
+    <NavLink class="btn btn-secondary" href="@NavigateUrl()">@SharedLocalizer["Cancel"]</NavLink>
+
+@code {
+	private int _visitorId;
+	private string _ip = string.Empty;
+	private string _language = string.Empty;
+	private string _useragent = string.Empty;
+	private string _url = string.Empty;
+	private string _referrer = string.Empty;
+	private string _user = string.Empty;
+	private string _visits = string.Empty;
+	private string _visited = string.Empty;
+	private string _created = string.Empty;
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			_visitorId = Int32.Parse(PageState.QueryString["id"]);
+			var visitor = await VisitorService.GetVisitorAsync(_visitorId);
+			if (visitor != null)
+			{
+				_ip = visitor.IPAddress;
+				_language = visitor.Language;
+				_useragent = visitor.UserAgent;
+				_url = visitor.Url;
+				_referrer = visitor.Referrer;
+				_visits = visitor.Visits.ToString();
+				_visited = visitor.VisitedOn.ToString(CultureInfo.CurrentCulture);
+				_created = visitor.CreatedOn.ToString(CultureInfo.CurrentCulture);
+
+				if (visitor.UserId != null)
+				{
+					var user = await UserService.GetUserAsync(visitor.UserId.Value, PageState.Site.SiteId);
+					if (user != null)
+					{
+						_user = user.DisplayName;
+					}
+				}
+			}
+			else
+			{
+				AddModuleMessage(Localizer["Error.LoadVisitor"], MessageType.Error);
+			}
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Loading Visitor {VisitorId} {Error}", _visitorId, ex.Message);
+			AddModuleMessage(Localizer["Error.LoadVisitor"], MessageType.Error);
+		}
+	}
+    }

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

@@ -0,0 +1,167 @@
+@namespace Oqtane.Modules.Admin.Visitors
+@inherits ModuleBase
+@inject IVisitorService VisitorService
+@inject ISiteService SiteService
+@inject ISettingService SettingService
+@inject IStringLocalizer<Index> Localizer
+@inject IStringLocalizer<SharedResources> SharedLocalizer
+
+@if (_visitors == null)
+{
+    <p><em>@SharedLocalizer["Loading"]</em></p>
+}
+else
+{
+    <TabStrip>
+        <TabPanel Name="Visitors" Heading="Visitors" ResourceKey="Visitors">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<div class="col-sm-6">
+						<select id="type" class="form-select custom-select" @onchange="(e => TypeChanged(e))">
+							<option value="false">@Localizer["AllVisitors"]</option>
+							<option value="true">@Localizer["UsersOnly"]</option>
+						</select>
+					</div>
+					<div class="col-sm-6">
+						<select id="type" class="form-select custom-select" @onchange="(e => DateChanged(e))">
+							<option value="1">@Localizer["PastDay"]</option>
+							<option value="7">@Localizer["PastWeek"]</option>
+							<option value="30">@Localizer["PastMonth"]</option>
+						</select>
+					</div>
+				</div>
+			</div>
+			<br/>
+			<Pager Items="@_visitors">
+				<Header>
+					<th style="width: 1px;">&nbsp;</th>
+					<th>@Localizer["IP"]</th>
+					<th>@Localizer["User"]</th>
+					<th>@Localizer["Language"]</th>
+					<th>@Localizer["Visits"]</th>
+					<th>@Localizer["Visited"]</th>
+					<th>@Localizer["Created"]</th>
+				</Header>
+				<Row>
+					<td><ActionLink Action="Detail" Parameters="@($"id=" + context.VisitorId.ToString())" ResourceKey="Details" /></td>
+					<td>@context.IPAddress</td>
+					<td>
+						@if (context.UserId != null)
+						{
+							@context.User.DisplayName
+						}
+					</td>
+					<td>@context.Language</td>
+					<td>@context.Visits</td>
+					<td>@context.VisitedOn</td>
+					<td>@context.CreatedOn</td>
+				</Row>
+			</Pager>
+		</TabPanel>
+        <TabPanel Name="Settings" Heading="Settings" ResourceKey="Settings">
+			<div class="container">
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="tracking" HelpText="Specify if visitor tracking is enabled" ResourceKey="Tracking">Tracking Enabled? </Label>
+					<div class="col-sm-9">
+						<select id="tracking" class="form-select" @bind="@_tracking" >
+							<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="filter" HelpText="Comma delimited list of terms which may exist in IP addresses, user agents, or languages which identify visitors which should not be tracked (ie. bots)" ResourceKey="Filter">Filter: </Label>
+					<div class="col-sm-9">
+						<textarea id="filter" class="form-control" @bind="@_filter" rows="3"></textarea>
+					</div>
+				</div>
+				<div class="row mb-1 align-items-center">
+					<Label Class="col-sm-3" For="retention" HelpText="Number of days of visitor activity to retain" ResourceKey="Retention">Retention (Days): </Label>
+					<div class="col-sm-9">
+						<input id="retention" class="form-control" @bind="@_retention" />
+					</div>
+				</div>
+			</div>
+			<br />
+			<button type="button" class="btn btn-success" @onclick="SaveSiteSettings">@SharedLocalizer["Save"]</button>
+		</TabPanel>
+	</TabStrip>
+}
+
+@code {
+	private bool _users = false;
+	private int _days = 1;
+	private List<Visitor> _visitors;
+	private string _tracking;
+	private string _filter = "";
+	private string _retention = "";
+
+	public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+
+	protected override async Task OnParametersSetAsync()
+	{
+		await GetVisitors();
+		_tracking = PageState.Site.VisitorTracking.ToString();
+		_filter = SettingService.GetSetting(PageState.Site.Settings, "VisitorFilter", "");
+		_retention = SettingService.GetSetting(PageState.Site.Settings, "VisitorRetention", "30");
+	}
+
+	private async void TypeChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_users = bool.Parse(e.Value.ToString());
+			await GetVisitors();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error On TypeChanged");
+		}
+	}
+
+	private async void DateChanged(ChangeEventArgs e)
+	{
+		try
+		{
+			_days = int.Parse(e.Value.ToString());
+			await GetVisitors();
+			StateHasChanged();
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error On DateChanged");
+		}
+	}
+
+	private async Task GetVisitors()
+	{
+		_visitors = await VisitorService.GetVisitorsAsync(PageState.Site.SiteId, DateTime.UtcNow.AddDays(-_days));
+		if (_users)
+		{
+			_visitors = _visitors.Where(item => item.UserId != null).ToList();
+		}
+	}
+
+	private async Task SaveSiteSettings()
+	{
+		try
+		{
+			var site = PageState.Site;
+			site.VisitorTracking = bool.Parse(_tracking);
+			await SiteService.UpdateSiteAsync(site);
+
+			var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
+			settings = SettingService.SetSetting(settings, "VisitorFilter", _filter, true);
+			settings = SettingService.SetSetting(settings, "VisitorRetention", _retention, true);
+            await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId);
+
+			AddModuleMessage(Localizer["Success.SaveSiteSettings"], MessageType.Success);
+		}
+		catch (Exception ex)
+		{
+			await logger.LogError(ex, "Error Saving Site Settings {Error}", ex.Message);
+			AddModuleMessage(Localizer["Error.SaveSiteSettings"], MessageType.Error);
+		}
+	}
+}

Oqtane.Client/Modules/Controls/ActionDialog.razor

@@ -17,7 +17,7 @@
                     <div class="modal-footer">
                         @if (!string.IsNullOrEmpty(Action))
                         {
-                            <button type="button" class="@Class" @onclick="Confirm">@((MarkupString)_iconSpan) @Localize(Action)</button>
+                            <button type="button" class="@Class" @onclick="Confirm">@((MarkupString)_iconSpan) @Text</button>
                         }
                         <button type="button" class="btn btn-secondary" @onclick="DisplayModal">@Localize("Cancel")</button>
                     </div>
@@ -30,16 +30,17 @@
 {
     if (Disabled)
     {
-        <button class="@Class" disabled>@((MarkupString)_iconSpan) @Text</button>
+        <button type="button" class="@Class" disabled>@((MarkupString)_iconSpan) @Text</button>
     }
     else
     {
-        <button class="@Class" @onclick="DisplayModal">@((MarkupString)_iconSpan) @Text</button>
+        <button type="button" class="@Class" @onclick="DisplayModal">@((MarkupString)_iconSpan) @Text</button>
     }
 }
 
 @code {
     private bool _visible = false;
+	private string _permissions = string.Empty;
     private bool _editmode = false;
     private bool _authorized = false;
     private string _iconSpan = string.Empty;
@@ -59,6 +60,9 @@
     [Parameter]
     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
+
     [Parameter]
     public string Class { get; set; } // optional
 
@@ -105,6 +109,7 @@
         Header = Localize(nameof(Header), Header);
         Message = Localize(nameof(Message), Message);
 
+		_permissions = (string.IsNullOrEmpty(Permissions)) ? ModuleState.Permissions : Permissions;
         _authorized = IsAuthorized();
     }
 
@@ -138,10 +143,10 @@
                     authorized = true;
                     break;
                 case SecurityAccessLevel.View:
-                    authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, ModuleState.Permissions);
+                    authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.View, _permissions);
                     break;
                 case SecurityAccessLevel.Edit:
-                    authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, ModuleState.Permissions);
+                    authorized = UserSecurity.IsAuthorized(PageState.User,PermissionNames.Edit, _permissions);
                     break;
                 case SecurityAccessLevel.Admin:
                     authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);

Oqtane.Client/Modules/Controls/ActionLink.razor

@@ -6,101 +6,118 @@
 {
     if (Disabled)
     {
-        <button class="@_classname" style="@_style" disabled>@((MarkupString)_iconSpan) @_text</button>
-    }
-    else
-    {
-        <NavLink class="@_classname" href="@_url" style="@_style">@((MarkupString)_iconSpan) @_text</NavLink>
-    }
+		<button type="button" class="@_classname" style="@_style" disabled>@((MarkupString)_iconSpan) @_text</button>
+	}
+	else
+	{
+		if (OnClick == null)
+		{
+			<NavLink class="@_classname" href="@_url" style="@_style">@((MarkupString)_iconSpan) @_text</NavLink>
+		}
+		else
+		{
+			<button type="button" class="@_classname" style="@_style" onclick="@OnClick">@((MarkupString)_iconSpan) @_text</button>
+		}
+	}
 }
 
 @code {
-    private string _text = string.Empty;
-    private string _url = string.Empty;
-    private string _parameters = string.Empty;
-    private string _classname = "btn btn-primary";
-    private string _style = string.Empty;
-    private bool _editmode = false;
-    private bool _authorized = false;
-    private string _iconSpan = string.Empty;
+	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;
 
-    [Parameter]
-    public string Action { get; set; } // required
+	[Parameter]
+	public string Action { get; set; } // required
 
-    [Parameter]
-    public SecurityAccessLevel? Security { get; set; } // optional - can be used to explicitly specify SecurityAccessLevel
+	[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 string Parameters { get; set; } // optional - querystring parameter 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 string Class { get; set; } // optional - defaults to primary if not specified
+	[Parameter]
+	public Action OnClick { get; set; } = null; // optional - executes a method in the calling component
 
-    [Parameter]
-    public string Style { get; set; } // optional
+	[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; } // optional - can be used to specify a permission string
 
-    [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 bool Disabled { get; set; } // optional
 
-    [Parameter]
-    public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
+	[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 bool IconOnly { get; set; } // optional - specifies only icon in link
+	[Parameter]
+	public string Class { get; set; } // optional - defaults to primary if not specified
 
-    protected override void OnParametersSet()
-    {
-        base.OnParametersSet();
+	[Parameter]
+	public string Style { get; set; } // optional
 
-        _text = Action;
-        if (!string.IsNullOrEmpty(Text))
-        {
-            _text = Text;
-        }
+	[Parameter]
+	public string IconName { get; set; } // optional - specifies an icon for the link - default is no icon
 
-        if (IconOnly && !string.IsNullOrEmpty(IconName))
-        {
-            _text = string.Empty;
-        }
+	[Parameter]
+	public bool IconOnly { get; set; } // optional - specifies only icon in link
 
-        if (!string.IsNullOrEmpty(Parameters))
-        {
-            _parameters = Parameters;
-        }
+	protected override void OnParametersSet()
+	{
+		base.OnParametersSet();
 
-        if (!string.IsNullOrEmpty(Class))
-        {
-            _classname = Class;
-        }
+		_text = Action;
+		if (!string.IsNullOrEmpty(Text))
+		{
+			_text = Text;
+		}
 
-        if (!string.IsNullOrEmpty(Style))
-        {
-            _style = Style;
-        }
+		if (IconOnly && !string.IsNullOrEmpty(IconName))
+		{
+			_text = string.Empty;
+		}
 
-        if (!string.IsNullOrEmpty(EditMode))
-        {
-            _editmode = bool.Parse(EditMode);
-        }
+		if (!string.IsNullOrEmpty(Parameters))
+		{
+			_parameters = Parameters;
+		}
 
-        if (!string.IsNullOrEmpty(IconName))
-        {
-            if (!IconName.Contains(" "))
-            {
-                IconName = "oi oi-" + IconName;
-            }
-            _iconSpan = $"<span class=\"{IconName}\"></span>{(IconOnly ? "" : "&nbsp")}";
+		if (!string.IsNullOrEmpty(Class))
+		{
+			_classname = Class;
+		}
 
-        }
+		if (!string.IsNullOrEmpty(Style))
+		{
+			_style = Style;
+		}
 
-        _text = Localize(nameof(Text), _text);
-        _url = EditUrl(Action, _parameters);
+		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();
     }
 
@@ -136,10 +153,10 @@
                     authorized = true;
                     break;
                 case SecurityAccessLevel.View:
-                    authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, ModuleState.Permissions);
+                    authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, _permissions);
                     break;
                 case SecurityAccessLevel.Edit:
-                    authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, ModuleState.Permissions);
+                    authorized = UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, _permissions);
                     break;
                 case SecurityAccessLevel.Admin:
                     authorized = UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin);

Oqtane.Client/Modules/Controls/Label.razor

@@ -25,8 +25,8 @@ else
     [Parameter]
     public string HelpText { get; set; } // optional - tooltip for this label
 
-    private string _spanclass = "app-tooltip";
-    private string _labelclass = "form-label";
+    private string _spanclass;
+    private string _labelclass;
     private string _helptext = string.Empty;
 
     protected override void OnParametersSet()
@@ -36,11 +36,15 @@ else
         if (!string.IsNullOrEmpty(HelpText))
         {
             _helptext = Localize(nameof(HelpText), HelpText);
-            _spanclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _labelclass = "form-label";
+
+            var spanclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _spanclass = "app-tooltip" + spanclass;
         }
         else
         {
-            _labelclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            var labelclass = (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
+            _labelclass = "form-label" + labelclass;
         }
 
         var text = Localize("Text", String.Empty);

Oqtane.Client/Modules/Controls/LocalizableComponent.cs

@@ -13,6 +13,9 @@ namespace Oqtane.Modules.Controls
         [Parameter]
         public string ResourceKey { get; set; }
 
+        [Parameter]
+        public string ResourceType { get; set; }
+
         protected bool IsLocalizable { get; private set; }
 
         protected string Localize(string name) => _localizer?[name] ?? name;
@@ -50,9 +53,14 @@ namespace Oqtane.Modules.Controls
         {
             IsLocalizable = false;
 
-            if (!String.IsNullOrEmpty(ResourceKey) && ModuleState?.ModuleType != null)
+            if (string.IsNullOrEmpty(ResourceType))
             {
-                var moduleType = Type.GetType(ModuleState.ModuleType);
+                ResourceType = ModuleState?.ModuleType;
+            }
+
+            if (!String.IsNullOrEmpty(ResourceKey) && !string.IsNullOrEmpty(ResourceType))
+            {
+                var moduleType = Type.GetType(ResourceType);
                 if (moduleType != null)
                 {
                     using (var scope = ServiceActivator.GetScope())

Oqtane.Client/Modules/Controls/Pager.razor

@@ -4,7 +4,7 @@
 
 @if (ItemList != null)
 {
-    @if (Toolbar == "Top" && _pages > 0 && Items.Count() > _maxItems)
+    @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")">
@@ -54,21 +54,23 @@
     }
     @if (Format == "Table" && Row != null)
     {
-        <table class="@Class">
-            <thead>
-                <tr>@Header</tr>
-            </thead>
-            <tbody>
-                @foreach (var item in ItemList)
-                {
-                    <tr>@Row(item)</tr>
-                    @if (Detail != null)
-                    {
-                        <tr>@Detail(item)</tr>
-                    }
-                }
-            </tbody>
-        </table>
+		<div class="table-responsive">
+			<table class="@Class">
+				<thead>
+					<tr>@Header</tr>
+				</thead>
+				<tbody>
+					@foreach (var item in ItemList)
+					{
+						<tr>@Row(item)</tr>
+						@if (Detail != null)
+						{
+							<tr>@Detail(item)</tr>
+						}
+					}
+				</tbody>
+			</table>
+		</div>
     }
     @if (Format == "Grid" && Row != null)
     {
@@ -101,14 +103,14 @@
             }
         </div>
     }
-    @if (Toolbar == "Bottom" && _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")">
                 <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)
-            {
+            @if (_pages > _displayPages && _displayPages > 1)
+             {
                 <li class="page-item@((_page > _displayPages) ? "" : " 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>
@@ -135,7 +137,7 @@
             <li class="page-item@((_page < _pages) ? "" : " 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)
+            @if (_pages > _displayPages && _displayPages > 1)
             {
                 <li class="page-item@((_endPage < _pages) ? "" : " disabled")">
                     <a class="page-link" @onclick=@(async () => SkipPages("forward"))><span class="oi oi-media-skip-forward" title="skip forward" aria-hidden="true"></span></a>
@@ -145,7 +147,7 @@
                 <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">Page @_page of @_pages</a>
+               <a class="page-link" style="white-space: nowrap;">Page @_page of @_pages</a>
             </li>
         </ul>
     }
@@ -164,7 +166,7 @@
     public string Format { get; set; } // Table or Grid
 
     [Parameter]
-    public string Toolbar { get; set; } // Top or Bottom
+    public string Toolbar { get; set; } // Top, Bottom or Both
 
     [Parameter]
     public RenderFragment Header { get; set; } = null;

Oqtane.Client/Modules/Controls/RichTextEditor.razor

@@ -115,23 +115,24 @@
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill1.3.6.min.js" },
+        new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill1.3.7.min.js" },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-blot-formatter.min.js" },
         new Resource { ResourceType = ResourceType.Script, Bundle = "Quill", Url = "js/quill-interop.js" }
     };
 
-    protected override void OnInitialized()
+    protected override async Task OnParametersSetAsync()
     {
         _content = Content; // raw HTML
+        await RefreshRichText();
     }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
+        var interop = new RichTextEditorInterop(JSRuntime);
         if (firstRender)
         {
             await base.OnAfterRenderAsync(firstRender);
 
-            var interop = new RichTextEditorInterop(JSRuntime);
 
             await interop.CreateEditor(
                 _editorElement,
@@ -145,9 +146,9 @@
 
             _content = Content; // raw HTML
 
+        }
             // preserve a copy of the rich text content ( Quill sanitizes content so we need to retrieve it from the editor )
             _original = await interop.GetHtml(_editorElement);
-        }
     }
 
     public void CloseFileManager()

Oqtane.Client/Modules/Controls/TabPanel.razor

@@ -40,6 +40,10 @@ else
         {
             Heading = Localize(nameof(Name), Name);
         }
+        else
+        {
+            Heading = Localize(nameof(Heading), Heading);
+        }
     }
 
     public string DisplayHeading()

Oqtane.Client/Modules/Controls/TabStrip.razor

@@ -43,16 +43,12 @@
     [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 OnInitialized()
+    protected override void OnParametersSet()
     {
         if (PageState.QueryString.ContainsKey("tab"))
         {
             ActiveTab = PageState.QueryString["tab"];
         }
-    }
-
-    protected override void OnParametersSet()
-    {
         if (_tabPanels == null || Refresh)
         {
             _tabPanels = new List<TabPanel>();

Oqtane.Client/Modules/HtmlText/Edit.razor

@@ -30,8 +30,8 @@
     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/quill1.3.6.bubble.css" },
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.6.snow.css" }
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.7.bubble.css" },
+        new Resource { ResourceType = ResourceType.Stylesheet, Url = "css/quill/quill1.3.7.snow.css" }
     };
 
     private RichTextEditor RichTextEditorHtml;
@@ -65,8 +65,8 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "An Error Occurred Loading Html/Text Content. " + ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
+            await logger.LogError(ex, "Error Loading Content {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Content.Load"], MessageType.Error);
         }
     }
 
@@ -91,7 +91,7 @@
                 await HtmlTextService.AddHtmlTextAsync(htmltext);
             }
 
-            await logger.LogInformation("Html/Text Content Saved {HtmlText}", htmltext);
+            await logger.LogInformation("Content Saved {HtmlText}", htmltext);
             NavigationManager.NavigateTo(NavigateUrl());
         }
         catch (Exception ex)

Oqtane.Client/Modules/HtmlText/Index.razor

@@ -15,16 +15,16 @@
 }
 
 @code {
-    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" }
     };
 
-    private string content = "";
+	private string content = "";
 
-    protected override async Task OnParametersSetAsync()
-    {
-        try
+	protected override async Task OnParametersSetAsync()
+	{
+		try
         {
             var htmltext = await HtmlTextService.GetHtmlTextAsync(ModuleState.ModuleId);
             if (htmltext != null)
@@ -35,8 +35,8 @@
         }
         catch (Exception ex)
         {
-            await logger.LogError(ex, "An Error Occurred Loading Html/Text Content. " + ex.Message);
-            AddModuleMessage(ex.Message, MessageType.Error);
+			await logger.LogError(ex, "Error Loading Content {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error.Content.Load"], MessageType.Error);
         }
     }
 }

Oqtane.Client/Modules/HtmlText/ModuleInfo.cs

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

Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs

@@ -1,10 +1,12 @@
 using System.Net.Http;
 using System.Threading.Tasks;
+using Oqtane.Documentation;
 using Oqtane.Services;
 using Oqtane.Shared;
 
 namespace Oqtane.Modules.HtmlText.Services
 {
+    [PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")]
     public class HtmlTextService : ServiceBase, IHtmlTextService, IService
     {        
         public HtmlTextService(HttpClient http, SiteState siteState) : base(http, siteState) {}

Oqtane.Client/Modules/HtmlText/Services/IHtmlTextService.cs

@@ -1,9 +1,11 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
+using Oqtane.Documentation;
 using Oqtane.Modules.HtmlText.Models;
 
 namespace Oqtane.Modules.HtmlText.Services
 {
+    [PrivateApi("Mark HtmlText classes as private, since it's not very useful in the public docs")]
     public interface IHtmlTextService 
     {
         Task<Models.HtmlText> GetHtmlTextAsync(int ModuleId);

Oqtane.Client/Modules/HtmlText/Settings.razor

@@ -5,44 +5,45 @@
 @inject IStringLocalizer<Settings> Localizer
 @inject IStringLocalizer<SharedResources> SharedLocalizer
 
-    <div class="container">
-        <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="files" ResourceKey="Allow File Management" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
-            <div class="col-sm-9">
-                <select id="files" class="form-select" @bind="@_allowfilemanagement">
-                    <option value="true">@SharedLocalizer["Yes"]</option>
-                    <option value="false">@SharedLocalizer["No"]</option>
-                </select>
-            </div>
+<div class="container">
+    <div class="row mb-1 align-items-center">
+        <Label Class="col-sm-3" For="files" ResourceKey="AllowFileManagement" ResourceType="@resourceType" HelpText="Specify If Editors Can Upload and Select Files">Allow File Management: </Label>
+        <div class="col-sm-9">
+            <select id="files" class="form-select" @bind="@_allowfilemanagement">
+                <option value="true">@SharedLocalizer["Yes"]</option>
+                <option value="false">@SharedLocalizer["No"]</option>
+            </select>
         </div>
     </div>
+</div>
 
-    @code {
-        private string _allowfilemanagement;
+@code {		
+	private string resourceType = "Oqtane.Modules.HtmlText.Settings, Oqtane.Client"; // for localization
+    private string _allowfilemanagement;
 
-        protected override void OnInitialized()
+    protected override void OnInitialized()
+    {
+        try
         {
-            try
-            {
-                _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
+            _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
         }
-
-        public async Task UpdateSettings()
+        catch (Exception ex)
         {
-            try
-            {
-                var settings = ModuleState.Settings;
-                settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
-                await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}

Oqtane.Client/Modules/ModuleBase.cs

@@ -134,9 +134,19 @@ namespace Oqtane.Modules
             return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
         }
 
+        public string ImageUrl(int fileid, int width, int height)
+        {
+            return ImageUrl(fileid, width, height, "");
+        }
+
         public string ImageUrl(int fileid, int width, int height, string mode)
         {
-            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode);
+            return ImageUrl(fileid, width, height, mode, "", "", 0, false);
+        }
+
+        public string ImageUrl(int fileid, int width, int height, string mode, string position, string background, int rotate, bool recreate)
+        {
+            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, position, background, rotate, recreate);
         }
 
         public virtual Dictionary<string, string> GetUrlParameters(string parametersTemplate = "")

Oqtane.Client/Oqtane.Client.csproj

@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RazorLangVersion>3.0</RazorLangVersion>
     <Configurations>Debug;Release</Configurations>
-    <Version>3.0.0</Version>
+    <Version>3.0.2</Version>
     <Product>Oqtane</Product>
     <Authors>Shaun Walker</Authors>
     <Company>.NET Foundation</Company>
@@ -13,7 +13,7 @@
     <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.0.0</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/oqtane/oqtane.framework/releases/tag/v3.0.2</PackageReleaseNotes>
     <RepositoryUrl>https://github.com/oqtane/oqtane.framework</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
     <RootNamespace>Oqtane</RootNamespace>
@@ -34,11 +34,6 @@
     <ProjectReference Include="..\Oqtane.Shared\Oqtane.Shared.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Resources\" />
-    <Folder Include="Resources\Themes\Controls\Theme\" />
-  </ItemGroup>
-
   <ItemGroup>
     <TrimmerRootAssembly Include="System.Runtime" />
     <TrimmerRootAssembly Include="System.Linq.Parallel" />

Oqtane.Client/Program.cs

@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.AspNetCore.Localization;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.JSInterop;
+using Oqtane.Documentation;
 using Oqtane.Modules;
 using Oqtane.Services;
 using Oqtane.Shared;
@@ -19,6 +20,7 @@ using Oqtane.UI;
 
 namespace Oqtane.Client
 {
+    [PrivateApi("Mark Entry-Program as private, since it's not very useful in the public docs")]
     public class Program
     {
         public static async Task Main(string[] args)

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

@@ -159,4 +159,10 @@
   <data name="Type" xml:space="preserve">
     <value>Type</value>
   </data>
+  <data name="DeleteFile.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="UploadFiles.Text" xml:space="preserve">
+    <value>Upload Files</value>
+  </data>
 </root>

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

@@ -186,4 +186,10 @@
   <data name="NextExecution.Text" xml:space="preserve">
     <value>Next Execution: </value>
   </data>
+  <data name="Week(s)" xml:space="preserve">
+    <value>Week(s)</value>
+  </data>
+  <data name="Once" xml:space="preserve">
+    <value>Execute Once</value>
+  </data>
 </root>

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

@@ -133,19 +133,16 @@
     <value>Every</value>
   </data>
   <data name="Minute" xml:space="preserve">
-    <value>Minute</value>
+    <value>Minute(s)</value>
   </data>
   <data name="Hour" xml:space="preserve">
-    <value>Hour</value>
+    <value>Hour(s)</value>
   </data>
   <data name="Day" xml:space="preserve">
-    <value>Day</value>
+    <value>Day(s)</value>
   </data>
   <data name="Month" xml:space="preserve">
-    <value>Month</value>
-  </data>
-  <data name="s" xml:space="preserve">
-    <value>s</value>
+    <value>Month(s)</value>
   </data>
   <data name="Error.Job.Delete" xml:space="preserve">
     <value>Error Deleting Job</value>
@@ -168,4 +165,31 @@
   <data name="Stop" xml:space="preserve">
     <value>Stop</value>
   </data>
+  <data name="DeleteJob.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="EditJob.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="JobLog.Text" xml:space="preserve">
+    <value>Log</value>
+  </data>
+  <data name="Error.Job.Start" xml:space="preserve">
+    <value>An error occurred when starting the job</value>
+  </data>
+  <data name="Error.Job.Stop" xml:space="preserve">
+    <value>An error occurred when stopping the job</value>
+  </data>
+  <data name="Message.Job.Start" xml:space="preserve">
+    <value>The process responsible for executing this job has been started. The next execution will be based on the schedule criteria for the job.</value>
+  </data>
+  <data name="Message.Job.Stop" xml:space="preserve">
+    <value>The process responsible for executing this job has been stopped. In order to restart the process you will need to use the Start button or restart the application.</value>
+  </data>
+  <data name="Week" xml:space="preserve">
+    <value>Week(s)</value>
+  </data>
+  <data name="Once" xml:space="preserve">
+    <value>Execute Once</value>
+  </data>
 </root>

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

@@ -153,4 +153,19 @@
   <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>
+  </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>
+  </data>
+  <data name="LanguageUpload.Text" xml:space="preserve">
+    <value>Upload Language</value>
+  </data>
+  <data name="Manage.Heading" xml:space="preserve">
+    <value>Manage</value>
+  </data>
+  <data name="Upload.Heading" xml:space="preserve">
+    <value>Upload</value>
+  </data>
 </root>

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

@@ -141,4 +141,7 @@
   <data name="Default" xml:space="preserve">
     <value>Default</value>
   </data>
+  <data name="DeleteLanguage.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
 </root>

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

@@ -138,4 +138,13 @@
   <data name="Info.SignedIn" xml:space="preserve">
     <value>You Are Already Signed In</value>
   </data>
+  <data name="Message.ForgotPassword" xml:space="preserve">
+    <value>Please Enter The Username Related To Your Account And Then Select The Forgot Password Option Again</value>
+  </data>
+  <data name="Message.ForgotUser" xml:space="preserve">
+    <value>Please Check The Email Address Associated To Your User Account For A Password Reset Notification</value>
+  </data>
+  <data name="Message.UserDoesNotExist" xml:space="preserve">
+    <value>User Does Not Exist</value>
+  </data>
 </root>

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

@@ -189,4 +189,25 @@
   <data name="Create" xml:space="preserve">
     <value>Create</value>
   </data>
+  <data name="LogDetails.Text" xml:space="preserve">
+    <value>Details</value>
+  </data>
+  <data name="Error.SaveSiteSettings" xml:space="preserve">
+    <value>Error Saving Settings</value>
+  </data>
+  <data name="Events.Heading" xml:space="preserve">
+    <value>Events</value>
+  </data>
+  <data name="Retention.HelpText" xml:space="preserve">
+    <value>Number of days of events to retain</value>
+  </data>
+  <data name="Retention.Text" xml:space="preserve">
+    <value>Retention (Days):</value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Success.SaveSiteSettings" xml:space="preserve">
+    <value>Settings Saved Successfully</value>
+  </data>
 </root>

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

@@ -138,4 +138,10 @@
   <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>
+  </data>
+  <data name="Upload.Heading" xml:space="preserve">
+    <value>Upload</value>
+  </data>
 </root>

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

@@ -183,7 +183,16 @@
   <data name="Runtimes.Text" xml:space="preserve">
     <value>Runtimes: </value>
   </data>
-  <data name="Definition.Name" xml:space="preserve">
+  <data name="Definition.Heading" xml:space="preserve">
     <value>Definition</value>
   </data>
+  <data name="Information.Heading" xml:space="preserve">
+    <value>Information</value>
+  </data>
+  <data name="Permissions.Heading" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+  <data name="Information.Text" xml:space="preserve">
+    <value>Information</value>
+  </data>
 </root>

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

@@ -144,4 +144,10 @@
   <data name="DeleteModule.Header" xml:space="preserve">
     <value>Delete Module</value>
   </data>
+  <data name="InUse" xml:space="preserve">
+    <value>In Use</value>
+  </data>
+  <data name="EditModule.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
 </root>

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -210,7 +210,7 @@
   <data name="Personalizable.Text" xml:space="preserve">
     <value>Personalizable? </value>
   </data>
-  <data name="Appearance.Name" xml:space="preserve">
+  <data name="Appearance.Heading" xml:space="preserve">
     <value>Appearance</value>
   </data>
   <data name="ThisLocation.Keep" xml:space="preserve">
@@ -231,4 +231,37 @@
   <data name="Move.Text" xml:space="preserve">
     <value>Move: </value>
   </data>
+  <data name="ModuleDefinition" xml:space="preserve">
+    <value>Module</value>
+  </data>
+  <data name="ModuleTitle" xml:space="preserve">
+    <value>Title</value>
+  </data>
+  <data name="PageModules.Heading" xml:space="preserve">
+    <value>Modules</value>
+  </data>
+  <data name="ModuleSettings.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="DeleteModule.Header" xml:space="preserve">
+    <value>Delete Module</value>
+  </data>
+  <data name="DeleteModule.Message" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete This Module?</value>
+  </data>
+  <data name="DeleteModule.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Permissions.Heading" xml:space="preserve">
+    <value>Permissions</value>
+  </data>
+  <data name="ThemeSettings.Heading" xml:space="preserve">
+    <value>Theme Settings</value>
+  </data>
+  <data name="Clickable.HelpText" xml:space="preserve">
+    <value>Select whether the link in the site navigation is enabled or disabled</value>
+  </data>
+  <data name="Clickable.Text" xml:space="preserve">
+    <value>Clickable?</value>
+  </data>
 </root>

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

@@ -132,4 +132,10 @@
   <data name="Browse" xml:space="preserve">
     <value>Browse</value>
   </data>
+  <data name="DeletePage.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="EditPage.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
 </root>

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

@@ -132,4 +132,10 @@
   <data name="DeleteProfile.Header" xml:space="preserve">
     <value>Delete Profile</value>
   </data>
+  <data name="DeleteProfile.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="EditProfile.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
 </root>

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

@@ -177,7 +177,10 @@
   <data name="DeleteAllModules.Message" xml:space="preserve">
     <value>Are You Sure You Wish To Permanently Delete All Modules?</value>
   </data>
-  <data name="Pages.Name" xml:space="preserve">
+  <data name="Pages.Heading" xml:space="preserve">
     <value>Pages</value>
   </data>
+  <data name="Modules.Heading" xml:space="preserve">
+    <value>Modules</value>
+  </data>
 </root>

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

@@ -117,22 +117,37 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="Password.Confirm" xml:space="preserve">
-    <value>Confirm Password:</value>
-  </data>
   <data name="Message.Password.NoMatch" xml:space="preserve">
     <value>Passwords Entered Do Not Match</value>
   </data>
   <data name="Message.Required.UserInfo" xml:space="preserve">
-    <value>You Must Provide A Username, Password, and Email Address</value>
+    <value>You Must Provide The Password And Confirmation</value>
   </data>
   <data name="Password.Reset" xml:space="preserve">
     <value>Reset Password</value>
   </data>
   <data name="Error.Password.ResetInfo" xml:space="preserve">
-    <value>Error Resetting User Password. Please Ensure Password Meets Complexity Requirements.</value>
+    <value>Error Resetting User Password. Please Ensure The Request To Reset Your Password Was Made Within The Past 24 Hours And The New Password Meets The Complexity Requirements.</value>
   </data>
   <data name="Error.Password.Reset" xml:space="preserve">
     <value>Error Resetting User Password</value>
   </data>
+  <data name="Confirm.Text" xml:space="preserve">
+    <value>Confirm:</value>
+  </data>
+  <data name="Conform.HelpText" xml:space="preserve">
+    <value>Enter the password again. It must exactly match the password entered above.</value>
+  </data>
+  <data name="Password.HelpText" xml:space="preserve">
+    <value>The new password. It must satisfy complexity rules for the site.</value>
+  </data>
+  <data name="Password.Text" xml:space="preserve">
+    <value>Password:</value>
+  </data>
+  <data name="Username.HelpText" xml:space="preserve">
+    <value>Your username will be populated from the link you received in the password reset notification</value>
+  </data>
+  <data name="Username.Text" xml:space="preserve">
+    <value>Username:</value>
+  </data>
 </root>

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

@@ -129,4 +129,13 @@
   <data name="DeleteRole.Header" xml:space="preserve">
     <value>Delete Role</value>
   </data>
+  <data name="DeleteRole.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="Edit.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="Users.Text" xml:space="preserve">
+    <value>Users</value>
+  </data>
 </root>

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

@@ -129,9 +129,6 @@
   <data name="DefaultContainer.Text" xml:space="preserve">
     <value>Default Container: </value>
   </data>
-  <data name="Appearance.Name" xml:space="preserve">
-    <value>Appearance</value>
-  </data>
   <data name="DefaultAdminContainer" xml:space="preserve">
     <value>Default Admin Container</value>
   </data>
@@ -145,7 +142,7 @@
     <value>Site Settings Saved</value>
   </data>
   <data name="Message.Aliases.Taken" xml:space="preserve">
-    <value>An Alias Specified Has Already Been Used For Another Site</value>
+    <value>The Default Alias Has Not Been Specified Or An Alias Was Specified That Has Already Been Used For Another Site</value>
   </data>
   <data name="Message.Required.SiteName" xml:space="preserve">
     <value>You Must Provide A Site Name, Alias, And Default Theme/Container</value>
@@ -171,9 +168,6 @@
   <data name="Aliases.HelpText" xml:space="preserve">
     <value>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 should be separated by commas.</value>
   </data>
-  <data name="AllowRegistration.HelpText" xml:space="preserve">
-    <value>Do you want the users to be able to register for an account on the site</value>
-  </data>
   <data name="IsDeleted.HelpText" xml:space="preserve">
     <value>Is this site deleted?</value>
   </data>
@@ -225,11 +219,8 @@
   <data name="Aliases.Text" xml:space="preserve">
     <value>Aliases: </value>
   </data>
-  <data name="AllowRegistration.Text" xml:space="preserve">
-    <value>Allow User Registration? </value>
-  </data>
   <data name="IsDeleted.Text" xml:space="preserve">
-    <value>Is Deleted? </value>
+    <value>Deleted? </value>
   </data>
   <data name="Logo.Text" xml:space="preserve">
     <value>Logo: </value>
@@ -282,7 +273,7 @@
   <data name="Theme.Select" xml:space="preserve">
     <value>Select Theme</value>
   </data>
-  <data name="Hosting" xml:space="preserve">
+  <data name="Hosting.Heading" xml:space="preserve">
     <value>Hosting Model</value>
   </data>
   <data name="Prerender.HelpText" xml:space="preserve">
@@ -300,4 +291,37 @@
   <data name="Browse" xml:space="preserve">
     <value>Browse</value>
   </data>
+  <data name="TenantInformation.Heading" xml:space="preserve">
+    <value>Tenant Information</value>
+  </data>
+  <data name="PWASettings.Heading" xml:space="preserve">
+    <value>PWA Settings</value>
+  </data>
+  <data name="SMTPSettings.Heading" xml:space="preserve">
+    <value>SMTP Settings</value>
+  </data>
+  <data name="ConnectionString.Text" xml:space="preserve">
+    <value>Connection:</value>
+  </data>
+  <data name="Database.Text" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="ConnectionString.HelpText" xml:space="preserve">
+    <value>The connection information for the database</value>
+  </data>
+  <data name="Database.HelpText" xml:space="preserve">
+    <value>The database for the tenant</value>
+  </data>
+  <data name="DeleteSite.Text" xml:space="preserve">
+    <value>Delete Site</value>
+  </data>
+  <data name="DefaultAlias.HelpText" xml:space="preserve">
+    <value>The default alias for the site. Requests for non-default aliases will be redirected to the default alias.</value>
+  </data>
+    <data name="DefaultAlias.Text" xml:space="preserve">
+    <value>Default Alias: </value>
+  </data>
+  <data name="Aliases.Heading" xml:space="preserve">
+    <value>Aliases</value>
+  </data>
 </root>

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

@@ -133,7 +133,7 @@
     <value>Server Path</value>
   </data>
   <data name="ServerTime.HelpText" xml:space="preserve">
-    <value>Server Time</value>
+    <value>Server Date/Time (in UTC)</value>
   </data>
   <data name="FrameworkVersion.Text" xml:space="preserve">
     <value>Framework Version: </value>
@@ -148,7 +148,7 @@
     <value>Server Path: </value>
   </data>
   <data name="ServerTime.Text" xml:space="preserve">
-    <value>Server Time: </value>
+    <value>Server Date/Time: </value>
   </data>
   <data name="RestartApplication.Header" xml:space="preserve">
     <value>Restart Application</value>
@@ -204,10 +204,10 @@
   <data name="Critical" xml:space="preserve">
     <value>Critical</value>
   </data>
-  <data name="Info" xml:space="preserve">
+  <data name="Info.Heading" xml:space="preserve">
     <value>Info</value>
   </data>
-  <data name="Options" xml:space="preserve">
+  <data name="Options.Heading" xml:space="preserve">
     <value>Options</value>
   </data>
   <data name="Register" xml:space="preserve">
@@ -228,4 +228,7 @@
   <data name="Swagger.Text" xml:space="preserve">
     <value>Swagger Enabled?</value>
   </data>
+  <data name="RestartApplication.Text" xml:space="preserve">
+    <value>Restart Application</value>
+  </data>
 </root>

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

@@ -138,4 +138,10 @@
   <data name="DeleteTheme.Header" xml:space="preserve">
     <value>Delete Theme</value>
   </data>
+  <data name="CreateTheme.Text" xml:space="preserve">
+    <value>Create Theme</value>
+  </data>
+  <data name="ViewTheme.Text" xml:space="preserve">
+    <value>View</value>
+  </data>
 </root>

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

@@ -135,4 +135,10 @@
   <data name="Success.Framework.Download" xml:space="preserve">
     <value>Framework Downloaded Successfully... Please Select Upgrade To Complete the Process</value>
   </data>
+  <data name="Download.Heading" xml:space="preserve">
+    <value>Download</value>
+  </data>
+  <data name="Upload.Heading" xml:space="preserve">
+    <value>Upload</value>
+  </data>
 </root>

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

@@ -0,0 +1,144 @@
+<?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="MappedUrl.Text" xml:space="preserve">
+    <value>Redirect To:</value>
+  </data>
+  <data name="MappedUrl.HelpText" xml:space="preserve">
+    <value>A relative or absolute Url where the user will be redirected</value>
+  </data>
+  <data name="Url.HelpText" xml:space="preserve">
+    <value>An absolute Url identifying a path to a specific page in the site</value>
+  </data>
+  <data name="Url.Text" xml:space="preserve">
+    <value>Url:</value>
+  </data>
+  <data name="Error.SaveUrlMapping" xml:space="preserve">
+    <value>Error Saving Url Mapping</value>
+  </data>
+  <data name="Message.InfoRequired" xml:space="preserve">
+    <value>Please Provide All Required Information</value>
+  </data>
+  <data name="Message.DuplicateUrlMapping" xml:space="preserve">
+    <value>The Url and Redirect To cannot be the same</value>
+  </data>
+  <data name="Message.SaveUrlMapping" xml:space="preserve">
+    <value>The Url must belong to the current site</value>
+  </data>
+</root>

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

@@ -0,0 +1,144 @@
+<?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="MappedUrl.Text" xml:space="preserve">
+    <value>Redirect To:</value>
+  </data>
+  <data name="MappedUrl.HelpText" xml:space="preserve">
+    <value>A relative or absolute Url where the user will be redirected</value>
+  </data>
+  <data name="Url.HelpText" xml:space="preserve">
+    <value>A relative Url identifying a path to a specific page in the site</value>
+  </data>
+  <data name="Url.Text" xml:space="preserve">
+    <value>Url:</value>
+  </data>
+  <data name="Error.LoadUrlMapping" xml:space="preserve">
+    <value>Error Loading Url Mapping</value>
+  </data>
+  <data name="Error.SaveUrlMapping" xml:space="preserve">
+    <value>Error Saving Url Mapping</value>
+  </data>
+  <data name="Message.InfoRequired" xml:space="preserve">
+    <value>Please Provide All Required Information</value>
+  </data>
+  <data name="Message.DuplicateUrlMapping" xml:space="preserve">
+    <value>The Url and Redirect To cannot be the same</value>
+  </data>
+</root>

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

@@ -0,0 +1,162 @@
+<?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="Confirm.DeleteUrlMapping" xml:space="preserve">
+    <value>Are You Sure You Wish To Delete {0}?</value>
+  </data>
+  <data name="AddUrlMapping.Text" xml:space="preserve">
+    <value>Add Url Mapping</value>
+  </data>
+  <data name="DeleteUrlMapping.Header" xml:space="preserve">
+    <value>Delete Url Mapping</value>
+  </data>
+  <data name="Requested" xml:space="preserve">
+    <value>Requested</value>
+  </data>
+  <data name="Requests" xml:space="preserve">
+    <value>Requests</value>
+  </data>
+  <data name="Mapped" xml:space="preserve">
+    <value>Mapped Urls</value>
+  </data>
+  <data name="Broken" xml:space="preserve">
+    <value>Broken Urls</value>
+  </data>
+  <data name="CaptureBrokenUrls.HelpText" xml:space="preserve">
+    <value>Specify if broken Urls should be captured automatically and saved in Url Mappings</value>
+  </data>
+  <data name="CaptureBrokenUrls.Text" xml:space="preserve">
+    <value>Capture Broken Urls?</value>
+  </data>
+  <data name="Error.SaveSiteSettings" xml:space="preserve">
+    <value>Error Saving Settings</value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Success.SaveSiteSettings" xml:space="preserve">
+    <value>Settings Saved Successfully</value>
+  </data>
+  <data name="Urls.Heading" xml:space="preserve">
+    <value>Urls</value>
+  </data>
+  <data name="Url" xml:space="preserve">
+    <value>Url</value>
+  </data>
+</root>

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

@@ -177,4 +177,10 @@
   <data name="Username.Text" xml:space="preserve">
     <value>Username:</value>
   </data>
+  <data name="Identity.Heading" xml:space="preserve">
+    <value>Identity</value>
+  </data>
+  <data name="Profile.Heading" xml:space="preserve">
+    <value>Profile</value>
+  </data>
 </root>

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

@@ -126,4 +126,31 @@
   <data name="DeleteUser.Header" xml:space="preserve">
     <value>Delete User</value>
   </data>
+  <data name="AllowRegistration.HelpText" xml:space="preserve">
+    <value>Do you want the users to be able to register for an account on the site</value>
+  </data>
+  <data name="AllowRegistration.Text" xml:space="preserve">
+    <value>Allow User Registration? </value>
+  </data>
+  <data name="Error.SaveSiteSettings" xml:space="preserve">
+    <value>Error Saving Settings</value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Success.SaveSiteSettings" xml:space="preserve">
+    <value>Settings Saved Successfully</value>
+  </data>
+  <data name="Users.Heading" xml:space="preserve">
+    <value>Users</value>
+  </data>
+  <data name="DeleteUser.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="EditUser.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="Roles.Text" xml:space="preserve">
+    <value>Roles</value>
+  </data>
 </root>

Oqtane.Client/Resources/Modules/Admin/Users/Roles.resx

@@ -177,4 +177,7 @@
   <data name="Expiry" xml:space="preserve">
     <value>Expiry</value>
   </data>
+  <data name="DeleteUserRole.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
 </root>

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

@@ -0,0 +1,177 @@
+<?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="IP.Text" xml:space="preserve">
+    <value>IP Address:</value>
+  </data>
+  <data name="IP.HelpText" xml:space="preserve">
+    <value>The last recorded IP address for this visitor</value>
+  </data>
+  <data name="Language.HelpText" xml:space="preserve">
+    <value>The last recorded language for this visitor</value>
+  </data>
+  <data name="Language.Text" xml:space="preserve">
+    <value>Language:</value>
+  </data>
+  <data name="Error.LoadVisitor" xml:space="preserve">
+    <value>Error Loading Visitor</value>
+  </data>
+  <data name="Created.HelpText" xml:space="preserve">
+    <value>The frst recorded date/time when the visitor visited the site</value>
+  </data>
+  <data name="Created.Text" xml:space="preserve">
+    <value>Created:</value>
+  </data>
+  <data name="Referrer.HelpText" xml:space="preserve">
+    <value>The last recorded referrer for this visitor</value>
+  </data>
+  <data name="Referrer.Text" xml:space="preserve">
+    <value>Referrer:</value>
+  </data>
+  <data name="Url.HelpText" xml:space="preserve">
+    <value>The last recorded Url for this visitor</value>
+  </data>
+  <data name="Url.Text" xml:space="preserve">
+    <value>Url:</value>
+  </data>
+  <data name="User.HelpText" xml:space="preserve">
+    <value>The last recorded user associated with this visitor</value>
+  </data>
+  <data name="User.Text" xml:space="preserve">
+    <value>User:</value>
+  </data>
+  <data name="UserAgent.HelpText" xml:space="preserve">
+    <value>The last recorded user agent for this visitor</value>
+  </data>
+  <data name="UserAgent.Text" xml:space="preserve">
+    <value>User Agent:</value>
+  </data>
+  <data name="Visited.HelpText" xml:space="preserve">
+    <value>The last recorded date/time when the visitor visited the site</value>
+  </data>
+  <data name="Visited.Text" xml:space="preserve">
+    <value>Visited:</value>
+  </data>
+  <data name="Visits.HelpText" xml:space="preserve">
+    <value>The total number of visits by this visitor all time</value>
+  </data>
+  <data name="Visits.Text" xml:space="preserve">
+    <value>Visits:</value>
+  </data>
+</root>

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

@@ -0,0 +1,189 @@
+<?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="Url" xml:space="preserve">
+    <value>Url</value>
+  </data>
+  <data name="Visited" xml:space="preserve">
+    <value>Visited</value>
+  </data>
+  <data name="Visits" xml:space="preserve">
+    <value>Visits</value>
+  </data>
+  <data name="AllVisitors" xml:space="preserve">
+    <value>All Visitors</value>
+  </data>
+  <data name="PastDay" xml:space="preserve">
+    <value>Past Day</value>
+  </data>
+  <data name="PastMonth" xml:space="preserve">
+    <value>Past Month</value>
+  </data>
+  <data name="PastWeek" xml:space="preserve">
+    <value>Past Week</value>
+  </data>
+  <data name="UsersOnly" xml:space="preserve">
+    <value>Users Only</value>
+  </data>
+  <data name="Language" xml:space="preserve">
+    <value>Language</value>
+  </data>
+  <data name="Error.SaveSiteSettings" xml:space="preserve">
+    <value>Error Saving Settings</value>
+  </data>
+  <data name="Settings.Heading" xml:space="preserve">
+    <value>Settings</value>
+  </data>
+  <data name="Success.SaveSiteSettings" xml:space="preserve">
+    <value>Settings Saved Successfully</value>
+  </data>
+  <data name="Visitors.Heading" xml:space="preserve">
+    <value>Visitors</value>
+  </data>
+  <data name="Tracking.HelpText" xml:space="preserve">
+    <value>Specify if visitor tracking is enabled</value>
+  </data>
+  <data name="Tracking.Text" xml:space="preserve">
+    <value>Tracking Enabled?</value>
+  </data>
+  <data name="IP" xml:space="preserve">
+    <value>IP</value>
+  </data>
+  <data name="User" xml:space="preserve">
+    <value>User</value>
+  </data>
+  <data name="Created" xml:space="preserve">
+    <value>Created</value>
+  </data>
+  <data name="Details.Text" xml:space="preserve">
+    <value>Details</value>
+  </data>
+  <data name="Filter.HelpText" xml:space="preserve">
+    <value>Comma delimited list of terms which may exist in IP addresses, user agents, or languages which identify visitors which should not be tracked (ie. bots)</value>
+  </data>
+  <data name="Filter.Text" xml:space="preserve">
+    <value>Filter:</value>
+  </data>
+  <data name="Retention.HelpText" xml:space="preserve">
+    <value>Number of days of visitor activity to retain</value>
+  </data>
+  <data name="Retention.Text" xml:space="preserve">
+    <value>Retention (Days):</value>
+  </data>
+</root>

Oqtane.Client/Resources/Modules/HtmlText/Edit.resx

@@ -117,7 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Error.Content.Load" xml:space="preserve">
+    <value>An Error Occurred Loading Content</value>
+  </data>
   <data name="Error.Content.Save" xml:space="preserve">
-    <value>Error Saving Content</value>
+    <value>An Error Occurred Saving Content</value>
   </data>
 </root>

Oqtane.Client/Resources/Modules/HtmlText/Index.resx

@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
-            Microsoft ResX Schema 
+    Microsoft ResX Schema 
     
-            Version 2.0
+    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.
+    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:
+    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>
+    ... 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.
+    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.
+    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:
+    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.
+    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.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.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 xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    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>
@@ -120,4 +120,7 @@
   <data name="Edit.Action" xml:space="preserve">
     <value>Edit</value>
   </data>
+  <data name="Error.Content.Load" xml:space="preserve">
+    <value>An Error Occurred Loading Content</value>
+  </data>
 </root>

Oqtane.Client/Resources/SharedResources.resx

@@ -318,4 +318,7 @@
   <data name="BlazorWebAssembly" xml:space="preserve">
     <value>Blazor WebAssembly</value>
   </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Settings</value>
+  </data>
 </root>

Oqtane.Client/Resources/Themes/Controls/ControlPanel.resx

@@ -177,4 +177,13 @@
   <data name="System.Update" xml:space="preserve">
     <value>Check For System Updates</value>
   </data>
+  <data name="Visibility" xml:space="preserve">
+    <value>Visibility:</value>
+  </data>
+  <data name="VisibilityEdit" xml:space="preserve">
+    <value>Page Editors Only</value>
+  </data>
+  <data name="VisibilityView" xml:space="preserve">
+    <value>Same As Page</value>
+  </data>
 </root>

Oqtane.Client/Resources/Themes/OqtaneTheme/ContainerSettings.resx

@@ -1,65 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
-            Microsoft ResX Schema 
+    Microsoft ResX Schema 
     
-            Version 2.0
+    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.
+    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:
+    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>
+    ... 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.
+    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.
+    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:
+    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.
+    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.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.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 xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+    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>

Oqtane.Client/Resources/Themes/OqtaneTheme/ThemeSettings.resx

@@ -121,7 +121,7 @@
     <value>Specify if a Footer pane should always be displayed in a fixed location at the bottom of the page.</value>
   </data>
   <data name="Footer.Text" xml:space="preserve">
-    <value>Display Footer?</value>
+    <value>Display Fixed Footer?</value>
   </data>
   <data name="Login.HelpText" xml:space="preserve">
     <value>Specify if a Login option should be displayed,  Note that this option does not prevent the login page from being accessible via a direct url.</value>

Oqtane.Client/Resources/UI/ModuleInstance.resx

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -123,4 +123,7 @@
   <data name="Error.Module.InvalidType" xml:space="preserve">
     <value>Module Type Is Invalid For {0}</value>
   </data>
+  <data name="Error.Module.Exception" xml:space="preserve">
+      <value>An Unexpected Error Has Occurred</value>
+  </data>
 </root>

Oqtane.Client/Services/Interfaces/ISettingService.cs

@@ -1,4 +1,5 @@
 using Oqtane.Models;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -70,7 +71,7 @@ namespace Oqtane.Services
         /// <summary>
         /// Returns a key-value dictionary of all module settings for the given module
         /// </summary>
-        /// <param name="pageId"></param>
+        /// <param name="moduleId"></param>
         /// <returns></returns>
         Task<Dictionary<string, string>> GetModuleSettingsAsync(int moduleId);
 
@@ -82,6 +83,21 @@ namespace Oqtane.Services
         /// <returns></returns>
         Task UpdateModuleSettingsAsync(Dictionary<string, string> moduleSettings, int moduleId);
 
+        /// <summary>
+        /// Returns a key-value dictionary of all module settings for the given module
+        /// </summary>
+        /// <param name="moduleDefinitionId"></param>
+        /// <returns></returns>
+        Task<Dictionary<string, string>> GetModuleDefinitionSettingsAsync(int moduleDefinitionId);
+
+        /// <summary>
+        /// Updates a module setting
+        /// </summary>
+        /// <param name="moduleDefinitionSettings"></param>
+        /// <param name="moduleDefinitionId"></param>
+        /// <returns></returns>
+        Task UpdateModuleDefinitionSettingsAsync(Dictionary<string, string> moduleDefinitionSettings, int moduleDefinitionId);
+
         /// <summary>
         /// Returns a key-value dictionary of all user settings for the given user
         /// </summary>
@@ -113,6 +129,19 @@ namespace Oqtane.Services
         /// <returns></returns>        
         Task UpdateFolderSettingsAsync(Dictionary<string, string> folderSettings, int folderId);
 
+        /// <summary>
+        /// Returns a key-value dictionary of all tenant settings
+        /// </summary>
+        /// <returns></returns>
+        Task<Dictionary<string, string>> GetHostSettingsAsync();
+
+        /// <summary>
+        /// Updates a host setting
+        /// </summary>
+        /// <param name="hostSettings"></param>
+        /// <returns></returns>
+        Task UpdateHostSettingsAsync(Dictionary<string, string> hostSettings);
+
         /// <summary>
         /// Returns a key-value dictionary of all settings for the given entityName
         /// </summary>
@@ -135,7 +164,7 @@ namespace Oqtane.Services
         /// </summary>
         /// <param name="settingId"></param>
         /// <returns></returns>
-        Task<Setting> GetSettingAsync(int settingId);
+        Task<Setting> GetSettingAsync(string entityName, int settingId);
 
 
         /// <summary>
@@ -157,7 +186,7 @@ namespace Oqtane.Services
         /// </summary>
         /// <param name="settingId"></param>
         /// <returns></returns>
-        Task DeleteSettingAsync(int settingId);
+        Task DeleteSettingAsync(string entityName, int settingId);
 
         /// <summary>
         /// Gets the value of the given settingName (key) from the given key-value dictionary 
@@ -177,8 +206,16 @@ namespace Oqtane.Services
         /// <returns></returns>
         Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue);
 
-        Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPublic);
+        Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPrivate);
 
         Dictionary<string, string> MergeSettings(Dictionary<string, string> settings1, Dictionary<string, string> settings2);
-}
+
+
+        [Obsolete("GetSettingAsync(int settingId) is deprecated. Use GetSettingAsync(string entityName, int settingId) instead.", false)]
+        Task<Setting> GetSettingAsync(int settingId);
+
+        [Obsolete("DeleteSettingAsync(int settingId) is deprecated. Use DeleteSettingAsync(string entityName, int settingId) instead.", false)]
+        Task DeleteSettingAsync(int settingId);
+
+    }
 }

Oqtane.Client/Services/Interfaces/IUrlMappingService.cs

@@ -0,0 +1,56 @@
+using Oqtane.Models;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Oqtane.Services
+{
+    /// <summary>
+    /// Service to manage <see cref="UrlMapping"/>s on a <see cref="Site"/>
+    /// </summary>
+    public interface IUrlMappingService
+    {
+        /// <summary>
+        /// Get all <see cref="UrlMapping"/>s of this <see cref="Site"/>.
+        ///
+        /// </summary>
+        /// <param name="siteId">ID-reference of a <see cref="Site"/></param>
+        /// <returns></returns>
+        Task<List<UrlMapping>> GetUrlMappingsAsync(int siteId, bool isMapped);
+
+        /// <summary>
+        /// Get one specific <see cref="UrlMapping"/>
+        /// </summary>
+        /// <param name="urlMappingId">ID-reference of a <see cref="UrlMapping"/></param>
+        /// <returns></returns>
+        Task<UrlMapping> GetUrlMappingAsync(int urlMappingId);
+
+        /// <summary>
+        /// Get one specific <see cref="UrlMapping"/>
+        /// </summary>
+        /// <param name="siteId">ID-reference of a <see cref="Site"/></param>
+        /// <param name="url">A url</param>
+        /// <returns></returns>
+        Task<UrlMapping> GetUrlMappingAsync(int siteId, string url);
+
+        /// <summary>
+        /// Add / save a new <see cref="UrlMapping"/> to the database.
+        /// </summary>
+        /// <param name="urlMapping"></param>
+        /// <returns></returns>
+        Task<UrlMapping> AddUrlMappingAsync(UrlMapping urlMapping);
+
+        /// <summary>
+        /// Update a <see cref="UrlMapping"/> in the database.
+        /// </summary>
+        /// <param name="urlMapping"></param>
+        /// <returns></returns>
+        Task<UrlMapping> UpdateUrlMappingAsync(UrlMapping urlMapping);
+
+        /// <summary>
+        /// Delete a <see cref="UrlMapping"/> in the database.
+        /// </summary>
+        /// <param name="urlMappingId">ID-reference of a <see cref="UrlMapping"/></param>
+        /// <returns></returns>
+        Task DeleteUrlMappingAsync(int urlMappingId);
+    }
+}

Oqtane.Client/Services/Interfaces/IVisitorService.cs

@@ -0,0 +1,29 @@
+using Oqtane.Models;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Oqtane.Services
+{
+    /// <summary>
+    /// Service to manage <see cref="Visitor"/>s on a <see cref="Site"/>
+    /// </summary>
+    public interface IVisitorService
+    {
+        /// <summary>
+        /// Get all <see cref="Visitor"/>s of this <see cref="Site"/>.
+        ///
+        /// </summary>
+        /// <param name="siteId">ID-reference of a <see cref="Site"/></param>
+        /// <returns></returns>
+        Task<List<Visitor>> GetVisitorsAsync(int siteId, DateTime fromDate);
+
+        /// <summary>
+        /// Get a specific <see cref="Visitor"/> of this <see cref="Site"/>.
+        ///
+        /// </summary>
+        /// <param name="visitorId">ID-reference of a <see cref="Visitor"/></param>
+        /// <returns></returns>
+        Task<Visitor> GetVisitorAsync(int visitorId);
+    }
+}

Oqtane.Client/Services/SettingService.cs

@@ -21,6 +21,7 @@ namespace Oqtane.Services
         }
 
         private string Apiurl => CreateApiUrl("Setting", _siteState.Alias);
+
         public async Task<Dictionary<string, string>> GetTenantSettingsAsync()
         {
             return await GetSettingsAsync(EntityNames.Tenant, -1);
@@ -71,6 +72,16 @@ namespace Oqtane.Services
             await UpdateSettingsAsync(moduleSettings, EntityNames.Module, moduleId);
         }
 
+        public async Task<Dictionary<string, string>> GetModuleDefinitionSettingsAsync(int moduleDefinitionId)
+        {
+            return await GetSettingsAsync(EntityNames.ModuleDefinition, moduleDefinitionId);
+        }
+
+        public async Task UpdateModuleDefinitionSettingsAsync(Dictionary<string, string> moduleDefinitionSettings, int moduleDefinitionId)
+        {
+            await UpdateSettingsAsync(moduleDefinitionSettings, EntityNames.ModuleDefinition, moduleDefinitionId);
+        }
+
         public async Task<Dictionary<string, string>> GetUserSettingsAsync(int userId)
         {
             return await GetSettingsAsync(EntityNames.User, userId);
@@ -91,6 +102,16 @@ namespace Oqtane.Services
             await UpdateSettingsAsync(folderSettings, EntityNames.Folder, folderId);
         }
 
+        public async Task<Dictionary<string, string>> GetHostSettingsAsync()
+        {
+            return await GetSettingsAsync(EntityNames.Host, -1);
+        }
+
+        public async Task UpdateHostSettingsAsync(Dictionary<string, string> hostSettings)
+        {
+            await UpdateSettingsAsync(hostSettings, EntityNames.Host, -1);
+        }
+
         public async Task<Dictionary<string, string>> GetSettingsAsync(string entityName, int entityId)
         {
             var dictionary = new Dictionary<string, string>();
@@ -110,14 +131,21 @@ namespace Oqtane.Services
             foreach (KeyValuePair<string, string> kvp in settings)
             {
                 string value = kvp.Value;
-                bool ispublic = false;
+                bool modified = false;
+                bool isprivate = false;
+
+                // manage settings modified with SetSetting method
+                if (value.StartsWith("[Private]"))
+                {
+                    modified = true;
+                    isprivate = true;
+                    value = value.Substring(9);                  
+                }
                 if (value.StartsWith("[Public]"))
                 {
-                    if (entityName == EntityNames.Site)
-                    {
-                        ispublic = true;
-                    }
-                    value = value.Substring(8); // remove [Public]
+                    modified = true;
+                    isprivate = false;
+                    value = value.Substring(8);                   
                 }
 
                 Setting setting = settingsList.FirstOrDefault(item => item.SettingName.Equals(kvp.Key, StringComparison.OrdinalIgnoreCase));
@@ -128,25 +156,24 @@ namespace Oqtane.Services
                     setting.EntityId = entityId;
                     setting.SettingName = kvp.Key;
                     setting.SettingValue = value;
-                    setting.IsPublic = ispublic;
+                    setting.IsPrivate = isprivate;
                     setting = await AddSettingAsync(setting);
                 }
                 else
                 {
-                    if (setting.SettingValue != kvp.Value)
+                    if (setting.SettingValue != value || (modified && setting.IsPrivate != isprivate))
                     {
                         setting.SettingValue = value;
-                        setting.IsPublic = ispublic;
+                        setting.IsPrivate = isprivate;
                         setting = await UpdateSettingAsync(setting);
                     }
                 }
             }
         }
 
-
-        public async Task<Setting> GetSettingAsync(int settingId)
+        public async Task<Setting> GetSettingAsync(string entityName, int settingId)
         {
-            return await GetJsonAsync<Setting>($"{Apiurl}/{settingId}");
+            return await GetJsonAsync<Setting>($"{Apiurl}/{settingId}/{entityName}");
         }
 
         public async Task<Setting> AddSettingAsync(Setting setting)
@@ -159,9 +186,9 @@ namespace Oqtane.Services
             return await PutJsonAsync<Setting>($"{Apiurl}/{setting.SettingId}", setting);
         }
 
-        public async Task DeleteSettingAsync(int settingId)
+        public async Task DeleteSettingAsync(string entityName, int settingId)
         {
-            await DeleteAsync($"{Apiurl}/{settingId}");
+            await DeleteAsync($"{Apiurl}/{settingId}/{entityName}");
         }
 
 
@@ -180,13 +207,13 @@ namespace Oqtane.Services
             return SetSetting(settings, settingName, settingValue, false);
         }
 
-        public Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPublic)
+        public Dictionary<string, string> SetSetting(Dictionary<string, string> settings, string settingName, string settingValue, bool isPrivate)
         {
             if (settings == null)
             {
                 settings = new Dictionary<string, string>();
             }
-            settingValue = (isPublic) ? "[Public]" + settingValue : settingValue;
+            settingValue = (isPrivate) ? "[Private]" + settingValue : "[Public]" + settingValue;
             if (settings.ContainsKey(settingName))
             {
                 settings[settingName] = settingValue;
@@ -220,5 +247,19 @@ namespace Oqtane.Services
             }
             return settings1;
         }
+
+        [Obsolete("GetSettingAsync(int settingId) is deprecated. Use GetSettingAsync(string entityName, int settingId) instead.", false)]
+        public async Task<Setting> GetSettingAsync(int settingId)
+        {
+            return await GetJsonAsync<Setting>($"{Apiurl}/{settingId}/tenant");
+        }
+
+        [Obsolete("DeleteSettingAsync(int settingId) is deprecated. Use DeleteSettingAsync(string entityName, int settingId) instead.", false)]
+        public async Task DeleteSettingAsync(int settingId)
+        {
+            await DeleteAsync($"{Apiurl}/{settingId}/tenant");
+        }
+
+
     }
 }

Oqtane.Client/Services/UrlMappingService.cs

@@ -0,0 +1,57 @@
+using Oqtane.Models;
+using System.Threading.Tasks;
+using System.Net.Http;
+using System.Linq;
+using System.Collections.Generic;
+using Oqtane.Documentation;
+using Oqtane.Shared;
+using System.Net;
+
+namespace Oqtane.Services
+{
+    [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
+    public class UrlMappingService : ServiceBase, IUrlMappingService
+    {
+        
+        private readonly SiteState _siteState;
+
+        public UrlMappingService(HttpClient http, SiteState siteState) : base(http)
+        {
+            
+            _siteState = siteState;
+        }
+
+        private string Apiurl => CreateApiUrl("UrlMapping", _siteState.Alias);
+
+        public async Task<List<UrlMapping>> GetUrlMappingsAsync(int siteId, bool isMapped)
+        {
+            List<UrlMapping> urlMappings = await GetJsonAsync<List<UrlMapping>>($"{Apiurl}?siteid={siteId}&ismapped={isMapped}");
+            return urlMappings.OrderByDescending(item => item.RequestedOn).ToList();
+        }
+
+        public async Task<UrlMapping> GetUrlMappingAsync(int urlMappingId)
+        {
+            return await GetJsonAsync<UrlMapping>($"{Apiurl}/{urlMappingId}");
+        }
+
+        public async Task<UrlMapping> GetUrlMappingAsync(int siteId, string url)
+        {
+            return await GetJsonAsync<UrlMapping>($"{Apiurl}/url/{siteId}?url={WebUtility.UrlEncode(url)}");
+        }
+
+        public async Task<UrlMapping> AddUrlMappingAsync(UrlMapping role)
+        {
+            return await PostJsonAsync<UrlMapping>(Apiurl, role);
+        }
+
+        public async Task<UrlMapping> UpdateUrlMappingAsync(UrlMapping role)
+        {
+            return await PutJsonAsync<UrlMapping>($"{Apiurl}/{role.UrlMappingId}", role);
+        }
+
+        public async Task DeleteUrlMappingAsync(int urlMappingId)
+        {
+            await DeleteAsync($"{Apiurl}/{urlMappingId}");
+        }
+    }
+}

Oqtane.Client/Services/VisitorService.cs

@@ -0,0 +1,37 @@
+using Oqtane.Models;
+using System.Threading.Tasks;
+using System.Net.Http;
+using System.Linq;
+using System.Collections.Generic;
+using Oqtane.Documentation;
+using Oqtane.Shared;
+using System;
+
+namespace Oqtane.Services
+{
+    [PrivateApi("Don't show in the documentation, as everything should use the Interface")]
+    public class VisitorService : ServiceBase, IVisitorService
+    {
+        
+        private readonly SiteState _siteState;
+
+        public VisitorService(HttpClient http, SiteState siteState) : base(http)
+        {
+            
+            _siteState = siteState;
+        }
+
+        private string Apiurl => CreateApiUrl("Visitor", _siteState.Alias);
+
+        public async Task<List<Visitor>> GetVisitorsAsync(int siteId, DateTime fromDate)
+        {
+            List<Visitor> visitors = await GetJsonAsync<List<Visitor>>($"{Apiurl}?siteid={siteId}&fromdate={fromDate.ToString("dd-MMM-yyyy")}");
+            return visitors.OrderByDescending(item => item.VisitedOn).ToList();
+        }
+
+        public async Task<Visitor> GetVisitorAsync(int visitorId)
+        {
+            return await GetJsonAsync<Visitor>($"{Apiurl}/{visitorId}");
+        }
+    }
+}

Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor

@@ -1,13 +1,20 @@
 @namespace Oqtane.Themes.BlazorTheme
 @inherits ContainerBase
 <div class="container">
-    <div class="row p-4">
-        <div class="d-flex flex-nowrap">
-            <ModuleActions /><h2><ModuleTitle /></h2>
-        </div>
-        <hr class="app-rule" />
-    </div>
-    <div class="row px-4">
+	@if (ModuleState.Title != "-")
+	{
+		<div class="row p-4">
+			<div class="d-flex flex-nowrap">
+				<ModuleActions /><h2><ModuleTitle /></h2>
+			</div>
+			<hr class="app-rule" />
+		</div>
+	}
+	else
+	{
+		<ModuleActions />
+	}
+	<div class="row px-4">
         <div class="container">
             <ModuleInstance />
         </div>

Oqtane.Client/Themes/BlazorTheme/ThemeInfo.cs

@@ -1,7 +1,9 @@
-using Oqtane.Models;
+using Oqtane.Documentation;
+using Oqtane.Models;
 
 namespace Oqtane.Themes.BlazorTheme
 {
+    [PrivateApi("Mark Build-In Theme-Info classes as private, since it's not very useful in the public docs")]
     public class ThemeInfo : ITheme
     {
         public Theme Theme => new Theme

Oqtane.Client/Themes/Controls/Theme/Breadcrumbs.razor

@@ -16,7 +16,15 @@
                 else
                 {
                     <li class="breadcrumb-item">
-                        <a href="@NavigateUrl(p.Path)">@p.Name</a>
+                        @if(p.IsClickable)
+                        {
+                            <a href="@NavigateUrl(p.Path)">@p.Name</a>
+                        }
+                        else
+                        {
+                            @p.Name
+                        }
+
                     </li>
                 }
             }

Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor

@@ -35,7 +35,7 @@
 
 @if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
 {
-    <button class="btn @ButtonClass" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel">
+    <button type="button" class="btn @ButtonClass" data-bs-toggle="offcanvas" data-bs-target="#offcanvasControlPanel" aria-controls="offcanvasControlPanel">
         <span class="oi oi-cog"></span>
     </button>
 
@@ -46,360 +46,366 @@
 		</div>
 		<div class="@BodyClass">
 			<div class="container-fluid">
-			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
-			{
-				<div class="row d-flex">
-					<div class="col">
-						<button data-bs-dismiss="offcanvas" type="button" class="btn btn-primary col-12" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button>
+				@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+				{
+					<div class="row d-flex">
+						<div class="col">
+							<button type="button" data-bs-dismiss="offcanvas" class="btn btn-primary col-12" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button>
+						</div>
 					</div>
-				</div>
 
-				<hr class="app-rule" />
+					<hr class="app-rule" />
 
-				<div class="row">
-					<div class="col text-center">
-						<label class="control-label">@Localizer["Page.Manage"] </label>
+					<div class="row">
+						<div class="col text-center">
+							<label class="control-label">@Localizer["Page.Manage"] </label>
+						</div>
 					</div>
-				</div>
-				<div class="row d-flex">
-					<div class="col d-flex justify-content-between">
-						<button type="button" class="btn btn-secondary col-3" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Add"))>@SharedLocalizer["Add"]</button>
-						<button type="button" class="btn btn-secondary col-3" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Edit"))>@SharedLocalizer["Edit"]</button>
-						<button type="button" class="btn btn-danger col-3" @onclick="ConfirmDelete">@SharedLocalizer["Delete"]</button>
+					<div class="row d-flex mb-2">
+						<div class="col d-flex justify-content-between">
+							<button type="button" class="btn btn-secondary col me-1" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Add"))>@SharedLocalizer["Add"]</button>
+							<button type="button" class="btn btn-secondary col" data-bs-dismiss="offcanvas" @onclick=@(async () => Navigate("Edit"))>@SharedLocalizer["Edit"]</button>
+							<button type="button" class="btn btn-danger col ms-1" @onclick="ConfirmDelete">@SharedLocalizer["Delete"]</button>
+						</div>
 					</div>
-				</div>
-				<br />
-				<div class="row d-flex">
-					<div class="col">
-						@if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
-						{
-							<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("unpublish"))>@Localizer["Page.Unpublish"]</button>
-						}
-						else
-						{
-							<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("publish"))>@Localizer["Page.Publish"]</button>
-						}
+					<div class="row d-flex">
+						<div class="col">
+							@if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
+							{
+								<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("unpublish"))>@Localizer["Page.Unpublish"]</button>
+							}
+							else
+							{
+								<button type="button" class="btn btn-secondary col-12" @onclick=@(async () => Publish("publish"))>@Localizer["Page.Publish"]</button>
+							}
+						</div>
 					</div>
-				</div>
-			}
+				}
 
-			@if (_deleteConfirmation)
-			{
-				<div class="app-admin-modal">
-					<div class="modal" tabindex="-1" role="dialog">
-						<div class="modal-dialog">
-							<div class="modal-content">
-								<div class="modal-header">
-									<h5 class="modal-title">@Localizer["Page.Delete"]</h5>
-									<button type="button" class="btn-close" aria-label="Close" @onclick="ConfirmDelete"></button>
-								</div>
-								<div class="modal-body">
-									<p>Are You Sure You Want To Delete This Page?</p>
-								</div>
-								<div class="modal-footer">
-									<button type="button" class="btn btn-danger" @onclick="DeletePage">@SharedLocalizer["Delete"]</button>
-									<button type="button" class="btn btn-secondary" @onclick="ConfirmDelete">@SharedLocalizer["Cancel"]</button>
+				@if (_deleteConfirmation)
+				{
+					<div class="app-admin-modal">
+						<div class="modal" tabindex="-1" role="dialog">
+							<div class="modal-dialog">
+								<div class="modal-content">
+									<div class="modal-header">
+										<h5 class="modal-title">@Localizer["Page.Delete"]</h5>
+										<button type="button" class="btn-close" aria-label="Close" @onclick="ConfirmDelete"></button>
+									</div>
+									<div class="modal-body">
+										<p>Are You Sure You Want To Delete This Page?</p>
+									</div>
+									<div class="modal-footer">
+										<button type="button" class="btn btn-danger" @onclick="DeletePage">@SharedLocalizer["Delete"]</button>
+										<button type="button" class="btn btn-secondary" @onclick="ConfirmDelete">@SharedLocalizer["Cancel"]</button>
+									</div>
 								</div>
 							</div>
 						</div>
 					</div>
-				</div>
-			}
-			<hr class="app-rule" />
-			<div class="row">
-				<div class="col text-center">
-					<label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
-					<select class="form-select" @bind="@ModuleType">
-						<option value="new">@Localizer["Module.AddNew"]</option>
-						<option value="existing">@Localizer["Module.AddExisting"]</option>
-					</select>
-					@if (ModuleType == "new")
-					{
-						@if (_moduleDefinitions != null)
+				}
+				<hr class="app-rule" />
+				<div class="row">
+					<div class="col text-center">
+						<label for="Module" class="control-label">@Localizer["Module.Manage"] </label>
+						<select class="form-select" @bind="@ModuleType">
+							<option value="new">@Localizer["Module.AddNew"]</option>
+							<option value="existing">@Localizer["Module.AddExisting"]</option>
+						</select>
+						@if (ModuleType == "new")
 						{
-							<select class="form-select" @onchange="(e => CategoryChanged(e))">
-								@foreach (var category in _categories)
-								{
-									if (category == Category)
+							@if (_moduleDefinitions != null)
+							{
+								<select class="form-select" @onchange="(e => CategoryChanged(e))">
+									@foreach (var category in _categories)
 									{
-										<option value="@category" selected>@category @Localizer["Modules"]</option>
+										if (category == Category)
+										{
+											<option value="@category" selected>@category @Localizer["Modules"]</option>
+										}
+										else
+										{
+											<option value="@category">@category @Localizer["Modules"]</option>
+										}
+									}
+								</select>
+								<select class="form-select" @onchange="(e => ModuleChanged(e))">
+									@if (ModuleDefinitionName == "-")
+									{
+										<option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option>
 									}
 									else
 									{
-										<option value="@category">@category @Localizer["Modules"]</option>
+										<option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
 									}
-								}
-							</select>
-							<select class="form-select" @onchange="(e => ModuleChanged(e))">
-								@if (ModuleDefinitionName == "-")
-								{
-									<option value="-" selected>&lt;@Localizer["Module.Select"]&gt;</option>
-								}
-								else
-								{
-									<option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
-								}
-								@foreach (var moduledefinition in _moduleDefinitions)
-								{
-									if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.Permissions))
+									@foreach (var moduledefinition in _moduleDefinitions)
 									{
-										if (moduledefinition.Runtimes == "" || moduledefinition.Runtimes.Contains(PageState.Runtime.ToString()))
+										if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Utilize, moduledefinition.Permissions))
 										{
-											<option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option>
+											if (moduledefinition.Runtimes == "" || moduledefinition.Runtimes.Contains(PageState.Runtime.ToString()))
+											{
+												<option value="@moduledefinition.ModuleDefinitionName">@moduledefinition.Name</option>
+											}
 										}
 									}
+								</select>
+							}
+						}
+						else
+						{
+							<select class="form-select" @onchange="(e => PageChanged(e))">
+								<option value="-">&lt;@Localizer["Page.Select"]&gt;</option>
+								@foreach (Page p in _pages)
+								{
+									<option value="@p.PageId">@p.Name</option>
+								}
+							</select>
+							<select class="form-select" @bind="@ModuleId">
+								<option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
+								@foreach (Module module in _modules)
+								{
+									<option value="@module.ModuleId">@module.Title</option>
 								}
 							</select>
-							@((MarkupString) Description)
 						}
-					}
-					else
-					{
-						<select class="form-select" @onchange="(e => PageChanged(e))">
-							<option value="-">&lt;@Localizer["Page.Select"]&gt;</option>
-							@foreach (Page p in _pages)
-							{
-								<option value="@p.PageId">@p.Name</option>
-							}
-						</select>
-						<select class="form-select" @bind="@ModuleId">
-							<option value="-">&lt;@Localizer["Module.Select"]&gt;</option>
-							@foreach (Module module in _modules)
-							{
-								<option value="@module.ModuleId">@module.Title</option>
-							}
-						</select>
-					}
+					</div>
 				</div>
-			</div>
-			<div class="row">
-				<div class="col text-center">
-					<label for="Title" class="control-label">@Localizer["Title"] </label>
-					<input type="text" name="Title" class="form-control" @bind="@Title" />
-				</div>
-			</div>
-			@if (_pane.Length > 1)
-			{
 				<div class="row">
 					<div class="col text-center">
-						<label for="Pane" class="control-label">@Localizer["Pane"] </label>
-						<select class="form-select" @bind="@Pane">
-							@foreach (string pane in PageState.Page.Panes)
+						<label for="Title" class="control-label">@Localizer["Title"] </label>
+						<input type="text" name="Title" class="form-control" @bind="@Title" />
+					</div>
+				</div>
+				@if (_pane.Length > 1)
+				{
+					<div class="row">
+						<div class="col text-center">
+							<label for="Pane" class="control-label">@Localizer["Pane"] </label>
+							<select class="form-select" @bind="@Pane">
+								@foreach (string pane in PageState.Page.Panes)
+								{
+									<option value="@pane">@pane Pane</option>
+								}
+							</select>
+						</div>
+					</div>
+				}
+				<div class="row">
+					<div class="col text-center">
+						<label for="Container" class="control-label">@Localizer["Container"] </label>
+						<select class="form-select" @bind="@ContainerType">
+							@foreach (var container in _containers)
 							{
-								<option value="@pane">@pane Pane</option>
+								<option value="@container.TypeName">@container.Name</option>
 							}
 						</select>
 					</div>
 				</div>
-			}
-			<div class="row">
-				<div class="col text-center">
-					<label for="Container" class="control-label">@Localizer["Container"] </label>
-					<select class="form-select" @bind="@ContainerType">
-						@foreach (var container in _containers)
-						{
-							<option value="@container.TypeName">@container.Name</option>
-						}
-					</select>
+				<div class="row">
+					<div class="col text-center">
+						<label for="visibility" class="control-label">@Localizer["Visibility"]</label>
+						<select class="form-select" @bind="@Visibility">
+							<option value="edit" selected>@Localizer["VisibilityEdit"]</option>
+							<option value="view">@Localizer["VisibilityView"]</option>
+						</select>
+					</div>
 				</div>
-			</div>
-			<br />
-			<button type="button" class="btn btn-primary col-12" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
-			@((MarkupString) Message)
-			@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
-			{
-				<hr class="app-rule" />
-				<NavLink class="btn btn-info col-12" data-bs-dismiss="offcanvas" href="@NavigateUrl("admin/update")">@Localizer["System.Update"]</NavLink>
-			}
+				<button type="button" class="btn btn-primary col-12 mt-4" @onclick="@AddModule">@Localizer["Page.Module.Add"]</button>
+				@((MarkupString) Message)
 			</div>
 		</div>
 	</div>
 }
 
 @code{
+	private bool _deleteConfirmation = false;
+	private List<string> _categories = new List<string>();
+	private List<ModuleDefinition> _allModuleDefinitions;
+	private List<ModuleDefinition> _moduleDefinitions;
+	private List<Page> _pages = new List<Page>();
+	private List<Module> _modules = new List<Module>();
+	private List<ThemeControl> _containers = new List<ThemeControl>();
+	private string _category = "Common";
 
-    private bool _deleteConfirmation = false;
-    private List<string> _categories = new List<string>();
-    private List<ModuleDefinition> _allModuleDefinitions;
-    private List<ModuleDefinition> _moduleDefinitions;
-    private List<Page> _pages = new List<Page>();
-    private List<Module> _modules = new List<Module>();
-    private List<ThemeControl> _containers = new List<ThemeControl>();
-    private string _category = "Common";
+	protected string PageId { get; private set; } = "-";
+	protected string ModuleId { get; private set; } = "-";
+	protected string ModuleType { get; private set; } = "new";
+	protected string ModuleDefinitionName { get; private set; } = "-";
 
-    protected string PageId { get; private set; } = "-";
-    protected string ModuleId { get; private set; } = "-";
-    protected string ModuleType { get; private set; } = "new";
-    protected string ModuleDefinitionName { get; private set; } = "-";
+	protected string Category
+	{
+		get => _category;
+		private set
+		{
+			if (_category != value)
+			{
+				_category = value;
+				_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
+				ModuleDefinitionName = "-";
+				Message = "";
+				StateHasChanged();
+				_ = UpdateSettingsAsync();
+			}
+		}
+	}
 
-    protected string Category
-    {
-        get => _category;
-        private set
-        {
-            if (_category != value)
-            {
-                _category = value;
-                _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
-                ModuleDefinitionName = "-";
-                Description = "";
-                StateHasChanged();
-                _ = UpdateSettingsAsync();
-            }
-        }
-    }
+	protected string Pane
+	{
+		get => _pane;
+		private set
+		{
+			if (_pane != value)
+			{
+				_pane = value;
+				_ = UpdateSettingsAsync();
+			}
+		}
+	}
 
-    protected string Pane
-    {
-        get => _pane;
-        private set
-        {
-            if (_pane != value)
-            {
-                _pane = value;
-                _ = UpdateSettingsAsync();
-            }
-        }
-    }
+	protected string Title { get; private set; } = "";
+	protected string ContainerType { get; private set; } = "";
+	protected string Visibility { get; private set; } = "edit";
+	protected string Message { get; private set; } = "";
+
+	[Parameter]
+	public string ButtonClass { get; set; } = "btn-outline-secondary";
+
+	[Parameter]
+	public string ContainerClass { get; set; } = "offcanvas offcanvas-end";
+
+	[Parameter]
+	public string HeaderClass { get; set; } = "offcanvas-header";
+
+	[Parameter]
+	public string BodyClass { get; set; } = "offcanvas-body overflow-auto";
+
+	[Parameter]
+	public bool ShowLanguageSwitcher { get; set; } = true;
 
 
-    protected string Description { get; private set; } = "";
+	protected override async Task OnParametersSetAsync()
+	{
+		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+		{
+			_pages?.Clear();
 
-    protected string Title { get; private set; } = "";
-    protected string ContainerType { get; private set; } = "";
-    protected string Message { get; private set; } = "";
+			foreach (Page p in PageState.Pages)
+			{
+				if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
+				{
+					_pages.Add(p);
+				}
+			}
+			await LoadSettingsAsync();
 
-    [Parameter]
-    public string ButtonClass { get; set; } = "btn-outline-secondary";
+			var themes = await ThemeService.GetThemesAsync();
+			_containers = ThemeService.GetContainerControls(themes, PageState.Page.ThemeType);
+			ContainerType = PageState.Site.DefaultContainerType;
+			_allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
+			_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
+			_categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
+		}
+	}
 
-    [Parameter]
-    public string ContainerClass { get; set; } = "offcanvas offcanvas-end";
+	private void CategoryChanged(ChangeEventArgs e)
+	{
+		Category = (string)e.Value;
+	}
 
-    [Parameter]
-    public string HeaderClass { get; set; } = "offcanvas-header";
+	private void ModuleChanged(ChangeEventArgs e)
+	{
+		ModuleDefinitionName = (string)e.Value;
+		if (ModuleDefinitionName != "-")
+		{
+			var moduleDefinition = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName);
+			Message = "<div class=\"alert alert-info mt-2 text-center\" role=\"alert\">" + moduleDefinition.Description + "</div>";
+		}
+		else
+		{
+			Message = "";
+		}
+		StateHasChanged();
+	}
 
-    [Parameter]
-    public string BodyClass { get; set; } = "offcanvas-body overflow-auto";
+	private void PageChanged(ChangeEventArgs e)
+	{
+		PageId = (string)e.Value;
+		if (PageId != "-")
+		{
+			_modules = PageState.Modules
+				.Where(module => module.PageId == int.Parse(PageId)
+									&& !module.IsDeleted
+									&& UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
+				.ToList();
+		}
+		ModuleId = "-";
+		StateHasChanged();
+	}
 
-    [Parameter]
-    public bool ShowLanguageSwitcher { get; set; } = true;
+	private async Task AddModule()
+	{
+		if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
+		{
+			if ((ModuleType == "new" && ModuleDefinitionName != "-") || (ModuleType != "new" && ModuleId != "-"))
+			{
+				if (ModuleType == "new")
+				{
+					Module module = new Module();
+					module.SiteId = PageState.Site.SiteId;
+					module.PageId = PageState.Page.PageId;
+					module.ModuleDefinitionName = ModuleDefinitionName;
+					module.AllPages = false;
 
+					List<PermissionString> permissions = UserSecurity.GetPermissionStrings(PageState.Page.Permissions);
+					if (Visibility == "view")
+					{
+						// set module view permissions to page view permissions
+						permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions = permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions;
+					}
+					else
+					{
+						// set module view permissions to page edit permissions
+						permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions = permissions.Find(p => p.PermissionName == PermissionNames.Edit).Permissions;
+					}
+					module.Permissions = UserSecurity.SetPermissionStrings(permissions);
 
-    protected override async Task OnParametersSetAsync()
-    {
-        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
-        {
-            _pages?.Clear();
+					module = await ModuleService.AddModuleAsync(module);
+					ModuleId = module.ModuleId.ToString();
+				}
 
-            foreach (Page p in PageState.Pages)
-            {
-                if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions))
-                {
-                    _pages.Add(p);
-                }
-            }
-            await LoadSettingsAsync();
-
-            var themes = await ThemeService.GetThemesAsync();
-            _containers = ThemeService.GetContainerControls(themes, PageState.Page.ThemeType);
-            ContainerType = PageState.Site.DefaultContainerType;
-            _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
-            _moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(Category)).ToList();
-            _categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
-        }
-    }
-
-    private void CategoryChanged(ChangeEventArgs e)
-    {
-        Category = (string)e.Value;
-    }
-
-    private void ModuleChanged(ChangeEventArgs e)
-    {
-        ModuleDefinitionName = (string)e.Value;
-        if (ModuleDefinitionName != "-")
-        {
-            var moduleDefinition = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName);
-            Description = "<br /><div class=\"alert alert-info\" role=\"alert\">" + moduleDefinition.Description + "</div>";
-        }
-        else
-        {
-            Description = "";
-        }
-
-        StateHasChanged();
-    }
-
-    private void PageChanged(ChangeEventArgs e)
-    {
-        PageId = (string)e.Value;
-        if (PageId != "-")
-        {
-            _modules = PageState.Modules
-                .Where(module => module.PageId == int.Parse(PageId)
-                                 && !module.IsDeleted
-                                 && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.Permissions))
-                .ToList();
-        }
-        ModuleId = "-";
-        StateHasChanged();
-    }
-
-    private async Task AddModule()
-    {
-        if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.Permissions))
-        {
-            if ((ModuleType == "new" && ModuleDefinitionName != "-") || (ModuleType != "new" && ModuleId != "-"))
-            {
-                if (ModuleType == "new")
-                {
-                    Module module = new Module();
-                    module.SiteId = PageState.Site.SiteId;
-                    module.PageId = PageState.Page.PageId;
-                    module.ModuleDefinitionName = ModuleDefinitionName;
-                    module.AllPages = false;
-
-                    // set module view permissions to page edit permissions
-                    List<PermissionString> permissions = UserSecurity.GetPermissionStrings(PageState.Page.Permissions);
-                    permissions.Find(p => p.PermissionName == PermissionNames.View).Permissions = permissions.Find(p => p.PermissionName == PermissionNames.Edit).Permissions;
-                    module.Permissions = UserSecurity.SetPermissionStrings(permissions);
-
-                    module = await ModuleService.AddModuleAsync(module);
-                    ModuleId = module.ModuleId.ToString();
-                }
-
-                var pageModule = new PageModule
+				var pageModule = new PageModule
                 {
                     PageId = PageState.Page.PageId,
                     ModuleId = int.Parse(ModuleId),
                     Title = Title
                 };
-                if (pageModule.Title == "")
-                {
-                    if (ModuleType == "new")
-                    {
-                        pageModule.Title = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName)?.Name;
-                    }
-                    else
-                    {
-                        pageModule.Title = _modules.FirstOrDefault(item => item.ModuleId == int.Parse(ModuleId))?.Title;
-                    }
-                }
+				if (pageModule.Title == "")
+				{
+					if (ModuleType == "new")
+					{
+						pageModule.Title = _moduleDefinitions.FirstOrDefault(item => item.ModuleDefinitionName == ModuleDefinitionName)?.Name;
+					}
+					else
+					{
+						pageModule.Title = _modules.FirstOrDefault(item => item.ModuleId == int.Parse(ModuleId))?.Title;
+					}
+				}
 
-                pageModule.Pane = Pane;
-                pageModule.Order = int.MaxValue;
-                pageModule.ContainerType = ContainerType;
+				pageModule.Pane = Pane;
+				pageModule.Order = int.MaxValue;
+				pageModule.ContainerType = ContainerType;
 
-                if (pageModule.ContainerType == PageState.Site.DefaultContainerType)
-                {
-                    pageModule.ContainerType = "";
-                }
+				if (pageModule.ContainerType == PageState.Site.DefaultContainerType)
+				{
+					pageModule.ContainerType = "";
+				}
 
-                await PageModuleService.AddPageModuleAsync(pageModule);
-                await PageModuleService.UpdatePageModuleOrderAsync(pageModule.PageId, pageModule.Pane);
+				await PageModuleService.AddPageModuleAsync(pageModule);
+				await PageModuleService.UpdatePageModuleOrderAsync(pageModule.PageId, pageModule.Pane);
 
-                Message = $"<div class=\"alert alert-success mt-2 text-center\" role=\"alert\">{Localizer["Success.Page.ModuleAdd"]}</div>";
-                NavigationManager.NavigateTo(NavigateUrl());
+				Message = $"<div class=\"alert alert-success mt-2 text-center\" role=\"alert\">{Localizer["Success.Page.ModuleAdd"]}</div>";
+				Title = "";
+				NavigationManager.NavigateTo(NavigateUrl());
             }
             else
             {

Oqtane.Client/Themes/Controls/Theme/LoginBase.cs

@@ -2,6 +2,7 @@ using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
+using Oqtane.Enums;
 using Oqtane.Providers;
 using Oqtane.Security;
 using Oqtane.Services;
@@ -17,6 +18,7 @@ namespace Oqtane.Themes.Controls
         [Inject] public IJSRuntime jsRuntime { get; set; }
         [Inject] public IServiceProvider ServiceProvider { get; set; }
         [Inject] public SiteState SiteState { get; set; }
+        [Inject] public ILogService LoggingService { get; set; }
 
         protected void LoginUser()
         {
@@ -31,6 +33,8 @@ namespace Oqtane.Themes.Controls
         protected async Task LogoutUser()
         {
             await UserService.LogoutUserAsync(PageState.User);
+            await LoggingService.Log(PageState.Alias, PageState.Page.PageId, PageState.ModuleId, PageState.User.UserId, GetType().AssemblyQualifiedName, "Logout", LogFunction.Security, LogLevel.Information, null, "User Logout For Username {Username}", PageState.User.Username);
+
             PageState.User = null;
             bool authorizedtoviewpage = UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, PageState.Page.Permissions);
 

Oqtane.Client/Themes/Controls/Theme/MenuHorizontal.razor

@@ -5,7 +5,7 @@
 @if (MenuPages.Any())
 {
     <span class="app-menu-toggler navbar-expand-md">
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
+        <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
     </span>

Oqtane.Client/Themes/Controls/Theme/MenuVertical.razor

@@ -4,7 +4,7 @@
 @if (MenuPages.Any())
 {
     <span class="app-menu-toggler">
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
+        <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target="#Menu" aria-controls="Menu" aria-expanded="false" aria-label="Toggle Navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
     </span>

Oqtane.Client/Themes/OqtaneTheme/Containers/Container.razor

@@ -3,7 +3,7 @@
 @inject ISettingService SettingService
 
 <div class="@_classes">
-    @if (_title)
+    @if (_title && ModuleState.Title != "-")
     {
         <div class="row px-4">
             <div class="d-flex flex-nowrap">

Oqtane.Client/Themes/OqtaneTheme/Containers/ContainerSettings.razor

@@ -6,7 +6,7 @@
 
 <div class="container">
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="title" ResourceKey="Title" HelpText="Specify If The Module Title Should Be Displayed">Display Title?</Label>
+        <Label Class="col-sm-3" For="title" ResourceKey="Title" ResourceType="@resourceType" HelpText="Specify If The Module Title Should Be Displayed">Display Title?</Label>
         <div class="col-sm-9">
             <select id="title" class="form-select" @bind="@_title">
                 <option value="true">Yes</option>
@@ -15,7 +15,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="background\" ResourceKey="Background" HelpText="Optionally Specify A Background Color For The Container">Background Color:</Label>
+        <Label Class="col-sm-3" For="background\" ResourceKey="Background" ResourceType="@resourceType" HelpText="Optionally Specify A Background Color For The Container">Background Color:</Label>
         <div class="col-sm-9">
             <select id="background" class="form-select" @bind="@_background">
                 <option value="">None</option>
@@ -31,7 +31,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="text" ResourceKey="Text" HelpText="Optionally Specify A Text Color For The Container">Text Color:</Label>
+        <Label Class="col-sm-3" For="text" ResourceKey="Text" ResourceType="@resourceType" HelpText="Optionally Specify A Text Color For The Container">Text Color:</Label>
         <div class="col-sm-9">
             <select id="text" class="form-select" @bind="@_text">
                 <option value="">None</option>
@@ -47,7 +47,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="border" ResourceKey="Border" HelpText="Optionally Specify A Border For The Container">Border Color:</Label>
+        <Label Class="col-sm-3" For="border" ResourceKey="Border" ResourceType="@resourceType" HelpText="Optionally Specify A Border For The Container">Border Color:</Label>
         <div class="col-sm-9">
             <select id="border" class="form-select" @bind="@_border">
                 <option value="">None</option>
@@ -65,41 +65,42 @@
     </div>
 </div>
 
-    @code {
-        private string _title = "true";
-        private string _background = "";
-        private string _text = "";
-        private string _border = "";
+@code {
+	private string resourceType = "Oqtane.Themes.OqtaneTheme.ContainerSettings, Oqtane.Client"; // for localization
+    private string _title = "true";
+    private string _background = "";
+    private string _text = "";
+    private string _border = "";
 
-        protected override void OnInitialized()
+    protected override void OnInitialized()
+    {
+        try
         {
-            try
-            {
-                _title = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true");
-                _background = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Background", "");
-                _text = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Text", "");
-                _border = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Border", "");
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
+            _title = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true");
+            _background = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Background", "");
+            _text = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Text", "");
+            _border = SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Border", "");
         }
-
-        public async Task UpdateSettings()
+        catch (Exception ex)
         {
-            try
-            {
-                var settings = ModuleState.Settings;
-                settings = SettingService.SetSetting(settings, GetType().Namespace + ":Title", _title);
-                settings = SettingService.SetSetting(settings, GetType().Namespace + ":Background", _background);
-                settings = SettingService.SetSetting(settings, GetType().Namespace + ":Text", _text);
-                settings = SettingService.SetSetting(settings, GetType().Namespace + ":Border", _border);
-                await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
-            }
-            catch (Exception ex)
-            {
-                ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
-            }
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
         }
     }
+
+    public async Task UpdateSettings()
+    {
+        try
+        {
+			var settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
+            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Title", _title);
+            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Background", _background);
+            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Text", _text);
+            settings = SettingService.SetSetting(settings, GetType().Namespace + ":Border", _border);
+            await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+        }
+        catch (Exception ex)
+        {
+            ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+}

Oqtane.Client/Themes/OqtaneTheme/ThemeInfo.cs

@@ -1,7 +1,9 @@
+using Oqtane.Documentation;
 using Oqtane.Models;
 
 namespace Oqtane.Themes.OqtaneTheme
 {
+    [PrivateApi("Mark Build-In Theme-Info classes as private, since it's not very useful in the public docs")]
     public class ThemeInfo : ITheme
     {
         public Theme Theme => new Theme

Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor

@@ -8,7 +8,7 @@
 
 <div class="container">
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="scope" ResourceKey="Scope" HelpText="Specify if the settings are applicable to this page or the entire site.">Setting Scope:</Label>
+        <Label Class="col-sm-3" For="scope" ResourceKey="Scope" ResourceType="@resourceType" HelpText="Specify if the settings are applicable to this page or the entire site.">Setting Scope:</Label>
         <div class="col-sm-9">
             <select id="scope" class="form-select" value="@_scope" @onchange="(e => ScopeChanged(e))">
                 @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
@@ -20,7 +20,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="login" ResourceKey="Login" HelpText="Specify if a Login option should be displayed. Note that this option does not prevent the login page from being accessible via a direct url.">Show Login?</Label>
+        <Label Class="col-sm-3" For="login" ResourceKey="Login" ResourceType="@resourceType" HelpText="Specify if a Login option should be displayed. Note that this option does not prevent the login page from being accessible via a direct url.">Show Login?</Label>
         <div class="col-sm-9">
             <select id="login" class="form-select" @bind="@_login">
                 <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
@@ -30,7 +30,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="register" ResourceKey="Register" HelpText="Specify if a Register option should be displayed. Note that this option is also dependent on the Allow Registration option in Site Settings.">Show Register?</Label>
+        <Label Class="col-sm-3" For="register" ResourceKey="Register" ResourceType="@resourceType" HelpText="Specify if a Register option should be displayed. Note that this option is also dependent on the Allow Registration option in Site Settings.">Show Register?</Label>
         <div class="col-sm-9">
             <select id="register" class="form-select" @bind="@_register">
                 <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
@@ -40,7 +40,7 @@
         </div>
     </div>
     <div class="row mb-1 align-items-center">
-        <Label Class="col-sm-3" For="footer" ResourceKey="Footer" HelpText="Specify if a Footer pane should always be displayed in a fixed location at the bottom of the page">Display Fixed Footer?</Label>
+        <Label Class="col-sm-3" For="footer" ResourceKey="Footer" ResourceType="@resourceType" HelpText="Specify if a Footer pane should always be displayed in a fixed location at the bottom of the page">Display Fixed Footer?</Label>
         <div class="col-sm-9">
             <select id="footer" class="form-select" @bind="@_footer">
                 <option value="-">&lt;@SharedLocalizer["Not Specified"]&gt;</option>
@@ -52,16 +52,17 @@
 </div>
 
 @code {
-    private string _scope = "page";
-    private string _login = "-";
-    private string _register = "-";
-    private string _footer = "-";
+	private string resourceType = "Oqtane.Themes.OqtaneTheme.ThemeSettings, Oqtane.Client"; // for localization
+	private string _scope = "page";
+	private string _login = "-";
+	private string _register = "-";
+	private string _footer = "-";
 
-    protected override async Task OnInitializedAsync()
-    {
-        try
-        {
-            await LoadSettings();
+	protected override async Task OnInitializedAsync()
+	{
+		try
+		{
+			await LoadSettings();
         }
         catch (Exception ex)
         {
@@ -110,7 +111,7 @@
         {
             if (_scope == "site")
             {
-                var settings = PageState.Site.Settings;
+                var settings = await SettingService.GetSiteSettingsAsync(PageState.Site.SiteId);
                 if (_login != "-")
                 {
                     settings = SettingService.SetSetting(settings, GetType().Namespace + ":Login", _login, true);
@@ -127,7 +128,7 @@
             }
             else
             {
-                var settings = PageState.Page.Settings;
+                var settings = await SettingService.GetPageSettingsAsync(PageState.Page.PageId);
                 if (_login != "-")
                 {
                     settings = SettingService.SetSetting(settings, GetType().Namespace + ":Login", _login);

Oqtane.Client/Themes/ThemeBase.cs

@@ -104,9 +104,19 @@ namespace Oqtane.Themes
             return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
         }
 
+        public string ImageUrl(int fileid, int width, int height)
+        {
+            return ImageUrl(fileid, width, height, "");
+        }
+
         public string ImageUrl(int fileid, int width, int height, string mode)
         {
-            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode);
+            return ImageUrl(fileid, width, height, mode, "", "", 0, false);
+        }
+
+        public string ImageUrl(int fileid, int width, int height, string mode, string position, string background, int rotate, bool recreate)
+        {
+            return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode, position, background, rotate, recreate);
         }
     }
 }

Oqtane.Client/UI/Interop.cs

@@ -262,5 +262,22 @@ namespace Oqtane.UI
                 return Task.CompletedTask;
             }
         }
+
+        public Task ScrollTo(int top, int left, string behavior)
+        {
+            try
+            {
+                if (string.IsNullOrEmpty(behavior)) behavior = "smooth";
+                _jsRuntime.InvokeVoidAsync(
+                    "Oqtane.Interop.scrollTo",
+                    top, left, behavior);
+                return Task.CompletedTask;
+            }
+            catch
+            {
+                return Task.CompletedTask;
+            }
+        }
+
     }
 }