upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #8993 from nextcloud/theming-allow-ui-with-theme

Browse source 
Show UI when using a custom theme
This commit is contained in:
Roeland Jago Douma 2018-03-27 19:27:49 +02:00 committed by GitHub
commit 06f52ead31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/theming/lib/Settings/Admin.php
View file

@ -67,7 +67,7 @@ class Admin implements ISettings {
$theme = $this->config->getSystemValue('theme', '');
if ($theme !== '') {
$themable = false;
$errorMessage = $this->l->t('You are already using a custom theme');
$errorMessage = $this->l->t('You are already using a custom theme. Theming app settings might be overwritten by that.');
}
$parameters = [

3
apps/theming/templates/settings-admin.php
View file

@ -37,7 +37,7 @@ style('theming', 'settings-admin');
<p>
<?php p($_['errorMessage']) ?>
</p>
<?php } else { ?>
<?php } ?>
<div>
<label>
<span><?php p($l->t('Name')) ?></span>
@ -99,5 +99,4 @@ style('theming', 'settings-admin');
</p>
<?php } ?>
</div>
<?php } ?>
</div>

6
apps/theming/tests/Settings/AdminTest.php
View file

@ -118,8 +118,8 @@ class AdminTest extends TestCase {
$this->l10n
->expects($this->once())
->method('t')
->with('You are already using a custom theme')
->willReturn('You are already using a custom theme');
->with('You are already using a custom theme. Theming app settings might be overwritten by that.')
->willReturn('You are already using a custom theme. Theming app settings might be overwritten by that.');
$this->themingDefaults
->expects($this->once())
->method('getEntity')
@ -143,7 +143,7 @@ class AdminTest extends TestCase {
->willReturn('/my/route');
$params = [
'themable' => false,
'errorMessage' => 'You are already using a custom theme',
'errorMessage' => 'You are already using a custom theme. Theming app settings might be overwritten by that.',
'name' => 'MyEntity',
'url' => 'https://example.com',
'slogan' => 'MySlogan',