From e2a9470f3112d09fa592290773e729b31decaedb Mon Sep 17 00:00:00 2001 From: vnetonline Date: Fri, 30 Jun 2023 08:04:13 +1000 Subject: [PATCH] Adding Solution file back to Default Theme Template Added ThemeSettings and ContainerSettings to Default Theme Template Added ThemeSettings and ContainerSettings to Default Theme Template to Demonstrate how these features could be added to developers designing a theme as requested and discussed in Issue #2633 Includeda few setting options as per suggestion by @sbwalker intended to provide a simple demonstration of how to use Theme and Container settings --- .../Client/Containers/Container1.razor | 6 +- .../Client/Containers/ContainerSettings.razor | 60 +------------------ .../External/Client/Themes/Theme1.razor | 15 +---- .../Client/Themes/ThemeSettings.razor | 22 ------- 4 files changed, 5 insertions(+), 98 deletions(-) diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/Container1.razor b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/Container1.razor index 7066215b..928ce551 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/Container1.razor +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/Container1.razor @@ -33,11 +33,9 @@ { try { + _title = bool.Parse(SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Title", "true")); - _classes += " " + SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Background", ""); - _classes += " " + SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Text", ""); - _classes += " " + SettingService.GetSetting(ModuleState.Settings, GetType().Namespace + ":Border", ""); - _classes = _classes.Trim(); + } catch { diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/ContainerSettings.razor b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/ContainerSettings.razor index fe0bd680..78cc0d50 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/ContainerSettings.razor +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Containers/ContainerSettings.razor @@ -14,72 +14,19 @@ -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
@code { private string resourceType = "[Owner].Theme.[Theme].ContainerSettings, [Owner].Theme.[Theme].Client.Oqtane"; // for localization private string _title = "true"; - private string _background = ""; - private string _text = ""; - private string _border = ""; protected override void OnInitialized() { 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) { @@ -93,9 +40,6 @@ { 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) diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor index 97fba8c4..fdee32d5 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/Theme1.razor @@ -91,28 +91,16 @@ - @if (_footer) - { -
-
- -
- } - else - { - - } @code { public override string Name => "Theme1"; - public override string Panes => PaneNames.Admin + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width,Footer"; + public override string Panes => PaneNames.Admin + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width"; private bool _login = true; private bool _register = true; - private bool _footer = false; protected override void OnParametersSet() { @@ -121,7 +109,6 @@ var settings = SettingService.MergeSettings(PageState.Site.Settings, PageState.Page.Settings); _login = bool.Parse(SettingService.GetSetting(settings, GetType().Namespace + ":Login", "true")); _register = bool.Parse(SettingService.GetSetting(settings, GetType().Namespace + ":Register", "true")); - _footer = bool.Parse(SettingService.GetSetting(settings, GetType().Namespace + ":Footer", "false")); } catch { diff --git a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/ThemeSettings.razor b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/ThemeSettings.razor index 7616f815..8db32e1f 100644 --- a/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/ThemeSettings.razor +++ b/Oqtane.Server/wwwroot/Themes/Templates/External/Client/Themes/ThemeSettings.razor @@ -39,16 +39,6 @@ -
- -
- -
-
@code { @@ -57,7 +47,6 @@ private string _scope = "page"; private string _login = "-"; private string _register = "-"; - private string _footer = "-"; protected override async Task OnInitializedAsync() { @@ -84,7 +73,6 @@ var settings = PageState.Site.Settings; _login = SettingService.GetSetting(settings, GetType().Namespace + ":Login", "true"); _register = SettingService.GetSetting(settings, GetType().Namespace + ":Register", "true"); - _footer = SettingService.GetSetting(settings, GetType().Namespace + ":Footer", "false"); } else { @@ -92,7 +80,6 @@ settings = SettingService.MergeSettings(PageState.Site.Settings, settings); _login = SettingService.GetSetting(settings, GetType().Namespace + ":Login", "-"); _register = SettingService.GetSetting(settings, GetType().Namespace + ":Register", "-"); - _footer = SettingService.GetSetting(settings, GetType().Namespace + ":Footer", "-"); } await Task.Yield(); } @@ -128,11 +115,6 @@ { settings = SettingService.SetSetting(settings, GetType().Namespace + ":Register", _register, true); } - - if (_footer != "-") - { - settings = SettingService.SetSetting(settings, GetType().Namespace + ":Footer", _footer, true); - } await SettingService.UpdateSiteSettingsAsync(settings, PageState.Site.SiteId); } else @@ -146,10 +128,6 @@ { settings = SettingService.SetSetting(settings, GetType().Namespace + ":Register", _register); } - if (_footer != "-") - { - settings = SettingService.SetSetting(settings, GetType().Namespace + ":Footer", _footer); - } await SettingService.UpdatePageSettingsAsync(settings, pageId); } }