Skip to content

Improve accessibility of the title of the settings #29881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlSchwan merged 2 commits into from
Sep 6, 2022
Merged

Improve accessibility of the title of the settings #29881

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
046d545
Improve accessibility of the title of the settings
CarlSchwan Nov 24, 2021
2397ea7
Merge branch 'master' into fix/setting/accessibility-title
CarlSchwan Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into fix/setting/accessibility-title 
Signed-off-by: Carl Schwan <[email protected]>
  • Loading branch information
@CarlSchwan
CarlSchwan authored Sep 2, 2022
commit 2397ea72196de42a79e2a5873dcbb07db698f348
7 changes: 6 additions & 1 deletion apps/settings/lib/Controller/CommonSettingsTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,12 @@ private function formatSettings(array $settings): array {
}

private function getIndexResponse(string $type, string $section): TemplateResponse {
$this->navigationManager->setActiveEntry('settings');
if ($type === 'personal') {
$this->navigationManager->setActiveEntry('settings');
} elseif ($type === 'admin') {
$this->navigationManager->setActiveEntry('admin_settings');
}

$templateParams = [];
$templateParams = array_merge($templateParams, $this->getNavigationParameters($type, $section));
$templateParams = array_merge($templateParams, $this->getSettings($section));
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.