- @SharedLocalizer["Version"] @Constants.Version
+ @SharedLocalizer["Version"] @Constants.Version (.NET 7)
@@ -61,7 +63,7 @@
@Localizer["ApplicationAdmin"]
@@ -96,6 +98,20 @@
+
+
@@ -103,7 +119,13 @@
+ @if (_templates != null)
+ {
+
+ }
+
+ -
+ @((MarkupString)_message)
+
+
+ }
+
+
+
+
+
+
@@ -199,6 +208,7 @@
private string _name;
private string _description = "";
private string _categories;
+ private string _isenabled;
private string _moduledefinitionname = "";
private string _version;
private string _packagename = "";
@@ -234,6 +244,7 @@
_name = moduleDefinition.Name;
_description = moduleDefinition.Description;
_categories = moduleDefinition.Categories;
+ _isenabled = moduleDefinition.IsEnabled.ToString();
_moduledefinitionname = moduleDefinition.ModuleDefinitionName;
_version = moduleDefinition.Version;
_packagename = moduleDefinition.PackageName;
@@ -297,6 +308,7 @@
{
moduledefinition.Categories = _categories;
}
+ moduledefinition.IsEnabled = (_isenabled == null ? true : bool.Parse(_isenabled));
moduledefinition.PermissionList = _permissionGrid.GetPermissionList();
await ModuleDefinitionService.UpdateModuleDefinitionAsync(moduledefinition);
await logger.LogInformation("ModuleDefinition Saved {ModuleDefinition}", moduledefinition);
diff --git a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
index 1df05879..ff9a96cc 100644
--- a/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
+++ b/Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
@@ -43,6 +43,7 @@ else
@SharedLocalizer["Name"]
@SharedLocalizer["Version"]
+ @Localizer["Enabled"]
@Localizer["InUse"]
@SharedLocalizer["Expires"]
@@ -57,6 +58,16 @@ else
@context.Name
@context.Version
+
+ @if (context.IsEnabled)
+ {
+ @SharedLocalizer["Yes"]
+ }
+ else
+ {
+ @SharedLocalizer["No"]
+ }
+
@if (context.AssemblyName == Constants.ClientId || PageState.Modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
{
diff --git a/Oqtane.Client/Modules/Admin/Modules/Settings.razor b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
index 68df3167..a3133216 100644
--- a/Oqtane.Client/Modules/Admin/Modules/Settings.razor
+++ b/Oqtane.Client/Modules/Admin/Modules/Settings.razor
@@ -44,12 +44,20 @@
@@ -90,37 +98,35 @@
@code {
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
- public override string Title => "Module Settings";
+ public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Edit;
+ public override string Title => "Module Settings";
- private ElementReference form;
- private bool validated = false;
- private List _themes;
- private List _containers = new List();
- private string _title;
- private string _containerType;
- private string _allPages = "false";
- private string _permissionNames = "";
- private List _permissions = null;
- private string _pageId;
- private PermissionGrid _permissionGrid;
- private Type _moduleSettingsType;
- private object _moduleSettings;
- private string _moduleSettingsTitle = "Module Settings";
- private RenderFragment ModuleSettingsComponent { get; set; }
- private Type _containerSettingsType;
- private object _containerSettings;
- private RenderFragment ContainerSettingsComponent { get; set; }
- private string createdby;
- private DateTime createdon;
- private string modifiedby;
- private DateTime modifiedon;
+ private ElementReference form;
+ private bool validated = false;
+ private List _containers = new List();
+ private string _title;
+ private string _containerType;
+ private string _allPages = "false";
+ private string _permissionNames = "";
+ private List _permissions = null;
+ private string _pageId;
+ private PermissionGrid _permissionGrid;
+ private Type _moduleSettingsType;
+ private object _moduleSettings;
+ private string _moduleSettingsTitle = "Module Settings";
+ private RenderFragment ModuleSettingsComponent { get; set; }
+ 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()
- {
- _title = ModuleState.Title;
- _themes = await ThemeService.GetThemesAsync();
- _containers = ThemeService.GetContainerControls(_themes, PageState.Page.ThemeType);
+ protected override void OnInitialized()
+ {
+ _title = ModuleState.Title;
+ _containers = ThemeService.GetContainerControls(PageState.Site.Themes, PageState.Page.ThemeType);
_containerType = ModuleState.ContainerType;
_allPages = ModuleState.AllPages.ToString();
_permissions = ModuleState.PermissionList;
@@ -165,7 +171,7 @@
AddModuleMessage(string.Format(Localizer["Error.Module.Load"], ModuleState.ModuleDefinitionName), MessageType.Error);
}
- var theme = _themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
+ var theme = PageState.Site.Themes.FirstOrDefault(item => item.Containers.Any(themecontrol => themecontrol.TypeName.Equals(_containerType)));
if (theme != null && !string.IsNullOrEmpty(theme.ContainerSettingsType))
{
_containerSettingsType = Type.GetType(theme.ContainerSettingsType);
diff --git a/Oqtane.Client/Modules/Admin/Pages/Add.razor b/Oqtane.Client/Modules/Admin/Pages/Add.razor
index ae722343..5832f45d 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Add.razor
@@ -6,12 +6,11 @@
@inject IStringLocalizer Localizer
@inject IStringLocalizer SharedLocalizer
-
-
+}
@code {
- public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Admin;
+ public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.View;
- private List _themeList;
- private List _themes = new List();
- private List _containers = new List();
- private string _name;
- private string _title;
- private string _meta;
- private string _path = string.Empty;
- private string _parentid = "-1";
- private string _insert = ">>";
- private List _children;
- private int _childid = -1;
- private string _isnavigation = "True";
- private string _isclickable = "True";
- private string _url;
- private string _ispersonalizable = "False";
- private string _themetype = string.Empty;
- private string _containertype = string.Empty;
- private string _icon = string.Empty;
- private string _permissions = null;
- private PermissionGrid _permissionGrid;
- private Type _themeSettingsType;
- private object _themeSettings;
- private RenderFragment ThemeSettingsComponent { get; set; }
- private bool _refresh = false;
- private ElementReference form;
- private bool validated = false;
+ private bool _initialized = false;
+ private ElementReference form;
+ private bool validated = false;
+ private List _themes = new List();
+ private List _containers = new List();
+ private int _pageId;
+ private string _name;
+ private string _parentid = "-1";
+ private string _insert = ">>";
+ private List _children;
+ private int _childid = -1;
+ private string _isnavigation = "True";
+ private string _isclickable = "True";
+ private string _path = string.Empty;
+ private string _url;
+ private string _ispersonalizable = "False";
+ private string _title;
+ private string _icon = string.Empty;
+ private string _themetype = string.Empty;
+ private string _containertype = string.Empty;
+ private string _headcontent;
+ private string _bodycontent;
+ private string _permissions = null;
+ private PermissionGrid _permissionGrid;
+ private Type _themeSettingsType;
+ private object _themeSettings;
+ private RenderFragment ThemeSettingsComponent { get; set; }
+ private bool _refresh = false;
+ protected Page _parent = null;
- protected override async Task OnInitializedAsync()
- {
- try
- {
- _themeList = await ThemeService.GetThemesAsync();
- _themes = ThemeService.GetThemeControls(_themeList);
- _themetype = PageState.Site.DefaultThemeType;
- _containers = ThemeService.GetContainerControls(_themeList, _themetype);
- _containertype = PageState.Site.DefaultContainerType;
- _children = PageState.Pages.Where(item => item.ParentId == null).ToList();
- ThemeSettings();
- }
+ protected override async Task OnInitializedAsync()
+ {
+ try
+ {
+ if (PageState.QueryString.ContainsKey("id"))
+ {
+ _pageId = Int32.Parse(PageState.QueryString["id"]);
+ _parent = await PageService.GetPageAsync(_pageId);
+ if (_parent != null)
+ {
+ _parentid = _parent.PageId.ToString();
+ }
+ }
+
+ // if admin or user has edit access to parent page
+ if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin) || (_parent != null && UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, _parent.PermissionList)))
+ {
+ _themetype = PageState.Site.DefaultThemeType;
+ _themes = ThemeService.GetThemeControls(PageState.Site.Themes, _themetype);
+ _containers = ThemeService.GetContainerControls(PageState.Site.Themes, _themetype);
+ _containertype = PageState.Site.DefaultContainerType;
+ _children = PageState.Pages.Where(item => item.ParentId == null).ToList();
+ ThemeSettings();
+ _initialized = true;
+ }
+ else
+ {
+ await logger.LogWarning("Error Loading Page {ParentId}", _parentid);
+ AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
+ }
+ }
catch (Exception ex)
{
- await logger.LogError(ex, "Error Initializing Page {Error}", ex.Message);
- AddModuleMessage(Localizer["Error.Page.Initialize"], MessageType.Error);
+ await logger.LogError(ex, "Error Loading Page {Error}", ex.Message);
+ AddModuleMessage(Localizer["Error.Page.Load"], MessageType.Error);
}
}
@@ -246,27 +301,10 @@
}
}
- private async void ThemeChanged(ChangeEventArgs e)
- {
- try
- {
- _themetype = (string)e.Value;
- _containers = ThemeService.GetContainerControls(_themeList, _themetype);
- _containertype = "-";
- ThemeSettings();
- StateHasChanged();
- }
- catch (Exception ex)
- {
- await logger.LogError(ex, "Error Loading Pane Layouts For Theme {ThemeType} {Error}", _themetype, ex.Message);
- AddModuleMessage(Localizer["Error.Pane.Load"], MessageType.Error);
- }
- }
-
private void ThemeSettings()
{
_themeSettingsType = null;
- var theme = _themeList.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
+ var theme = PageState.Site.Themes.FirstOrDefault(item => item.Themes.Any(themecontrol => themecontrol.TypeName.Equals(_themetype)));
if (theme != null && !string.IsNullOrEmpty(theme.ThemeSettingsType))
{
_themeSettingsType = Type.GetType(theme.ThemeSettingsType);
@@ -292,12 +330,11 @@
Page page = null;
try
{
- if (!string.IsNullOrEmpty(_themetype) && _containertype != "-")
+ if (!string.IsNullOrEmpty(_themetype) && !string.IsNullOrEmpty(_containertype))
{
page = new Page();
page.SiteId = PageState.Page.SiteId;
page.Name = _name;
- page.Title = _title;
if (string.IsNullOrEmpty(_path))
{
@@ -365,34 +402,42 @@
page.IsNavigation = (_isnavigation == null ? true : Boolean.Parse(_isnavigation));
page.IsClickable = (_isclickable == null ? true : Boolean.Parse(_isclickable));
- page.Url = _url;
- page.ThemeType = (_themetype != "-") ? _themetype : string.Empty;
+ page.Url = _url;
+ page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
+ page.UserId = null;
+
+ // appearance
+ page.Title = _title;
+ page.Icon = (_icon == null ? string.Empty : _icon);
+ page.ThemeType = _themetype;
if (!string.IsNullOrEmpty(page.ThemeType) && page.ThemeType == PageState.Site.DefaultThemeType)
{
page.ThemeType = string.Empty;
}
- page.DefaultContainerType = (_containertype != "-") ? _containertype : string.Empty;
+ page.DefaultContainerType = _containertype;
if (!string.IsNullOrEmpty(page.DefaultContainerType) && page.DefaultContainerType == PageState.Site.DefaultContainerType)
{
page.DefaultContainerType = string.Empty;
}
- page.Icon = (_icon == null ? string.Empty : _icon);
+
+ // page content
+ page.HeadContent = _headcontent;
+ page.BodyContent = _bodycontent;
+
+ // permissions
page.PermissionList = _permissionGrid.GetPermissionList();
- page.IsPersonalizable = (_ispersonalizable == null ? false : Boolean.Parse(_ispersonalizable));
- page.UserId = null;
- page.Meta = _meta;
page = await PageService.AddPageAsync(page);
await PageService.UpdatePageOrderAsync(page.SiteId, page.PageId, page.ParentId);
await logger.LogInformation("Page Added {Page}", page);
- if (PageState.QueryString.ContainsKey("cp"))
+ if (!string.IsNullOrEmpty(PageState.ReturnUrl))
{
- NavigationManager.NavigateTo(NavigateUrl(PageState.Pages.First(item => item.PageId == int.Parse(PageState.QueryString["cp"])).Path));
+ NavigationManager.NavigateTo(page.Path); // redirect to new page
}
else
{
- NavigationManager.NavigateTo(NavigateUrl(page.Path));
+ NavigationManager.NavigateTo(NavigateUrl()); // redirect to page management
}
}
else
@@ -415,9 +460,9 @@
private void Cancel()
{
- if (PageState.QueryString.ContainsKey("cp"))
+ if (!string.IsNullOrEmpty(PageState.ReturnUrl))
{
- NavigationManager.NavigateTo(NavigateUrl(PageState.Pages.First(item => item.PageId == int.Parse(PageState.QueryString["cp"])).Path));
+ NavigationManager.NavigateTo(PageState.ReturnUrl);
}
else
{
diff --git a/Oqtane.Client/Modules/Admin/Pages/Edit.razor b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
index 4f0c1166..f77c3970 100644
--- a/Oqtane.Client/Modules/Admin/Pages/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/Pages/Edit.razor
@@ -8,133 +8,123 @@
@inject IStringLocalizer Localizer
@inject IStringLocalizer SharedLocalizer
-