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

Fix #2382 - Admin pane improvements

Browse Source
This commit is contained in:
Shaun Walker
2022-09-02 18:10:13 -04:00
parent 13b9982461
commit 282a0b0c44
9 changed files with 86 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
View File

@ -576,7 +576,21 @@
Dictionary<string, string> settings = await SettingService.GetUserSettingsAsync(PageState.User.UserId);
_category = SettingService.GetSetting(settings, settingCategory, "Common");
var pane = SettingService.GetSetting(settings, settingPane, "");
_pane = PageState.Page.Panes.Contains(pane) ? pane : PaneNames.Admin;
if (PageState.Page.Panes.Contains(pane))
{
_pane = pane;
}
else
{
if (PageState.Page.Panes.Count != 0)
{
_pane = PageState.Page.Panes[0];
}
else
{
_pane = PaneNames.Admin;
}
}
}
private async Task UpdateSettingsAsync()

15
Oqtane.Client/Themes/OqtaneTheme/Themes/Default.razor
View File

@ -13,11 +13,18 @@
<div class="container">
<div class="row">
<div class="col-md-12">
<Pane Name="@PaneNames.Admin" />
<Pane Name="@PaneNames.Default" />
</div>
</div>
</div>
<Pane Name="Top Full Width" />
<div class="container">
<div class="row">
<div class="col-md-12">
<Pane Name="@PaneNames.Admin" />
</div>
</div>
</div>
<Pane Name="Top Full Width" />
<div class="container">
<div class="row">
<div class="col-md-12">
@ -102,13 +109,13 @@
{
<Pane Name="Footer" />
}
</div>
</div>
</main>
@code {
public override string Name => "Default Theme";
public override string Panes => PaneNames.Admin + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width,Footer";
public override string Panes => PaneNames.Default + ",Top Full Width,Top 100%,Left 50%,Right 50%,Left 33%,Center 33%,Right 33%,Left Outer 25%,Left Inner 25%,Right Inner 25%,Right Outer 25%,Left 25%,Center 50%,Right 25%,Left Sidebar 66%,Right Sidebar 33%,Left Sidebar 33%,Right Sidebar 66%,Bottom 100%,Bottom Full Width,Footer," + PaneNames.Admin;
public override List<Resource> Resources => new List<Resource>()
{