From 9752c72998df80f90df747b38be7e0452bbc8a52 Mon Sep 17 00:00:00 2001 From: Leigh Date: Thu, 28 Oct 2021 19:43:51 +0200 Subject: [PATCH 1/8] Fix for #1736 Blazor theme not rendering correctly Fix to the Default theme and container --- .../Themes/BlazorTheme/Containers/Container.razor | 4 ++-- Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor index e62bc207..9ca3599e 100644 --- a/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor +++ b/Oqtane.Client/Themes/BlazorTheme/Containers/Container.razor @@ -1,7 +1,7 @@ -@namespace Oqtane.Themes.BlazorTheme +@namespace Oqtane.Themes.BlazorTheme @inherits ContainerBase
-
+

diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor index d770cc1b..a83e8ffe 100644 --- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor +++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor @@ -5,23 +5,24 @@
+
-
+
-
+
- +
@code { public override string Panes => PaneNames.Admin; From 1659de3a2b44ecc306d11037c1ffc0950a773574 Mon Sep 17 00:00:00 2001 From: Leigh Date: Thu, 28 Oct 2021 20:35:48 +0200 Subject: [PATCH 2/8] Fix for #1736 Server Css Update to the Server file Theme.css --- Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css | 1 + 1 file changed, 1 insertion(+) diff --git a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css index a73e6b33..668d7fd3 100644 --- a/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css +++ b/Oqtane.Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css @@ -124,6 +124,7 @@ @media (min-width: 768px) { app { flex-direction: row; + display: block; } .app-logo { From 6d8df2661c0fd70d7eb01175a2d57497e43be9d3 Mon Sep 17 00:00:00 2001 From: Leigh Date: Sun, 31 Oct 2021 07:08:19 +0100 Subject: [PATCH 3/8] modification for responsive theme small modification to ensure theme is responsive --- .../Themes/BlazorTheme/Themes/Default.razor | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor index a83e8ffe..bc60e72f 100644 --- a/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor +++ b/Oqtane.Client/Themes/BlazorTheme/Themes/Default.razor @@ -1,28 +1,30 @@ @namespace Oqtane.Themes.BlazorTheme @inherits ThemeBase +
-
-
- -
- -
-
-
+
+
+
-
-
- + +
+
+
+
+
+
+ +
-
+ @code { public override string Panes => PaneNames.Admin; From a8ddb64b49df4ae2897006e04860db3fa3bfe357 Mon Sep 17 00:00:00 2001 From: Leigh Date: Tue, 2 Nov 2021 05:57:05 +0100 Subject: [PATCH 4/8] Fix for #1749 navigate to sub sub pages Added Open button that will navigate to sub pages --- Oqtane.Client/Modules/Admin/Pages/Index.razor | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor index 0b772dae..564ae99e 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Index.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor @@ -11,11 +11,12 @@
-   -   - @SharedLocalizer["Name"] +   +   + @SharedLocalizer["Name"]
+ @(new string('-', context.Level * 2))@(context.Name) @@ -42,4 +43,8 @@ AddModuleMessage(Localizer["Error.Page.Delete"], MessageType.Error); } } + protected string GetUrl(Page page) + { + return string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url; + } } From fce9220dcb9844ea85c41d61e4534076c96063e1 Mon Sep 17 00:00:00 2001 From: Leigh Date: Tue, 2 Nov 2021 07:01:24 +0100 Subject: [PATCH 5/8] Update for #1753 Date format for the Audit Added Parameter DateTimeFormat with default value of "MMM dd yyyy HH:mm:ss" --- Oqtane.Client/Modules/Controls/AuditInfo.razor | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Oqtane.Client/Modules/Controls/AuditInfo.razor b/Oqtane.Client/Modules/Controls/AuditInfo.razor index 1584fd6e..d36e7f9a 100644 --- a/Oqtane.Client/Modules/Controls/AuditInfo.razor +++ b/Oqtane.Client/Modules/Controls/AuditInfo.razor @@ -35,6 +35,9 @@ [Parameter] public string Style { get; set; } + [Parameter] + public string DateTimeFormat { get; set; } = "MMM dd yyyy HH:mm:ss"; + protected override void OnParametersSet() { _text = string.Empty; @@ -49,7 +52,7 @@ if (CreatedOn != null) { - _text += $" {Localizer["On"]} {CreatedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}"; + _text += $" {Localizer["On"]} {CreatedOn.Value.ToString(DateTimeFormat)}"; } _text += "

"; @@ -66,7 +69,7 @@ if (ModifiedOn != null) { - _text += $" {Localizer["on"]} {ModifiedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}"; + _text += $" {Localizer["on"]} {ModifiedOn.Value.ToString(DateTimeFormat)}"; } _text += "

"; @@ -83,7 +86,7 @@ if (DeletedOn != null) { - _text += $" {Localizer["On"]} {DeletedOn.Value.ToString("MMM dd yyyy HH:mm:ss")}"; + _text += $" {Localizer["On"]} {DeletedOn.Value.ToString(DateTimeFormat)}"; } _text += "

"; From fff36949b787b7d014d7c11c8fab7ac709ae404c Mon Sep 17 00:00:00 2001 From: Leigh Date: Tue, 2 Nov 2021 19:59:59 +0100 Subject: [PATCH 6/8] Fix for #1749 navigate to sub sub pages Also added missing "Browse" localization from site/index,resx --- Oqtane.Client/Modules/Admin/Pages/Index.razor | 4 ++-- Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx | 3 +++ Oqtane.Client/Resources/Modules/Admin/Site/Index.resx | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Pages/Index.razor b/Oqtane.Client/Modules/Admin/Pages/Index.razor index 564ae99e..9238574a 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Index.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Index.razor @@ -16,9 +16,9 @@ @SharedLocalizer["Name"] - + @(new string('-', context.Level * 2))@(context.Name) @@ -43,7 +43,7 @@ AddModuleMessage(Localizer["Error.Page.Delete"], MessageType.Error); } } - protected string GetUrl(Page page) + protected string Browse(Page page) { return string.IsNullOrEmpty(page.Url) ? NavigateUrl(page.Path) : page.Url; } diff --git a/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx index 9d1d643a..a05c2e9b 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Pages/Index.resx @@ -129,4 +129,7 @@ Delete Page + + Browse + \ No newline at end of file diff --git a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx index dee13803..3404baa2 100644 --- a/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx +++ b/Oqtane.Client/Resources/Modules/Admin/Site/Index.resx @@ -297,4 +297,7 @@ Runtime: + + Browse + \ No newline at end of file From d2d52a7eb31760a824c13535c1ef8a180bb05cc6 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Wed, 3 Nov 2021 14:42:24 -0400 Subject: [PATCH 7/8] update SqlClient to latest preview version --- Oqtane.Server/Oqtane.Server.csproj | 2 +- Oqtane.Test/Oqtane.Test.csproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Oqtane.Server/Oqtane.Server.csproj b/Oqtane.Server/Oqtane.Server.csproj index e2da14d8..2b01178a 100644 --- a/Oqtane.Server/Oqtane.Server.csproj +++ b/Oqtane.Server/Oqtane.Server.csproj @@ -33,7 +33,7 @@ - + diff --git a/Oqtane.Test/Oqtane.Test.csproj b/Oqtane.Test/Oqtane.Test.csproj index 9aa12ba7..b944a691 100644 --- a/Oqtane.Test/Oqtane.Test.csproj +++ b/Oqtane.Test/Oqtane.Test.csproj @@ -20,10 +20,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive From bd5a827593de557142a3ca574e041194d33eb4f3 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Wed, 3 Nov 2021 16:37:37 -0400 Subject: [PATCH 8/8] fix #1746 - SQL Server installation needs to allow configuration of encryption setting on .NET 6 --- .../Installer/Controls/SqlServerConfig.razor | 21 ++++++++++++------- .../Installer/Controls/SqlServerConfig.resx | 6 ++++++ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor index 905f8006..28192be0 100644 --- a/Oqtane.Client/Installer/Controls/SqlServerConfig.razor +++ b/Oqtane.Client/Installer/Controls/SqlServerConfig.razor @@ -1,6 +1,7 @@ @namespace Oqtane.Installer.Controls @implements Oqtane.Interfaces.IDatabaseConfigControl @inject IStringLocalizer Localizer +@inject IStringLocalizer SharedLocalizer
@@ -38,6 +39,15 @@
} +
+ +
+ +
+
@code { private string _server = String.Empty; @@ -45,6 +55,7 @@ private string _security = "integrated"; private string _uid = String.Empty; private string _pwd = String.Empty; + private string _encryption = "false"; public string GetConnectionString() { @@ -61,15 +72,9 @@ } else { - if (!String.IsNullOrEmpty(_uid) && !String.IsNullOrEmpty(_pwd)) - { - connectionString += $"User ID={_uid};Password={_pwd};"; - } - else - { - connectionString = String.Empty; - } + connectionString += $"User ID={_uid};Password={_pwd};"; } + connectionString += $"Encrypt={_encryption};"; return connectionString; } diff --git a/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx index b37a6487..0f4ca4ac 100644 --- a/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx +++ b/Oqtane.Client/Resources/Installer/Controls/SqlServerConfig.resx @@ -153,4 +153,10 @@ Integrated + + Encryption: + + + Specify if you are using an encrypted database connection. It is highly recommended to use encryption in a production environment. + \ No newline at end of file