From fca290f8f5ee1201ba71e025857c9e4fb4b39b96 Mon Sep 17 00:00:00 2001 From: Leigh Date: Sat, 10 Jul 2021 13:37:05 +0200 Subject: [PATCH] Modifications for Bootstrap 5 Admin section now finished. All Tables now replaced with div --- Oqtane.Client/Modules/Admin/Files/Add.razor | 60 ++- .../Modules/Admin/Files/Details.razor | 56 ++- Oqtane.Client/Modules/Admin/Files/Edit.razor | 88 ++-- Oqtane.Client/Modules/Admin/Files/Index.razor | 32 +- .../Modules/Admin/Languages/Add.razor | 61 ++- Oqtane.Client/Modules/Admin/Logs/Detail.razor | 414 ++++++++++-------- Oqtane.Client/Modules/Admin/Logs/Index.razor | 30 +- .../Modules/Admin/ModuleCreator/Index.razor | 77 ++-- .../Modules/Admin/ModuleDefinitions/Add.razor | 35 +- .../Admin/ModuleDefinitions/Create.razor | 76 ++-- .../Admin/ModuleDefinitions/Edit.razor | 140 +++--- .../Modules/Admin/Modules/Export.razor | 39 +- .../Modules/Admin/Modules/Import.razor | 66 ++- .../Modules/Admin/Modules/Settings.razor | 101 ++--- Oqtane.Client/Modules/Admin/Pages/Add.razor | 153 +++---- Oqtane.Client/Modules/Admin/Pages/Edit.razor | 166 +++---- .../Modules/Admin/Profiles/Edit.razor | 125 +++--- .../Modules/Admin/Register/Index.razor | 67 ++- Oqtane.Client/Modules/Admin/Site/Index.razor | 292 ++++++------ Oqtane.Client/Modules/Admin/Sites/Add.razor | 146 +++--- Oqtane.Client/Modules/Admin/Sql/Index.razor | 56 ++- .../Modules/Admin/SystemInfo/Index.razor | 162 +++---- Oqtane.Client/Modules/Admin/Themes/Add.razor | 35 +- .../Modules/Admin/Themes/Create.razor | 106 ++--- Oqtane.Client/Modules/Admin/Themes/View.razor | 88 ++-- .../Modules/Admin/Upgrade/Index.razor | 16 +- 26 files changed, 1234 insertions(+), 1453 deletions(-) diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor index 727c0bcf..4021a033 100644 --- a/Oqtane.Client/Modules/Admin/Files/Add.razor +++ b/Oqtane.Client/Modules/Admin/Files/Add.razor @@ -9,45 +9,39 @@ - - - - - -
- - +
+
+ +
-
+ + + @SharedLocalizer["Cancel"] @if (_folders != null) { - - - - - - - - - -
- - - -
- - - -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
@SharedLocalizer["Cancel"] } diff --git a/Oqtane.Client/Modules/Admin/Files/Details.razor b/Oqtane.Client/Modules/Admin/Files/Details.razor index 44e7e3a2..14610ca6 100644 --- a/Oqtane.Client/Modules/Admin/Files/Details.razor +++ b/Oqtane.Client/Modules/Admin/Files/Details.razor @@ -8,37 +8,31 @@ @if (_folders != null) { - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
@SharedLocalizer["Cancel"]
diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor index 48d5ef79..611b593f 100644 --- a/Oqtane.Client/Modules/Admin/Files/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor @@ -8,57 +8,53 @@ @if (_folders != null) { - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - +
+
+ +
+ + } - else + @foreach (Folder folder in _folders) { - + } -
- - -
+ + + +
+ +
+ +
+
+
+ +
+ @if (PageState.QueryString.ContainsKey("id")) + { + + } + else + { + + } +
+
+
+
+ + + +
+
+ + @if (!_isSystem) { diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor index e119515c..11684f3f 100644 --- a/Oqtane.Client/Modules/Admin/Files/Index.razor +++ b/Oqtane.Client/Modules/Admin/Files/Index.razor @@ -8,34 +8,34 @@ @if (_files != null) { - - - - - - -
+
+
+
-
+ +
-
+ +
    -
+ + +
-   -   - @SharedLocalizer["Name"] - @Localizer["Modified"] - @Localizer["Type"] - @Localizer["Size"] +   +   + @SharedLocalizer["Name"] + @Localizer["Modified"] + @Localizer["Type"] + @Localizer["Size"]
diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor index 636305aa..4657fe52 100644 --- a/Oqtane.Client/Modules/Admin/Languages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor @@ -23,50 +23,45 @@ else } else { - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
+ + + } @SharedLocalizer["Cancel"] - - - - - - -
+
+
+
-
+ +
  -
+ + + @if (_packages != null) { @@ -97,16 +92,14 @@ else } - - - - - -
- - +
+
+ +
-
+ + + @SharedLocalizer["Cancel"] diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor index 65fa7a2c..91e4d0e7 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor @@ -9,206 +9,246 @@ @inject IStringLocalizer Localizer @inject IStringLocalizer SharedLocalizer - - - - - - - - - - - - - - - - - - - - - - @if (_pageName != string.Empty) - { - - - - - } - @if (_moduleTitle != string.Empty) - { - - - - - } - @if (_username != string.Empty) - { - - - - - } - - - - - - - - - - - - - @if (!string.IsNullOrEmpty(_exception)) - { - - - - - } - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - -
-@SharedLocalizer["Cancel"] +
+
-@code { - private int _logId; - private string _logDate = string.Empty; - private string _level = string.Empty; - private string _feature = string.Empty; - private string _function = string.Empty; - private string _category = string.Empty; - private string _pageName = string.Empty; - private string _moduleTitle = string.Empty; - private string _username = string.Empty; - private string _url = string.Empty; - private string _template = string.Empty; - private string _message = string.Empty; - private string _exception = string.Empty; - private string _properties = string.Empty; - private string _server = string.Empty; +
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; +
+
+
- protected override async Task OnInitializedAsync() - { - try +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ @if (_pageName != string.Empty) { - _logId = Int32.Parse(PageState.QueryString["id"]); - var log = await LogService.GetLogAsync(_logId); - if (log != null) +
+ +
+ +
+
+ } + @if (_moduleTitle != string.Empty) + { +
+ +
+ +
+
+ } + @if (_username != string.Empty) + { +
+ +
+ +
+
+ } +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ @if (!string.IsNullOrEmpty(_exception)) + { +
+ +
+ +
+
+ } +
+ +
+ +
+
+
+ +
+ +
+
+ + @SharedLocalizer["Cancel"] + + @code { + private int _logId; + private string _logDate = string.Empty; + private string _level = string.Empty; + private string _feature = string.Empty; + private string _function = string.Empty; + private string _category = string.Empty; + private string _pageName = string.Empty; + private string _moduleTitle = string.Empty; + private string _username = string.Empty; + private string _url = string.Empty; + private string _template = string.Empty; + private string _message = string.Empty; + private string _exception = string.Empty; + private string _properties = string.Empty; + private string _server = string.Empty; + + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; + + protected override async Task OnInitializedAsync() + { + try { - _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture); - _level = log.Level; - _feature = log.Feature; - _function = log.Function; - _category = log.Category; - - if (log.PageId != null) + _logId = Int32.Parse(PageState.QueryString["id"]); + var log = await LogService.GetLogAsync(_logId); + if (log != null) { - var page = await PageService.GetPageAsync(log.PageId.Value); - if (page != null) - { - _pageName = page.Name; - } - } + _logDate = log.LogDate.ToString(CultureInfo.CurrentCulture); + _level = log.Level; + _feature = log.Feature; + _function = log.Function; + _category = log.Category; - if (log.PageId != null && log.ModuleId != null) - { - var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value); - if (pagemodule != null) + if (log.PageId != null) { - _moduleTitle = pagemodule.Title; + var page = await PageService.GetPageAsync(log.PageId.Value); + if (page != null) + { + _pageName = page.Name; + } } - } - if (log.UserId != null) - { - var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId); - if (user != null) + if (log.PageId != null && log.ModuleId != null) { - _username = user.Username; + var pagemodule = await PageModuleService.GetPageModuleAsync(log.PageId.Value, log.ModuleId.Value); + if (pagemodule != null) + { + _moduleTitle = pagemodule.Title; + } } - } - _url = log.Url; - _template = log.MessageTemplate; - _message = log.Message; - _exception = log.Exception; - _properties = log.Properties; - _server = log.Server; + if (log.UserId != null) + { + var user = await UserService.GetUserAsync(log.UserId.Value, PageState.Site.SiteId); + if (user != null) + { + _username = user.Username; + } + } + + _url = log.Url; + _template = log.MessageTemplate; + _message = log.Message; + _exception = log.Exception; + _properties = log.Properties; + _server = log.Server; + } + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message); + AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error); } } - catch (Exception ex) - { - await logger.LogError(ex, "Error Loading Log {LogId} {Error}", _logId, ex.Message); - AddModuleMessage(Localizer["Error.Log.Load"], MessageType.Error); - } } -} diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor index 02bd9d62..920ec709 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor @@ -10,9 +10,9 @@ } else { - - - - - - -
+
+
+


-
+ +


-
+ +


-
+ + + @if (_logs.Any()) {
-   - @Localizer["Date"] - @Localizer["Level"] - @Localizer["Feature"] - @Localizer["Function"] +   + @Localizer["Date"] + @Localizer["Level"] + @Localizer["Feature"] + @Localizer["Function"]
diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor index a6ac643b..06149841 100644 --- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor @@ -10,36 +10,28 @@ @if (string.IsNullOrEmpty(_moduledefinitionname) && _templates != null) { - - - - - - - - - - - - - - - - - - - - - + + @if (!string.IsNullOrEmpty(_location)) { - - - - + + } -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - +
+ +
-
+ + } else diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor index 400ec49b..1b8dbb9c 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor @@ -10,18 +10,19 @@ - - - - - - -
+
+
+
+
-
+ +
  -
+ +
+ + @if (_packages != null) { @@ -50,16 +51,14 @@ } - - - - - -
- - +
+
+ +
-
+ + + diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor index c4fae60b..765ae2df 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor @@ -10,36 +10,28 @@ @if (_templates != null) { - - - - - - - - - - - - - - - - - - - - - + + @if (!string.IsNullOrEmpty(_location)) { - - - - + + } -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - +
+ +
-
+ @SharedLocalizer["Cancel"] } diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index 604a5904..d75464d1 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -7,101 +7,79 @@ - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + +
- - - - -
- -
+
+
+ +
+
diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor index 41c7d73b..d02706ef 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Export.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Export.razor @@ -5,31 +5,28 @@ @inject IStringLocalizer Localizer @inject IStringLocalizer SharedLocalizer - - - - - - - -
- - +
+
+ +
-
- -@SharedLocalizer["Cancel"] + + + + + + @SharedLocalizer["Cancel"] -@code { - private string _content = string.Empty; + @code { + private string _content = string.Empty; - public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; - public override string Title => "Export Content"; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; + public override string Title => "Export Content"; - private async Task ExportModule() - { - _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId); + private async Task ExportModule() + { + _content = await ModuleService.ExportModuleAsync(ModuleState.ModuleId); + } } -} diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor index 833dbefc..33b7a8d4 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Import.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Import.razor @@ -5,53 +5,51 @@ @inject IStringLocalizer Localizer @inject IStringLocalizer SharedLocalizer - - - - - - - -
- - +
+
+ +
-
- -@SharedLocalizer["Cancel"] + + + + + + + @SharedLocalizer["Cancel"] -@code { - private string _content = string.Empty; + @code { + private string _content = string.Empty; - public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; - public override string Title => "Import Content"; + public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; + public override string Title => "Import Content"; - private async Task ImportModule() - { - if (_content != string.Empty) + private async Task ImportModule() { - try + if (_content != string.Empty) { - bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, _content); - if (success) + try { - AddModuleMessage(Localizer["Success.Content.Import"], MessageType.Success); + bool success = await ModuleService.ImportModuleAsync(ModuleState.ModuleId, _content); + if (success) + { + AddModuleMessage(Localizer["Success.Content.Import"], MessageType.Success); + } + else + { + AddModuleMessage(Localizer["Message.Content.ImportProblem"], MessageType.Warning); + } } - else + catch (Exception ex) { - AddModuleMessage(Localizer["Message.Content.ImportProblem"], MessageType.Warning); + await logger.LogError(ex, "Error Importing Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message); + AddModuleMessage(Localizer["Error.Module.Import"], MessageType.Error); } } - catch (Exception ex) + else { - await logger.LogError(ex, "Error Importing Module {ModuleId} {Error}", ModuleState.ModuleId, ex.Message); - AddModuleMessage(Localizer["Error.Module.Import"], MessageType.Error); + AddModuleMessage(Localizer["Message.Required.ImportContent"], MessageType.Warning); } } - else - { - AddModuleMessage(Localizer["Message.Required.ImportContent"], MessageType.Warning); - } } -} diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor index 7fc04462..cbf32fef 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor @@ -12,68 +12,59 @@ @if (_containers != null) { - - - - - - - - - - - - - - - - - -
- - - -
- - - + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ -
- - - -
- - - -
+ } + + + + } @if (_permissions != null) { - - - - -
- -
+
+
+ +
+
+ } @if (_moduleSettingsType != null) diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index 91a2f391..b474a619 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -10,20 +10,16 @@ @if (_themeList != null) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
} -
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + + +
- - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + +
} diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index 3e1c964a..a189a539 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -11,20 +11,16 @@ @if (_themeList != null) { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
} -
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + +
- - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + +


@@ -171,13 +147,13 @@ @if (_permissions != null) { - - - - -
- -
+
+
+ + +
+
+ } @if (_themeSettingsType != null) diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor index 5249172b..0a6ce896 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor @@ -5,94 +5,75 @@ @inject IStringLocalizer Localizer @inject IStringLocalizer SharedLocalizer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + + +
@SharedLocalizer["Cancel"] @if (PageState.QueryString.ContainsKey("id")) diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor index f942eb84..57f0f1d9 100644 --- a/Oqtane.Client/Modules/Admin/Register/Index.razor +++ b/Oqtane.Client/Modules/Admin/Register/Index.razor @@ -16,50 +16,39 @@ - - - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- + + + +
diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index 328c039b..974eb07b 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -13,20 +13,16 @@ @if (_initialized) { - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) { @@ -35,55 +31,44 @@ { } -
- - + + +
+ +
-
- - + + +
+ +
-
+ + +
- - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  +
+
+
+
+
@Localizer["Smtp.Required.EnableNotificationJob"]
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- -

+ + + +

+ + + +
- - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + +
@if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) {
- - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + +
}
diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index 016ff9d4..4dba923a 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -19,28 +19,22 @@ } else { - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @if (_tenantid == "+") { - - - - - - - - - - - + + if (_databaseConfigType != null) { @DatabaseConfigComponent; } - - - - - - - - + + } -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
-
-
- - +
+
+
+
+ +
-
- - + + +
+ +
-
- - +
+ +
-
- - + + +
+ +
-
+ +
+
@SharedLocalizer["Cancel"] } diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor index a74d8d54..9ff2d9b5 100644 --- a/Oqtane.Client/Modules/Admin/Sql/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor @@ -13,12 +13,11 @@ } else { - - - - - + + @if (_tenantid != "-1") { - - - - - - - - - - - - + + } -
- - +
+ +
+ +
-
- - +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ +


@if (!string.IsNullOrEmpty(_results)) { @((MarkupString)_results) +
+
} } diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor index 1d8771d3..257a690d 100644 --- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor +++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor @@ -7,105 +7,85 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
  + + +
+
+

@Localizer["Register"] -
+ + +

- - - - - - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + +

  @Localizer["Access.ApiFramework"]  diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index 41dbace0..3699a4f5 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -10,18 +10,24 @@ +
+
+
- - - - - -
+ +
-
+ +
  -
+
+
+ +
+
+
+ @if (_packages != null) { @@ -50,13 +56,22 @@ } +
+
+ +
+ + +
+
+
- + - +
diff --git a/Oqtane.Client/Modules/Admin/Themes/Create.razor b/Oqtane.Client/Modules/Admin/Themes/Create.razor index ba3c1930..f563c1ff 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Create.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Create.razor @@ -11,66 +11,56 @@ @if (_templates != null) { - - - - - - - - - - - - - - - - - - @if (!string.IsNullOrEmpty(_location)) - { - - - - - } -
- - - -
- - - -
- - - + + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ -
- - - -
- - - -
+ } + + + + + @if (!string.IsNullOrEmpty(_location)) { +
+ +
+ +
+
+ } + +
@SharedLocalizer["Cancel"] } diff --git a/Oqtane.Client/Modules/Admin/Themes/View.razor b/Oqtane.Client/Modules/Admin/Themes/View.razor index a9bb2281..30cac439 100644 --- a/Oqtane.Client/Modules/Admin/Themes/View.razor +++ b/Oqtane.Client/Modules/Admin/Themes/View.razor @@ -6,64 +6,50 @@ @inject IStringLocalizer Localizer @inject IStringLocalizer SharedLocalizer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - +
+
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
- - + + +
+ +
-
+ + + @SharedLocalizer["Cancel"] @code { diff --git a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor index c2727177..7c90b014 100644 --- a/Oqtane.Client/Modules/Admin/Upgrade/Index.razor +++ b/Oqtane.Client/Modules/Admin/Upgrade/Index.razor @@ -22,16 +22,14 @@ - - - - - -
- - +
+
+ +
-
+ + +