| - - | -- | -
+
+
+
+
+
+
+
+
@code {
- private readonly List
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@code {
- private readonly List
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@if (_security == "custom")
+{
+
+
+
+
+
+
+
+
+
+
+
+
}
@code {
- private readonly List
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@if (_security == "custom")
+{
+
+
+
+
+
+
+
+
+
+
+
+
}
@code {
- private readonly List
+
+
+
+
+
@code {
- private readonly List
+
+
+@Localizer["DatabaseConfig"]
-
| - - | -- | -
@Localizer["ApplicationAdmin"]
-
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @@ -116,7 +102,7 @@ private object _databaseConfig; private RenderFragment DatabaseConfigComponent { get; set; } - private string _hostUsername = UserNames.Host; + private string _hostUsername = string.Empty; private string _hostPassword = string.Empty; private string _confirmPassword = string.Empty; private string _hostEmail = string.Empty; @@ -164,7 +150,8 @@ if (firstRender) { var interop = new Interop(JSRuntime); - await interop.IncludeLink("app-stylesheet", "stylesheet", "https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css", "text/css", "sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T", "anonymous", ""); + await interop.IncludeLink("", "stylesheet", "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css", "text/css", "sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC", "anonymous", ""); + await interop.IncludeScript("", "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", "anonymous", "", "head", ""); } } @@ -176,7 +163,7 @@ connectionString = databaseConfigControl.GetConnectionString(); } - if (connectionString != "" && _hostUsername != "" && _hostPassword.Length >= 6 && _hostPassword == _confirmPassword && _hostEmail != "" && _hostEmail.Contains("@")) + if (connectionString != "" && !string.IsNullOrEmpty(_hostUsername) && _hostPassword.Length >= 6 && _hostPassword == _confirmPassword && !string.IsNullOrEmpty(_hostEmail) && _hostEmail.Contains("@")) { _loadingDisplay = ""; StateHasChanged(); @@ -190,9 +177,10 @@ DatabaseType = database.DBType, ConnectionString = connectionString, Aliases = uri.Authority, - HostEmail = _hostEmail, + HostUsername = _hostUsername, HostPassword = _hostPassword, - HostName = UserNames.Host, + HostEmail = _hostEmail, + HostName = _hostUsername, TenantName = TenantNames.Master, IsNewTenant = true, SiteName = Constants.DefaultSite, @@ -215,5 +203,4 @@ _message = Localizer["Message.Require.DbInfo"]; } } - } diff --git a/Oqtane.Client/Modules/Admin/Files/Add.razor b/Oqtane.Client/Modules/Admin/Files/Add.razor index 727c0bcf..a36e6cc2 100644 --- a/Oqtane.Client/Modules/Admin/Files/Add.razor +++ b/Oqtane.Client/Modules/Admin/Files/Add.razor @@ -9,55 +9,60 @@
| - - | -
+
+
+
+ |
-
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
-
-
| - - | -- | -
| - - | -- - | -
| - - | -- @if (PageState.QueryString.ContainsKey("id")) - { - - } - else - { - - } - | -
|
-
- |
- |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@if (!_isSystem)
{
@@ -79,11 +89,15 @@
}
@code {
+ private ElementReference form;
+ private bool validated = false;
private List
+
+
+ |
+
+
+
- |
-
+
+
- |
-
+
+ |
-
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
-
-
| - - | -- - | -
| - - | -- - | -
|
+
+
+
+
- |
- - + - | -
@context.Name
by: @context.Owner@(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)
- @(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"] | @SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy") | @SharedLocalizer["Search.Version"]: @context.Version | @SharedLocalizer["Search.Source"]: @context.PackageUrl + @(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"] | + @SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy") | + @SharedLocalizer["Search.Version"]: @context.Version + @((MarkupString)(context.TrialPeriod > 0 ? " | " + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "" : ""))
| - - | -
- |
-
+
+
+
+
+
+
+
+}
+
@code {
+ private ElementReference form;
+ private bool validated = false;
+
private string _code = string.Empty;
private string _isDefault = "False";
private string _message;
private IEnumerable
+
+
+
+
+ "); + } + _packageid = package.PackageId; + _version = package.Version; } - - await logger.LogInformation("Language Added {Language}", language); - - NavigationManager.NavigateTo(NavigateUrl()); + StateHasChanged(); } catch (Exception ex) { - await logger.LogError(ex, "Error Adding Language {Language} {Error}", language, ex.Message); - AddModuleMessage(Localizer["Error.Language.Add"], MessageType.Error); + await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version); + AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); + } + } + + private async Task DownloadPackage() + { + try + { + await PackageService.DownloadPackageAsync(_packageid, _version, "Packages"); + await logger.LogInformation("Language Package {Name} {Version} Downloaded Successfully", _packageid, _version); + AddModuleMessage(Localizer["Success.Language.Download"], MessageType.Success); + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Downloading Translation {Name} {Version}", _packageid, _version); + AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error); } } @@ -217,22 +342,6 @@ else } } - private async Task DownloadLanguage(string packageid, string version) - { - try - { - await PackageService.DownloadPackageAsync(packageid, version, "Packages"); - await logger.LogInformation("Language Paclage {Name} {Version} Downloaded Successfully", packageid, version); - AddModuleMessage(Localizer["Success.Language.Download"], MessageType.Success); - StateHasChanged(); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Downloading Translation {Name} {Version}", packageid, version); - AddModuleMessage(Localizer["Error.Language.Download"], MessageType.Error); - } - } - private async Task SetCultureAsync(string culture) { if (culture != CultureInfo.CurrentUICulture.Name) diff --git a/Oqtane.Client/Modules/Admin/Languages/Index.razor b/Oqtane.Client/Modules/Admin/Languages/Index.razor index b8a3d21d..08fc569b 100644 --- a/Oqtane.Client/Modules/Admin/Languages/Index.razor +++ b/Oqtane.Client/Modules/Admin/Languages/Index.razor @@ -29,9 +29,9 @@ else
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
+
+
-@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))
+ {
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ - |
-
+
+ - |
-
+
+ - |
-
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- | -
| - - | -- - | -
|
+
+
+
+
- |
- - + - | -
@context.Name
by: @context.Owner@(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)
- @(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"] | @SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy") | @SharedLocalizer["Search.Version"]: @context.Version | @SharedLocalizer["Search.Source"]: @context.PackageUrl + @(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"] | + @SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy") | + @SharedLocalizer["Search.Version"]: @context.Version + @((MarkupString)(context.TrialPeriod > 0 ? " | " + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "" : ""))
| - - | -
+
+
+
+ |
-
+
+}
+
+
+
+
+
+ "); + } + _packageid = package.PackageId; + _version = package.Version; + } + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version); + AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); + } + } + + private async Task DownloadPackage() + { + try + { + await PackageService.DownloadPackageAsync(_packageid, _version, "Packages"); + await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version); + AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success); + _productname = ""; + _license = ""; + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version); + AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); + } + } + private async Task InstallModules() { try @@ -139,20 +255,4 @@ await logger.LogError(ex, "Error Installing Module"); } } - - private async Task DownloadModule(string packageid, string version) - { - try - { - await PackageService.DownloadPackageAsync(packageid, version, "Packages"); - await logger.LogInformation("Module {ModuleDefinitionName} {Version} Downloaded Successfully", packageid, version); - AddModuleMessage(Localizer["Success.Module.Download"], MessageType.Success); - StateHasChanged(); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Downloading Module {ModuleDefinitionName} {Version}", packageid, version); - AddModuleMessage(Localizer["Error.Module.Download"], MessageType.Error); - } - } } diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor index c4fae60b..6adc392a 100644 --- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor +++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Create.razor @@ -10,79 +10,71 @@ @if (_templates != null) { -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- | -
| - - | -- - | -
+
+
+ @if (!string.IsNullOrEmpty(_location))
+ {
+
+
+
+
+
+
+ }
+
+
+
+
+
+ | - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
|
- |
-
+
+
+ | - - | -- - | -
+
+
+
+
+
+
+
+ | - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- | -
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+
+ |
-
-
-
+ +
+
+
| - - | -- - | -
| - - | -- | -
| - - | -- - @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">")) - { - - } - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- | -
|
- |
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | - - | -- - | -
| - - | -- | -
| - - | -- - @if (_children != null && _children.Count > 0 && (_insert == "<" || _insert == ">")) - { - - } - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- | -
| - - | -- - | -
| - - | -- - | -
| - - | -- | -
-
|
- |
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ }
+
+
+ + } + + + + @code { public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin; + private ElementReference form; + private bool validated = false; private List
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
- SharedLocalizer
+
+
-
-
+
+
@code {
+ private ElementReference form;
+ private bool validated = false;
private string _username = string.Empty;
private string _password = string.Empty;
private string _confirm = string.Empty;
@@ -43,45 +47,54 @@
private async Task Reset()
{
- try
+ validated = true;
+ var interop = new Interop(JSRuntime);
+ if (await interop.FormValid(form))
{
- if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty)
+ try
{
- if (_password == _confirm)
+ if (_username != string.Empty && _password != string.Empty && _confirm != string.Empty)
{
- var user = new User
+ if (_password == _confirm)
{
- SiteId = PageState.Site.SiteId,
- Username = _username,
- Password = _password
- };
- user = await UserService.ResetPasswordAsync(user, PageState.QueryString["token"]);
+ var user = new User
+ {
+ SiteId = PageState.Site.SiteId,
+ Username = _username,
+ Password = _password
+ };
+ user = await UserService.ResetPasswordAsync(user, PageState.QueryString["token"]);
- if (user != null)
- {
- await logger.LogInformation("User Password Reset {Username}", _username);
- NavigationManager.NavigateTo(NavigateUrl("login"));
+ if (user != null)
+ {
+ await logger.LogInformation("User Password Reset {Username}", _username);
+ NavigationManager.NavigateTo(NavigateUrl("login"));
+ }
+ else
+ {
+ await logger.LogError("Error Resetting User Password {Username}", _username);
+ AddModuleMessage(Localizer["Error.Password.ResetInfo"], MessageType.Error);
+ }
}
else
{
- await logger.LogError("Error Resetting User Password {Username}", _username);
- AddModuleMessage(Localizer["Error.Password.ResetInfo"], MessageType.Error);
+ AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
}
}
else
{
- AddModuleMessage(Localizer["Message.Password.NoMatch"], MessageType.Warning);
+ AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
}
}
- else
+ catch (Exception ex)
{
- AddModuleMessage(Localizer["Message.Required.UserInfo"], MessageType.Warning);
+ await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message);
+ AddModuleMessage(Localizer["Error.Password.Reset"], MessageType.Error);
}
}
- catch (Exception ex)
+ else
{
- await logger.LogError(ex, "Error Resetting User Password {Username} {Error}", _username, ex.Message);
- AddModuleMessage(Localizer["Error.Password.Reset"], MessageType.Error);
+ AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
}
}
diff --git a/Oqtane.Client/Modules/Admin/Roles/Add.razor b/Oqtane.Client/Modules/Admin/Roles/Add.razor
index 905d8061..f20a721d 100644
--- a/Oqtane.Client/Modules/Admin/Roles/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Roles/Add.razor
@@ -6,37 +6,32 @@
@inject IStringLocalizer+ +
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
-
- @Localizer["Users"]
- @Localizer["Effective"]
- @Localizer["Expiry"]
-
- @context.User.DisplayName
- @context.EffectiveDate
- @context.ExpiryDate
-
-
-
| - - | -- - | -
| - - | -- @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) - { - - } - else - { - - } - | -
| - - | -
- |
-
| - - | -
- |
-
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - |
- @Localizer["Smtp.Required.EnableNotificationJob"] - |
-
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
-
| - - | -- - | -
| - - | -
- |
-
| - - | -
- |
-
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
- -
-
-
+
+ +
+
+
+
+
+
+
+
+ @Localizer["Smtp.Required.EnableNotificationJob"]
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
|
- - |
- |
| - - | -- - | -
| - - | -- | -
| - - | -- - | -
| - - | -- - | -
+
+ +
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -- - | -
- @if (!string.IsNullOrEmpty(_results)) + @if (_results != null) { - @((MarkupString)_results) + @if (_results.Count > 0) + { +
+
+
+ @foreach (KeyValuePair kvp in _results.First())
+ {
+ @kvp.Key
+ }
+
+
+ @foreach (KeyValuePair kvp in context)
+ {
+ @kvp.Value
+ }
+
+
+
+ }
+ else
+ {
+ @Localizer["Return.NoResult"]
+ }
+ +
} } @@ -71,7 +89,7 @@ else private string _database = string.Empty; private string _connectionstring = string.Empty; private string _sql = string.Empty; - private string _results = string.Empty; + private List
";
- table += "
";
- }
- else
- {
- table = Localizer["Return.NoResult"];
- }
-
- return table;
- }
}
diff --git a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
index 1d8771d3..9cd52ff2 100644
--- a/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
+++ b/Oqtane.Client/Modules/Admin/SystemInfo/Index.razor
@@ -7,105 +7,79 @@
| " + kvp.Key + " | "; - } - - table += "
|---|
| " + kvp.Value + " | "; - } - - table += "
| - - | -
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - |
- @Localizer["Register"] - |
-
| - - | -
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
@Localizer["Access.ApiFramework"] @@ -220,20 +190,4 @@ await logger.LogError(ex, "Error Restarting Application"); } } - - private async Task RegisterChecked(ChangeEventArgs e) - { - try - { - if ((bool)e.Value) - { - await InstallationService.RegisterAsync(PageState.User.Email); - AddModuleMessage(Localizer["Success.Register"], MessageType.Success); - } - } - catch (Exception ex) - { - await logger.LogError(ex, "Error On Register"); - } - } } \ No newline at end of file diff --git a/Oqtane.Client/Modules/Admin/Themes/Add.razor b/Oqtane.Client/Modules/Admin/Themes/Add.razor index 41dbace0..1f810e9d 100644 --- a/Oqtane.Client/Modules/Admin/Themes/Add.razor +++ b/Oqtane.Client/Modules/Admin/Themes/Add.razor @@ -9,19 +9,19 @@
|
+
+
+
+
- |
- - + - | -
@context.Name
@SharedLocalizer["Search.By"]: @context.Owner@(context.Description.Length > 400 ? (context.Description.Substring(0, 400) + "...") : context.Description)
- @(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"] | @SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy") | @SharedLocalizer["Search.Version"]: @context.Version | @SharedLocalizer["Search.Source"]: @context.PackageUrl + @(String.Format("{0:n0}", context.Downloads)) @SharedLocalizer["Search.Downloads"] | + @SharedLocalizer["Search.Released"]: @context.ReleaseDate.ToString("MMM dd, yyyy") | + @SharedLocalizer["Search.Version"]: @context.Version + @((MarkupString)(context.TrialPeriod > 0 ? " | " + context.TrialPeriod + " " + @SharedLocalizer["Trial"] + "" : ""))
| - - | -
+
+
+
+ |
-
+
+}
+
+
+
+
+
+ "); + } + _packageid = package.PackageId; + _version = package.Version; + } + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Getting Package {PackageId} {Version}", packageid, version); + AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error); + } + } + + private async Task DownloadPackage() + { + try + { + await PackageService.DownloadPackageAsync(_packageid, _version, "Packages"); + await logger.LogInformation("Package {PackageId} {Version} Downloaded Successfully", _packageid, _version); + AddModuleMessage(Localizer["Success.Theme.Download"], MessageType.Success); + _productname = ""; + _license = ""; + StateHasChanged(); + } + catch (Exception ex) + { + await logger.LogError(ex, "Error Downloading Package {PackageId} {Version}", _packageid, _version); + AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error); + } + } + private async Task InstallThemes() { try @@ -139,20 +256,4 @@ await logger.LogError(ex, "Error Installing Theme"); } } - - private async Task DownloadTheme(string packageid, string version) - { - try - { - await PackageService.DownloadPackageAsync(packageid, version, "Packages"); - await logger.LogInformation("Theme {ThemeName} {Version} Downloaded Successfully", packageid, version); - AddModuleMessage(Localizer["Success.Theme.Download"], MessageType.Success); - StateHasChanged(); - } - catch (Exception ex) - { - await logger.LogError(ex, "Error Downloading Module {ThemeName} {Version}", packageid, version); - AddModuleMessage(Localizer["Error.Theme.Download"], MessageType.Error); - } - } } 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) { -
| - - | -- - | -
| - - | -- - | -
| - - | -- | -
| - - | -- - | -
| - - | -- - | -
+
+
+ }
+
+
+
+
+ | - - | -
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+ |
-
| - - | -- - | -
| - - | -- - | -
| - - | -- - | -
+
+
+
+
+
+
+
>
+
+
+
+
+
+
+
+
+
+
+
+
+ | - - | -
+
+
+
+
- |
-
| - - | -- - | -
| - - | -
+
+
+
+
+
+
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
- |
-
+
+
+
+
+
+ } @@ -78,58 +68,56 @@ else
|
+ if (p.Category != category)
+ {
+
@p.Category
- |
- |
|---|---|
| - - | -
- @if (!string.IsNullOrEmpty(p.Options))
- {
-
- }
- else
- {
- @if (p.IsRequired)
+
+ category = p.Category;
+ }
+
+
+
+ @if (!string.IsNullOrEmpty(p.Options))
{
-
+
}
else
{
-
+ @if (p.IsRequired)
+ {
+
+ }
+ else
+ {
+
+ }
}
- }
- |
-
| - - | +
+
- |
+
+
- |
+
| - - | + +
+
- |
+
+
- |
+
}
-
| - - | -
+
+
+
- |
- |
| - - | -- - | -|
| - - | -- - | -
| - - | -
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - @p.Category - | -|
|---|---|
| - - | -- @if (p.IsRequired) - { - - } - else - { - - } - | -
+
| - - | -
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+ |
-
| - - | -
+
+
+
+
+
- |
-
| - @p.Category - | -|
|---|---|
| - - | -- @if (p.IsRequired) - { - - } - else - { - - } - | -
|
- |
-
+
+
+
+
+
- |
-
+
+
- |
-
| - - | -
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
| - - | -
+
+
+
+
+
- |
-
+
- @if (Toolbar == "Top")
+@if (ItemList != null)
+{
+ @if (Toolbar == "Top" && _pages > 0 && Items.Count() > _maxItems)
{
- @Localizer["Roles"]
- @Localizer["Effective"]
- @Localizer["Expiry"]
-
+ @Localizer["Roles"]
+ @Localizer["Effective"]
+ @Localizer["Expiry"]
+
@context.Role.Name
diff --git a/Oqtane.Client/Modules/Controls/FileManager.razor b/Oqtane.Client/Modules/Controls/FileManager.razor
index 9628ff48..9822859d 100644
--- a/Oqtane.Client/Modules/Controls/FileManager.razor
+++ b/Oqtane.Client/Modules/Controls/FileManager.razor
@@ -58,7 +58,6 @@
}
-
+
+ }
}
@@ -89,7 +96,7 @@
public string Id { get; set; } // optional - for setting the id of the FileManager component for accessibility
[Parameter]
- public string Folder { get; set; } // optional - for setting a specific folder by default
+ public string Folder { get; set; } // optional - for setting a specific folder by default ( only relevant for host functions )
[Parameter]
public int FolderId { get; set; } = -1; // optional - for setting a specific folderid by default
@@ -104,7 +111,10 @@
public bool ShowFolders { get; set; } = true; // optional - for indicating whether a list of folders should be displayed - default is true
[Parameter]
- public int FileId { get; set; } = -1; // optional - for setting a specific file by default
+ public bool ShowImage { get; set; } = true; // optional - for indicating whether an image thumbnail should be displayed - default is true
+
+ [Parameter]
+ public int FileId { get; set; } = -1; // optional - for selecting a specific file by default
[Parameter]
public string Filter { get; set; } // optional - comma delimited list of file types that can be selected or uploaded ie. "jpg,gif"
@@ -112,6 +122,15 @@
[Parameter]
public bool UploadMultiple { get; set; } = false; // optional - enable multiple file uploads - default false
+ [Parameter]
+ public EventCallback
+
+ 
+
+
+
}
else
{
- @((MarkupString)_openLabel)@ChildContent@((MarkupString)_closeLabel)
+
}
@code {
- private string _openLabel = string.Empty;
- private string _closeLabel = "";
-
[Parameter]
public RenderFragment ChildContent { get; set; }
@@ -21,39 +20,33 @@ else
public string For { get; set; } // optional - the id of the associated input control for accessibility
[Parameter]
- public string Class { get; set; } // optional - the class for the label ( ie. control-label )
+ public string Class { get; set; } // optional - CSS classes
[Parameter]
public string HelpText { get; set; } // optional - tooltip for this label
+ private string _spanclass = "app-tooltip";
+ private string _labelclass = "form-label";
+ private string _helptext = string.Empty;
+
protected override void OnParametersSet()
{
base.OnParametersSet();
- if (string.IsNullOrEmpty(Class))
+ if (!string.IsNullOrEmpty(HelpText))
{
- Class = "form-label";
+ _helptext = Localize(nameof(HelpText), HelpText);
+ _spanclass += (!string.IsNullOrEmpty(Class)) ? " " + Class : "";
}
-
- _openLabel = "
+
+
+
@((MarkupString)_message)
@if (Type == MessageType.Error && PageState != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
@@ -12,7 +12,6 @@
}
-
}
@code {
diff --git a/Oqtane.Client/Modules/Controls/Pager.razor b/Oqtane.Client/Modules/Controls/Pager.razor
index c0b285b7..464431dd 100644
--- a/Oqtane.Client/Modules/Controls/Pager.razor
+++ b/Oqtane.Client/Modules/Controls/Pager.razor
@@ -2,45 +2,57 @@
@inherits ModuleControlBase
@typeparam TableItem
-
- @if (_endPage > 1)
+
+
+
@@ -58,90 +70,125 @@
}
- @if (Format == "Grid")
+ @if (Format == "Grid" && Row != null)
{
+ int count = 0;
+ if (ItemList != null)
+ {
+ count = (int)Math.Ceiling(ItemList.Count() / (decimal)_columns) * _columns;
+ }
-
}
- @if (Toolbar == "Bottom")
+ @if (Toolbar == "Bottom" && _pages > 0 && Items.Count() > _maxItems)
{
- @Header
- @foreach (var item in ItemList)
+ @if (Header != null)
{
- @Row(item)
- @if (Detail != null)
- {
- @Detail(item)
- }
+
+ }
+ @for (int row = 0; row < (count / _columns); row++)
+ {
+ @Header
+ @for (int col = 0; col < _columns; col++)
+ {
+ int index = (row * _columns) + col;
+ if (index < ItemList.Count())
+ {
+
}
@Row(ItemList.ElementAt(index))
+ }
+ else
+ {
+
+ }
+ }
+
- @if (_endPage > 1)
+
+
+
-
-
-
- @if (_users.Count != 0)
- {
-
-
- @foreach (Role role in _roles)
- {
- @Localizer["Role"]
- @foreach (PermissionString permission in _permissions)
- {
- @Localizer[permission.PermissionName]
- }
-
-
- }
-
- @role.Name
- @foreach (PermissionString permission in _permissions)
- {
- var p = permission;
-
-
- }
-
-
-
+
-
-
-
- @foreach (User user in _users)
- {
- string userid = "[" + user.UserId.ToString() + "]";
+@Localizer["User"]
- @foreach (PermissionString permission in _permissions)
- {
- @Localizer[permission.PermissionName]
- }
-
+
+
+
+
+
- }
-
-
- }
-
- @user.DisplayName
+ @Localizer["Role"]
@foreach (PermissionString permission in _permissions)
{
- var p = permission;
-
-
+ @Localizer[permission.PermissionName]
}
-
-
-
-
-
-
-
-
-
-
-
+
+ }
+ @role.Name
+ @foreach (PermissionString permission in _permissions)
+ {
+ var p = permission;
+
+
+ }
+
+
+
+
+ @if (_users.Count != 0)
+ {
+
+
+
+
+
+
+
+
+
+
+
+
+ @foreach (User user in _users)
+ {
+ string userid = "[" + user.UserId.ToString() + "]";
+ @Localizer["User"]
+ @foreach (PermissionString permission in _permissions)
+ {
+ @Localizer[permission.PermissionName]
+ }
+
+
+ }
+
+ @user.DisplayName
+ @foreach (PermissionString permission in _permissions)
+ {
+ var p = permission;
+
+
+ }
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
}
@code {
diff --git a/Oqtane.Client/Modules/HtmlText/Index.razor b/Oqtane.Client/Modules/HtmlText/Index.razor
index b1dc8fd6..57a95cef 100644
--- a/Oqtane.Client/Modules/HtmlText/Index.razor
+++ b/Oqtane.Client/Modules/HtmlText/Index.razor
@@ -2,7 +2,7 @@
@namespace Oqtane.Modules.HtmlText
@inherits ModuleBase
@inject IHtmlTextService HtmlTextService
-@inject IStringLocalizer
+
+
-
+
-
-
-
-
-
-
-
-
+
-@code {
- private string _allowfilemanagement;
+ @code {
+ private string _allowfilemanagement;
- protected override void OnInitialized()
- {
- try
+ protected override void OnInitialized()
{
- _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
+ try
+ {
+ _allowfilemanagement = SettingService.GetSetting(ModuleState.Settings, "AllowFileManagement", "true");
+ }
+ catch (Exception ex)
+ {
+ ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+ }
}
- catch (Exception ex)
+
+ public async Task UpdateSettings()
{
- ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+ try
+ {
+ var settings = ModuleState.Settings;
+ settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
+ await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
+ }
+ catch (Exception ex)
+ {
+ ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+ }
}
}
-
- public async Task UpdateSettings()
- {
- try
- {
- var settings = ModuleState.Settings;
- settings = SettingService.SetSetting(settings, "AllowFileManagement", _allowfilemanagement);
- await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
- }
- catch (Exception ex)
- {
- ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
- }
- }
-}
diff --git a/Oqtane.Client/Modules/ModuleBase.cs b/Oqtane.Client/Modules/ModuleBase.cs
index e7c6658d..c4c5bef9 100644
--- a/Oqtane.Client/Modules/ModuleBase.cs
+++ b/Oqtane.Client/Modules/ModuleBase.cs
@@ -134,6 +134,11 @@ namespace Oqtane.Modules
return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
}
+ public string ImageUrl(int fileid, int width, int height, string mode)
+ {
+ return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode);
+ }
+
public virtual Dictionary
+
+
+
+
+
+
-
-
- @Localizer["ControlPanel"]
-
-
+
+
+
+ @Localizer["ControlPanel"]
+
+
+ @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
+ {
+
-
+
-
+
+
- @if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
- {
-
@code {
- private string _footer = "false";
+ private string _scope = "page";
+ private string _login = "-";
+ private string _register = "-";
+ private string _footer = "-";
- protected override void OnInitialized()
+ protected override async Task OnInitializedAsync()
{
try
{
- _footer = SettingService.GetSetting(PageState.Page.Settings, GetType().Namespace + ":Footer", "false");
+ await LoadSettings();
}
catch (Exception ex)
{
- ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+ await logger.LogError(ex, "Error Loading Settings {Error}", ex.Message);
+ AddModuleMessage("Error Loading Settings", MessageType.Error);
+ }
+ }
+
+ private async Task LoadSettings()
+ {
+ if (_scope == "site")
+ {
+ 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
+ {
+ var settings = SettingService.MergeSettings(PageState.Site.Settings, PageState.Page.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();
+ }
+
+ private async Task ScopeChanged(ChangeEventArgs eventArgs)
+ {
+ try
+ {
+ _scope = (string)eventArgs.Value;
+ await LoadSettings();
+ StateHasChanged();
+ }
+ catch (Exception ex)
+ {
+ await logger.LogError(ex, "Error Loading Settings {Error}", ex.Message);
+ AddModuleMessage("Error Loading Settings", MessageType.Error);
}
}
@@ -37,13 +108,45 @@
{
try
{
- var settings = PageState.Page.Settings;
- settings = SettingService.SetSetting(settings, GetType().Namespace + ":Footer", _footer);
- await SettingService.UpdatePageSettingsAsync(settings, PageState.Page.PageId);
+ if (_scope == "site")
+ {
+ var settings = PageState.Site.Settings;
+ if (_login != "-")
+ {
+ settings = SettingService.SetSetting(settings, GetType().Namespace + ":Login", _login, true);
+ }
+ if (_register != "-")
+ {
+ 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
+ {
+ var settings = PageState.Page.Settings;
+ if (_login != "-")
+ {
+ settings = SettingService.SetSetting(settings, GetType().Namespace + ":Login", _login);
+ }
+ if (_register != "-")
+ {
+ settings = SettingService.SetSetting(settings, GetType().Namespace + ":Register", _register);
+ }
+ if (_footer != "-")
+ {
+ settings = SettingService.SetSetting(settings, GetType().Namespace + ":Footer", _footer);
+ }
+ await SettingService.UpdatePageSettingsAsync(settings, PageState.Page.PageId);
+ }
}
catch (Exception ex)
{
- ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+ await logger.LogError(ex, "Error Saving Settings {Error}", ex.Message);
+ AddModuleMessage("Error Saving Settings", MessageType.Error);
}
}
}
diff --git a/Oqtane.Client/Themes/ThemeBase.cs b/Oqtane.Client/Themes/ThemeBase.cs
index 158321f9..6dbece0b 100644
--- a/Oqtane.Client/Themes/ThemeBase.cs
+++ b/Oqtane.Client/Themes/ThemeBase.cs
@@ -103,5 +103,10 @@ namespace Oqtane.Themes
{
return Utilities.ContentUrl(PageState.Alias, fileid, asAttachment);
}
+
+ public string ImageUrl(int fileid, int width, int height, string mode)
+ {
+ return Utilities.ImageUrl(PageState.Alias, fileid, width, height, mode);
+ }
}
}
diff --git a/Oqtane.Client/UI/ContainerBuilder.razor b/Oqtane.Client/UI/ContainerBuilder.razor
index a48dfe0f..98d8702f 100644
--- a/Oqtane.Client/UI/ContainerBuilder.razor
+++ b/Oqtane.Client/UI/ContainerBuilder.razor
@@ -1,6 +1,6 @@
@namespace Oqtane.UI
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
-
+ @if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
+ {
+
+ }
+ else
+ {
+
+ }
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- }
-
- @if (_deleteConfirmation)
- {
-
- @if (UserSecurity.GetPermissionStrings(PageState.Page.Permissions).FirstOrDefault(item => item.PermissionName == PermissionNames.View).Permissions.Split(';').Contains(RoleNames.Everyone))
- {
-
- }
- else
- {
-
- }
-
-
-
+
-
-@code {
- private string _title = "true";
- private string _background = "";
- private string _text = "";
- private string _border = "";
+ @code {
+ private string _title = "true";
+ private string _background = "";
+ private string _text = "";
+ private string _border = "";
- protected override void OnInitialized()
- {
- try
+ protected override void OnInitialized()
{
- _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", "");
+ 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)
+ {
+ ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+ }
}
- catch (Exception ex)
+
+ public async Task UpdateSettings()
{
- ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+ try
+ {
+ var settings = ModuleState.Settings;
+ 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)
+ {
+ ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
+ }
}
}
-
- public async Task UpdateSettings()
- {
- try
- {
- var settings = ModuleState.Settings;
- 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)
- {
- ModuleInstance.AddModuleMessage(ex.Message, MessageType.Error);
- }
- }
-}
diff --git a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
index 9779050c..85ddaa9e 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
@@ -6,7 +6,7 @@
-
+
+
@@ -117,13 +117,18 @@
new Resource { ResourceType = ResourceType.Script, Bundle = "Bootstrap", Url = "https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/js/bootstrap.bundle.min.js", Integrity = "sha384-MrcW6ZMFYlzcLA8Nl+NtUVF0sA7MsXsP1UyJoMp4YLEuNSfAP+JcXn/tWtIaxVXM", CrossOrigin = "anonymous" }
};
+ private bool _login = true;
+ private bool _register = true;
private bool _footer = false;
protected override void OnParametersSet()
{
try
{
- _footer = bool.Parse(SettingService.GetSetting(PageState.Page.Settings, GetType().Namespace + ":Footer", "false"));
+ 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.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
index 2b5d56b6..ecebce19 100644
--- a/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
+++ b/Oqtane.Client/Themes/OqtaneTheme/Themes/ThemeSettings.razor
@@ -2,34 +2,105 @@
@inherits ModuleBase
@implements Oqtane.Interfaces.ISettingsControl
@inject ISettingService SettingService
+@inject IStringLocalizer
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Oqtane.Client/UI/ModuleInstance.razor b/Oqtane.Client/UI/ModuleInstance.razor
index 0dec5413..d63ef4b6 100644
--- a/Oqtane.Client/UI/ModuleInstance.razor
+++ b/Oqtane.Client/UI/ModuleInstance.razor
@@ -27,6 +27,8 @@
protected override void OnParametersSet()
{
+ _message = "";
+
DynamicComponent = builder =>
{
Type moduleType = null;
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 3714eeb9..8f73a00b 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -1,5 +1,4 @@
@using System.Diagnostics.CodeAnalysis
-@using System.Runtime.InteropServices
@namespace Oqtane.UI
@inject AuthenticationStateProvider AuthenticationStateProvider
@inject SiteState SiteState
@@ -16,11 +15,16 @@
@DynamicComponent
@code {
-
private string _absoluteUri;
private bool _navigationInterceptionEnabled;
private PageState _pagestate;
+ [Parameter]
+ public string Runtime { get; set; }
+
+ [Parameter]
+ public string RenderMode { get; set; }
+
[CascadingParameter]
PageState PageState { get; set; }
@@ -71,7 +75,7 @@
var editmode = false;
var refresh = UI.Refresh.None;
var lastsyncdate = DateTime.UtcNow.AddHours(-1);
- var runtime = GetRuntime();
+ var runtime = (Shared.Runtime)Enum.Parse(typeof(Shared.Runtime), Runtime);
Uri uri = new Uri(_absoluteUri);
@@ -89,7 +93,7 @@
else
{
// reload the client application if the user navigated to a site with a different alias or there is a forced reload
- if ((!path.StartsWith(SiteState.Alias.Path) && SiteState.Alias.Path != "") || querystring.ContainsKey("reload"))
+ if ((!path.ToLower().StartsWith(SiteState.Alias.Path.ToLower()) && !string.IsNullOrEmpty(SiteState.Alias.Path)) || querystring.ContainsKey("reload"))
{
NavigationManager.NavigateTo(_absoluteUri.Replace("?reload", ""), true);
return;
@@ -138,6 +142,7 @@
if (authState.User.Identity.IsAuthenticated)
{
user = await UserService.GetUserAsync(authState.User.Identity.Name, site.SiteId);
+ user.IsAuthenticated = authState.User.Identity.IsAuthenticated;
}
}
else
@@ -425,7 +430,7 @@
if ((module.PageId == page.PageId || module.ModuleId == moduleid))
{
var typename = Constants.ErrorModule;
- if (module.ModuleDefinition != null && (module.ModuleDefinition.Runtimes == "" || module.ModuleDefinition.Runtimes.Contains(GetRuntime().ToString())))
+ if (module.ModuleDefinition != null && (module.ModuleDefinition.Runtimes == "" || module.ModuleDefinition.Runtimes.Contains(Runtime)))
{
typename = module.ModuleDefinition.ControlTypeTemplate;
@@ -543,10 +548,4 @@
}
return pageresources;
}
-
- private Oqtane.Shared.Runtime GetRuntime()
-=> RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"))
- ? Oqtane.Shared.Runtime.WebAssembly
- : Oqtane.Shared.Runtime.Server;
-
}
diff --git a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
index 8d9f32ed..ccb89b0b 100644
--- a/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
+++ b/Oqtane.Database.MySQL/Oqtane.Database.MySQL.csproj
@@ -2,7 +2,7 @@