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

improvements for site groups

Browse Source
This commit is contained in:
sbwalker
2026-02-06 11:53:10 -05:00
parent dff2261994
commit 57deeb6acf
12 changed files with 131 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,11 @@
@inject IPageService PageService
@inject ISettingService SettingService
@if (ShowLanguageSwitcher)
{
<LanguageSwitcher ButtonClass="@ButtonClass" DropdownAlignment="@LanguageDropdownAlignment" />
}
@if (ShowEditMode && (_showEditMode || (PageState.Page.IsPersonalizable && PageState.User != null && UserSecurity.IsAuthorized(PageState.User, RoleNames.Registered))))
{
<form method="post" class="app-form-inline" @formname="EditModeForm" @onsubmit="@(async () => await ToggleEditMode(PageState.EditMode))" data-enhance>
@@ -48,11 +53,9 @@
[Parameter]
public string BodyClass { get; set; } = "offcanvas-body overflow-auto";
// deprecated in 10.1.0 - UI culture is set in user's profile
[Parameter]
public bool ShowLanguageSwitcher { get; set; } = true;
// deprecated in 10.1.0 - UI culture is set in user's profile
[Parameter]
public string LanguageDropdownAlignment { get; set; } = string.Empty; // Empty or Left or Right

17
Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
View File

@@ -11,6 +11,7 @@
@inject ILogService logger
@inject ISettingService SettingService
@inject IJSRuntime jsRuntime
@inject ISiteGroupDefinitionService SiteGroupDefinitionService
@inject IServiceProvider ServiceProvider
@inject ILogService LoggingService
@inject IStringLocalizer<ControlPanelInteractive> Localizer
@@ -34,6 +35,10 @@
<button type="button" data-bs-dismiss="offcanvas" class="btn btn-primary col-12" @onclick=@(async () => Navigate("Admin"))>@Localizer["AdminDash"]</button>
</div>
</div>
@if (_siteGroupDefinitions.Any(item => item.Synchronization))
{
<button type="button" class="btn btn-success col-12 mt-1" @onclick="SynchronizeSite">@Localizer["Synchronize"]</button>
}
<hr class="app-rule" />
}
@if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, PageState.Page.PermissionList))
@@ -257,6 +262,7 @@
private List<Page> _pages = new List<Page>();
private List<Module> _modules = new List<Module>();
private List<ThemeControl> _containers = new List<ThemeControl>();
private List<SiteGroupDefinition> _siteGroupDefinitions = new List<SiteGroupDefinition>();
private string _category = "Common";
private string _pane = "";
@@ -287,6 +293,7 @@
_allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Page.SiteId);
_moduleDefinitions = _allModuleDefinitions.Where(item => item.Categories.Contains(_category)).ToList();
_categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',', StringSplitOptions.RemoveEmptyEntries)).Distinct().Where(item => item != "Headless").ToList();
_siteGroupDefinitions = await SiteGroupDefinitionService.GetSiteGroupDefinitionsAsync(PageState.Site.SiteId);
}
}
@@ -631,4 +638,14 @@
{
_message = "";
}
private async Task SynchronizeSite()
{
foreach (var group in _siteGroupDefinitions.Where(item => item.Synchronization))
{
group.Synchronize = true;
await SiteGroupDefinitionService.UpdateSiteGroupDefinitionAsync(group);
}
NavigationManager.NavigateTo(Utilities.NavigateUrl(PageState.Alias.Path, PageState.Page.Path, ""), true);
}
}

37
Oqtane.Client/Themes/Controls/Theme/LanguageSelector.razor
View File

@@ -1,37 +0,0 @@
@using System.Globalization
@using Oqtane.Models
@using System.Linq
@namespace Oqtane.Themes.Controls
@inherits ThemeControlBase
@inject ILocalizationService LocalizationService
@inject NavigationManager NavigationManager
@if (PageState.Site.Languages.Count() > 1)
{
<div class="app-languages btn-group pe-1" role="group">
<button id="btnCultures" type="button" class="btn @ButtonClass dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="oi oi-globe"></span>
</button>
<div class="dropdown-menu @MenuAlignment">
@foreach (var language in PageState.Site.Languages)
{
<a class="dropdown-item" href="@(PageState.Alias.Protocol + language.AliasName)">@language.Name</a>
}
</div>
</div>
}
@code{
private string MenuAlignment = string.Empty;
[Parameter]
public string DropdownAlignment { get; set; } = string.Empty; // Empty or Left or Right
[Parameter]
public string ButtonClass { get; set; } = "btn-outline-secondary";
protected override async Task OnParametersSetAsync()
{
MenuAlignment = DropdownAlignment.ToLower() == "right" ? "dropdown-menu-end" : string.Empty;
}
}

24
Oqtane.Client/Themes/Controls/Theme/LanguageSwitcher.razor
View File

@@ -6,22 +6,29 @@
@inject ILocalizationCookieService LocalizationCookieService
@inject NavigationManager NavigationManager
@if (_supportedCultures?.Count() > 1)
@if (PageState.Site.Languages.Count() > 1)
{
<div class="app-languages btn-group pe-1" role="group">
<button id="btnCultures" type="button" class="btn @ButtonClass dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="oi oi-globe"></span>
</button>
<div class="dropdown-menu @MenuAlignment" aria-labelledby="btnCultures">
@foreach (var culture in _supportedCultures)
@foreach (var language in PageState.Site.Languages)
{
@if (PageState.RenderMode == RenderModes.Interactive)
@if (_contentLocalization)
{
<a class="dropdown-item @(CultureInfo.CurrentUICulture.Name == culture.Name ? "active" : String.Empty)" href="#" @onclick="@(async e => await SetCultureAsync(culture.Name))" @onclick:preventDefault="true">@culture.DisplayName</a>
<a class="dropdown-item" href="@(PageState.Alias.Protocol + language.AliasName)">@language.Name</a>
}
else
{
<a class="dropdown-item @(CultureInfo.CurrentUICulture.Name == culture.Name ? "active" : String.Empty)" href="@NavigateUrl(PageState.Page.Path, "culture=" + culture.Name)" data-enhance-nav="false">@culture.DisplayName</a>
@if (PageState.RenderMode == RenderModes.Interactive)
{
<a class="dropdown-item @(CultureInfo.CurrentUICulture.Name == language.Code ? "active" : String.Empty)" href="#" @onclick="@(async e => await SetCultureAsync(language.Code))" @onclick:preventDefault="true">@language.Name</a>
}
else
{
<a class="dropdown-item @(CultureInfo.CurrentUICulture.Name == language.Code ? "active" : String.Empty)" href="@NavigateUrl(PageState.Page.Path, "culture=" + language.Code)" data-enhance-nav="false">@language.Name</a>
}
}
}
</div>
@@ -29,7 +36,7 @@
}
@code{
private IEnumerable<Culture> _supportedCultures;
private bool _contentLocalization;
private string MenuAlignment = string.Empty;
[Parameter]
@@ -41,12 +48,13 @@
{
MenuAlignment = DropdownAlignment.ToLower() == "right" ? "dropdown-menu-end" : string.Empty;
_supportedCultures = PageState.Languages.Select(l => new Culture { Name = l.Code, DisplayName = l.Name });
// if AliasName is populated it means the site is using content localization
_contentLocalization = PageState.Languages.Any(item => !string.IsNullOrEmpty(item.AliasName));
if (PageState.QueryString.ContainsKey("culture"))
{
var culture = PageState.QueryString["culture"];
if (_supportedCultures.Any(item => item.Name == culture))
if (PageState.Site.Languages.Any(item => item.Code == culture))
{
await LocalizationCookieService.SetLocalizationCookieAsync(culture);
}

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

@@ -11,7 +11,6 @@
<Search CssClass="me-3 text-center bg-primary" />
<UserProfile ShowRegister="@_register" />
<Login ShowLogin="@_login" />
<LanguageSelector />
<ControlPanel LanguageDropdownAlignment="right" />
</div>
</div>