summaryrefslogtreecommitdiffstats
path: root/apps/theming
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2019-11-26 10:55:20 +0100
committerGitHub <noreply@github.com>2019-11-26 10:55:20 +0100
commitfe6dc8082c8f370cd1136bb0a0494b902ffbbea0 (patch)
tree7149df5d8ba57fd764761c34683cae49e3f9d901 /apps/theming
parentdfe85ae0c2c542178657a0a610ecea9f7cd1cea6 (diff)
parent6d883f3641b769bda17d7267bdde42027f051e7d (diff)
downloadnextcloud-server-fe6dc8082c8f370cd1136bb0a0494b902ffbbea0.tar.gz
nextcloud-server-fe6dc8082c8f370cd1136bb0a0494b902ffbbea0.zip
add var for theming images , advanced options (#16815)
add var for theming images , advanced options
Diffstat (limited to 'apps/theming')
-rw-r--r--apps/theming/css/theming.scss4
-rw-r--r--apps/theming/lib/Capabilities.php2
-rw-r--r--apps/theming/lib/ThemingDefaults.php4
-rw-r--r--apps/theming/tests/CapabilitiesTest.php14
-rw-r--r--apps/theming/tests/ThemingDefaultsTest.php4
5 files changed, 19 insertions, 9 deletions
diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss
index f21f00f438a..368b3f33c5d 100644
--- a/apps/theming/css/theming.scss
+++ b/apps/theming/css/theming.scss
@@ -153,7 +153,7 @@ $invert: luma($color-primary) > 0.6;
@if variable_exists('theming-logoheader-mime') and $theming-logoheader-mime != '' {
#theming .advanced-option-logoheader .image-preview,
body:not(#body-login) #header .logo {
- background-image: url(#{$image-logoheader});
+ background-image: $image-logoheader;
}
} @else {
#theming .advanced-option-favicon .image-preview {
@@ -163,7 +163,7 @@ $invert: luma($color-primary) > 0.6;
@if variable_exists('theming-favicon-mime') and $theming-favicon-mime != '' {
#theming .advanced-option-favicon .image-preview {
- background-image: url(#{$image-favicon});
+ background-image: $image-favicon;
}
} @else {
#theming .advanced-option-favicon .image-preview {
diff --git a/apps/theming/lib/Capabilities.php b/apps/theming/lib/Capabilities.php
index a75403a1fd5..e48c63d50fa 100644
--- a/apps/theming/lib/Capabilities.php
+++ b/apps/theming/lib/Capabilities.php
@@ -83,6 +83,8 @@ class Capabilities implements IPublicCapability {
$this->url->getAbsoluteURL($this->theming->getBackground()),
'background-plain' => $backgroundLogo === 'backgroundColor',
'background-default' => !$this->util->isBackgroundThemed(),
+ 'logoheader' => $this->url->getAbsoluteURL($this->theming->getLogo()),
+ 'favicon' => $this->url->getAbsoluteURL($this->theming->getLogo()),
],
];
}
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index bca3d70e4ef..43af8f203fd 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -287,8 +287,8 @@ class ThemingDefaults extends \OC_Defaults {
];
$variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
- $variables['image-logoheader'] = "'".$this->imageManager->getImageUrl('logoheader')."'";
- $variables['image-favicon'] = "'".$this->imageManager->getImageUrl('favicon')."'";
+ $variables['image-logoheader'] = "url('".$this->imageManager->getImageUrl('logoheader')."')";
+ $variables['image-favicon'] = "url('".$this->imageManager->getImageUrl('favicon')."')";
$variables['image-login-background'] = "url('".$this->imageManager->getImageUrl('background')."')";
$variables['image-login-plain'] = 'false';
diff --git a/apps/theming/tests/CapabilitiesTest.php b/apps/theming/tests/CapabilitiesTest.php
index 87c544b2a2c..f007de1dbdb 100644
--- a/apps/theming/tests/CapabilitiesTest.php
+++ b/apps/theming/tests/CapabilitiesTest.php
@@ -78,6 +78,8 @@ class CapabilitiesTest extends TestCase {
'background' => 'http://absolute/background',
'background-plain' => false,
'background-default' => false,
+ 'logoheader' => 'http://absolute/logo',
+ 'favicon' => 'http://absolute/logo',
]],
['name1', 'url2', 'slogan3', '#01e4a0', '#ffffff', 'logo5', 'background6', 'http://localhost/', false, [
'name' => 'name1',
@@ -90,6 +92,8 @@ class CapabilitiesTest extends TestCase {
'background' => 'http://localhost/background6',
'background-plain' => false,
'background-default' => true,
+ 'logoheader' => 'http://localhost/logo5',
+ 'favicon' => 'http://localhost/logo5',
]],
['name1', 'url2', 'slogan3', '#000000', '#ffffff', 'logo5', 'backgroundColor', 'http://localhost/', true, [
'name' => 'name1',
@@ -102,6 +106,8 @@ class CapabilitiesTest extends TestCase {
'background' => '#000000',
'background-plain' => true,
'background-default' => false,
+ 'logoheader' => 'http://localhost/logo5',
+ 'favicon' => 'http://localhost/logo5',
]],
['name1', 'url2', 'slogan3', '#000000', '#ffffff', 'logo5', 'backgroundColor', 'http://localhost/', false, [
'name' => 'name1',
@@ -114,6 +120,8 @@ class CapabilitiesTest extends TestCase {
'background' => '#000000',
'background-plain' => true,
'background-default' => true,
+ 'logoheader' => 'http://localhost/logo5',
+ 'favicon' => 'http://localhost/logo5',
]],
];
}
@@ -147,7 +155,7 @@ class CapabilitiesTest extends TestCase {
$this->theming->expects($this->atLeast(1))
->method('getColorPrimary')
->willReturn($color);
- $this->theming->expects($this->once())
+ $this->theming->expects($this->exactly(3))
->method('getLogo')
->willReturn($logo);
$this->theming->expects($this->once())
@@ -168,13 +176,13 @@ class CapabilitiesTest extends TestCase {
$this->theming->expects($this->once())
->method('getBackground')
->willReturn($background);
- $this->url->expects($this->exactly(2))
+ $this->url->expects($this->exactly(4))
->method('getAbsoluteURL')
->willReturnCallback(function($url) use($baseUrl) {
return $baseUrl . $url;
});
} else {
- $this->url->expects($this->once())
+ $this->url->expects($this->exactly(3))
->method('getAbsoluteURL')
->willReturnCallback(function($url) use($baseUrl) {
return $baseUrl . $url;
diff --git a/apps/theming/tests/ThemingDefaultsTest.php b/apps/theming/tests/ThemingDefaultsTest.php
index 3c69490bef5..71b8ba97e9b 100644
--- a/apps/theming/tests/ThemingDefaultsTest.php
+++ b/apps/theming/tests/ThemingDefaultsTest.php
@@ -681,8 +681,8 @@ class ThemingDefaultsTest extends TestCase {
'color-primary-element' => '#aaaaaa',
'theming-logoheader-mime' => '\'jpeg\'',
'theming-favicon-mime' => '\'jpeg\'',
- 'image-logoheader' => '\'custom-logoheader?v=0\'',
- 'image-favicon' => '\'custom-favicon?v=0\'',
+ 'image-logoheader' => "url('custom-logoheader?v=0')",
+ 'image-favicon' => "url('custom-favicon?v=0')",
'has-legal-links' => 'false'
];
$this->assertEquals($expected, $this->template->getScssVariables());