Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Support for third party modules, improved error handling, standardardized enum naming, reorganized interface definitions, support for DB script upgrades, added Settings entity

Browse Source
This commit is contained in:
Shaun Walker
2019-08-14 09:34:35 -04:00
parent 916109015f
commit b71f007981
78 changed files with 809 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Oqtane.Client/Themes/ContainerBase.cs
View File

@ -21,14 +21,13 @@ namespace Oqtane.Themes
public string NavigateUrl(string path)
{
return Utilities.NavigateUrl(PageState.Alias.Path, path);
return NavigateUrl(path, "");
}
public string EditUrl(string action)
public string NavigateUrl(string path, string parameters)
{
return EditUrl(ModuleState.ModuleId, action);
return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters);
}
public string EditUrl(string action, string parameters)
{
return EditUrl(ModuleState.ModuleId, action, parameters);

3
Oqtane.Client/Themes/Controls/Logo.razor
View File

@ -6,11 +6,12 @@
@code {
string logo = "";
protected override void OnInit()
protected override Task OnParametersSetAsync()
{
if (PageState.Site.Logo != "")
{
logo = "<a href=\"" + PageState.Alias.Url + "\"><img src=\"/Sites/" + PageState.Site.SiteId.ToString() + "/" + PageState.Site.Logo + "\" alt=\"" + PageState.Site.Name + "\"/></a>";
}
return Task.CompletedTask;
}
}

3
Oqtane.Client/Themes/Controls/Menu.razor
View File

@ -34,7 +34,7 @@
List<Page> pages;
Page parent = null;
protected override void OnInit()
protected override Task OnParametersSetAsync()
{
// if current page has no children
if (PageState.Pages.Where(item => item.ParentId == PageState.Page.PageId).FirstOrDefault() == null)
@ -54,5 +54,6 @@
// current page is parent
parent = PageState.Pages.Where(item => item.ParentId == PageState.Page.ParentId).FirstOrDefault();
}
return Task.CompletedTask;
}
}

3
Oqtane.Client/Themes/Controls/ModuleTitle.razor
View File

@ -6,12 +6,13 @@
@code {
string title = "";
protected override void OnInit()
protected override Task OnParametersSetAsync()
{
title = ModuleState.Title;
if (PageState.Control == "Settings")
{
title = PageState.Control;
}
return Task.CompletedTask;
}
}

7
Oqtane.Client/Themes/ThemeBase.cs
View File

@ -17,7 +17,12 @@ namespace Oqtane.Themes
public string NavigateUrl(string path)
{
return Utilities.NavigateUrl(PageState.Alias.Path, path);
return NavigateUrl(path, "");
}
public string NavigateUrl(string path, string parameters)
{
return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters);
}
}

7
Oqtane.Client/Themes/ThemeObjectBase.cs
View File

@ -15,7 +15,12 @@ namespace Oqtane.Themes
public string NavigateUrl(string path)
{
return Utilities.NavigateUrl(PageState.Alias.Path, path);
return NavigateUrl(path, "");
}
public string NavigateUrl(string path, string parameters)
{
return Utilities.NavigateUrl(PageState.Alias.Path, path, parameters);
}
public string EditUrl(int moduleid, string action)