From cb7d9a03711b6e21aa09f6f53ab4029960355923 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Fri, 2 Jul 2021 20:03:51 -0400 Subject: [PATCH] upgrade to Boostrap 5 --- Oqtane.Client/Modules/Admin/Files/Add.razor | 2 +- .../Modules/Admin/Files/Details.razor | 4 +- Oqtane.Client/Modules/Admin/Files/Edit.razor | 6 +- Oqtane.Client/Modules/Admin/Files/Index.razor | 2 +- Oqtane.Client/Modules/Admin/Jobs/Edit.razor | 17 +- .../Modules/Admin/Languages/Add.razor | 6 +- Oqtane.Client/Modules/Admin/Logs/Detail.razor | 2 +- Oqtane.Client/Modules/Admin/Logs/Index.razor | 6 +- .../Modules/Admin/ModuleCreator/Index.razor | 6 +- .../Modules/Admin/ModuleDefinitions/Add.razor | 2 +- .../Admin/ModuleDefinitions/Create.razor | 6 +- .../Admin/ModuleDefinitions/Edit.razor | 4 +- .../Modules/Admin/Modules/Export.razor | 2 +- .../Modules/Admin/Modules/Import.razor | 2 +- .../Modules/Admin/Modules/Settings.razor | 19 +- Oqtane.Client/Modules/Admin/Pages/Add.razor | 24 +- Oqtane.Client/Modules/Admin/Pages/Edit.razor | 20 +- .../Modules/Admin/Profiles/Edit.razor | 20 +- .../Modules/Admin/Register/Index.razor | 73 +- Oqtane.Client/Modules/Admin/Roles/Add.razor | 4 +- Oqtane.Client/Modules/Admin/Roles/Edit.razor | 4 +- Oqtane.Client/Modules/Admin/Roles/Users.razor | 4 +- Oqtane.Client/Modules/Admin/Site/Index.razor | 27 +- Oqtane.Client/Modules/Admin/Sites/Add.razor | 14 +- Oqtane.Client/Modules/Admin/Sql/Index.razor | 4 +- .../Modules/Admin/SystemInfo/Index.razor | 28 +- .../Modules/Admin/Themes/Create.razor | 6 +- Oqtane.Client/Modules/Admin/Themes/View.razor | 2 +- .../Modules/Admin/UserProfile/Add.razor | 2 +- .../Modules/Admin/UserProfile/Index.razor | 34 +- .../Modules/Admin/UserProfile/View.razor | 2 +- Oqtane.Client/Modules/Admin/Users/Add.razor | 26 +- Oqtane.Client/Modules/Admin/Users/Edit.razor | 32 +- Oqtane.Client/Modules/Admin/Users/Index.razor | 23 +- Oqtane.Client/Modules/Admin/Users/Roles.razor | 4 +- .../Modules/Controls/ActionDialog.razor | 2 +- .../Modules/Controls/FileManager.razor | 6 +- Oqtane.Client/Modules/Controls/Label.razor | 5 + .../Modules/Controls/ModuleMessage.razor | 10 +- Oqtane.Client/Modules/Controls/Pager.razor | 12 +- .../Modules/Controls/PermissionGrid.razor | 6 +- .../Modules/Controls/RichTextEditor.razor | 4 +- Oqtane.Client/Modules/Controls/Section.razor | 8 +- Oqtane.Client/Modules/Controls/TabStrip.razor | 4 +- Oqtane.Client/Modules/HtmlText/Settings.razor | 4 +- .../Modules/Admin/Register/Index.resx | 30 + .../Resources/Modules/Admin/Site/Index.resx | 4 +- .../Modules/Admin/UserProfile/Index.resx | 45 +- .../Resources/Modules/Admin/Users/Add.resx | 33 +- .../Resources/Modules/Admin/Users/Edit.resx | 48 +- Oqtane.Client/Themes/AdminContainer.razor | 4 +- .../Themes/BlazorTheme/Themes/Default.razor | 8 +- .../Controls/Container/ModuleActions.razor | 2 +- .../Themes/Controls/Theme/ControlPanel.razor | 74 +- .../Controls/Theme/LanguageSwitcher.razor | 2 +- .../Controls/Theme/MenuHorizontal.razor | 2 +- .../Controls/Theme/MenuItemsHorizontal.razor | 10 +- .../Controls/Theme/MenuItemsVertical.razor | 4 +- .../Themes/Controls/Theme/MenuVertical.razor | 2 +- .../Containers/ContainerSettings.razor | 10 +- .../Themes/OqtaneTheme/Themes/Default.razor | 10 +- .../OqtaneTheme/Themes/ThemeSettings.razor | 4 +- .../Oqtane.Themes.BlazorTheme/Theme.css | 35 +- .../BootswatchCyborg.css | 11153 ---------------- .../Oqtane.Themes.OqtaneTheme/Theme.css | 31 +- Oqtane.Server/wwwroot/css/app.css | 3 +- 66 files changed, 551 insertions(+), 11463 deletions(-) delete mode 100644 Oqtane.Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/BootswatchCyborg.css diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor index b131f1a6..727c0bcf 100644 --- a/Oqtane.Client/Modules/Admin/Files/Add.razor +++ b/Oqtane.Client/Modules/Admin/Files/Add.razor @@ -38,7 +38,7 @@ - @foreach (Folder folder in _folders) { diff --git a/Oqtane.Client/Modules/Admin/Files/Details.razor b/Oqtane.Client/Modules/Admin/Files/Details.razor index 96434ebb..44e7e3a2 100644 --- a/Oqtane.Client/Modules/Admin/Files/Details.razor +++ b/Oqtane.Client/Modules/Admin/Files/Details.razor @@ -10,7 +10,7 @@ { -
+ @@ -22,7 +22,7 @@ - @foreach (Folder folder in _folders) { diff --git a/Oqtane.Client/Modules/Admin/Files/Edit.razor b/Oqtane.Client/Modules/Admin/Files/Edit.razor index f9c051c3..48d5ef79 100644 --- a/Oqtane.Client/Modules/Admin/Files/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Files/Edit.razor @@ -10,11 +10,11 @@ { -
+ - @if (PageState.QueryString.ContainsKey("id")) { @@ -45,7 +45,7 @@ } else { - diff --git a/Oqtane.Client/Modules/Admin/Files/Index.razor b/Oqtane.Client/Modules/Admin/Files/Index.razor index adabcaad..e119515c 100644 --- a/Oqtane.Client/Modules/Admin/Files/Index.razor +++ b/Oqtane.Client/Modules/Admin/Files/Index.razor @@ -14,7 +14,7 @@ - @foreach (Folder folder in _folders) { diff --git a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor index fe737b70..31d982c3 100644 --- a/Oqtane.Client/Modules/Admin/Jobs/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Jobs/Edit.razor @@ -7,7 +7,7 @@ -
+ @@ -27,7 +27,7 @@ - @@ -39,7 +39,7 @@ - @@ -82,6 +82,9 @@
@SharedLocalizer["Cancel"] +
+
+ @code { private int _jobId; @@ -94,6 +97,10 @@ private string _endDate = string.Empty; private string _retentionHistory = string.Empty; private string _nextExecution = string.Empty; + private string createdby; + private DateTime createdon; + private string modifiedby; + private DateTime modifiedon; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host; @@ -114,6 +121,10 @@ _endDate = (job.EndDate != null) ? job.EndDate.ToString() : string.Empty; _retentionHistory = job.RetentionHistory.ToString(); _nextExecution = job.NextExecution.ToString(); + createdby = job.CreatedBy; + createdon = job.CreatedOn; + modifiedby = job.ModifiedBy; + modifiedon = job.ModifiedOn; } } catch (Exception ex) diff --git a/Oqtane.Client/Modules/Admin/Languages/Add.razor b/Oqtane.Client/Modules/Admin/Languages/Add.razor index 4276dceb..636305aa 100644 --- a/Oqtane.Client/Modules/Admin/Languages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Languages/Add.razor @@ -25,11 +25,11 @@ else { -
+ - @foreach (var culture in _availableCultures) { @@ -42,7 +42,7 @@ else - diff --git a/Oqtane.Client/Modules/Admin/Logs/Detail.razor b/Oqtane.Client/Modules/Admin/Logs/Detail.razor index e7b2d376..65fa7a2c 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Detail.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Detail.razor @@ -11,7 +11,7 @@ -
+ diff --git a/Oqtane.Client/Modules/Admin/Logs/Index.razor b/Oqtane.Client/Modules/Admin/Logs/Index.razor index ffb8c403..02bd9d62 100644 --- a/Oqtane.Client/Modules/Admin/Logs/Index.razor +++ b/Oqtane.Client/Modules/Admin/Logs/Index.razor @@ -14,7 +14,7 @@ else


- @@ -26,7 +26,7 @@ else


- @@ -38,7 +38,7 @@ else


- diff --git a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor index 2e04ba4b..a6ac643b 100644 --- a/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor +++ b/Oqtane.Client/Modules/Admin/ModuleCreator/Index.razor @@ -12,7 +12,7 @@ { -
+ @@ -40,7 +40,7 @@ - @foreach (Template template in _templates) { @@ -54,7 +54,7 @@ - @foreach (string version in _versions) { if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0) diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor index 54f5e3dc..400ec49b 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Add.razor @@ -11,7 +11,7 @@ - +
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor index 64593f64..c4fae60b 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor @@ -12,7 +12,7 @@ { -
+ @@ -40,7 +40,7 @@ - @foreach (Template template in _templates) { @@ -54,7 +54,7 @@ - @foreach (string version in _versions) { if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0) diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor index bc57293b..604a5904 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor @@ -9,7 +9,7 @@ -
+ @@ -36,7 +36,7 @@
-
+ diff --git a/Oqtane.Client/Modules/Admin/Modules/Export.razor b/Oqtane.Client/Modules/Admin/Modules/Export.razor index b5e24b30..41c7d73b 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Export.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Export.razor @@ -8,7 +8,7 @@ -
+ diff --git a/Oqtane.Client/Modules/Admin/Modules/Import.razor b/Oqtane.Client/Modules/Admin/Modules/Import.razor index efef5cc6..833dbefc 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Import.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Import.razor @@ -8,7 +8,7 @@ -
+ diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor index bf966a0b..7fc04462 100644 --- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor +++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor @@ -14,7 +14,7 @@ { -
+ @@ -26,7 +26,7 @@ - @foreach (var container in _containers) { @@ -39,7 +39,7 @@ - @@ -50,7 +50,7 @@ - @foreach (Page p in PageState.Pages) { if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, p.Permissions)) @@ -91,6 +91,9 @@ @SharedLocalizer["Cancel"] +
+
+ @code { public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit; @@ -112,6 +115,10 @@ private Type _containerSettingsType; private object _containerSettings; private RenderFragment ContainerSettingsComponent { get; set; } + private string createdby; + private DateTime createdon; + private string modifiedby; + private DateTime modifiedon; protected override async Task OnInitializedAsync() { @@ -123,6 +130,10 @@ _permissions = ModuleState.Permissions; _permissionNames = ModuleState.ModuleDefinition.PermissionNames; _pageId = ModuleState.PageId.ToString(); + createdby = ModuleState.CreatedBy; + createdon = ModuleState.CreatedOn; + modifiedby = ModuleState.ModifiedBy; + modifiedon = ModuleState.ModifiedOn; if (!string.IsNullOrEmpty(ModuleState.ModuleDefinition.SettingsType)) { diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor index d9b8a7c5..91a2f391 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Add.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor @@ -12,7 +12,7 @@ { -
+ @@ -24,7 +24,7 @@ - @foreach (Page page in _pageList) { @@ -38,7 +38,7 @@ - @if (_children != null && _children.Count > 0) { @@ -49,7 +49,7 @@ @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">")) { - @foreach (Page page in _children) { @@ -61,10 +61,10 @@
- + - @@ -72,10 +72,10 @@
- + - @@ -101,7 +101,7 @@
-
+ @@ -113,7 +113,7 @@ - @foreach (var theme in _themes) { @@ -126,7 +126,7 @@ - @foreach (var container in _containers) { @@ -148,7 +148,7 @@ - diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor index 0cef876b..3e1c964a 100644 --- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor @@ -13,7 +13,7 @@ { -
+ @@ -25,7 +25,7 @@ - @foreach (Page page in _pageList) { @@ -42,7 +42,7 @@ - @if (_parentid == _currentparentid) { @@ -57,7 +57,7 @@ @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">")) { - @foreach (Page page in _children) { @@ -72,7 +72,7 @@ - @@ -83,7 +83,7 @@ - @@ -109,7 +109,7 @@
-
+ @@ -121,7 +121,7 @@ - @foreach (var theme in _themes) { @@ -134,7 +134,7 @@ - @foreach (var container in _containers) { @@ -156,7 +156,7 @@ - diff --git a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor index 2457a1bc..5249172b 100644 --- a/Oqtane.Client/Modules/Admin/Profiles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Profiles/Edit.razor @@ -7,7 +7,7 @@ -
+ @@ -75,7 +75,7 @@ - @@ -86,7 +86,7 @@ - @@ -95,6 +95,12 @@
@SharedLocalizer["Cancel"] +@if (PageState.QueryString.ContainsKey("id")) +{ +
+
+ +} @code { private int _profileid = -1; @@ -108,6 +114,10 @@ private string _options = string.Empty; private string _isrequired = "False"; private string _isprivate = "False"; + private string createdby; + private DateTime createdon; + private string modifiedby; + private DateTime modifiedon; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; @@ -133,6 +143,10 @@ _options = profile.Options; _isrequired = profile.IsRequired.ToString(); _isprivate = profile.IsPrivate.ToString(); + createdby = profile.CreatedBy; + createdon = profile.CreatedOn; + modifiedby = profile.ModifiedBy; + modifiedon = profile.ModifiedOn; } } } diff --git a/Oqtane.Client/Modules/Admin/Register/Index.razor b/Oqtane.Client/Modules/Admin/Register/Index.razor index 86663439..f942eb84 100644 --- a/Oqtane.Client/Modules/Admin/Register/Index.razor +++ b/Oqtane.Client/Modules/Admin/Register/Index.razor @@ -17,30 +17,51 @@ -
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- - -
+ + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + +
} @@ -54,7 +75,7 @@ else private string _password = string.Empty; private string _confirm = string.Empty; private string _email = string.Empty; - private string _displayName = string.Empty; + private string _displayname = string.Empty; public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Anonymous; @@ -72,7 +93,7 @@ else { SiteId = PageState.Site.SiteId, Username = _username, - DisplayName = (_displayName == string.Empty ? _username : _displayName), + DisplayName = (_displayname == string.Empty ? _username : _displayname), Email = _email, Password = _password }; diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor index 80552c4c..905d8061 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Add.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor @@ -8,7 +8,7 @@
-
+ @@ -28,7 +28,7 @@ - diff --git a/Oqtane.Client/Modules/Admin/Roles/Edit.razor b/Oqtane.Client/Modules/Admin/Roles/Edit.razor index 9126fd57..54d1bb0f 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Edit.razor @@ -8,7 +8,7 @@ -
+ @@ -28,7 +28,7 @@ - diff --git a/Oqtane.Client/Modules/Admin/Roles/Users.razor b/Oqtane.Client/Modules/Admin/Roles/Users.razor index be87910d..4732c9f5 100644 --- a/Oqtane.Client/Modules/Admin/Roles/Users.razor +++ b/Oqtane.Client/Modules/Admin/Roles/Users.razor @@ -13,7 +13,7 @@ else { -
+ @@ -25,7 +25,7 @@ else - @foreach (UserRole userrole in users) { diff --git a/Oqtane.Client/Modules/Admin/Site/Index.razor b/Oqtane.Client/Modules/Admin/Site/Index.razor index 0ad4256c..328c039b 100644 --- a/Oqtane.Client/Modules/Admin/Site/Index.razor +++ b/Oqtane.Client/Modules/Admin/Site/Index.razor @@ -15,7 +15,7 @@ { -
+ @@ -43,7 +43,7 @@ - @@ -54,7 +54,7 @@ - @@ -64,7 +64,7 @@
-
+ @@ -84,7 +84,7 @@ - @foreach (var theme in _themes) { @@ -98,7 +98,7 @@ - @foreach (var container in _containers) { @@ -112,7 +112,7 @@ - @foreach (var container in _containers) @@ -127,8 +127,9 @@
- + @@ -152,7 +153,7 @@
- @Localizer["Smtp.Required.EnableNotificationJob"] +   + @Localizer["Smtp.Required.EnableNotificationJob"]
- @@ -189,11 +190,11 @@
-
+ - @@ -222,7 +223,7 @@
-
+ diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor index 22f3bff9..016ff9d4 100644 --- a/Oqtane.Client/Modules/Admin/Sites/Add.razor +++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor @@ -21,7 +21,7 @@ else { -
+ @@ -41,7 +41,7 @@ else - @foreach (var theme in _themes) { @@ -55,7 +55,7 @@ else - @foreach (var container in _containers) { @@ -69,7 +69,7 @@ else - @foreach (var container in _containers) @@ -84,7 +84,7 @@ else - @foreach (SiteTemplate siteTemplate in _siteTemplates) { @@ -98,7 +98,7 @@ else - @foreach (Tenant tenant in _tenants) @@ -128,7 +128,7 @@ else - @foreach (var database in _databases) { if (database.IsDefault) diff --git a/Oqtane.Client/Modules/Admin/Sql/Index.razor b/Oqtane.Client/Modules/Admin/Sql/Index.razor index 71efdc19..a74d8d54 100644 --- a/Oqtane.Client/Modules/Admin/Sql/Index.razor +++ b/Oqtane.Client/Modules/Admin/Sql/Index.razor @@ -15,11 +15,11 @@ else { -
+ - @foreach (Tenant tenant in _tenants) { diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor index 754a5957..1d8771d3 100644 --- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor +++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor @@ -9,7 +9,7 @@ - + + + +
+ @@ -56,23 +56,24 @@
  +
@Localizer["Register"] +
-
-
- @Localizer["Register"] -
-


-
+ - @@ -83,7 +84,7 @@ - @@ -94,7 +95,7 @@ - @@ -105,7 +106,7 @@ - @@ -120,7 +121,7 @@ - @@ -131,13 +132,14 @@ -
+

  @Localizer["Access.ApiFramework"]  diff --git a/Oqtane.Client/Modules/Admin/Themes/Create.razor b/Oqtane.Client/Modules/Admin/Themes/Create.razor index 8912089e..ba3c1930 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Create.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Create.razor @@ -13,7 +13,7 @@ { -
+ @@ -33,7 +33,7 @@ - @foreach (Template template in _templates) { @@ -47,7 +47,7 @@ - @foreach (string version in _versions) { if (Version.Parse(version).CompareTo(Version.Parse(_minversion)) >= 0) diff --git a/Oqtane.Client/Modules/Admin/Themes/View.razor b/Oqtane.Client/Modules/Admin/Themes/View.razor index f9a318a5..a9bb2281 100644 --- a/Oqtane.Client/Modules/Admin/Themes/View.razor +++ b/Oqtane.Client/Modules/Admin/Themes/View.razor @@ -8,7 +8,7 @@ - -
+ diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor index 75227200..a10e0c3a 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Add.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Add.razor @@ -10,7 +10,7 @@ { - -
+ diff --git a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor index f74165a2..54e2d398 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/Index.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/Index.razor @@ -23,55 +23,55 @@ else { -
- + + - +
- + - +
- + - +
- + - +
- + - +
- +
- + } @@ -94,13 +94,13 @@ else category = p.Category; }
+ @if (!string.IsNullOrEmpty(p.Options)) { - @foreach (var option in p.Options.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)) { @if (GetProfileValue(p.Name, "") == option || (GetProfileValue(p.Name, "") == "" && p.DefaultValue == option)) @@ -130,7 +130,7 @@ else } }
- + } @@ -206,7 +206,7 @@ else }

- diff --git a/Oqtane.Client/Modules/Admin/UserProfile/View.razor b/Oqtane.Client/Modules/Admin/UserProfile/View.razor index a51f0426..555190c1 100644 --- a/Oqtane.Client/Modules/Admin/UserProfile/View.razor +++ b/Oqtane.Client/Modules/Admin/UserProfile/View.razor @@ -10,7 +10,7 @@ { - @if (title == "From") diff --git a/Oqtane.Client/Modules/Admin/Users/Add.razor b/Oqtane.Client/Modules/Admin/Users/Add.razor index 61222757..386bd1b0 100644 --- a/Oqtane.Client/Modules/Admin/Users/Add.razor +++ b/Oqtane.Client/Modules/Admin/Users/Add.razor @@ -13,43 +13,43 @@ {
+
-
- + + - +
- + - +
- + - +
- + - +
- + - +
@@ -72,7 +72,7 @@ category = p.Category; }
+ @@ -92,7 +92,7 @@ - + @SharedLocalizer["Cancel"] @code { diff --git a/Oqtane.Client/Modules/Admin/Users/Edit.razor b/Oqtane.Client/Modules/Admin/Users/Edit.razor index 53c25d68..5f53e756 100644 --- a/Oqtane.Client/Modules/Admin/Users/Edit.razor +++ b/Oqtane.Client/Modules/Admin/Users/Edit.razor @@ -22,48 +22,48 @@ else { - -
- + + - +
- + - +
- + - +
- + - +
- + - +
- + @@ -71,10 +71,10 @@ else
- + - @@ -100,7 +100,7 @@ else category = p.Category; }
+ @@ -120,7 +120,7 @@ else - + @SharedLocalizer["Cancel"]

diff --git a/Oqtane.Client/Modules/Admin/Users/Index.razor b/Oqtane.Client/Modules/Admin/Users/Index.razor index 99d678ef..e14dc97d 100644 --- a/Oqtane.Client/Modules/Admin/Users/Index.razor +++ b/Oqtane.Client/Modules/Admin/Users/Index.razor @@ -14,16 +14,19 @@ } else { -
-
- -
-
-
-   -
-
-
+ + + + + + +
+
+
+ + + +
diff --git a/Oqtane.Client/Modules/Admin/Users/Roles.razor b/Oqtane.Client/Modules/Admin/Users/Roles.razor index 0251a367..260ecb12 100644 --- a/Oqtane.Client/Modules/Admin/Users/Roles.razor +++ b/Oqtane.Client/Modules/Admin/Users/Roles.razor @@ -14,7 +14,7 @@ else { -
+ @@ -26,7 +26,7 @@ else - @foreach (Role role in roles) { diff --git a/Oqtane.Client/Modules/Controls/ActionDialog.razor b/Oqtane.Client/Modules/Controls/ActionDialog.razor index 43d6e0af..5cda1386 100644 --- a/Oqtane.Client/Modules/Controls/ActionDialog.razor +++ b/Oqtane.Client/Modules/Controls/ActionDialog.razor @@ -9,7 +9,7 @@