upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

[Bugfix]: Titles of pages (dashboard, apps-settings, users-settings) #43327

Browse source 
Signed-off-by: Andrii Rublov <airublev@outlook.com>
This commit is contained in:
Andrii Rublov 2024-02-14 16:38:46 +01:00 committed by Andrii Rublov
parent 18434d1ef3
commit 8d22d341c8
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/settings/lib/Controller/AppSettingsController.php
View file

@ -139,7 +139,7 @@ class AppSettingsController extends Controller {
$params['bundles'] = $this->getBundles();
$this->navigationManager->setActiveEntry('core_apps');
$templateResponse = new TemplateResponse('settings', 'settings-vue', ['serverData' => $params, 'pageTitle' => $this->l10n->t('Apps')]);
$templateResponse = new TemplateResponse('settings', 'settings-vue', ['serverData' => $params, 'pageTitle' => $this->l10n->t('Settings')]);
$policy = new ContentSecurityPolicy();
$policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com');
$templateResponse->setContentSecurityPolicy($policy);

2
apps/settings/lib/Controller/UsersController.php
View file

@ -280,7 +280,7 @@ class UsersController extends Controller {
$serverData['newUserRequireEmail'] = $this->config->getAppValue('core', 'newUser.requireEmail', 'no') === 'yes';
$serverData['newUserSendEmail'] = $this->config->getAppValue('core', 'newUser.sendEmail', 'yes') === 'yes';
return new TemplateResponse('settings', 'settings-vue', ['serverData' => $serverData, 'pageTitle' => $this->l10n->t('Users')]);
return new TemplateResponse('settings', 'settings-vue', ['serverData' => $serverData, 'pageTitle' => $this->l10n->t('Settings')]);
}
/**

4
apps/settings/tests/Controller/AppSettingsControllerTest.php
View file

@ -210,7 +210,7 @@ class AppSettingsControllerTest extends TestCase {
'bundles' => [],
'developerDocumentation' => ''
],
'pageTitle' => 'Apps'
'pageTitle' => 'Settings'
],
'user');
$expected->setContentSecurityPolicy($policy);
@ -245,7 +245,7 @@ class AppSettingsControllerTest extends TestCase {
'bundles' => [],
'developerDocumentation' => ''
],
'pageTitle' => 'Apps'
'pageTitle' => 'Settings'
],
'user');
$expected->setContentSecurityPolicy($policy);

4
core/templates/layout.guest.php
View file

@ -9,8 +9,8 @@
<title>
<?php
p(!empty($_['pageTitle']) ? $_['pageTitle'] . ' – ' : '');
p($theme->getTitle());
?>
p($theme->getTitle());
?>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<?php if ($theme->getiTunesAppId() !== '') { ?>

6
core/templates/layout.public.php
View file

@ -4,9 +4,9 @@
<meta charset="utf-8">
<title>
<?php
p(!empty($_['application'])?$_['application'].' - ':'');
p($theme->getTitle());
?>
p(!empty($_['application']) ? $_['application'].' - ' : '');
p($theme->getTitle());
?>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<?php if ($theme->getiTunesAppId() !== '') { ?>

8
core/templates/layout.user.php
View file

@ -18,10 +18,10 @@ $getUserAvatar = static function (int $size) use ($_): string {
<meta charset="utf-8">
<title>
<?php
p(!empty($_['pageTitle'])?$_['pageTitle'].' - ':'');
p(!empty($_['application'])?$_['application'].' - ':'');
p($theme->getTitle());
?>
p(!empty($_['pageTitle']) && $_['pageTitle'] !== $_['application'] ? $_['pageTitle'].' - ' : '');
p(!empty($_['application']) ? $_['application'].' - ' : '');
p($theme->getTitle());
?>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />