mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4707 from nextcloud/fix-invalid-theming-urls 

Fix invalid theming URLs
This commit is contained in:
Roeland Jago Douma 2017-05-05 12:47:50 +02:00 committed by GitHub
parent 619d09529c ac04fb8277
commit 15f43b2635
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/theming/css/theming.scss
View File

@ -45,12 +45,12 @@
#header .logo, #header .logo,
#header .logo-icon { #header .logo-icon {
background-size: contain; background-size: contain;
background-image: url(#{$image-logo}?v=#{$theming-cachebuster}); background-image: url(#{$image-logo});
} }
#body-login, #body-login,
#firstrunwizard .firstrunwizard-header { #firstrunwizard .firstrunwizard-header {
background-image: url(#{$image-login-background}?v=#{$theming-cachebuster}); background-image: url(#{$image-login-background});
background-color: $color-primary; background-color: $color-primary;
} }

6
apps/theming/lib/ThemingDefaults.php
View File

@ -165,11 +165,13 @@ class ThemingDefaults extends \OC_Defaults {
$backgroundExists = false; $backgroundExists = false;
} }
$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
if(!$backgroundLogo || !$backgroundExists) { if(!$backgroundLogo || !$backgroundExists) {
return $this->urlGenerator->imagePath('core','background.jpg'); return $this->urlGenerator->imagePath('core','background.jpg') . '?v=' . $cacheBusterCounter;
} }
return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground'); return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground') . '?v=' . $cacheBusterCounter;
} }

27
apps/theming/tests/ThemingDefaultsTest.php
View File

@ -384,10 +384,15 @@ class ThemingDefaultsTest extends TestCase {
->method('getFolder') ->method('getFolder')
->willThrowException(new NotFoundException()); ->willThrowException(new NotFoundException());
$this->config $this->config
->expects($this->once()) ->expects($this->at(0))
->method('getAppValue') ->method('getAppValue')
->with('theming', 'backgroundMime') ->with('theming', 'backgroundMime')
->willReturn(''); ->willReturn('');
$this->config
->expects($this->at(1))
->method('getAppValue')
->with('theming', 'cachebuster', '0')
->willReturn('0');
$this->appData $this->appData
->expects($this->once()) ->expects($this->once())
->method('getFolder') ->method('getFolder')
@ -397,7 +402,7 @@ class ThemingDefaultsTest extends TestCase {
->method('imagePath') ->method('imagePath')
->with('core', 'background.jpg') ->with('core', 'background.jpg')
->willReturn('core-background'); ->willReturn('core-background');
$this->assertEquals('core-background', $this->template->getBackground()); $this->assertEquals('core-background?v=0', $this->template->getBackground());
} }
public function testGetBackgroundCustom() { public function testGetBackgroundCustom() {
@ -410,15 +415,20 @@ class ThemingDefaultsTest extends TestCase {
->method('getFolder') ->method('getFolder')
->willReturn($folder); ->willReturn($folder);
$this->config $this->config
->expects($this->once()) ->expects($this->at(0))
->method('getAppValue') ->method('getAppValue')
->with('theming', 'backgroundMime', false) ->with('theming', 'backgroundMime', false)
->willReturn('image/svg+xml'); ->willReturn('image/svg+xml');
$this->config
->expects($this->at(1))
->method('getAppValue')
->with('theming', 'cachebuster', '0')
->willReturn('0');
$this->urlGenerator->expects($this->once()) $this->urlGenerator->expects($this->once())
->method('linkToRoute') ->method('linkToRoute')
->with('theming.Theming.getLoginBackground') ->with('theming.Theming.getLoginBackground')
->willReturn('custom-background'); ->willReturn('custom-background');
$this->assertEquals('custom-background', $this->template->getBackground()); $this->assertEquals('custom-background?v=0', $this->template->getBackground());
} }
public function testGetLogoDefault() { public function testGetLogoDefault() {
@ -444,7 +454,7 @@ class ThemingDefaultsTest extends TestCase {
->method('imagePath') ->method('imagePath')
->with('core', 'logo.svg') ->with('core', 'logo.svg')
->willReturn('core-logo'); ->willReturn('core-logo');
$this->assertEquals('core-logo' . '?v=0', $this->template->getLogo()); $this->assertEquals('core-logo?v=0', $this->template->getLogo());
} }
public function testGetLogoCustom() { public function testGetLogoCustom() {
@ -483,9 +493,10 @@ class ThemingDefaultsTest extends TestCase {
$this->config->expects($this->at(1))->method('getAppValue')->with('theming', 'logoMime', false)->willReturn('jpeg'); $this->config->expects($this->at(1))->method('getAppValue')->with('theming', 'logoMime', false)->willReturn('jpeg');
$this->config->expects($this->at(2))->method('getAppValue')->with('theming', 'cachebuster', '0')->willReturn('0'); $this->config->expects($this->at(2))->method('getAppValue')->with('theming', 'cachebuster', '0')->willReturn('0');
$this->config->expects($this->at(3))->method('getAppValue')->with('theming', 'backgroundMime', false)->willReturn('jpeg'); $this->config->expects($this->at(3))->method('getAppValue')->with('theming', 'backgroundMime', false)->willReturn('jpeg');
$this->config->expects($this->at(4))->method('getAppValue')->with('theming', 'color', null)->willReturn($this->defaults->getColorPrimary()); $this->config->expects($this->at(4))->method('getAppValue')->with('theming', 'cachebuster', '0')->willReturn('0');
$this->config->expects($this->at(5))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary()); $this->config->expects($this->at(5))->method('getAppValue')->with('theming', 'color', null)->willReturn($this->defaults->getColorPrimary());
$this->config->expects($this->at(6))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary()); $this->config->expects($this->at(6))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
$this->config->expects($this->at(7))->method('getAppValue')->with('theming', 'color', $this->defaults->getColorPrimary())->willReturn($this->defaults->getColorPrimary());
$this->util->expects($this->any())->method('invertTextColor')->with($this->defaults->getColorPrimary())->willReturn(false); $this->util->expects($this->any())->method('invertTextColor')->with($this->defaults->getColorPrimary())->willReturn(false);
$this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(null); $this->cache->expects($this->once())->method('get')->with('getScssVariables')->willReturn(null);
@ -512,7 +523,7 @@ class ThemingDefaultsTest extends TestCase {
$expected = [ $expected = [
'theming-cachebuster' => '\'0\'', 'theming-cachebuster' => '\'0\'',
'image-logo' => "'absolute-custom-logo?v=0'", 'image-logo' => "'absolute-custom-logo?v=0'",
'image-login-background' => "'absolute-custom-background'", 'image-login-background' => "'absolute-custom-background?v=0'",
'color-primary' => $this->defaults->getColorPrimary(), 'color-primary' => $this->defaults->getColorPrimary(),
'color-primary-text' => '#ffffff' 'color-primary-text' => '#ffffff'