From 8762809a832e9fba7b72e28147413075e7d5861d Mon Sep 17 00:00:00 2001
From: Shaun Walker <sbwalker@users.noreply.github.com>
Date: Fri, 26 Feb 2021 08:04:39 -0500
Subject: [PATCH 01/17] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5d0bb04c..bd6646dd 100644
--- a/README.md
+++ b/README.md
@@ -51,8 +51,8 @@ This project is a work in progress and the schedule for implementing enhancement
 
 V.2.1.0 ( Q1 2021 )
 - [x] Complete Static Localization of Admin UI
-- [ ] Cross Platform Database Support ( ie. SQLite )
-- [ ] EF Core Migrations for Database Installation/Upgrade
+- [ ] Cross Platform Database Support ( ie. SQLite ) - see #964
+- [ ] EF Core Migrations for Database Installation/Upgrade - see #964
 
 V.2.0.0 ( released in conjuntion with .NET 5 on Nov 11, 2020 )
 - [x] Migration to .NET 5

From 5b9196cfd4b030067d4aaa8aa34315e78b60ce56 Mon Sep 17 00:00:00 2001
From: Shaun Walker <sbwalker@users.noreply.github.com>
Date: Fri, 26 Feb 2021 08:05:36 -0500
Subject: [PATCH 02/17] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index bd6646dd..5788b1db 100644
--- a/README.md
+++ b/README.md
@@ -51,8 +51,8 @@ This project is a work in progress and the schedule for implementing enhancement
 
 V.2.1.0 ( Q1 2021 )
 - [x] Complete Static Localization of Admin UI
-- [ ] Cross Platform Database Support ( ie. SQLite ) - see #964
-- [ ] EF Core Migrations for Database Installation/Upgrade - see #964
+- [ ] Cross Platform Database Support ( ie. SQLite ) - see [#964](https://github.com/oqtane/oqtane.framework/discussions/964)
+- [ ] EF Core Migrations for Database Installation/Upgrade - see [#964](https://github.com/oqtane/oqtane.framework/discussions/964)
 
 V.2.0.0 ( released in conjuntion with .NET 5 on Nov 11, 2020 )
 - [x] Migration to .NET 5

From 191a1dea4d26c1c4db0caa5d80c14ccc4457db59 Mon Sep 17 00:00:00 2001
From: Shaun Walker <sbwalker@users.noreply.github.com>
Date: Sat, 27 Feb 2021 12:50:36 -0500
Subject: [PATCH 03/17] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5788b1db..20559301 100644
--- a/README.md
+++ b/README.md
@@ -50,10 +50,12 @@ There is a separate [Documentation repository](https://github.com/oqtane/oqtane.
 This project is a work in progress and the schedule for implementing enhancements is dependent upon the availability of community members who are willing/able to assist.
 
 V.2.1.0 ( Q1 2021 )
-- [x] Complete Static Localization of Admin UI
 - [ ] Cross Platform Database Support ( ie. SQLite ) - see [#964](https://github.com/oqtane/oqtane.framework/discussions/964)
 - [ ] EF Core Migrations for Database Installation/Upgrade - see [#964](https://github.com/oqtane/oqtane.framework/discussions/964)
 
+V.2.0.1 ( Feb 27, 2021 )
+- [x] Complete Static Localization of Admin UI
+
 V.2.0.0 ( released in conjuntion with .NET 5 on Nov 11, 2020 )
 - [x] Migration to .NET 5
 - [x] Static Localization ( ie. labels, help text, etc.. )

From cccb0806e19f0b065101d29df4d12d7e7b2dc0a7 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@users.noreply.github.com>
Date: Tue, 2 Mar 2021 16:17:33 +0100
Subject: [PATCH 04/17] LangVersion Fix #1148

removed the LangVersion property from project
---
 .../Templates/External/Server/[Owner].[Module].Server.csproj     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module].Server.csproj b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module].Server.csproj
index cfce1a60..ec0e8e4a 100644
--- a/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module].Server.csproj
+++ b/Oqtane.Server/wwwroot/Modules/Templates/External/Server/[Owner].[Module].Server.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>7.3</LangVersion>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
     <Version>1.0.0</Version>
     <Product>[Owner].[Module]</Product>

From 0d5ecb7427ce44e050f5801a0515ee9814abfe7d Mon Sep 17 00:00:00 2001
From: Charles Nurse <charlesnurse@gmail.com>
Date: Tue, 2 Mar 2021 12:03:26 -0800
Subject: [PATCH 05/17] Include gitignore and README files in Solution Files
 folder, so they are more accessible for editing

---
 Oqtane.sln | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Oqtane.sln b/Oqtane.sln
index 2755bdb2..70e85123 100644
--- a/Oqtane.sln
+++ b/Oqtane.sln
@@ -16,6 +16,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{77EECA8C-B58E-469E-B8C5-D543AFC9A654}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		.gitignore = .gitignore
+		README.md = README.md
 	EndProjectSection
 EndProject
 Global

From dbc4e3ea66c974a903e053bf5d5866ce8e3c74ec Mon Sep 17 00:00:00 2001
From: Charles Nurse <charlesnurse@gmail.com>
Date: Tue, 2 Mar 2021 12:07:04 -0800
Subject: [PATCH 06/17] Add the Jetbrains Rider "idea" folder to gitignore.

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index d47b8dcf..98408e86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,8 @@ msbuild.binlog
 *.binlog
 *.nupkg
 
+*.idea
+
 Oqtane.Server/appsettings.json
 Oqtane.Server/Data/*.mdf
 Oqtane.Server/Data/*.ldf

From 7205246718c1a93bb875a5cfd0b549dc47b7abb8 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@outlook.com>
Date: Wed, 3 Mar 2021 13:25:49 +0100
Subject: [PATCH 07/17] Added Delete all pages and modules

---
 .../Modules/Admin/RecycleBin/Index.razor      | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index 2d81476a..c26f852b 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -31,6 +31,9 @@
                     <td>@context.DeletedOn</td>
                 </Row>
             </Pager>
+            <div style="text-align:right; visibility : @IsDeleteAllPagesVisible">
+                <ActionDialog Header="Delete All Pages" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Pages?", "Delete All Pages"]" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
+            </div>
         }
     </TabPanel>
     <TabPanel Name="Modules" ResourceKey="Modules">
@@ -59,6 +62,10 @@
                     <td>@context.DeletedOn</td>
                 </Row>
             </Pager>
+            <div style="text-align:right; visibility : @IsDeleteAllModulesVisible" >
+                <ActionDialog Header="Delete All Modules" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Modules?", "Delete All Modules"]" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
+            </div>
+
         }
     </TabPanel>
 </TabStrip>
@@ -69,6 +76,22 @@
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
+    protected string IsDeleteAllPagesVisible
+    {
+        get
+        {
+            return _pages.Count == 0 ? "hidden" : "visible";
+        }
+    }
+
+    protected string IsDeleteAllModulesVisible
+    {
+        get {
+            return _modules.Count == 0 ? "hidden" : "visible" ;
+        }
+    }
+
+
     protected override async Task OnInitializedAsync()
     {
         try
@@ -126,6 +149,28 @@
         }
     }
 
+    private async Task DeleteAllPages()
+    {
+        try
+        {
+            foreach (Page page in _pages)
+            {
+                await PageService.DeletePageAsync(page.PageId);
+                await logger.LogInformation("Page Permanently Deleted {Page}", page);
+            }
+
+            await logger.LogInformation("Pages Permanently Deleted");
+            await Load();
+            StateHasChanged();
+            NavigationManager.NavigateTo(NavigateUrl());
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Permanently Deleting Pages {Error}", ex.Message);
+            AddModuleMessage(ex.Message, MessageType.Error);
+        }
+    }
+
     private async Task RestoreModule(Module module)
     {
         try
@@ -167,4 +212,31 @@
             AddModuleMessage(Localizer["Error Permanently Deleting Module"], MessageType.Error);
         }
     }
+
+    private async Task DeleteAllModules()
+    {
+        try
+        {
+            foreach (Module module in _modules)
+            {
+                await PageModuleService.DeletePageModuleAsync(module.PageModuleId);
+                // check if there are any remaining module instances in the site
+                _modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
+
+                if (!_modules.Exists(item => item.ModuleId == module.ModuleId))
+                {
+                    await ModuleService.DeleteModuleAsync(module.ModuleId);
+                }
+            }
+
+            await logger.LogInformation("Modules Permanently Deleted");
+            await Load();
+            StateHasChanged();
+        }
+        catch (Exception ex)
+        {
+            await logger.LogError(ex, "Error Permanently Deleting Modules {Error}", ex.Message);
+            AddModuleMessage(Localizer["Error Permanently Deleting Modules"], MessageType.Error);
+        }
+    }
 }

From a03434ac413b10ac97080dba1dc8ecd6623c4b25 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@outlook.com>
Date: Wed, 3 Mar 2021 16:39:32 +0100
Subject: [PATCH 08/17] recycle bin and log paging

---
 Oqtane.Client/Modules/Admin/Logs/Index.razor  |  2 +-
 .../Modules/Admin/RecycleBin/Index.razor      | 34 +++++++------------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 3ace61fd..6ccb8bb8 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -48,7 +48,7 @@ else
 
     @if (_logs.Any())
     {
-        <Pager Items="@_logs">
+        <Pager Items="@_logs" PageSize="@_rows" >
             <Header>
                 <th style="width: 1px;">&nbsp;</th>
                 <th>@Localizer["Date"]</th>
diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index c26f852b..7c30c7a1 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -31,9 +31,12 @@
                     <td>@context.DeletedOn</td>
                 </Row>
             </Pager>
-            <div style="text-align:right; visibility : @IsDeleteAllPagesVisible">
-                <ActionDialog Header="Delete All Pages" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Pages?", "Delete All Pages"]" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
-            </div>
+            @if (_pages.Any())
+            {
+                <div style="text-align:right;">
+                    <ActionDialog Header="Delete All Pages" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Pages?", "Delete All Pages"]" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
+                </div>
+            }
         }
     </TabPanel>
     <TabPanel Name="Modules" ResourceKey="Modules">
@@ -62,9 +65,12 @@
                     <td>@context.DeletedOn</td>
                 </Row>
             </Pager>
-            <div style="text-align:right; visibility : @IsDeleteAllModulesVisible" >
-                <ActionDialog Header="Delete All Modules" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Modules?", "Delete All Modules"]" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
-            </div>
+            @if (_modules.Any())
+            {
+                <div style="text-align:right;">
+                    <ActionDialog Header="Delete All Modules" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Modules?", "Delete All Modules"]" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
+                </div>
+            }
 
         }
     </TabPanel>
@@ -76,22 +82,6 @@
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    protected string IsDeleteAllPagesVisible
-    {
-        get
-        {
-            return _pages.Count == 0 ? "hidden" : "visible";
-        }
-    }
-
-    protected string IsDeleteAllModulesVisible
-    {
-        get {
-            return _modules.Count == 0 ? "hidden" : "visible" ;
-        }
-    }
-
-
     protected override async Task OnInitializedAsync()
     {
         try

From 0fd46d28b5769cae21a9f718bba0b1dc5ba20797 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@outlook.com>
Date: Wed, 3 Mar 2021 16:55:13 +0100
Subject: [PATCH 09/17] Delete all modules and pages in recycle bin

---
 .../Modules/Admin/RecycleBin/Index.razor      | 34 +++++++------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
index c26f852b..7c30c7a1 100644
--- a/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
+++ b/Oqtane.Client/Modules/Admin/RecycleBin/Index.razor
@@ -31,9 +31,12 @@
                     <td>@context.DeletedOn</td>
                 </Row>
             </Pager>
-            <div style="text-align:right; visibility : @IsDeleteAllPagesVisible">
-                <ActionDialog Header="Delete All Pages" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Pages?", "Delete All Pages"]" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
-            </div>
+            @if (_pages.Any())
+            {
+                <div style="text-align:right;">
+                    <ActionDialog Header="Delete All Pages" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Pages?", "Delete All Pages"]" Action="Delete All Pages" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllPages())" ResourceKey="DeleteAllPages" />
+                </div>
+            }
         }
     </TabPanel>
     <TabPanel Name="Modules" ResourceKey="Modules">
@@ -62,9 +65,12 @@
                     <td>@context.DeletedOn</td>
                 </Row>
             </Pager>
-            <div style="text-align:right; visibility : @IsDeleteAllModulesVisible" >
-                <ActionDialog Header="Delete All Modules" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Modules?", "Delete All Modules"]" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
-            </div>
+            @if (_modules.Any())
+            {
+                <div style="text-align:right;">
+                    <ActionDialog Header="Delete All Modules" Message="@Localizer["Are You Sure You Wish To Permanently Delete All Modules?", "Delete All Modules"]" Action="Delete All Modules" Security="SecurityAccessLevel.Admin" Class="btn btn-danger" OnClick="@(async () => await DeleteAllModules())" ResourceKey="DeleteAllModules" />
+                </div>
+            }
 
         }
     </TabPanel>
@@ -76,22 +82,6 @@
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
 
-    protected string IsDeleteAllPagesVisible
-    {
-        get
-        {
-            return _pages.Count == 0 ? "hidden" : "visible";
-        }
-    }
-
-    protected string IsDeleteAllModulesVisible
-    {
-        get {
-            return _modules.Count == 0 ? "hidden" : "visible" ;
-        }
-    }
-
-
     protected override async Task OnInitializedAsync()
     {
         try

From 63fc1cd04291bf2ea468facf4736af329d0bb6f1 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@users.noreply.github.com>
Date: Wed, 3 Mar 2021 17:15:00 +0100
Subject: [PATCH 10/17] Update Index.razor

---
 Oqtane.Client/Modules/Admin/Logs/Index.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 6ccb8bb8..3ace61fd 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -48,7 +48,7 @@ else
 
     @if (_logs.Any())
     {
-        <Pager Items="@_logs" PageSize="@_rows" >
+        <Pager Items="@_logs">
             <Header>
                 <th style="width: 1px;">&nbsp;</th>
                 <th>@Localizer["Date"]</th>

From 4c9960b983ecc82d8172b3371215981a749668cc Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Fri, 5 Mar 2021 16:41:53 +0300
Subject: [PATCH 11/17] Rows -> Maximum Rows

---
 Oqtane.Client/Modules/Admin/Logs/Index.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 3ace61fd..ca99da6d 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -36,7 +36,7 @@ else
                 </select>
             </td>
             <td>
-                <label>@Localizer["Rows:"] </label>
+                <label>@Localizer["Maximum Rows:"] </label>
                 <select class="form-control" @onchange="(e => RowsChanged(e))">
                     <option value="10">10</option>
                     <option value="50">50</option>

From 13b45453c677c8171e5eb1dc261b772a3e7137fc Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@outlook.com>
Date: Fri, 5 Mar 2021 15:31:38 +0100
Subject: [PATCH 12/17] Fixed Issue with menu Icon Spacing. #1160

---
 Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor b/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
index 840fbf4e..d5397e11 100644
--- a/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
+++ b/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
@@ -8,14 +8,14 @@
         {
             if (childPage.PageId == PageState.Page.PageId)
             {
-                <a class="dropdown-item active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                <a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
                     <FontIcon Value="@childPage.Icon" />
                     @childPage.Name <span class="sr-only">(current)</span>
                 </a>
             }
             else
             {
-                <a class="dropdown-item" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
+                <a class="nav-link px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
                     <FontIcon Value="@childPage.Icon" />
                     @childPage.Name
                 </a>

From 8376a09ad6c6b7992f39d15bad89aacbeca2da73 Mon Sep 17 00:00:00 2001
From: Charles Nurse <charlesnurse@gmail.com>
Date: Sat, 6 Mar 2021 14:13:06 -0800
Subject: [PATCH 13/17] Create new UseOqtaneDatabase extension method and
 replace all uses of UseSqlServer. This is a preparative step to locate all
 database configuration in one file.

---
 .../DbContextOptionsBuilderExtensions.cs          | 15 +++++++++++++++
 Oqtane.Server/Infrastructure/DatabaseManager.cs   |  9 +++++----
 Oqtane.Server/Repository/Context/DBContextBase.cs |  9 +++++----
 .../Repository/Context/InstallationContext.cs     |  5 +++--
 .../Repository/Context/MasterDBContext.cs         | 14 ++++++++------
 5 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 Oqtane.Server/Extensions/DbContextOptionsBuilderExtensions.cs

diff --git a/Oqtane.Server/Extensions/DbContextOptionsBuilderExtensions.cs b/Oqtane.Server/Extensions/DbContextOptionsBuilderExtensions.cs
new file mode 100644
index 00000000..e34d1563
--- /dev/null
+++ b/Oqtane.Server/Extensions/DbContextOptionsBuilderExtensions.cs
@@ -0,0 +1,15 @@
+using System.Diagnostics.CodeAnalysis;
+using Microsoft.EntityFrameworkCore;
+
+namespace Oqtane.Extensions
+{
+    public static class DbContextOptionsBuilderExtensions
+    {
+        public static DbContextOptionsBuilder UseOqtaneDatabase([NotNull] this DbContextOptionsBuilder optionsBuilder, string connectionString)
+        {
+            optionsBuilder.UseSqlServer(connectionString);
+
+            return optionsBuilder;
+        }
+    }
+}
diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index 35f93353..308b5cf0 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -168,9 +168,10 @@ namespace Oqtane.Infrastructure
                     var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
                     if (!Directory.Exists(dataDirectory)) Directory.CreateDirectory(dataDirectory);
 
-                    using (var dbc = new DbContext(new DbContextOptionsBuilder().UseSqlServer(NormalizeConnectionString(install.ConnectionString)).Options))
+                    var connectionString = NormalizeConnectionString(install.ConnectionString);
+                    using (var dbc = new DbContext(new DbContextOptionsBuilder().UseOqtaneDatabase(connectionString).Options))
                     {
-                        // create empty database if it does not exist       
+                        // create empty database if it does not exist
                         dbc.Database.EnsureCreated();
                         result.Success = true;
                     }
@@ -235,7 +236,7 @@ namespace Oqtane.Infrastructure
 
             if (!string.IsNullOrEmpty(install.TenantName) && !string.IsNullOrEmpty(install.Aliases))
             {
-                using (var db = new InstallationContext(NormalizeConnectionString(_config.GetConnectionString(SettingKeys.ConnectionStringKey)))) 
+                using (var db = new InstallationContext(NormalizeConnectionString(_config.GetConnectionString(SettingKeys.ConnectionStringKey))))
                 {
                     Tenant tenant;
                     if (install.IsNewTenant)
@@ -274,7 +275,7 @@ namespace Oqtane.Infrastructure
             using (var scope = _serviceScopeFactory.CreateScope())
             {
                 var upgrades = scope.ServiceProvider.GetRequiredService<IUpgradeManager>();
-  
+
                 using (var db = new InstallationContext(NormalizeConnectionString(_config.GetConnectionString(SettingKeys.ConnectionStringKey))))
                 {
                     foreach (var tenant in db.Tenant.ToList())
diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs
index 522bf0d9..e8dc5894 100644
--- a/Oqtane.Server/Repository/Context/DBContextBase.cs
+++ b/Oqtane.Server/Repository/Context/DBContextBase.cs
@@ -4,11 +4,12 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
-    public class DBContextBase :  IdentityUserContext<IdentityUser> 
+    public class DBContextBase :  IdentityUserContext<IdentityUser>
     {
         private ITenantResolver _tenantResolver;
         private IHttpContextAccessor _accessor;
@@ -24,9 +25,9 @@ namespace Oqtane.Repository
             var tenant = _tenantResolver.GetTenant();
             if (tenant != null)
             {
-                optionsBuilder.UseSqlServer(tenant.DBConnectionString
-                        .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString())
-                );
+                var connectionString = tenant.DBConnectionString
+                    .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString());
+                optionsBuilder.UseOqtaneDatabase(connectionString);
             }
             base.OnConfiguring(optionsBuilder);
         }
diff --git a/Oqtane.Server/Repository/Context/InstallationContext.cs b/Oqtane.Server/Repository/Context/InstallationContext.cs
index 29bfc281..6eaf5a65 100644
--- a/Oqtane.Server/Repository/Context/InstallationContext.cs
+++ b/Oqtane.Server/Repository/Context/InstallationContext.cs
@@ -1,10 +1,11 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore;
+using Oqtane.Extensions;
 using Oqtane.Models;
 
 namespace Oqtane.Repository
 {
-    
+
     public class InstallationContext : DbContext
     {
         private readonly string _connectionString;
@@ -15,7 +16,7 @@ namespace Oqtane.Repository
         }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
-            => optionsBuilder.UseSqlServer(_connectionString);
+            => optionsBuilder.UseOqtaneDatabase(_connectionString);
 
         public virtual DbSet<Alias> Alias { get; set; }
         public virtual DbSet<Tenant> Tenant { get; set; }
diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs
index 976874cf..162c82b9 100644
--- a/Oqtane.Server/Repository/Context/MasterDBContext.cs
+++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs
@@ -4,13 +4,14 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Oqtane.Models;
 using Microsoft.Extensions.Configuration;
+using Oqtane.Extensions;
 
 namespace Oqtane.Repository
 {
     public class MasterDBContext : DbContext
     {
-        private IHttpContextAccessor _accessor;
-        private IConfiguration _configuration;
+        private readonly IHttpContextAccessor _accessor;
+        private readonly IConfiguration _configuration;
 
         public MasterDBContext(DbContextOptions<MasterDBContext> options, IHttpContextAccessor accessor, IConfiguration configuration) : base(options)
         {
@@ -20,11 +21,12 @@ namespace Oqtane.Repository
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            if (!string.IsNullOrEmpty(_configuration.GetConnectionString("DefaultConnection")))
+            if (!String.IsNullOrEmpty(_configuration.GetConnectionString("DefaultConnection")))
             {
-                optionsBuilder.UseSqlServer(_configuration.GetConnectionString("DefaultConnection")
-                    .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString())
-                );
+                var connectionString = _configuration.GetConnectionString("DefaultConnection")
+                    .Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString());
+
+                optionsBuilder.UseOqtaneDatabase(connectionString);
             }
             base.OnConfiguring(optionsBuilder);
         }

From c64f350f3655ef9f78a9b048020111a027b0788c Mon Sep 17 00:00:00 2001
From: Charles Nurse <charlesnurse@gmail.com>
Date: Sat, 6 Mar 2021 16:06:29 -0800
Subject: [PATCH 14/17] Create new DbContextUtils class and move common
 SaveChanges code to this class.  While MasterDbContext has no entities that
 support IDeletable it does not hurt to check and minimizes duplication

---
 .../Repository/Context/DBContextBase.cs       | 49 +-------------
 .../Repository/Context/DbContextUtils.cs      | 65 +++++++++++++++++++
 .../Repository/Context/MasterDBContext.cs     | 33 +---------
 3 files changed, 67 insertions(+), 80 deletions(-)
 create mode 100644 Oqtane.Server/Repository/Context/DbContextUtils.cs

diff --git a/Oqtane.Server/Repository/Context/DBContextBase.cs b/Oqtane.Server/Repository/Context/DBContextBase.cs
index e8dc5894..9d488f45 100644
--- a/Oqtane.Server/Repository/Context/DBContextBase.cs
+++ b/Oqtane.Server/Repository/Context/DBContextBase.cs
@@ -34,54 +34,7 @@ namespace Oqtane.Repository
 
         public override int SaveChanges()
         {
-            ChangeTracker.DetectChanges();
-
-            string username = "";
-            if (_accessor.HttpContext != null && _accessor.HttpContext.User.Identity.Name != null)
-            {
-                username = _accessor.HttpContext.User.Identity.Name;
-            }
-            DateTime date = DateTime.UtcNow;
-
-            var created = ChangeTracker.Entries()
-                .Where(x => x.State == EntityState.Added);
-
-            foreach(var item in created)
-            {
-                if (item.Entity is IAuditable)
-                {
-                    item.CurrentValues[nameof(IAuditable.CreatedBy)] = username;
-                    item.CurrentValues[nameof(IAuditable.CreatedOn)] = date;
-                }
-            }
-
-            var modified = ChangeTracker.Entries()
-                .Where(x => x.State == EntityState.Modified || x.State == EntityState.Added);
-
-            foreach (var item in modified)
-            {
-                if (item.Entity is IAuditable)
-                {
-                    item.CurrentValues[nameof(IAuditable.ModifiedBy)] = username;
-                    item.CurrentValues[nameof(IAuditable.ModifiedOn)] = date;
-                }
-
-                if (item.Entity is IDeletable && item.State != EntityState.Added)
-                {
-                    if ((bool)item.CurrentValues[nameof(IDeletable.IsDeleted)]
-                        && !item.GetDatabaseValues().GetValue<bool>(nameof(IDeletable.IsDeleted)))
-                    {
-                        item.CurrentValues[nameof(IDeletable.DeletedBy)] = username;
-                        item.CurrentValues[nameof(IDeletable.DeletedOn)] = date;
-                    }
-                    else if (!(bool)item.CurrentValues[nameof(IDeletable.IsDeleted)]
-                        && item.GetDatabaseValues().GetValue<bool>(nameof(IDeletable.IsDeleted)))
-                    {
-                        item.CurrentValues[nameof(IDeletable.DeletedBy)] = null;
-                        item.CurrentValues[nameof(IDeletable.DeletedOn)] = null;
-                    }
-                }
-            }
+            DbContextUtils.SaveChanges(this, _accessor);
 
             return base.SaveChanges();
         }
diff --git a/Oqtane.Server/Repository/Context/DbContextUtils.cs b/Oqtane.Server/Repository/Context/DbContextUtils.cs
new file mode 100644
index 00000000..1b4014cb
--- /dev/null
+++ b/Oqtane.Server/Repository/Context/DbContextUtils.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+using Oqtane.Models;
+
+namespace Oqtane.Repository
+{
+    public class DbContextUtils
+    {
+        public static void SaveChanges(DbContext context, IHttpContextAccessor accessor)
+        {
+            var changeTracker = context.ChangeTracker;
+
+            changeTracker.DetectChanges();
+
+            string username = "";
+            if (accessor.HttpContext != null && accessor.HttpContext.User.Identity.Name != null)
+            {
+                username = accessor.HttpContext.User.Identity.Name;
+            }
+            DateTime date = DateTime.UtcNow;
+
+            var created = changeTracker.Entries()
+                .Where(x => x.State == EntityState.Added);
+
+            foreach(var item in created)
+            {
+                if (item.Entity is IAuditable)
+                {
+                    item.CurrentValues[nameof(IAuditable.CreatedBy)] = username;
+                    item.CurrentValues[nameof(IAuditable.CreatedOn)] = date;
+                }
+            }
+
+            var modified = changeTracker.Entries()
+                .Where(x => x.State == EntityState.Modified || x.State == EntityState.Added);
+
+            foreach (var item in modified)
+            {
+                if (item.Entity is IAuditable)
+                {
+                    item.CurrentValues[nameof(IAuditable.ModifiedBy)] = username;
+                    item.CurrentValues[nameof(IAuditable.ModifiedOn)] = date;
+                }
+
+                if (item.Entity is IDeletable && item.State != EntityState.Added)
+                {
+                    if ((bool)item.CurrentValues[nameof(IDeletable.IsDeleted)]
+                        && !item.GetDatabaseValues().GetValue<bool>(nameof(IDeletable.IsDeleted)))
+                    {
+                        item.CurrentValues[nameof(IDeletable.DeletedBy)] = username;
+                        item.CurrentValues[nameof(IDeletable.DeletedOn)] = date;
+                    }
+                    else if (!(bool)item.CurrentValues[nameof(IDeletable.IsDeleted)]
+                        && item.GetDatabaseValues().GetValue<bool>(nameof(IDeletable.IsDeleted)))
+                    {
+                        item.CurrentValues[nameof(IDeletable.DeletedBy)] = null;
+                        item.CurrentValues[nameof(IDeletable.DeletedOn)] = null;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/Oqtane.Server/Repository/Context/MasterDBContext.cs b/Oqtane.Server/Repository/Context/MasterDBContext.cs
index 162c82b9..dd94dedd 100644
--- a/Oqtane.Server/Repository/Context/MasterDBContext.cs
+++ b/Oqtane.Server/Repository/Context/MasterDBContext.cs
@@ -39,38 +39,7 @@ namespace Oqtane.Repository
 
         public override int SaveChanges()
         {
-            ChangeTracker.DetectChanges();
-
-            string username = "";
-            if (_accessor.HttpContext != null && _accessor.HttpContext.User.Identity.Name != null)
-            {
-                username = _accessor.HttpContext.User.Identity.Name;
-            }
-            DateTime date = DateTime.UtcNow;
-
-            var created = ChangeTracker.Entries()
-                .Where(x => x.State == EntityState.Added);
-
-            foreach (var item in created)
-            {
-                if (item.Entity is IAuditable)
-                {
-                    item.CurrentValues[nameof(IAuditable.CreatedBy)] = username;
-                    item.CurrentValues[nameof(IAuditable.CreatedOn)] = date;
-                }
-            }
-
-            var modified = ChangeTracker.Entries()
-                .Where(x => x.State == EntityState.Modified || x.State == EntityState.Added);
-
-            foreach (var item in modified)
-            {
-                if (item.Entity is IAuditable)
-                {
-                    item.CurrentValues[nameof(IAuditable.ModifiedBy)] = username;
-                    item.CurrentValues[nameof(IAuditable.ModifiedOn)] = date;
-                }
-            }
+            DbContextUtils.SaveChanges(this, _accessor);
 
             return base.SaveChanges();
         }

From 7f1f4ec4fb715beb9fb1d71123cf4fa6797da0d4 Mon Sep 17 00:00:00 2001
From: hishamco <hishamco_2007@yahoo.com>
Date: Mon, 8 Mar 2021 20:57:06 +0300
Subject: [PATCH 15/17] Rows -> Records

---
 Oqtane.Client/Modules/Admin/Logs/Index.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index ca99da6d..070e3fdf 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -36,7 +36,7 @@ else
                 </select>
             </td>
             <td>
-                <label>@Localizer["Maximum Rows:"] </label>
+                <label>@Localizer["Maximum Records:"] </label>
                 <select class="form-control" @onchange="(e => RowsChanged(e))">
                     <option value="10">10</option>
                     <option value="50">50</option>

From 3ff1dc4a21bd1be261c5922c39d24c1c214034b5 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@outlook.com>
Date: Tue, 9 Mar 2021 17:16:25 +0100
Subject: [PATCH 16/17] MenuItems updated with HTML markup in place of the
 FontIcon component

---
 .../Themes/Controls/MenuItemsHorizontal.razor      | 14 +++++++-------
 .../Themes/Controls/MenuItemsVertical.razor        |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor b/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
index d5397e11..5e75738b 100644
--- a/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
+++ b/Oqtane.Client/Themes/Controls/MenuItemsHorizontal.razor
@@ -9,14 +9,14 @@
             if (childPage.PageId == PageState.Page.PageId)
             {
                 <a class="nav-link active px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
-                    @childPage.Name <span class="sr-only">(current)</span>
+                        <span class="@childPage.Icon" aria-hidden="true" />
+                        @childPage.Name <span class="sr-only">(current)</span>
                 </a>
             }
             else
             {
                 <a class="nav-link px-3" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
+                    <span class="@childPage.Icon" aria-hidden="true" />
                     @childPage.Name
                 </a>
             }
@@ -34,7 +34,7 @@ else
                 {
                     <li class="nav-item active">
                         <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name <span class="sr-only">(current)</span>
                         </a>
                     </li>
@@ -43,7 +43,7 @@ else
                 {
                     <li class="nav-item">
                         <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name
                         </a>
                     </li>
@@ -55,7 +55,7 @@ else
                 {
                     <li class="nav-item dropdown active">
                         <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name <span class="sr-only">(current)</span>
                         </a>
                         <MenuItemsHorizontal ParentPage="childPage" Pages="Pages" />
@@ -65,7 +65,7 @@ else
                 {
                     <li class="nav-item dropdown">
                         <a class="nav-link dropdown-toggle" href="@GetUrl(childPage)" target="@GetTarget(childPage)" id="@($"navbarDropdown{childPage.PageId}")" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <FontIcon Value="@childPage.Icon" />
+                            <span class="@childPage.Icon" aria-hidden="true" />
                             @childPage.Name
                         </a>
                         <MenuItemsHorizontal ParentPage="childPage" Pages="Pages" />
diff --git a/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor b/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor
index a27f9a7a..2f314ca0 100644
--- a/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor
+++ b/Oqtane.Client/Themes/Controls/MenuItemsVertical.razor
@@ -9,7 +9,7 @@
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                 <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
+                    <span class="@childPage.Icon" aria-hidden="true" />
                     @childPage.Name <span class="sr-only">(current)</span>
                 </a>
             </li>
@@ -18,7 +18,7 @@
         {
             <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                 <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                    <FontIcon Value="@childPage.Icon" />
+                    <span class="@childPage.Icon" aria-hidden="true" />
                     @childPage.Name
                 </a>
             </li>
@@ -38,7 +38,7 @@ else
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                     <a class="nav-link active" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                        <FontIcon Value="@childPage.Icon" />
+                        <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name <span class="sr-only">(current)</span>
                     </a>
                 </li>
@@ -47,7 +47,7 @@ else
             {
                 <li class="nav-item px-3" style="margin-left: @(childPage.Level * 15)px;">
                     <a class="nav-link" href="@GetUrl(childPage)" target="@GetTarget(childPage)">
-                        <FontIcon Value="@childPage.Icon" />
+                        <span class="@childPage.Icon" aria-hidden="true" />
                         @childPage.Name
                     </a>
                 </li>

From b58c7386b3a9113b4da8c344a0f213a650f75574 Mon Sep 17 00:00:00 2001
From: Leigh Pointer <leigh-pointer@outlook.com>
Date: Wed, 10 Mar 2021 17:00:49 +0100
Subject: [PATCH 17/17] Fixed issue Event Log strange behavior with the Paging
 control #1158

---
 Oqtane.Client/Modules/Admin/Logs/Index.razor | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor
index 070e3fdf..64403d74 100644
--- a/Oqtane.Client/Modules/Admin/Logs/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor
@@ -48,7 +48,7 @@ else
 
     @if (_logs.Any())
     {
-        <Pager Items="@_logs">
+        <Pager TableItem="Log" Items="@_logs">
             <Header>
                 <th style="width: 1px;">&nbsp;</th>
                 <th>@Localizer["Date"]</th>
@@ -141,6 +141,10 @@ else
     private async Task GetLogs()
     {
         _logs = await LogService.GetLogsAsync(PageState.Site.SiteId, ((_level == "-") ? string.Empty : _level), ((_function == "-") ? string.Empty : _function), int.Parse(_rows));
+        await InvokeAsync(() =>
+        {
+            base.StateHasChanged();
+        });
     }
 
     private string GetClass(string function)